Fix missing XTest build

Make sure we can actually build without XTest libraries.

diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index e562c6ff6bebca382be826d6a97e77c8f564a7af..43819f0636ee6dc05197820fdf44005cb6c8da93 100644 (file)
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -276,8 +276,10 @@ void XDesktop::start(VNCServer* vs) {
 void XDesktop::stop() {
   running = false;
 
+#ifdef HAVE_XTEST
   // Delete added keycodes
   deleteAddedKeysyms(dpy);
+#endif
 
 #ifdef HAVE_XDAMAGE
   if (haveDamage)
@@ -355,6 +357,9 @@ void XDesktop::pointerEvent(const Point& pos, int buttonMask) {
     }
   }
   oldButtonMask = buttonMask;
+#else
+  (void)pos;
+  (void)buttonMask;
 #endif
 }
 
@@ -396,7 +401,6 @@ KeyCode XDesktop::XkbKeysymToKeycode(Display* dpy, KeySym keysym) {
 
   return keycode;
 }
-#endif
 
 KeyCode XDesktop::addKeysym(Display* dpy, KeySym keysym)
 {
@@ -512,6 +516,7 @@ KeyCode XDesktop::keysymToKeycode(Display* dpy, KeySym keysym) {
 
   return keycode;
 }
+#endif
 
 
 void XDesktop::keyEvent(uint32_t keysym, uint32_t xtcode, bool down) {
@@ -546,6 +551,10 @@ void XDesktop::keyEvent(uint32_t keysym, uint32_t xtcode, bool down) {
   vlog.debug("%d %s", keycode, down ? "down" : "up");
 
   XTestFakeKeyEvent(dpy, keycode, down, CurrentTime);
+#else
+  (void)keysym;
+  (void)xtcode;
+  (void)down;
 #endif
 }
 

diff --git a/unix/x0vncserver/XDesktop.h b/unix/x0vncserver/XDesktop.h
index 0221749652cd111ce94f461cde093158fbcdb550..99d1806573d47fd8c43de99afc9af60a7e2f7fd5 100644 (file)
--- a/unix/x0vncserver/XDesktop.h
+++ b/unix/x0vncserver/XDesktop.h
@@ -54,10 +54,6 @@ public:
   virtual void queryConnection(network::Socket* sock,
                                const char* userName);
   virtual void pointerEvent(const rfb::Point& pos, int buttonMask);
-  KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym);
-  KeyCode addKeysym(Display* dpy, KeySym keysym);
-  void deleteAddedKeysyms(Display* dpy);
-  KeyCode keysymToKeycode(Display* dpy, KeySym keysym);
   virtual void keyEvent(uint32_t keysym, uint32_t xtcode, bool down);
   virtual void clientCutText(const char* str);
   virtual unsigned int setScreenLayout(int fb_width, int fb_height,
@@ -101,6 +97,14 @@ protected:
   unsigned ledState;
   const unsigned short *codeMap;
   unsigned codeMapLen;
+
+protected:
+#ifdef HAVE_XTEST
+  KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym);
+  KeyCode addKeysym(Display* dpy, KeySym keysym);
+  void deleteAddedKeysyms(Display* dpy);
+  KeyCode keysymToKeycode(Display* dpy, KeySym keysym);
+#endif
   bool setCursor();
   rfb::ScreenSet computeScreenLayout();
 };