Xext/bigreq.c

@@ -35,6 +35,7 @@ from The Open Group.
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
+#include "dix_priv.h"
 #include "extnsionst.h"
 #include <X11/extensions/bigreqsproto.h>
 #include "opaque.h"

Xext/sync.c

@@ -60,7 +60,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xmd.h>
 #include "scrnintstr.h"
 #include "os.h"
-#include "bug.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"

Xi/exevents.c

@@ -89,8 +89,6 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/extensions/geproto.h>
-
-#include "bug.h"
 #include "windowstr.h"
 #include "miscstruct.h"
 #include "region.h"

Xi/xibarriers.c

@@ -45,7 +45,6 @@
 #include <dix-config.h>
 #endif
 
-#include "bug.h"
 #include "xibarriers.h"
 #include "scrnintstr.h"
 #include "cursorstr.h"

dix/cursor.c

@@ -50,8 +50,6 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-
-#include "bug.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"

dix/devices.c

@@ -53,7 +53,6 @@ SOFTWARE.
 #include "resource.h"
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
-#include "bug.h"
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"

dix/dispatch.c

@@ -105,12 +105,12 @@ Equipment Corporation.
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/libxfont2.h>
 #include "dixfontstr.h"
+#include "dix_priv.h"
 #include "gcstruct.h"
 #include "selection.h"
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
-#include "opaque.h"
 #include "input.h"
 #include "servermd.h"
 #include "extnsionst.h"

dix/dix_priv.h

+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_PRIV_H
+#define _XSERVER_DIX_PRIV_H
+
+/* This file holds global DIX settings to be used inside the Xserver,
+ *  but NOT supposed to be accessed directly by external server modules like
+ *  drivers or extension modules. Thus the definitions here are not part of the
+ *  Xserver's module API/ABI.
+ */
+
+/* server setting: maximum size for big requests */
+#define MAX_BIG_REQUEST_SIZE 4194303
+extern long maxBigRequestSize;
+
+#endif /* _XSERVER_DIX_PRIV_H */

dix/dixutils.c

@@ -525,6 +525,10 @@ ProcessWorkQueue(void)
 {
     WorkQueuePtr q, *p;
 
+    // don't have a work queue yet
+    if (!workQueue)
+        return;
+
     p = &workQueue;
     /*
      * Scan the work queue once, calling each function.  Those

dix/enterleave.c

@@ -32,8 +32,6 @@
 #include <X11/extensions/XI2.h>
 #include <X11/extensions/XIproto.h>
 #include <X11/extensions/XI2proto.h>
-
-#include "bug.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "scrnintstr.h"

dix/events.c

@@ -106,8 +106,6 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
-
-#include "bug.h"
 #include "misc.h"
 #include "resource.h"
 #include <X11/Xproto.h>

dix/gestures.c

@@ -38,7 +38,6 @@
 #include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
-#include "bug.h"
 
 #define GESTURE_HISTORY_SIZE 100
 

dix/getevents.c

@@ -37,7 +37,6 @@
 #include <math.h>
 #include <limits.h>
 
-#include "bug.h"
 #include "misc.h"
 #include "resource.h"
 #include "inputstr.h"

dix/globals.c

@@ -56,6 +56,7 @@ SOFTWARE.
 #include "input.h"
 #include "dixfont.h"
 #include "dixstruct.h"
+#include "dix_priv.h"
 #include "os.h"
 
 ScreenInfo screenInfo;

dix/grabs.c

@@ -62,7 +62,6 @@ SOFTWARE.
 #include "exglobals.h"
 #include "inpututils.h"
 #include "client.h"
-#include "bug.h"
 
 #define BITMASK(i) (((Mask)1) << ((i) & 31))
 #define MASKIDX(i) ((i) >> 5)

dix/inpututils.c

@@ -27,7 +27,6 @@
 #include "dix-config.h"
 #endif
 
-#include "bug.h"
 #include "exevents.h"
 #include "exglobals.h"
 #include "misc.h"

dix/ptrveloc.c

@@ -31,7 +31,6 @@
 #include <exevents.h>
 #include <X11/Xatom.h>
 #include <os.h>
-#include "bug.h"
 
 #include <xserver-properties.h>
 

dix/touch.c

@@ -39,7 +39,6 @@
 #include "eventconvert.h"
 #include "windowstr.h"
 #include "mi.h"
-#include "bug.h"
 
 #define TOUCH_HISTORY_SIZE 100
 

doc/Xserver-spec.xml

@@ -657,14 +657,11 @@ make the server suspend until one or more of the following occurs:
 <para>
 Before WaitForSomething() computes the masks to pass to select, poll or
 similar operating system interface, it needs to
-see if there is anything to do on the work queue; if so, it must call a DIX
-routine called ProcessWorkQueue.
+see if there is anything to do on the work queue; it must call a DIX
+routine called ProcessWorkQueue().
 <blockquote>
 <programlisting>
-	extern WorkQueuePtr	workQueue;
-
-	if (workQueue)
-		ProcessWorkQueue ();
+	ProcessWorkQueue ();
 </programlisting>
 </blockquote>
 </para>

hw/xquartz/quartzStartup.c

@@ -99,7 +99,7 @@ QuartzInitServer(int argc, char **argv, char **envp)
     sigset_t set;
     sigemptyset(&set);
     sigaddset(&set, SIGALRM);
-#ifdef BUSFAULT
+#ifdef HAVE_SIGACTION
     sigaddset(&set, SIGBUS);
 #endif
     pthread_sigmask(SIG_BLOCK, &set, NULL);