tigervnc11-xorg111.patch revision 1265
0N/ADownloaded from:
0N/Ahttp://pkgs.fedoraproject.org/gitweb/?p=tigervnc.git;a=blob_plain;f=tigervnc11-xorg111.patch;hb=HEAD
0N/A
0N/Acommit eba8cb45c6383117ffc99ef89b0691a33daeaa7c - Fri, 11 Nov 2011 13:47:47
935N/A
0N/Adiff -up tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc
0N/A--- tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 2011-08-09 23:16:36.000000000 +0200
919N/A+++ tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc 2011-11-11 11:59:14.226819903 +0100
919N/A@@ -82,10 +82,11 @@ static KeyCode KeysymToKeycode(KeySymsPt
919N/A /* Event queue is shared between all devices. */
919N/A #if XORG == 15
919N/A static xEvent *eventq = NULL;
919N/A-#else
919N/A+#elif XORG < 111
919N/A static EventList *eventq = NULL;
919N/A #endif
919N/A
919N/A+#if XORG < 111
919N/A static void initEventq(void)
919N/A {
919N/A /* eventq is never free()-ed because it exists during server life. */
919N/A@@ -100,7 +101,9 @@ static void initEventq(void)
919N/A #endif
919N/A }
0N/A }
0N/A+#endif /* XORG < 111 */
0N/A
156N/A+#if XORG < 111
493N/A static void enqueueEvents(DeviceIntPtr dev, int n)
0N/A {
970N/A int i;
970N/A@@ -122,6 +125,7 @@ static void enqueueEvents(DeviceIntPtr d
970N/A );
970N/A }
970N/A }
970N/A+#endif /* XORG < 111 */
970N/A
970N/A InputDevice::InputDevice(rfb::VNCServerST *_server)
970N/A : server(_server), oldButtonMask(0)
970N/A@@ -141,12 +145,17 @@ InputDevice::InputDevice(rfb::VNCServerS
970N/A keyboardProc, TRUE);
970N/A RegisterKeyboardDevice(keyboardDev);
970N/A #endif
970N/A+#if XORG < 111
970N/A initEventq();
970N/A+#endif
970N/A }
970N/A
970N/A void InputDevice::PointerButtonAction(int buttonMask)
970N/A {
970N/A- int i, n;
970N/A+ int i;
970N/A+#if XORG < 111
970N/A+ int n;
970N/A+#endif
0N/A #if XORG >= 110
950N/A ValuatorMask mask;
0N/A #endif
911N/A@@ -160,13 +169,17 @@ void InputDevice::PointerButtonAction(in
950N/A #if XORG < 110
950N/A n = GetPointerEvents(eventq, pointerDev, action, i + 1,
911N/A POINTER_RELATIVE, 0, 0, NULL);
0N/A-#else
493N/A+ enqueueEvents(pointerDev, n);
493N/A+#elif XORG < 111
156N/A valuator_mask_set_range(&mask, 0, 0, NULL);
0N/A n = GetPointerEvents(eventq, pointerDev, action, i + 1,
0N/A POINTER_RELATIVE, &mask);
156N/A-#endif
156N/A enqueueEvents(pointerDev, n);
0N/A-
0N/A+#else
950N/A+ valuator_mask_set_range(&mask, 0, 0, NULL);
950N/A+ QueuePointerEvents(pointerDev, action, i + 1,
950N/A+ POINTER_RELATIVE, &mask);
950N/A+#endif
950N/A }
950N/A }
950N/A
364N/A@@ -175,7 +188,10 @@ void InputDevice::PointerButtonAction(in
156N/A
156N/A void InputDevice::PointerMove(const rfb::Point &pos)
0N/A {
591N/A- int n, valuators[2];
947N/A+ int valuators[2];
947N/A+#if XORG < 111
591N/A+ int n;
591N/A+#endif
591N/A #if XORG >= 110
947N/A ValuatorMask mask;
947N/A #endif
947N/A@@ -190,12 +206,16 @@ void InputDevice::PointerMove(const rfb:
947N/A #if XORG < 110
947N/A n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, 0,
947N/A 2, valuators);
947N/A-#else
947N/A+ enqueueEvents(pointerDev, n);
947N/A+#elif XORG < 111
947N/A valuator_mask_set_range(&mask, 0, 2, valuators);
947N/A n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE,
947N/A &mask);
947N/A-#endif
947N/A enqueueEvents(pointerDev, n);
947N/A+#else
947N/A+ valuator_mask_set_range(&mask, 0, 2, valuators);
0N/A+ QueuePointerEvents(pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, &mask);
156N/A+#endif
493N/A
493N/A cursorPos = pos;
156N/A }
493N/A@@ -299,14 +319,20 @@ void InputDevice::initInputDevice(void)
493N/A static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg)
837N/A {
837N/A int action;
846N/A+#if XORG < 111
493N/A unsigned int n;
493N/A+#endif
156N/A
493N/A if (msg != NULL)
493N/A vlog.debug("%s %d %s", msg, kc, down ? "down" : "up");
493N/A
364N/A action = down ? KeyPress : KeyRelease;
0N/A- n = GetKeyboardEvents(eventq, dev, action, kc);
493N/A+#if XORG < 111
493N/A+ n = GetKeyboardEvents(eventq, dev, action, kc, NULL);
156N/A enqueueEvents(dev, n);
493N/A+#else
493N/A+ QueueKeyboardEvents(dev, action, kc, NULL);
0N/A+#endif
967N/A }
967N/A
967N/A #define IS_PRESSED(keyc, keycode) \
970N/A@@ -341,8 +367,11 @@ public:
980N/A int state, maxKeysPerMod, keycode;
0N/A #if XORG >= 17
980N/A KeyCode *modmap = NULL;
339N/A-
970N/A+#if XORG >= 111
970N/A+ state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state);
970N/A+#else /* XORG >= 111 */
970N/A state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
0N/A+#endif /* XORG >= 111 */
837N/A #else
837N/A KeyClassPtr keyc = dev->key;
838N/A state = keyc->state;
837N/A@@ -380,7 +409,11 @@ public:
837N/A #if XORG >= 17
967N/A KeyCode *modmap = NULL;
967N/A
967N/A+#if XORG >= 111
779N/A+ keyc = dev->master->key;
970N/A+#else /* XORG >= 111 */
838N/A keyc = dev->u.master->key;
591N/A+#endif /* XORG >= 111 */
967N/A state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
0N/A #else
0N/A keyc = dev->key;
0N/A@@ -596,7 +629,11 @@ void InputDevice::keyEvent(rdr::U32 keys
0N/A }
591N/A
0N/A #if XORG >= 17
339N/A+#if XORG >= 111
339N/A+ keyc = keyboardDev->master->key;
591N/A+#else /* XORG >= 111 */
493N/A keyc = keyboardDev->u.master->key;
970N/A+#endif /* XORG >= 111 */
970N/A
970N/A keymap = XkbGetCoreMap(keyboardDev);
970N/A if (!keymap) {
970N/A@@ -753,7 +790,11 @@ ModeSwitchFound:
970N/A XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
970N/A maxKeyCode - minKeyCode + 1,
970N/A NULL, serverClient);
837N/A+#if XORG >= 111
837N/A+ XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev);
967N/A+#else
967N/A XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
967N/A+#endif
779N/A #endif /* XORG < 17 */
156N/A break;
156N/A }
967N/Adiff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h
591N/A--- tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 2011-08-09 23:16:36.000000000 +0200
591N/A+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h 2011-11-11 11:55:32.255835319 +0100
591N/A@@ -36,6 +36,10 @@
591N/A #define XORG 19
935N/A #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000))
967N/A #define XORG 110
967N/A+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
967N/A+#define XORG 111
0N/A+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
+#define XORG 112
#else
#error "X.Org newer than 1.10 is not supported"
#endif
diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc
--- tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 2011-08-09 23:16:36.000000000 +0200
+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc 2011-11-11 11:55:32.256835319 +0100
@@ -211,7 +211,11 @@ static void vfbFreeFramebufferMemory(vfb
extern "C" {
+#if XORG < 111
void ddxGiveUp()
+#else
+void ddxGiveUp(enum ExitCode error)
+#endif
{
int i;
@@ -221,9 +225,17 @@ void ddxGiveUp()
}
void
+#if XORG < 111
AbortDDX()
+#else
+AbortDDX(enum ExitCode error)
+#endif
{
+#if XORG < 111
ddxGiveUp();
+#else
+ ddxGiveUp(error);
+#endif
}
#ifdef __DARWIN__
@@ -668,8 +680,13 @@ vfbUninstallColormap(ColormapPtr pmap)
{
if (pmap->mid != pmap->pScreen->defColormap)
{
+#if XORG < 111
curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap,
RT_COLORMAP);
+#else
+ dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap,
+ RT_COLORMAP, serverClient, DixUnknownAccess);
+#endif
(*pmap->pScreen->InstallColormap)(curpmap);
}
}
--- tigervnc-1.1.0/unix/xserver/hw/xfree86/common/xf86Opt.h Thu Feb 23 07:52:46 2012
+++ tigervnc-1.1.0/unix/xserver/hw/xfree86/common/xf86Opt.h Thu Feb 23 07:53:10 2012
@@ -91,7 +91,7 @@
extern _X_EXPORT char *xf86OptionValue(XF86OptionPtr opt);
extern _X_EXPORT void xf86OptionListReport(XF86OptionPtr parm);
extern _X_EXPORT XF86OptionPtr xf86FindOption(XF86OptionPtr options, const char *name);
-extern _X_EXPORT const char *xf86FindOptionValue(XF86OptionPtr options, const char *name);
+extern _X_EXPORT char *xf86FindOptionValue(pointer options, const char *name);
extern _X_EXPORT void xf86MarkOptionUsed(XF86OptionPtr option);
extern _X_EXPORT void xf86MarkOptionUsedByName(XF86OptionPtr options, const char *name);
extern _X_EXPORT Bool xf86CheckIfOptionUsed(XF86OptionPtr option);