Also fix compile time issues on xvnc in tigervnc

Author: kohnish

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

dix/dispatch.c

@@ -594,7 +594,9 @@ Dispatch(void)
         }
         dispatchException &= ~DE_PRIORITYCHANGE;
     }
+#if defined(DDXBEFORERESET)
     ddxBeforeReset();
+#endif
     KillAllClients();
     dispatchException &= ~DE_RESET;
     SmartScheduleLatencyLimited = 0;

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,19 +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 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"
@@ -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/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];
 }

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(