161 |
} |
} |
162 |
diff -Naur tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc |
diff -Naur tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc |
163 |
--- tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc 2011-01-21 20:42:27.000000000 +0100 |
--- tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc 2011-01-21 20:42:27.000000000 +0100 |
164 |
+++ tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc 2011-01-21 20:49:23.000000000 +0100 |
+++ tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc 2011-01-21 21:25:03.000000000 +0100 |
165 |
@@ -609,7 +609,11 @@ |
@@ -609,7 +609,11 @@ |
166 |
|
|
167 |
for (i = 0; i < entries; i++) ppix[i] = i; |
for (i = 0; i < entries; i++) ppix[i] = i; |
186 |
WindowPtr pChild; |
WindowPtr pChild; |
187 |
Bool WasViewable = (Bool)(pWin->viewable); |
Bool WasViewable = (Bool)(pWin->viewable); |
188 |
Bool anyMarked = FALSE; |
Bool anyMarked = FALSE; |
189 |
|
@@ -1322,3 +1330,9 @@ |
190 |
|
{ |
191 |
|
mieqInit (); |
192 |
|
} |
193 |
|
+ |
194 |
|
+#if XORG > 17 |
195 |
|
+void CloseInput(void) |
196 |
|
+{ |
197 |
|
+} |
198 |
|
+#endif |
199 |
diff -Naur tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc.orig tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc.orig |
diff -Naur tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc.orig tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc.orig |
200 |
--- tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc.orig 1970-01-01 01:00:00.000000000 +0100 |
--- tigervnc-1.0.1/unix/xserver/hw/vnc/xvnc.cc.orig 1970-01-01 01:00:00.000000000 +0100 |
201 |
+++ tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc.orig 2011-01-21 20:48:36.000000000 +0100 |
+++ tigervnc-1.0.1-magellan/unix/xserver/hw/vnc/xvnc.cc.orig 2011-01-21 20:49:23.000000000 +0100 |
202 |
@@ -0,0 +1,1328 @@ |
@@ -0,0 +1,1332 @@ |
203 |
+/* Copyright (c) 1993 X Consortium |
+/* Copyright (c) 1993 X Consortium |
204 |
+ Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. |
+ Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. |
205 |
+ Copyright (C) 2009 Pierre Ossman for Cendio AB |
+ Copyright (C) 2009 Pierre Ossman for Cendio AB |
811 |
+ |
+ |
812 |
+ for (i = 0; i < entries; i++) ppix[i] = i; |
+ for (i = 0; i < entries; i++) ppix[i] = i; |
813 |
+ /* XXX truecolor */ |
+ /* XXX truecolor */ |
814 |
|
+#if XORG < 19 |
815 |
+ QueryColors(pmap, entries, ppix, prgb); |
+ QueryColors(pmap, entries, ppix, prgb); |
816 |
|
+#else |
817 |
|
+ QueryColors(pmap, entries, ppix, prgb, serverClient); |
818 |
|
+#endif |
819 |
+ |
+ |
820 |
+ for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */ |
+ for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */ |
821 |
+ defs[i].pixel = ppix[i] & 0xff; /* change pixel to index */ |
+ defs[i].pixel = ppix[i] & 0xff; /* change pixel to index */ |