Start fixing tigervnc breakage #1394

* a lot of public api has been converted to private caused tigervnc to
not even initialise. Start gradually fixing them.

Author: kohnish

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/display.c

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

dix/dix_priv.h

@@ -292,7 +292,6 @@ extern int ScreenSaverBlanking;
 extern int ScreenSaverAllowExposures;
 extern int defaultScreenSaverBlanking;
 extern int defaultScreenSaverAllowExposures;
-extern const char *display;
 extern int displayfd;
 extern Bool explicit_display;
 

dix/main.c

@@ -129,13 +129,13 @@ extern void Dispatch(void);
 
 CallbackListPtr RootWindowFinalizeCallback = NULL;
 CallbackListPtr PostInitRootWindowCallback = NULL;
-
+char *display = NULL;
 int
 dix_main(int argc, char *argv[], char *envp[])
 {
     HWEventQueueType alwaysCheckForInput[2];
 
-    display = "0";
+    display = (char *)"0";
 
     InitRegions();
 

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,9 +56,6 @@ typedef struct {
     Atom target;
 } SelectionFilterParamRec, *SelectionFilterParamPtr;
 
-extern Selection *CurrentSelections;
-
-extern CallbackListPtr SelectionCallback;
 extern CallbackListPtr SelectionFilterCallback;
 
 int dixLookupSelection(Selection **result,

include/callback.h

@@ -51,12 +51,12 @@ SOFTWARE.
 #include <X11/Xdefs.h>          /* for Bool */
 #include <X11/Xproto.h>
 #include <X11/Xfuncproto.h>
-
 /*
  *  callback manager stuff
  */
 
 typedef struct _CallbackList *CallbackListPtr;
+typedef struct _Selection Selection;
 
 typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
 
@@ -79,4 +79,7 @@ CallCallbacks(CallbackListPtr *pcbl, void *call_data)
     _CallCallbacks(pcbl, call_data);
 }
 
+extern _X_EXPORT CallbackListPtr SelectionCallback;
+extern _X_EXPORT Selection *CurrentSelections;
+
 #endif                          /* CALLBACK_H */

include/opaque.h

@@ -37,4 +37,6 @@ from The Open Group.
 extern _X_EXPORT Bool enableIndirectGLX;
 extern _X_EXPORT Bool bgNoneRoot;
 
+extern _X_EXPORT char *display;
+
 #endif                          /* OPAQUE_H */

os/connection.c

@@ -105,6 +105,8 @@ SOFTWARE.
 #include "globals.h"
 #include "xace.h"
 
+#include <opaque.h>
+
 #ifdef HAVE_GETPEERUCRED
 #include <ucred.h>
 #include <zone.h>

os/xdmcp.c

@@ -47,7 +47,7 @@
 #include "dixstruct.h"
 
 #include "os/Xtrans.h"
-
+#include <opaque.h>
 #ifdef XDMCP
 #undef REQUEST