.gitlab-ci.yml

@@ -127,6 +127,7 @@ meson-dist:
 check-commits:
   extends:
     - .fdo.ci-fairy
+  needs: []
   stage: test
   script:
     - ci-fairy check-commits --junit-xml=results.xml
@@ -145,6 +146,7 @@ check-commits:
 check-merge-request:
   extends:
     - .fdo.ci-fairy
+  needs: []
   stage: test
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

Xext/security.c

@@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 
 #include "scrnintstr.h"

Xi/exevents.c

@@ -89,6 +89,9 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/geproto.h>
+
+#include "dix/eventconvert.h"
+
 #include "windowstr.h"
 #include "miscstruct.h"
 #include "region.h"
@@ -102,7 +105,6 @@ SOFTWARE.
 #include "listdev.h"            /* for CopySwapXXXClass */
 #include "xace.h"
 #include "xiquerydevice.h"      /* For List*Info */
-#include "eventconvert.h"
 #include "eventstr.h"
 #include "inpututils.h"
 #include "mi.h"

Xi/xiquerypointer.c

@@ -35,6 +35,9 @@
 
 #include <X11/X.h>              /* for inputstr.h    */
 #include <X11/Xproto.h>         /* Request macro     */
+
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
@@ -42,7 +45,6 @@
 #include "extnsionst.h"
 #include "exevents.h"
 #include "exglobals.h"
-#include "eventconvert.h"
 #include "scrnintstr.h"
 #include "xkbsrv.h"
 

dix/callback_priv.h

+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_CALLBACK_PRIV_H
+#define _XSERVER_CALLBACK_PRIV_H
+
+#include "callback.h"
+
+typedef struct _CallbackList *CallbackListPtr;
+
+void InitCallbackManager(void);
+void DeleteCallbackManager(void);
+
+#endif /* _XSERVER_CALLBACK_PRIV_H */

dix/cursor.c

@@ -69,8 +69,6 @@ typedef struct _GlyphShare {
 
 static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL;
 
-DevScreenPrivateKeyRec cursorScreenDevPriv;
-
 static CARD32 cursorSerial;
 
 static void

dix/dispatch.c

@@ -4000,9 +4000,6 @@ AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
 
     update_desktop_dimensions();
 
-    dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR,
-                                0);
-
     return i;
 }
 
@@ -4050,16 +4047,6 @@ AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
 
     update_desktop_dimensions();
 
-    /*
-     * We cannot register the Screen PRIVATE_CURSOR key if cursors are already
-     * created, because dix/privates.c does not have relocation code for
-     * PRIVATE_CURSOR. Once this is fixed the if() can be removed and we can
-     * register the Screen PRIVATE_CURSOR key unconditionally.
-     */
-    if (!dixPrivatesCreated(PRIVATE_CURSOR))
-        dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen,
-                                    PRIVATE_CURSOR, 0);
-
     return i;
 }
 

dix/dix_priv.h

@@ -36,4 +36,6 @@ void ClearWorkQueue(void);
 void ProcessWorkQueue(void);
 void ProcessWorkQueueZombies(void);
 
+void CloseDownClient(ClientPtr client);
+
 #endif /* _XSERVER_DIX_PRIV_H */

dix/dixutils.c

@@ -87,6 +87,7 @@ Author:  Adobe Systems Incorporated
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
+#include "dix/callback_priv.h"
 #include "dix/dix_priv.h"
 
 #include "misc.h"
@@ -739,6 +740,8 @@ _DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
     return FALSE;
 }
 
+static void DeleteCallbackList(CallbackListPtr *pcbl);
+
 void
 _CallCallbacks(CallbackListPtr *pcbl, void *call_data)
 {
@@ -871,8 +874,7 @@ DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
     return _DeleteCallback(pcbl, callback, data);
 }
 
