summaryrefslogtreecommitdiffstats
path: root/x11vnc/selection.c
diff options
context:
space:
mode:
authorrunge <runge>2006-05-07 00:50:13 +0000
committerrunge <runge>2006-05-07 00:50:13 +0000
commit279f35495a122c9892198545f83e03c6fc50fa08 (patch)
tree7ce00691a9f77432cead7a5f4ae702fc62878019 /x11vnc/selection.c
parent0d734ad8967eafab1fb058280a0db04e7470e569 (diff)
downloadlibvncserver-279f35495a122c9892198545f83e03c6fc50fa08.zip
libvncserver-279f35495a122c9892198545f83e03c6fc50fa08.tar.gz
x11vnc: support for video4linux webcams & tv-tuners, -24to32 bpp option, -rawfb console.
Diffstat (limited to 'x11vnc/selection.c')
-rw-r--r--x11vnc/selection.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/x11vnc/selection.c b/x11vnc/selection.c
index 6d652d6..cb2cce7 100644
--- a/x11vnc/selection.c
+++ b/x11vnc/selection.c
@@ -4,6 +4,7 @@
#include "cleanup.h"
#include "connections.h"
#include "unixpw.h"
+#include "xwrappers.h"
/*
* Selection/Cutbuffer/Clipboard handlers.
@@ -57,7 +58,11 @@ void selection_request(XEvent *ev, char *type) {
unsigned int length;
unsigned char *data;
#ifndef XA_LENGTH
- unsigned long XA_LENGTH = XInternAtom(dpy, "LENGTH", True);
+ unsigned long XA_LENGTH;
+#endif
+ RAWFB_RET_VOID
+#ifndef XA_LENGTH
+ XA_LENGTH = XInternAtom(dpy, "LENGTH", True);
#endif
req_event = &(ev->xselectionrequest);
@@ -128,7 +133,7 @@ void selection_request(XEvent *ev, char *type) {
XSetErrorHandler(old_handler);
trapped_xerror = 0;
- XFlush(dpy);
+ XFlush_wr(dpy);
}
int check_sel_direction(char *dir, char *label, char *sel, int len) {
@@ -179,6 +184,7 @@ void cutbuffer_send(void) {
cutbuffer_str[0] = '\0';
slen = 0;
+ RAWFB_RET_VOID
/* read the property value into cutbuffer_str: */
do {
@@ -248,6 +254,7 @@ void selection_send(XEvent *ev) {
unsigned char* data = NULL;
char *selection_str;
+ RAWFB_RET_VOID
/*
* remember info about our last value of PRIMARY (or CUT_BUFFER0)
* so we can check for any changes below.
OpenPOWER on IntegriCloud