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

diff --git a/xc/config/cf/vnc.def b/xc/config/cf/vnc.def
index 715044e53216f65e20234a30894d8fcf62bada68..255c8f4645490320df025b8d158e81ac07e42ad8 100644 (file)
--- 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

diff --git a/xc/programs/Xserver/vnc/RegionHelper.h b/xc/programs/Xserver/vnc/RegionHelper.h
index 640d55893a4d553584cc00cbc236cb8efc725135..5a71c3a1cc14d9c966956ee201e907fc1273a2f6 100644 (file)
--- a/xc/programs/Xserver/vnc/RegionHelper.h
+++ b/xc/programs/Xserver/vnc/RegionHelper.h
@@ -54,8 +54,8 @@ public:
 
   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);
     }

diff --git a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
index 4936016ee788d2ffb95849ca45633a4357ae1006..9e8b264d0b3d65d13dfad85a4ad069066eb8906a 100644 (file)
--- a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+++ b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -195,6 +195,7 @@ static int vfbBitsPerPixel(int depth)
 }
 
 extern "C" {
+  void ddxInitGlobals() {}
   void ddxGiveUp()
   {
     int i;
@@ -911,11 +912,6 @@ static void vfbClientStateChange(CallbackListPtr*, pointer, pointer) {
   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);