setDesktopSize support: disable support if older libvncserver version

Signed-off-by: Floris Bos <[email protected]>

Author: maxnet

configure.ac

@@ -285,6 +285,12 @@ elif test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
 			case `(uname -sr) 2>/dev/null` in
 			"SunOS 5"*) CPPFLAGS="$CPPFLAGS -I/usr/X11/include" ;;
 			esac
+
+			# support for setdesktopsize needs xrandr and libvncserver with setDesktopSizeHook
+			AC_CHECK_MEMBER([struct _rfbScreenInfo.setDesktopSizeHook],
+				[AC_DEFINE(HAVE_SETDESKTOPSIZE, 1, [libvncserver supports setDesktopSizeHook])],
+				[AC_MSG_WARN([Support for option -setdesktopsize disabled. Needs libvncserver 0.9.13])],
+				[[#include "rfb/rfb.h"]])
 		fi
 
 		X_LIBS="$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS"

src/cleanup.c

@@ -304,13 +304,9 @@ int trap_getimage_xerror(Display *d, XErrorEvent *error) {
 #endif
 
 static int Xerror(Display *d, XErrorEvent *error) {
+	char buf[255] = {0};
 	X_UNLOCK;
 
-	if (getenv("X11VNC_PRINT_XERROR")) {
-		fprintf(stderr, "Xerror: major_opcode: %d minor_opcode: %d error_code: %d\n",
-		    error->request_code, error->minor_code, error->error_code);
-	}
-
 	if (xshm_opcode > 0 && error->request_code == xshm_opcode) {
 		if (error->minor_code == X_ShmAttach) {
 			char *dstr = DisplayString(dpy);
@@ -323,13 +319,18 @@ static int Xerror(Display *d, XErrorEvent *error) {
 			}
 			fprintf(stderr, "  Suggestion, use: x11vnc -display :0 ... for local display :0\n\n");
 		}
-	}
 
-	interrupted(0);
+		interrupted(0);
+	}
+	else {
+		XGetErrorText(d, error->error_code, buf, sizeof(buf)-1);
+		fprintf(stderr, "Xerror: major_opcode: %d minor_opcode: %d error_code: %d msg: %s\n",
+		error->request_code, error->minor_code, error->error_code, buf);
+	}
 
 	if (d) {} /* unused vars warning: */
 
-	return (*Xerror_def)(d, error);
+	return 0;
 }
 
 void watch_loop(void);

src/connections.c

@@ -838,9 +838,11 @@ void client_gone(rfbClientPtr client) {
 		}
 	}
 
+#if HAVE_SETDESKTOPSIZE
 	if (enable_setdesktopsize && xrandr && client_count == 0) {
 		xrandr_reset_scaling();
 	}
+#endif
 	if (no_autorepeat && client_count == 0) {
 		autorepeat(1, 0);
 	}

src/help.c

@@ -3058,12 +3058,14 @@ void print_help(int mode) {
 "                       prefix \"string\" with \"nc:\", e.g. \"nc:+90\",\n"
 "                       \"nc:xy\", etc.\n"
 "\n"
+#if HAVE_SETDESKTOPSIZE
 "-setdesktopsize        Allow client to change framebuffer resolution to fit\n"
 "                       size of client window. x11vnc will use xrandr commands\n"
 "                       to change the X framebuffer size. The mode of the physical\n"
 "                       screen will not be changed, but scaling will be used to\n"
 "                       display the new framebuffer size on the physical screen.\n"
 "\n"
+#endif
 "-padgeom WxH           Whenever a new vncviewer connects, the framebuffer is\n"
 "                       replaced with a fake, solid black one of geometry WxH.\n"
 "                       Shortly afterwards the framebuffer is replaced with the\n"

src/screen.c

@@ -820,6 +820,7 @@ void free_old_fb(void) {
 	}
 }
 
+#if HAVE_SETDESKTOPSIZE
 static int set_desktop_size_hook(int width, int height, int numScreens, rfbExtDesktopScreen* extDesktopScreens, rfbClientPtr cl)
 {
     int i;
@@ -836,6 +837,7 @@ static int set_desktop_size_hook(int width, int height, int numScreens, rfbExtDe
 
     return xrandr_set_scale_from(width, height) ? rfbExtDesktopSize_Success : rfbExtDesktopSize_InvalidScreenLayout;
 }
+#endif
 
 static char _lcs_tmp[128];
 static int _bytes0_size = 128, _bytes0[128];
@@ -3669,9 +3671,11 @@ void initialize_screen(int *argc, char **argv, XImage *fb) {
 	screen->ptrAddEvent = pointer_event;
 	screen->setXCutText = xcut_receive;
 	screen->setTranslateFunction = set_xlate_wrapper;
+#if HAVE_SETDESKTOPSIZE
 	if (enable_setdesktopsize) {
 		screen->setDesktopSizeHook = set_desktop_size_hook;
 	}
+#endif
 
 	screen->kbdReleaseAllKeys = kbd_release_all_keys; 
 	screen->setSingleWindow = set_single_window; 

src/x11vnc.c

@@ -3888,10 +3888,12 @@ int main(int argc, char* argv[]) {
 			grab_buster = 0;
 			continue;
 		}
+#if HAVE_SETDESKTOPSIZE
 		if (!strcmp(arg, "-setdesktopsize")) {
 			enable_setdesktopsize = 1;
 			continue;
 		}
+#endif
 		if (!strcmp(arg, "-snapfb")) {
 			use_snapfb = 1;
 			continue;

src/x11vnc.h

@@ -66,6 +66,7 @@ so, delete this exception statement from your version.
 
 #include "config.h"
 
+#define LIBVNCSERVER_WITH_WEBSOCKETS 1
 #include <rfb/rfb.h>
 #include <rfb/rfbregion.h>
 

src/xrandr.c

@@ -304,11 +304,11 @@ int known_xrandr_mode(char *s) {
 	}
 }
 
+#if HAVE_SETDESKTOPSIZE
 /* Set framebuffer size to w x h
  * Does not alter physical resolution but scales desired framebuffer to physical display resolution */
 rfbBool xrandr_set_scale_from(int w, int h)
 {
-#if HAVE_LIBXRANDR
     XTransform transform;
     XRRScreenResources *screens;
     XRRCrtcInfo *crtcInfo;
@@ -446,16 +446,12 @@ rfbBool xrandr_set_scale_from(int w, int h)
        the old size.) */
 
     return TRUE;
-#else
-    rfbLog("Cannot resize desktop. XRANDR support not compiled into x11vnc\n");
-    return FALSE;
-#endif
 }
 
 /* Restore scaling to original size */
 void xrandr_reset_scaling()
 {
     xrandr_set_scale_from(-1, -1);
 }
-
+#endif