Move XDesktop to separate file
Define ledNames in XDesktop.cxx, rename N_LEDS to XDESKTOP_N_LEDS
diff --git a/unix/x0vncserver/XDesktop.h b/unix/x0vncserver/XDesktop.h
new file mode 100644
index 0000000..cc513a0
--- /dev/null
+++ b/unix/x0vncserver/XDesktop.h
@@ -0,0 +1,79 @@
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ * Copyright (C) 2004-2008 Constantin Kaplinsky. All Rights Reserved.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * USA.
+ */
+
+#ifndef __XDESKTOP_H__
+#define __XDESKTOP_H__
+
+#include <rfb/VNCServerST.h>
+#include <tx/TXWindow.h>
+
+#include <X11/XKBlib.h>
+#ifdef HAVE_XDAMAGE
+#include <X11/extensions/Xdamage.h>
+#endif
+
+class Geometry;
+class XPixelBuffer;
+
+// number of XKb indicator leds to handle
+#define XDESKTOP_N_LEDS 3
+
+class XDesktop : public rfb::SDesktop, public TXGlobalEventHandler
+{
+public:
+ XDesktop(Display* dpy_, Geometry *geometry);
+ virtual ~XDesktop();
+ void poll();
+ // -=- SDesktop interface
+ virtual void start(rfb::VNCServer* vs);
+ virtual void stop();
+ bool isRunning();
+ virtual void pointerEvent(const rfb::Point& pos, int buttonMask);
+ KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym);
+ virtual void keyEvent(rdr::U32 keysym, rdr::U32 xtcode, bool down);
+ virtual void clientCutText(const char* str, int len);
+ // -=- TXGlobalEventHandler interface
+ virtual bool handleGlobalEvent(XEvent* ev);
+
+protected:
+ Display* dpy;
+ Geometry* geometry;
+ XPixelBuffer* pb;
+ rfb::VNCServerST* server;
+ int oldButtonMask;
+ bool haveXtest;
+ bool haveDamage;
+ int maxButtons;
+ std::map<KeySym, KeyCode> pressedKeys;
+ bool running;
+#ifdef HAVE_XDAMAGE
+ Damage damage;
+ int xdamageEventBase;
+#endif
+ int xkbEventBase;
+#ifdef HAVE_XFIXES
+ int xfixesEventBase;
+#endif
+ int ledMasks[XDESKTOP_N_LEDS];
+ unsigned ledState;
+ const unsigned short *codeMap;
+ unsigned codeMapLen;
+};
+
+#endif // __XDESKTOP_H__