tigervnc/patches/tigervnc-1.0.1-r3883.patch

Index: unix/xserver/hw/vnc/xvnc.cc
===================================================================
--- unix/xserver/hw/vnc/xvnc.cc	(revision 3882)
+++ unix/xserver/hw/vnc/xvnc.cc	(revision 3883)
@@ -736,7 +736,7 @@
 }
 
 static Bool vfbRealizeCursor(
-#ifdef XORG_16
+#if XORG >= 16
 			     DeviceIntPtr pDev,
 #endif
 			     ScreenPtr pScreen, CursorPtr pCursor) {
@@ -744,7 +744,7 @@
 }
 
 static Bool vfbUnrealizeCursor(
-#ifdef XORG_16
+#if XORG >= 16
 			       DeviceIntPtr pDev,
 #endif
 			       ScreenPtr pScreen, CursorPtr pCursor) {
@@ -752,7 +752,7 @@
 }
 
 static void vfbSetCursor(
-#ifdef XORG_16
+#if XORG >= 16
 			 DeviceIntPtr pDev,
 #endif
 			 ScreenPtr pScreen, CursorPtr pCursor, int x, int y) 
@@ -760,14 +760,14 @@
 }
 
 static void vfbMoveCursor(
-#ifdef XORG_16
+#if XORG >= 16
 			  DeviceIntPtr pDev,
 #endif
 			  ScreenPtr pScreen, int x, int y) 
 {
 }
 
