Add support for libvnc.so from tigervnc

Xext/namespace/hook-init-rootwindow.c

@@ -40,7 +40,7 @@ void hookInitRootWindow(CallbackListPtr *pcbl, void *data, void *screen)
         }
 
         int rc = 0;
-        WindowPtr pWin = dixCreateWindow(
+        WindowPtr pWin = CreateWindow(
             FakeClientID(0), realRoot, 0, 0, 23, 23,
             0, /* bw */
             InputOutput,

Xext/saver.c

@@ -471,7 +471,7 @@ CreateSaverWindow(ScreenPtr pScreen)
     if (GrabInProgress && GrabInProgress != pAttr->client->index)
         return FALSE;
 
-    pWin = dixCreateWindow(pSaver->wid, pScreen->root,
+    pWin = CreateWindow(pSaver->wid, pScreen->root,
                         pAttr->x, pAttr->y, pAttr->width, pAttr->height,
                         pAttr->borderWidth, pAttr->class,
                         pAttr->mask, (XID *) pAttr->values,

Xext/sync.c

@@ -76,6 +76,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "protocol-versions.h"
 #include "inputstr.h"
 #include "misync_priv.h"
+#include "opaque.h"
 
 /*
  * Local Global Variables

Xext/xace.h

@@ -60,7 +60,7 @@ int XaceHookIsSet(int hook);
  */
 int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,
                            Mask access_mode);
-int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel, Mask access_mode);
+_X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel, Mask access_mode);
 
 /* needs to be exported for in-tree modesetting, but not part of public API */
 _X_EXPORT int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res,

composite/compoverlay.c

@@ -142,7 +142,7 @@ compCreateOverlayWindow(ScreenPtr pScreen)
 #endif /* XINERAMA */
 
     pWin = cs->pOverlayWin =
-        dixCreateWindow(cs->overlayWid, pRoot, x, y, w, h, 0,
+        CreateWindow(cs->overlayWid, pRoot, x, y, w, h, 0,
                      InputOutput, CWBackPixmap | CWOverrideRedirect, &attrs[0],
                      pRoot->drawable.depth,
                      serverClient, pScreen->rootVisual, &result);

dix/callback_priv.h

@@ -6,6 +6,7 @@
 #define _XSERVER_CALLBACK_PRIV_H
 
 #include "callback.h"
+#include <dix.h>
 
 void InitCallbackManager(void);
 void DeleteCallbackManager(void);

dix/dispatch.c

@@ -144,6 +144,7 @@ Equipment Corporation.
 #include "xkbsrv.h"
 #include "xfixesint.h"
 #include "dixstruct_priv.h"
+#include <window.h>
 
 #define mskcnt ((MAXCLIENTS + 31) / 32)
 #define BITMASK(i) (1U << ((i) & 31))
@@ -593,7 +594,9 @@ Dispatch(void)
         }
         dispatchException &= ~DE_PRIORITYCHANGE;
     }
+#if defined(DDXBEFORERESET)
     ddxBeforeReset();
+#endif
     KillAllClients();
     dispatchException &= ~DE_RESET;
     SmartScheduleLatencyLimited = 0;
@@ -745,7 +748,7 @@ int DoCreateWindowReq(ClientPtr client, xCreateWindowReq *stuff, XID *xids)
         client->errorValue = 0;
         return BadValue;
     }