-void
-DeleteCallbackList(CallbackListPtr *pcbl)
+static void DeleteCallbackList(CallbackListPtr *pcbl)
 {
     if (!pcbl || !*pcbl)
         return;

dix/enterleave.c

@@ -32,12 +32,14 @@
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
+
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "exglobals.h"
 #include "enterleave.h"
-#include "eventconvert.h"
 #include "xkbsrv.h"
 #include "inpututils.h"
 

dix/eventconvert.c

@@ -39,13 +39,14 @@
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XI2.h>
 
+#include "dix/eventconvert.h"
+
 #include "dix.h"
 #include "inputstr.h"
 #include "misc.h"
 #include "eventstr.h"
 #include "exevents.h"
 #include "exglobals.h"
-#include "eventconvert.h"
 #include "inpututils.h"
 #include "xiquerydevice.h"
 #include "xkbsrv.h"

include/eventconvert.h → dix/eventconvert.h

@@ -22,21 +22,24 @@
  *
  */
 
-#ifndef _EVENTCONVERT_H_
+#ifndef _XSERVER_EVENTCONVERT_H_
+#define _XSERVER_EVENTCONVERT_H_
+
 #include <X11/X.h>
 #include <X11/extensions/XIproto.h>
+
 #include "input.h"
 #include "events.h"
 #include "eventstr.h"
 
-_X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count);
-_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
-_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
-_X_INTERNAL int GetCoreType(enum EventType type);
-_X_INTERNAL int GetXIType(enum EventType type);
-_X_INTERNAL int GetXI2Type(enum EventType type);
+int EventToCore(InternalEvent *event, xEvent **core, int *count);
+int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
+int EventToXI2(InternalEvent *ev, xEvent **xi);
+int GetCoreType(enum EventType type);
+int GetXIType(enum EventType type);
+int GetXI2Type(enum EventType type);
 
-_X_INTERNAL enum EventType GestureTypeToBegin(enum EventType type);
-_X_INTERNAL enum EventType GestureTypeToEnd(enum EventType type);
+enum EventType GestureTypeToBegin(enum EventType type);
+enum EventType GestureTypeToEnd(enum EventType type);
 
 #endif                          /* _EVENTCONVERT_H_ */

dix/events.c

@@ -106,6 +106,9 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
+
+#include "dix/eventconvert.h"
+
 #include "misc.h"
 #include "resource.h"
 #include <X11/Xproto.h>
@@ -145,7 +148,6 @@ Equipment Corporation.
 
 #include "eventstr.h"
 #include "enterleave.h"
-#include "eventconvert.h"
 #include "mi.h"
 
 /* Extension events type numbering starts at EXTENSION_EVENT_BASE.  */

dix/gestures.c

@@ -27,6 +27,8 @@
 #include <dix-config.h>
 #endif
 
+#include "dix/eventconvert.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "dixgrabs.h"
@@ -35,7 +37,6 @@
 #include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
-#include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
 

dix/grabs.c

@@ -53,6 +53,9 @@ SOFTWARE.
 #include "misc.h"
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2.h>
+
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "inputstr.h"
 #include "cursorstr.h"

dix/main.c

@@ -83,6 +83,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 #include <pixman.h>
 
+#include "dix/callback_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 

dix/touch.c

@@ -29,6 +29,7 @@
 #endif
 
 #include "dix/dix_priv.h"
+#include "dix/eventconvert.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -38,7 +39,6 @@
 #include "exevents.h"
 #include "exglobals.h"
 #include "inpututils.h"
-#include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
 

hw/xfree86/common/xf86DGA.c

@@ -43,6 +43,9 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/eventconvert.h"
+
 #include "xf86.h"
 #include "xf86str.h"
 #include "xf86Priv.h"
@@ -60,7 +63,6 @@
 #include "exglobals.h"
 #include "exevents.h"
 #include "eventstr.h"
-#include "eventconvert.h"
 #include "xf86Extensions.h"
 
 #include "mi.h"

hw/xfree86/modes/xf86Cursors.c

@@ -301,7 +301,8 @@ xf86_set_cursor_colors(ScrnInfoPtr scrn, int bg, int fg)
     CursorPtr cursor = xf86CurrentCursor(screen);
     int c;
     CARD8 *bits = cursor ?
-        dixLookupScreenPrivate(&cursor->devPrivates, CursorScreenKey, screen)
+        dixLookupScreenPrivate(&cursor->devPrivates,
+                               &xf86ScreenCursorBitsKeyRec, screen)
         : NULL;
 
     /* Save ARGB versions of these colors */

hw/xfree86/os-support/shared/posix_tty.c

@@ -411,16 +411,6 @@ xf86WaitForInput(int fd, int timeout)
     return r;
 }
 
-int
-xf86SerialSendBreak(int fd, int duration)
-{
-    int r;
-
-    SYSCALL(r = tcsendbreak(fd, duration));
-    return r;
-
-}
-
 int
 xf86FlushInput(int fd)
 {