-#ifdef XORG_16
+#if XORG >= 16
 static Bool
 vfbDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
 {   
@@ -785,7 +785,7 @@
     vfbUnrealizeCursor,
     vfbSetCursor,
     vfbMoveCursor
-#ifdef XORG_16
+#if XORG >= 16
     , vfbDeviceCursorInitialize,
     vfbDeviceCursorCleanup
 #endif
@@ -1303,7 +1303,7 @@
 void ProcessInputEvents()
 {
   mieqProcessInputEvents();
-#ifdef XORG_15
+#if XORG == 15
   miPointerUpdate();
 #endif
 }
Index: unix/xserver/hw/vnc/XserverDesktop.cc
===================================================================
--- unix/xserver/hw/vnc/XserverDesktop.cc	(revision 3882)
+++ unix/xserver/hw/vnc/XserverDesktop.cc	(revision 3883)
@@ -63,7 +63,7 @@
 #ifdef XKB
 #include <xkbsrv.h>
 #endif
-#ifdef XORG_16
+#if XORG >= 16
 #include "exevents.h"
 extern void
 CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
@@ -77,7 +77,7 @@
 
 static DeviceIntPtr vncKeyboardDevice = NULL;
 static DeviceIntPtr vncPointerDevice = NULL;
-#ifdef XORG_15
+#if XORG == 15
 static xEvent *eventq = NULL;
 #else
 static EventList *eventq = NULL;
@@ -194,7 +194,7 @@
   if (httpListener)
     httpServer = new FileHTTPServer(this);
 
-#ifdef XORG_15
+#if XORG == 15
   /*
    * XXX eventq is never free()-ed because it has to exist during server life
    * */
@@ -211,7 +211,7 @@
    */
   if (vncKeyboardDevice == NULL) {
     vncKeyboardDevice = AddInputDevice(
-#ifdef XORG_16
+#if XORG >= 16
 				       serverClient,
 #endif
 				       vfbKeybdProc, TRUE);
@@ -220,7 +220,7 @@
 
   if (vncPointerDevice == NULL) {
     vncPointerDevice = AddInputDevice(
-#ifdef XORG_16
+#if XORG >= 16
 				      serverClient,
 #endif
 				      vfbMouseProc, TRUE);
@@ -557,7 +557,7 @@
   if (!cursorPos.equals(oldCursorPos)) {
     oldCursorPos = cursorPos;
     (*pScreen->SetCursorPosition) (
-#ifdef XORG_16
+#if XORG >= 16
 				   vncPointerDevice,
 #endif
 				   pScreen, cursorPos.x, cursorPos.y, FALSE);
@@ -569,7 +569,7 @@
 void XserverDesktop::blockHandler(fd_set* fds)
 {
   try {
-#ifdef XORG_15
+#if XORG == 15
     ScreenPtr screenWithCursor = GetCurrentRootWindow()->drawable.pScreen;
 #else
     ScreenPtr screenWithCursor =
@@ -578,7 +578,7 @@
     if (screenWithCursor == pScreen) {
       int x, y;
       GetSpritePosition(
-#ifdef XORG_16
+#if XORG >= 16
 			vncPointerDevice,
 #endif
 			&x, &y);
@@ -742,7 +742,7 @@
   //(*pScreen->SetCursorPosition) (pScreen, pos.x, pos.y, FALSE);
 
   NewCurrentScreen(
-#ifdef XORG_16
+#if XORG >= 16
 		   vncPointerDevice,
 #endif
 		   pScreen, pos.x, pos.y);
@@ -751,7 +751,7 @@
     valuators[0] = pos.x;
     valuators[1] = pos.y;
 
-#ifdef XORG_16
+#if XORG >= 16
     GetEventList(&eventq);
 #endif
     n = GetPointerEvents (eventq, vncPointerDevice, MotionNotify, 0,
@@ -759,7 +759,7 @@
 
     for (i = 0; i < n; i++) {
       mieqEnqueue (vncPointerDevice,
-#ifdef XORG_15
+#if XORG == 15
 		   eventq + i
 #else
 		   (eventq + i)->event
@@ -779,7 +779,7 @@
 
       for (j = 0; j < n; j++) {
 	mieqEnqueue (vncPointerDevice,
-#ifdef XORG_15
+#if XORG == 15
 		     eventq + j
 #else
 		     (eventq + j)->event
@@ -809,7 +809,7 @@
   RRModePtr         mode;
 
   // Make sure all RandR tables are properly populated
-#ifdef XORG_15
+#if XORG == 15
   ret = RRGetInfo(pScreen);
 #else
   ret = RRGetInfo(pScreen, FALSE);
@@ -832,7 +832,7 @@
 
   // Then we have to call RRGetInfo again for it to copy the RandR
   // 1.0 information to the 1.2 structures.
-#ifdef XORG_15
+#if XORG == 15
   ret = RRGetInfo(pScreen);
 #else
   ret = RRGetInfo(pScreen, FALSE);
@@ -1008,7 +1008,7 @@
 			   down ? KeyPress : KeyRelease, keycode);
     for (i = 0; i < n; i++) {
       mieqEnqueue (vncKeyboardDevice,
-#ifdef XORG_15
+#if XORG == 15
 		   eventq + i
 #else
 		   (eventq + i)->event
@@ -1161,7 +1161,7 @@
 
 	vlog.info("Added unknown keysym 0x%x to keycode %d",keysym,kc);
 
-#ifdef XORG_15
+#if XORG == 15
 	master = inputInfo.keyboard;
 #else
 	master = vncKeyboardDevice->u.master;
@@ -1169,7 +1169,7 @@
 	if (vncKeyboardDevice ==
 	    dixLookupPrivate(&master->devPrivates, CoreDevicePrivateKey)) {
 	  dixSetPrivate(&master->devPrivates, CoreDevicePrivateKey, NULL);
-#ifdef XORG_15
+#if XORG == 15
 	  SwitchCoreKeyboard(vncKeyboardDevice);
 #else
 	  CopyKeyClass(vncKeyboardDevice, master);
@@ -1213,7 +1213,7 @@
 			 KeyPress : KeyRelease, kc);
   for (i = 0; i < n; i++) {
     mieqEnqueue (vncKeyboardDevice,
-#ifdef XORG_15
+#if XORG == 15
 		 eventq + i
 #else
 		 (eventq + i)->event
@@ -1492,7 +1492,7 @@
     map[4] = 4;
     map[5] = 5;
     InitPointerDeviceStruct(pDev, map, 5,
-#ifdef XORG_15
+#if XORG == 15
 			    GetMotionHistory,
 #endif
 			    (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2);
Index: unix/xserver/hw/vnc/XserverDesktop.h
===================================================================
--- unix/xserver/hw/vnc/XserverDesktop.h	(revision 3882)
+++ unix/xserver/hw/vnc/XserverDesktop.h	(revision 3883)
@@ -29,10 +29,10 @@
 #if XORG_VERSION_CURRENT < \
 	((1 * 10000000) + (5 * 100000) + (99 * 1000))
 /* Xorg 1.5 branch */
-#define XORG_15
+#define XORG 15
 #else
 /* Xorg 1.6 branch */
-#define XORG_16
+#define XORG 16
 #endif
 
 #include <rfb/SDesktop.h>
Index: unix/xserver/hw/vnc/vncHooks.cc
===================================================================
--- unix/xserver/hw/vnc/vncHooks.cc	(revision 3882)
+++ unix/xserver/hw/vnc/vncHooks.cc	(revision 3883)
@@ -89,7 +89,7 @@
     GCOps *wrappedOps;
 } vncHooksGCRec, *vncHooksGCPtr;
 
-#ifdef XORG_15
+#if XORG == 15
 static DevPrivateKey vncHooksScreenPrivateKey = &vncHooksScreenPrivateKey;
 static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey;
 #else
@@ -119,7 +119,7 @@
 static void vncHooksStoreColors(ColormapPtr pColormap, int ndef,
                                 xColorItem* pdef);
 static Bool vncHooksDisplayCursor(
-#ifdef XORG_16
+#if XORG >= 16
 				  DeviceIntPtr pDev,
 #endif
 				  ScreenPtr pScreen, CursorPtr cursor);
@@ -454,7 +454,7 @@
 // DisplayCursor - get the cursor shape
 
 static Bool vncHooksDisplayCursor(
-#ifdef XORG_16
+#if XORG >= 16
 				  DeviceIntPtr pDev,
 #endif
 				  ScreenPtr pScreen_, CursorPtr cursor)
@@ -462,11 +462,11 @@
   SCREEN_UNWRAP(pScreen_, DisplayCursor);
 
   Bool ret = (*pScreen->DisplayCursor) (
-#ifdef XORG_16
+#if XORG >= 16
 					pDev,
 #endif
 					pScreen, cursor);
-#ifdef XORG_16
+#if XORG >= 16
   /*
    * XXX DIX calls this function with NULL argument to remove cursor sprite from
    * screen. Should we handle this in setCursor as well?
@@ -474,7 +474,7 @@
   if (cursor != NullCursor) {
 #endif
     vncHooksScreen->desktop->setCursor(cursor);
-#ifdef XORG_16
+#if XORG >= 16
   }
 #endif
 
1	Index: unix/xserver/hw/vnc/xvnc.cc
2	===================================================================
3	--- unix/xserver/hw/vnc/xvnc.cc (revision 3882)
4	+++ unix/xserver/hw/vnc/xvnc.cc (revision 3883)
5	@@ -736,7 +736,7 @@
6	}
7
8	static Bool vfbRealizeCursor(
9	-#ifdef XORG_16
10	+#if XORG >= 16
11	DeviceIntPtr pDev,
12	#endif
13	ScreenPtr pScreen, CursorPtr pCursor) {
14	@@ -744,7 +744,7 @@
15	}
16
17	static Bool vfbUnrealizeCursor(
18	-#ifdef XORG_16
19	+#if XORG >= 16
20	DeviceIntPtr pDev,
21	#endif
22	ScreenPtr pScreen, CursorPtr pCursor) {
23	@@ -752,7 +752,7 @@
24	}
25
26	static void vfbSetCursor(
27	-#ifdef XORG_16
28	+#if XORG >= 16
29	DeviceIntPtr pDev,
30	#endif
31	ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
32	@@ -760,14 +760,14 @@
33	}
34
35	static void vfbMoveCursor(
36	-#ifdef XORG_16
37	+#if XORG >= 16
38	DeviceIntPtr pDev,
39	#endif
40	ScreenPtr pScreen, int x, int y)
41	{
42	}
43
44	-#ifdef XORG_16
45	+#if XORG >= 16
46	static Bool
47	vfbDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
48	{
49	@@ -785,7 +785,7 @@
50	vfbUnrealizeCursor,
51	vfbSetCursor,
52	vfbMoveCursor
53	-#ifdef XORG_16
54	+#if XORG >= 16
55	, vfbDeviceCursorInitialize,
56	vfbDeviceCursorCleanup
57	#endif
58	@@ -1303,7 +1303,7 @@
59	void ProcessInputEvents()
60	{
61	mieqProcessInputEvents();
62	-#ifdef XORG_15
63	+#if XORG == 15
64	miPointerUpdate();
65	#endif
66	}
67	Index: unix/xserver/hw/vnc/XserverDesktop.cc
68	===================================================================
69	--- unix/xserver/hw/vnc/XserverDesktop.cc (revision 3882)
70	+++ unix/xserver/hw/vnc/XserverDesktop.cc (revision 3883)
71	@@ -63,7 +63,7 @@
72	#ifdef XKB
73	#include <xkbsrv.h>
74	#endif
75	-#ifdef XORG_16
76	+#if XORG >= 16
77	#include "exevents.h"
78	extern void
79	CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
80	@@ -77,7 +77,7 @@
81
82	static DeviceIntPtr vncKeyboardDevice = NULL;
83	static DeviceIntPtr vncPointerDevice = NULL;
84	-#ifdef XORG_15
85	+#if XORG == 15
86	static xEvent *eventq = NULL;
87	#else
88	static EventList *eventq = NULL;
89	@@ -194,7 +194,7 @@
90	if (httpListener)
91	httpServer = new FileHTTPServer(this);
92
93	-#ifdef XORG_15
94	+#if XORG == 15
95	/*
96	* XXX eventq is never free()-ed because it has to exist during server life
97	* */
98	@@ -211,7 +211,7 @@
99	*/
100	if (vncKeyboardDevice == NULL) {
101	vncKeyboardDevice = AddInputDevice(
102	-#ifdef XORG_16
103	+#if XORG >= 16
104	serverClient,
105	#endif
106	vfbKeybdProc, TRUE);
107	@@ -220,7 +220,7 @@
108
109	if (vncPointerDevice == NULL) {
110	vncPointerDevice = AddInputDevice(
111	-#ifdef XORG_16
112	+#if XORG >= 16
113	serverClient,
114	#endif
115	vfbMouseProc, TRUE);
116	@@ -557,7 +557,7 @@
117	if (!cursorPos.equals(oldCursorPos)) {
118	oldCursorPos = cursorPos;
119	(*pScreen->SetCursorPosition) (
120	-#ifdef XORG_16
121	+#if XORG >= 16
122	vncPointerDevice,
123	#endif
124	pScreen, cursorPos.x, cursorPos.y, FALSE);
125	@@ -569,7 +569,7 @@
126	void XserverDesktop::blockHandler(fd_set* fds)
127	{
128	try {
129	-#ifdef XORG_15
130	+#if XORG == 15
131	ScreenPtr screenWithCursor = GetCurrentRootWindow()->drawable.pScreen;
132	#else
133	ScreenPtr screenWithCursor =
134	@@ -578,7 +578,7 @@
135	if (screenWithCursor == pScreen) {
136	int x, y;
137	GetSpritePosition(
138	-#ifdef XORG_16
139	+#if XORG >= 16
140	vncPointerDevice,
141	#endif
142	&x, &y);
143	@@ -742,7 +742,7 @@
144	//(*pScreen->SetCursorPosition) (pScreen, pos.x, pos.y, FALSE);
145
146	NewCurrentScreen(
147	-#ifdef XORG_16
148	+#if XORG >= 16
149	vncPointerDevice,
150	#endif
151	pScreen, pos.x, pos.y);
152	@@ -751,7 +751,7 @@
153	valuators[0] = pos.x;
154	valuators[1] = pos.y;
155
156	-#ifdef XORG_16
157	+#if XORG >= 16
158	GetEventList(&eventq);
159	#endif
160	n = GetPointerEvents (eventq, vncPointerDevice, MotionNotify, 0,
161	@@ -759,7 +759,7 @@
162
163	for (i = 0; i < n; i++) {
164	mieqEnqueue (vncPointerDevice,
165	-#ifdef XORG_15
166	+#if XORG == 15
167	eventq + i
168	#else
169	(eventq + i)->event
170	@@ -779,7 +779,7 @@
171
172	for (j = 0; j < n; j++) {
173	mieqEnqueue (vncPointerDevice,
174	-#ifdef XORG_15
175	+#if XORG == 15
176	eventq + j
177	#else
178	(eventq + j)->event
179	@@ -809,7 +809,7 @@
180	RRModePtr mode;
181
182	// Make sure all RandR tables are properly populated
183	-#ifdef XORG_15
184	+#if XORG == 15
185	ret = RRGetInfo(pScreen);
186	#else
187	ret = RRGetInfo(pScreen, FALSE);
188	@@ -832,7 +832,7 @@
189
190	// Then we have to call RRGetInfo again for it to copy the RandR
191	// 1.0 information to the 1.2 structures.
192	-#ifdef XORG_15
193	+#if XORG == 15
194	ret = RRGetInfo(pScreen);
195	#else
196	ret = RRGetInfo(pScreen, FALSE);
197	@@ -1008,7 +1008,7 @@
198	down ? KeyPress : KeyRelease, keycode);
199	for (i = 0; i < n; i++) {
200	mieqEnqueue (vncKeyboardDevice,
201	-#ifdef XORG_15
202	+#if XORG == 15
203	eventq + i
204	#else
205	(eventq + i)->event
206	@@ -1161,7 +1161,7 @@
207
208	vlog.info("Added unknown keysym 0x%x to keycode %d",keysym,kc);
209
210	-#ifdef XORG_15
211	+#if XORG == 15
212	master = inputInfo.keyboard;
213	#else
214	master = vncKeyboardDevice->u.master;
215	@@ -1169,7 +1169,7 @@
216	if (vncKeyboardDevice ==
217	dixLookupPrivate(&master->devPrivates, CoreDevicePrivateKey)) {
218	dixSetPrivate(&master->devPrivates, CoreDevicePrivateKey, NULL);
219	-#ifdef XORG_15
220	+#if XORG == 15
221	SwitchCoreKeyboard(vncKeyboardDevice);
222	#else
223	CopyKeyClass(vncKeyboardDevice, master);
224	@@ -1213,7 +1213,7 @@
225	KeyPress : KeyRelease, kc);
226	for (i = 0; i < n; i++) {
227	mieqEnqueue (vncKeyboardDevice,
228	-#ifdef XORG_15
229	+#if XORG == 15
230	eventq + i
231	#else
232	(eventq + i)->event
233	@@ -1492,7 +1492,7 @@
234	map[4] = 4;
235	map[5] = 5;
236	InitPointerDeviceStruct(pDev, map, 5,
237	-#ifdef XORG_15
238	+#if XORG == 15
239	GetMotionHistory,
240	#endif
241	(PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2);
242	Index: unix/xserver/hw/vnc/XserverDesktop.h
243	===================================================================
244	--- unix/xserver/hw/vnc/XserverDesktop.h (revision 3882)
245	+++ unix/xserver/hw/vnc/XserverDesktop.h (revision 3883)
246	@@ -29,10 +29,10 @@
247	#if XORG_VERSION_CURRENT < \
248	((1 * 10000000) + (5 * 100000) + (99 * 1000))
249	/* Xorg 1.5 branch */
250	-#define XORG_15
251	+#define XORG 15
252	#else
253	/* Xorg 1.6 branch */
254	-#define XORG_16
255	+#define XORG 16
256	#endif
257
258	#include <rfb/SDesktop.h>
259	Index: unix/xserver/hw/vnc/vncHooks.cc
260	===================================================================
261	--- unix/xserver/hw/vnc/vncHooks.cc (revision 3882)
262	+++ unix/xserver/hw/vnc/vncHooks.cc (revision 3883)
263	@@ -89,7 +89,7 @@
264	GCOps *wrappedOps;
265	} vncHooksGCRec, *vncHooksGCPtr;
266
267	-#ifdef XORG_15
268	+#if XORG == 15
269	static DevPrivateKey vncHooksScreenPrivateKey = &vncHooksScreenPrivateKey;
270	static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey;
271	#else
272	@@ -119,7 +119,7 @@
273	static void vncHooksStoreColors(ColormapPtr pColormap, int ndef,
274	xColorItem* pdef);
275	static Bool vncHooksDisplayCursor(
276	-#ifdef XORG_16
277	+#if XORG >= 16
278	DeviceIntPtr pDev,
279	#endif
280	ScreenPtr pScreen, CursorPtr cursor);
281	@@ -454,7 +454,7 @@
282	// DisplayCursor - get the cursor shape
283
284	static Bool vncHooksDisplayCursor(
285	-#ifdef XORG_16
286	+#if XORG >= 16
287	DeviceIntPtr pDev,
288	#endif
289	ScreenPtr pScreen_, CursorPtr cursor)
290	@@ -462,11 +462,11 @@
291	SCREEN_UNWRAP(pScreen_, DisplayCursor);
292
293	Bool ret = (*pScreen->DisplayCursor) (
294	-#ifdef XORG_16
295	+#if XORG >= 16
296	pDev,
297	#endif
298	pScreen, cursor);
299	-#ifdef XORG_16
300	+#if XORG >= 16
301	/*
302	* XXX DIX calls this function with NULL argument to remove cursor sprite from
303	* screen. Should we handle this in setCursor as well?
304	@@ -474,7 +474,7 @@
305	if (cursor != NullCursor) {
306	#endif
307	vncHooksScreen->desktop->setCursor(cursor);
308	-#ifdef XORG_16
309	+#if XORG >= 16
310	}
311	#endif
312