From 1c03dd4d51a35103e93c3adaf1f619c868324c77 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Sun, 19 Oct 2008 16:16:41 +0000
Subject: x11vnc: -chatwindow, -scale WxH, -enc changes.

---
 x11vnc/xwrappers.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'x11vnc/xwrappers.c')

diff --git a/x11vnc/xwrappers.c b/x11vnc/xwrappers.c
index 022e59a..d16b7c9 100644
--- a/x11vnc/xwrappers.c
+++ b/x11vnc/xwrappers.c
@@ -9,6 +9,7 @@
 #include "macosx.h"
 
 int xshm_present = 0;
+int xshm_opcode = 0;
 int xtest_present = 0;
 int xtrap_present = 0;
 int xrecord_present = 0;
@@ -32,6 +33,7 @@ XImage *XShmCreateImage_wr(Display* disp, Visual* vis, unsigned int depth,
 Status XShmAttach_wr(Display *disp, XShmSegmentInfo *shminfo);
 Status XShmDetach_wr(Display *disp, XShmSegmentInfo *shminfo);
 Bool XShmQueryExtension_wr(Display *disp);
+int XShmGetEventBase_wr(Display *disp);
 
 XImage *xreadscreen(Display *disp, Drawable d, int x, int y,
     unsigned int width, unsigned int height, Bool show_cursor);
@@ -203,6 +205,15 @@ Bool XShmQueryExtension_wr(Display *disp) {
 #endif
 }
 
+int XShmGetEventBase_wr(Display *disp) {
+#if LIBVNCSERVER_HAVE_XSHM
+	return XShmGetEventBase(disp);
+#else
+	if (!disp) {}
+	return 0;
+#endif
+}
+
 /* wrapper for overlay screen reading: */
 
 XImage *xreadscreen(Display *disp, Drawable d, int x, int y,
@@ -224,7 +235,7 @@ XImage *xreadscreen(Display *disp, Drawable d, int x, int y,
 	}
 #  else
 	/* unused vars warning: */
-	if (disp || d || x || y || width || height || show_cursor) {} 
+	if (disp || d || x || y || width || height || show_cursor) {}
 
 	return NULL;
 #  endif
@@ -631,7 +642,7 @@ void XTRAP_FakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down,
 		return;
 	}
 	/* unused vars warning: */
-	if (key || down || delay) {} 
+	if (key || down || delay) {}
 
 # if LIBVNCSERVER_HAVE_LIBXTRAP
 	XESimulateXEventRequest(trap_ctx, down ? KeyPress : KeyRelease,
@@ -722,7 +733,7 @@ void XTRAP_FakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press,
 		return;
 	}
 	/* unused vars warning: */
-	if (button || is_press || delay) {} 
+	if (button || is_press || delay) {}
 
 #if LIBVNCSERVER_HAVE_LIBXTRAP
 	XESimulateXEventRequest(trap_ctx,
@@ -788,7 +799,7 @@ void XTRAP_FakeMotionEvent_wr(Display* dpy, int screen, int x, int y,
 		return;
 	}
 	/* unused vars warning: */
-	if (dpy || screen || x || y || delay) {} 
+	if (dpy || screen || x || y || delay) {}
 
 #if LIBVNCSERVER_HAVE_LIBXTRAP
 	XESimulateXEventRequest(trap_ctx, MotionNotify, 0, x, y, 0);
@@ -891,7 +902,7 @@ Bool XETrapQueryExtension_wr(Display *dpy, int *ev, int *er, int *op) {
 	    (INT32 *)op);
 #else
 	/* unused vars warning: */
-	if (ev || er || op) {} 
+	if (ev || er || op) {}
 	return False;
 #endif
 }
@@ -913,7 +924,7 @@ int XTestGrabControl_wr(Display *dpy, Bool impervious) {
 int XTRAP_GrabControl_wr(Display *dpy, Bool impervious) {
 	if (! xtrap_present) {
 		/* unused vars warning: */
-		if (dpy || impervious) {} 
+		if (dpy || impervious) {}
 		return 0;
 	}
 	RAWFB_RET(0)
-- 
cgit v1.2.3