commit 5b99ba5b250ef61d1fd5380a886adcb0c0370a85
author Peter Åstrand <astrand@cendio.se> Fri Feb 11 14:05:28 2005 +0000
committer Peter Åstrand <astrand@cendio.se> Fri Feb 11 14:05:28 2005 +0000
tree 423d20286e7eed52a89ab8d897d4bfc42d84c52e
parent af782655c92556cb01690f3795e34580b341395d

Applied vnc-def.patch and vnc-xorg.patch from FC3, except:
* The removal of printRegion
* The patching of xc/programs/Xserver/Imakefile, which should be part of xc.patch
* The new xc.patch, which has already been applied.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@170 3789f03b-4d11-0410-bbf8-ca57d06f2519

xc/config/cf/vnc.def

diff --git a/xc/config/cf/vnc.def b/xc/config/cf/vnc.def
index 715044e..255c8f4 100644
--- a/xc/config/cf/vnc.def
+++ b/xc/config/cf/vnc.def
@@ -6,10 +6,10 @@
 #define BuildNls NO
 #define BuildXIE NO
 #define BuildGlxExt NO
-#define XnestServer NO
+#define XnestServer YES
+#define XF86Server NO
 #define XprtServer NO
-#define XdmxServer NO
-#define BuildDmx NO
+#define BuildXFree86ConfigTools NO
 
 #ifdef SunArchitecture
 #define ProjectRoot /usr/openwin

xc/programs/Xserver/vnc/RegionHelper.h

diff --git a/xc/programs/Xserver/vnc/RegionHelper.h b/xc/programs/Xserver/vnc/RegionHelper.h
index 640d558..5a71c3a 100644
--- a/xc/programs/Xserver/vnc/RegionHelper.h
+++ b/xc/programs/Xserver/vnc/RegionHelper.h
@@ -54,8 +54,8 @@
 
   void init(BoxPtr rect, int size) {
     reg = &regRec;
-    if (rect && (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
-      REGION_INIT(pScreen, reg, NullBox, 0);
+    if (!rect || (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
+      REGION_NULL(pScreen, reg);
     } else {
       REGION_INIT(pScreen, reg, rect, size);
     }

xc/programs/Xserver/vnc/Xvnc/xvnc.cc

diff --git a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
index 4936016..9e8b264 100644
--- a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+++ b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -195,6 +195,7 @@
 }
 
 extern "C" {
+  void ddxInitGlobals() {}
   void ddxGiveUp()
   {
     int i;
@@ -911,11 +912,6 @@
   dispatchException &= ~DE_RESET;
 }
 
-/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
-void ddxInitGlobals(void)
-{
-}
-
 void InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 {
   ErrorF("\nXvnc version %s - built %s\n", XVNCVERSION, buildtime);