-    pWin = dixCreateWindow(stuff->wid, pParent, stuff->x,
+    pWin = CreateWindow(stuff->wid, pParent, stuff->x,
                         stuff->y, stuff->width, stuff->height,
                         stuff->borderWidth, stuff->class,
                         stuff->mask, (XID *) xids,
@@ -4257,4 +4260,3 @@ DetachOffloadGPU(ScreenPtr secondary)
     assert(secondary->is_offload_secondary);
     secondary->is_offload_secondary = FALSE;
 }
-

dix/display.c

@@ -7,8 +7,9 @@
 #include "dix/dix_priv.h"
 #include "include/dix.h"
 #include "include/screenint.h"
+#include <opaque.h>
 
-const char *display = "0";
+char *display = (char *)"0";
 int displayfd = -1;
 
 const char *dixGetDisplayName(ScreenPtr *pScreen)

dix/dix_priv.h

@@ -48,7 +48,6 @@
 #define MAX_BIG_REQUEST_SIZE 4194303
 extern long maxBigRequestSize;
 
-extern char dispatchExceptionAtReset;
 extern int terminateDelay;
 extern Bool touchEmulatePointer;
 
@@ -136,8 +135,6 @@ void EnableLimitedSchedulingLatency(void);
 
 void DisableLimitedSchedulingLatency(void);
 
-int dix_main(int argc, char *argv[], char *envp[]);
-
 void SetMaskForEvent(int deviceid, Mask mask, int event);
 
 void EnqueueEvent(InternalEvent *ev, DeviceIntPtr device);
@@ -281,20 +278,11 @@ extern Bool whiteRoot;
 
 extern volatile char isItTimeToYield;
 
-/* bit values for dispatchException */
-#define DE_RESET     1
-#define DE_TERMINATE 2
-#define DE_PRIORITYCHANGE 4     /* set when a client's priority changes */
-
-extern volatile char dispatchException;
-
 extern int ScreenSaverBlanking;
 extern int ScreenSaverAllowExposures;
 extern int defaultScreenSaverBlanking;
 extern int defaultScreenSaverAllowExposures;
-extern const char *display;
 extern int displayfd;
-extern Bool explicit_display;
 
 extern Bool disableBackingStore;
 extern Bool enableBackingStore;

dix/inpututils_priv.h

@@ -32,14 +32,6 @@
 
 extern Mask event_filters[MAXDEVICES][MAXEVENTS];
 
-struct _ValuatorMask {
-    int8_t last_bit;            /* highest bit set in mask */
-    int8_t has_unaccelerated;
-    uint8_t mask[(MAX_VALUATORS + 7) / 8];
-    double valuators[MAX_VALUATORS];    /* valuator data */
-    double unaccelerated[MAX_VALUATORS];    /* valuator data */
-};
-
 void verify_internal_event(const InternalEvent *ev);
 void init_device_event(DeviceEvent *event, DeviceIntPtr dev, Time ms,
                        enum DeviceEventSource event_source);

dix/main.c

@@ -119,7 +119,7 @@ Equipment Corporation.
 #include "extnsionst.h"
 #include "privates.h"
 #include "exevents.h"
-
+#include "opaque.h"
 #ifdef DPMSExtension
 #include <X11/extensions/dpmsconst.h>
 #include "dpmsproc.h"
@@ -135,7 +135,7 @@ dix_main(int argc, char *argv[], char *envp[])
 {
     HWEventQueueType alwaysCheckForInput[2];
 
-    display = "0";
+    display = (char *)"0";
 
     InitRegions();
 
@@ -195,7 +195,7 @@ dix_main(int argc, char *argv[], char *envp[])
         dixResetRegistry();
         InitFonts();
         InitCallbackManager();
-        InitOutput(argc, argv);
+        InitOutput(NULL, argc, argv);
 
         if (screenInfo.numScreens < 1)
             FatalError("no screens found");

dix/property_priv.h

@@ -94,9 +94,6 @@ typedef struct _PropertyFilterParam {
 
 extern CallbackListPtr PropertyFilterCallback;
 
-int dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom proprty,
-                      ClientPtr pClient, Mask access_mode);
-
 void DeleteAllWindowProperties(WindowPtr pWin);
 
 #endif /* _XSERVER_PROPERTY_PRIV_H */

dix/screenint_priv.h

@@ -13,9 +13,6 @@
 #include "include/screenint.h"
 #include "include/scrnintstr.h" /* for screenInfo */
 
-typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
-
-int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
 int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
 
 void RemoveGPUScreen(ScreenPtr pScreen);
@@ -26,8 +23,6 @@ void DetachUnboundGPU(ScreenPtr unbound);
 void AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
 void DetachOffloadGPU(ScreenPtr slave);
 
-void InitOutput(int argc, char **argv);
-
 static inline ScreenPtr dixGetMasterScreen(void) {
     return screenInfo.screens[0];
 }

dix/selection_priv.h

@@ -12,15 +12,15 @@
 #include "include/dixstruct.h"
 #include "include/privates.h"
 
-typedef struct _Selection {
+struct _Selection {
     Atom selection;
     TimeStamp lastTimeChanged;
     Window window;
     WindowPtr pWin;
     ClientPtr client;
     struct _Selection *next;
     PrivateRec *devPrivates;
-} Selection;
+};
 
 typedef enum {
     SelectionSetOwner,
@@ -56,18 +56,9 @@ typedef struct {
     Atom target;
 } SelectionFilterParamRec, *SelectionFilterParamPtr;
 
-extern Selection *CurrentSelections;
-
-extern CallbackListPtr SelectionCallback;
 extern CallbackListPtr SelectionFilterCallback;
 
-int dixLookupSelection(Selection **result,
-                       Atom name,
-                       ClientPtr client,
-                       Mask access_mode);
-
 void InitSelections(void);
-void DeleteWindowFromAnySelections(WindowPtr pWin);
 void DeleteClientFromAnySelections(ClientPtr client);
 
 #endif /* _XSERVER_DIX_SELECTION_PRIV_H */

dix/window.c

@@ -736,7 +736,7 @@ RealChildHead(WindowPtr pWin)
 }
 
 WindowPtr
-dixCreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
+CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
              unsigned h, unsigned bw, unsigned class, Mask vmask, XID *vlist,
              int depth, ClientPtr client, VisualID visual, int *error)
 {
@@ -3255,7 +3255,7 @@ TileScreenSaver(ScreenPtr pScreen, int kind)
     }
 
     pWin = pScreen->screensaver.pWindow =
-        dixCreateWindow(pScreen->screensaver.wid,
+        CreateWindow(pScreen->screensaver.wid,
                      pScreen->root,
                      -RANDOM_WIDTH, -RANDOM_WIDTH,
                      (unsigned short) pScreen->width + RANDOM_WIDTH,

hw/kdrive/ephyr/ephyrinit.c

@@ -63,7 +63,7 @@ InitCard(char *name)
 }
 
 void
-InitOutput(int argc, char **argv)
+InitOutput(ScreenInfo *unused, int argc, char **argv)
 {
     KdInitOutput(argc, argv);
 }
@@ -111,6 +111,13 @@ ddxInputThreadInit(void)
 }
 #endif
 
+#ifdef DDXBEFORERESET
+void
+ddxBeforeReset(void)
+{
+}
+#endif
+
 void
 ddxUseMsg(void)
 {

hw/kdrive/ephyr/meson.build

@@ -4,7 +4,6 @@ srcs = [
     'ephyrcursor.c',
     'ephyr_draw.c',
     'hostx.c',
-    '../../stubs/ddxBeforeReset.c',
 ]
 
 xephyr_dep = [

hw/kdrive/fbdev/fbinit.c

@@ -54,7 +54,7 @@ ddxInputThreadInit(void)
 #endif
 
 void
-InitOutput(int argc, char **argv)
+InitOutput(ScreenInfo *unused, int argc, char **argv)
 {
     if (serverGeneration == 1)
         ephyrExtensionInit();

hw/kdrive/fbdev/meson.build

@@ -1,7 +1,6 @@
 srcs = [
     'fbdev.c',
     'fbinit.c',
-    '../../stubs/ddxBeforeReset.c',
 ]
 
 xfbdev_server = executable(

hw/vfb/InitOutput.c

@@ -271,6 +271,14 @@ OsVendorFatalError(const char *f, va_list args)
 {
 }
 
+#if defined(DDXBEFORERESET)
+void
+ddxBeforeReset(void)
+{
+    return;
+}
+#endif
+
 #if INPUTTHREAD
 /** This function is called in Xserver/os/inputthread.c when starting
     the input thread. */
@@ -1047,7 +1055,7 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
 }                               /* end vfbScreenInit */
 
 void
-InitOutput(int argc, char **argv)
+InitOutput(ScreenInfo *unused, int argc, char **argv)
 {
     int i;
     int NumFormats = 0;

hw/vfb/meson.build

@@ -3,7 +3,6 @@ srcs = [
     'InitOutput.c',
     '../../mi/miinitext.c',
     '../../mi/miinitext.h',
-    '../stubs/ddxBeforeReset.c',
 ]
 
 xvfb_server = executable(

hw/xfree86/common/meson.build

@@ -22,7 +22,6 @@ srcs_xorg_common = [
     'xf86Mode.c',
     'xorgHelper.c',
     'xf86Extensions.c',
-    '../../stubs/ddxBeforeReset.c',
 ]
 
 xorg_sdk_headers = [

hw/xfree86/common/xf86Init.c

@@ -284,7 +284,7 @@ xf86EnsureRANDR(ScreenPtr pScreen)
  *      collecting the pixmap formats.
  */
 void
-InitOutput(int argc, char **argv)
+InitOutput(ScreenInfo *unused, int argc, char **argv)
 {
     int i, j, k, scr_index;
     const char **modulelist;
@@ -1324,6 +1324,13 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)
         return 0;
 }
 
+#ifdef DDXBEFORERESET
+void
+ddxBeforeReset(void)
+{
+}
+#endif
+
 #if INPUTTHREAD
 /** This function is called in Xserver/os/inputthread.c when starting
     the input thread. */