Add support for libvnc.so from tigervnc

kohnish · kohnish · commit 40cd37aa825a · 2025-11-13T18:01:03.000+01:00
* A lot of public api has been converted to private caused tigervnc to
not even initialise. Expose necessary interfaces again.
diff --git a/Xext/namespace/hook-init-rootwindow.c b/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,
diff --git a/Xext/saver.c b/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,
diff --git a/Xext/xace.h b/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,
diff --git a/composite/compoverlay.c b/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);
diff --git a/dix/callback_priv.h b/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);
diff --git a/dix/dispatch.c b/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))
@@ -745,7 +746,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 +4258,3 @@ DetachOffloadGPU(ScreenPtr secondary)
     assert(secondary->is_offload_secondary);
     secondary->is_offload_secondary = FALSE;
 }
-
diff --git a/dix/display.c b/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)
diff --git a/dix/dix_priv.h b/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;
 
diff --git a/dix/main.c b/dix/main.c
@@ -135,7 +135,7 @@ dix_main(int argc, char *argv[], char *envp[])
 {
     HWEventQueueType alwaysCheckForInput[2];
 
-    display = "0";
+    display = (char *)"0";
 
     InitRegions();
 
diff --git a/dix/property_priv.h b/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 */
diff --git a/dix/selection_priv.h b/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 */
diff --git a/dix/window.c b/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,
diff --git a/include/callback.h b/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,9 @@ CallCallbacks(CallbackListPtr *pcbl, void *call_data)
     _CallCallbacks(pcbl, call_data);
 }
 
+extern _X_EXPORT CallbackListPtr SelectionCallback;
+extern _X_EXPORT Selection *CurrentSelections;
+_X_EXPORT int dixLookupSelection(Selection ** result, Atom name,
+                                        ClientPtr client, Mask access_mode);
+
 #endif                          /* CALLBACK_H */
diff --git a/include/opaque.h b/include/opaque.h
@@ -37,4 +37,7 @@ from The Open Group.
 extern _X_EXPORT Bool enableIndirectGLX;
 extern _X_EXPORT Bool bgNoneRoot;
 
+// needed by libvnc.so from tigervnc
+extern _X_EXPORT char *display;
+
 #endif                          /* OPAQUE_H */
diff --git a/include/property.h b/include/property.h
@@ -65,4 +65,7 @@ extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
                                     WindowPtr /*pWin */ ,
                                     Atom /*propName */ );
 
+_X_EXPORT int dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom proprty,
+                      ClientPtr pClient, Mask access_mode);
+
 #endif                          /* PROPERTY_H */
diff --git a/include/window.h b/include/window.h
@@ -215,4 +215,25 @@ extern _X_EXPORT void PrintWindowTree(void);
 extern _X_EXPORT void PrintPassiveGrabs(void);
 
 extern _X_EXPORT VisualPtr WindowGetVisual(WindowPtr /*pWin*/);
+
+extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ ,
+                                        WindowPtr /*pParent */ ,
+                                        int /*x */ ,
+                                        int /*y */ ,
+                                        unsigned int /*w */ ,
+                                        unsigned int /*h */ ,
+                                        unsigned int /*bw */ ,
+                                        unsigned int /*class */ ,
+                                        Mask /*vmask */ ,
+                                        XID * /*vlist */ ,
+                                        int /*depth */ ,
+                                        ClientPtr /*client */ ,
+                                        VisualID /*visual */ ,
+                                        int * /*error */ );
+
+
+_X_EXPORT void DeleteWindowFromAnySelections(WindowPtr pWin);
+
+#define disCreateWindow CreateWindow
+
 #endif                          /* WINDOW_H */
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
@@ -37,6 +37,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "events.h"
 
+
+#define XkbChangeTypesOfKey            SrvXkbChangeTypesOfKey
+
 typedef struct _XkbInterest {
     DeviceIntPtr dev;
     ClientPtr client;
@@ -228,6 +231,23 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
 extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */,
 					  DeviceIntPtr /* src */);
 
+extern _X_EXPORT void XkbConvertCase(KeySym /* sym */ ,
+                                     KeySym * /* lower */ ,
+                                     KeySym *   /* upper */
+    );
+
+
+extern _X_EXPORT Status SrvXkbChangeTypesOfKey(XkbDescPtr /* xkb */ ,
+                                            int /* key */ ,
+                                            int /* nGroups */ ,
+                                            unsigned int /* groups */ ,
+                                            int * /* newTypesIn */ ,
+                                            XkbMapChangesPtr    /* changes */
+    );
+
+void _X_EXPORT XkbSendNotification(DeviceIntPtr kbd, XkbChangesPtr pChanges,
+                         XkbEventCausePtr cause);
+
 #include "xkbstr.h"
 #include "xkbrules.h"
 
