WIP: Xnest

hw/xnest/Display.c

@@ -31,7 +31,6 @@ is" without express or implied warranty.
 #include "xnest-xcb.h"
 
 #include "Display.h"
-#include "Init.h"
 #include "Args.h"
 
 #include "icon"
@@ -50,9 +49,6 @@ xnestOpenDisplay(int argc, char *argv[])
 {
     int i;
 
-    if (!xnestDoFullGeneration)
-        return;
-
     xnestCloseDisplay();
 
     if (!xnest_upstream_setup(xnestDisplayName))
@@ -130,13 +126,9 @@ xnestOpenDisplay(int argc, char *argv[])
 void
 xnestCloseDisplay(void)
 {
-    if (!xnestDoFullGeneration || !xnestUpstreamInfo.conn)
+    if (!xnestUpstreamInfo.conn)
         return;
 
-    /*
-       If xnestDoFullGeneration all x resources will be destroyed upon closing
-       the display connection.  There is no need to generate extra protocol.
-     */
     free(xnestVisualMap);
     xnestVisualMap = NULL;
     xnestNumVisualMap = 0;

hw/xnest/Init.c

@@ -42,7 +42,6 @@ is" without express or implied warranty.
 #include "Keyboard.h"
 #include "Handlers.h"
 #include "Events.h"
-#include "Init.h"
 #include "Args.h"
 #include "Drawable.h"
 #include "XNGC.h"
@@ -51,8 +50,6 @@ is" without express or implied warranty.
 #include "dpmsproc.h"
 #endif
 
-Bool xnestDoFullGeneration = TRUE;
-
 /* Xnest doesn't support GLX yet, so we don't link it, but still have
    satisfy DIX's symbol requirements */
 #ifdef GLXEXT
@@ -108,8 +105,6 @@ InitOutput(int argc, char *argv[])
         AddScreen(xnestOpenScreen, argc, argv);
 
     xnestNumScreens = screenInfo.numScreens;
-
-    xnestDoFullGeneration = FALSE;
 }
 
 static void
@@ -150,7 +145,6 @@ CloseInput(void)
 void
 ddxGiveUp(enum ExitCode error)
 {
-    xnestDoFullGeneration = TRUE;
     xnestCloseDisplay();
 }
 

hw/xnest/Init.h

@@ -17,6 +17,4 @@ is" without express or implied warranty.
 
 #include <X11/Xdefs.h>
 
-extern Bool xnestDoFullGeneration;
-
 #endif                          /* XNESTINIT_H */

hw/xnest/Screen.c

@@ -41,7 +41,6 @@ is" without express or implied warranty.
 #include "Color.h"
 #include "XNCursor.h"
 #include "Events.h"
-#include "Init.h"
 #include "mipointer.h"
 #include "Args.h"
 #include "mipointrst.h"
@@ -403,8 +402,6 @@ breakout:
 
 #define POSITION_OFFSET (pScreen->myNum * (xnestGeometry.width + xnestGeometry.height) / 32)
 
-    if (xnestDoFullGeneration) {
-
         xcb_params_cw_t attributes = {
             .back_pixel = xnestUpstreamInfo.screenInfo->white_pixel,
             .event_mask = xnestEventMask,
@@ -506,7 +503,6 @@ breakout:
                               xnestUpstreamInfo.screenInfo->root_visual,
                               valuemask,
                               &attributes);
-    }
 
     if (!xnestCreateDefaultColormap(pScreen))
         return FALSE;
@@ -524,11 +520,5 @@ xnestCloseScreen(ScreenPtr pScreen)
     free(pScreen->allowedDepths);
     free(pScreen->visuals);
     miScreenClose(pScreen);
-
-    /*
-       If xnestDoFullGeneration all x resources will be destroyed upon closing
-       the display connection.  There is no need to generate extra protocol.
-     */
-
     return TRUE;
 }