diff --git a/mi/mi.h b/mi/mi.h
@@ -51,6 +51,7 @@ SOFTWARE.
 #include "validate.h"
 #include "window.h"
 #include "gc.h"
+#include <X11/Xfuncproto.h>
 #include <X11/fonts/font.h>
 #include "input.h"
 #include "cursor.h"
@@ -308,4 +309,16 @@ extern _X_EXPORT void miPolyFillArc(DrawablePtr /*pDraw */ ,
                                     xArc *      /*parcs */
     );
 
+
+/**
+ * Custom input event handler. If you need to process input events in some
+ * other way than the default path, register an input event handler for the
+ * given internal event type.
+ */
+typedef void (*mieqHandler) (int screen, InternalEvent *event,
+                             DeviceIntPtr dev);
+
+void _X_EXPORT mieqSetHandler(int event, mieqHandler handler);
+void _X_EXPORT mieqProcessInputEvents(void);
+
 #endif                          /* MI_H */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
@@ -41,19 +41,9 @@ void mieqFini(void);
 void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
 void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_screen);
 void mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen);
-void mieqProcessInputEvents(void);
 void mieqAddCallbackOnDrained(CallbackProcPtr callback, void *param);
 void mieqRemoveCallbackOnDrained(CallbackProcPtr callback, void *param);
 
-/**
- * Custom input event handler. If you need to process input events in some
- * other way than the default path, register an input event handler for the
- * given internal event type.
- */
-typedef void (*mieqHandler) (int screen, InternalEvent *event,
-                             DeviceIntPtr dev);
-void mieqSetHandler(int event, mieqHandler handler);
-
 void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
 
 _X_EXPORT /* used by in-tree libwfb.so module */
diff --git a/os/connection.c b/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>
diff --git a/os/xdmcp.c b/os/xdmcp.c
@@ -47,7 +47,7 @@
 #include "dixstruct.h"
 
 #include "os/Xtrans.h"
-
+#include <opaque.h>
 #ifdef XDMCP
 #undef REQUEST
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
@@ -165,11 +165,8 @@ Bool XkbEnableDisableControls(XkbSrvInfoPtr xkbi, unsigned long change,
                               XkbEventCausePtr cause);
 void XkbDisableComputedAutoRepeats(DeviceIntPtr pXDev, unsigned int key);
 XkbGeometryPtr XkbLookupNamedGeometry(DeviceIntPtr dev, Atom name, Bool *shouldFree);
-void XkbConvertCase(KeySym sym, KeySym *lower, KeySym *upper);
 int XkbChangeKeycodeRange(XkbDescPtr xkb, int minKC, int maxKC, XkbChangesPtr changes);
 void XkbFreeInfo(XkbSrvInfoPtr xkbi);
-int XkbChangeTypesOfKey(XkbDescPtr xkb, int key, int nGroups, unsigned int groups,
-                        int *newTypesIn, XkbMapChangesPtr changes);
 int XkbKeyTypesForCoreSymbols(XkbDescPtr xkb, int map_width, KeySym *core_syms,
                               unsigned int protected, int *types_inout,
                               KeySym *xkb_syms_rtrn);
@@ -236,8 +233,6 @@ void XkbSendNamesNotify(DeviceIntPtr kbd, xkbNamesNotify *ev);
 void XkbSendActionMessage(DeviceIntPtr kbd, xkbActionMessage *ev);
 void XkbSendExtensionDeviceNotify(DeviceIntPtr kbd, ClientPtr client,
                                   xkbExtensionDeviceNotify *ev);
-void XkbSendNotification(DeviceIntPtr kbd, XkbChangesPtr pChanges,
-                         XkbEventCausePtr cause);
 void XkbSendNewKeyboardNotify(DeviceIntPtr kbd, xkbNewKeyboardNotify *pNKN);
 
 /* device lookup */

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void hookInitRootWindow(CallbackListPtr pcbl, void data, void *screen)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`int rc = 0;`
`43`		`- WindowPtr pWin = dixCreateWindow(`
	`43`	`+ WindowPtr pWin = CreateWindow(`
`44`	`44`	`FakeClientID(0), realRoot, 0, 0, 23, 23,`
`45`	`45`	`0, /* bw */`
`46`	`46`	`InputOutput,`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ dix_main(int argc, char argv[], char envp[])`
`135`	`135`	`{`
`136`	`136`	`HWEventQueueType alwaysCheckForInput[2];`
`137`	`137`
`138`		`- display = "0";`
	`138`	`+ display = (char *)"0";`
`139`	`139`
`140`	`140`	`InitRegions();`
`141`	`141`