(submit/unexport-ddx-callbacks) os: unexport ddx callbacks

The DDX callbacks (where core/DIX calls into DDX) aren't supposed to be
called by drivers directly, so unexport them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

dix/dispatch.c

@@ -120,6 +120,7 @@ Equipment Corporation.
 #include "os/screensaver.h"
 
 #include "windowstr.h"
+#include "ddx.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
 #include "colormapst.h"

dix/main.c

@@ -112,6 +112,7 @@ Equipment Corporation.
 #include "colormapst.h"
 #include "cursorstr.h"
 #include "servermd.h"
+#include "ddx.h"
 #include "dixfont.h"
 #include "extnsionst.h"
 #include "privates.h"

hw/kdrive/ephyr/ephyrinit.c

@@ -30,6 +30,7 @@
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
+#include "ddx.h"
 #include "ephyr.h"
 #include "ephyrlog.h"
 #include "glx_extinit.h"

hw/vfb/InitOutput.c

@@ -69,6 +69,7 @@ from The Open Group.
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #endif                          /* MITSHM */
+#include "ddx.h"
 #include "dix.h"
 #include "miline.h"
 #include "glx_extinit.h"

hw/xfree86/common/xf86Configure.c

@@ -32,6 +32,7 @@
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
+#include "ddx.h"
 #include "xf86.h"
 #include "xf86Config.h"
 #include "xf86_OSlib.h"

hw/xnest/Args.c

@@ -25,6 +25,7 @@ is" without express or implied warranty.
 #include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
+#include "ddx.h"
 
 #include "xnest-xcb.h"
 

hw/xnest/Init.c

@@ -25,6 +25,7 @@ is" without express or implied warranty.
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
+#include "ddx.h"
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"

hw/xquartz/darwin.c

@@ -46,6 +46,7 @@
 #include "micmap.h"             // mi colormap code
 #include "fb.h"                 // fb framebuffer code
 #include "globals.h"
+#include "ddx.h"
 #include "dix.h"
 #include "xkbsrv.h"
 

hw/xwayland/xwayland.c

@@ -51,6 +51,7 @@
 #include <glx_extinit.h>
 #include <opaque.h>
 #include <os.h>
+#include "ddx.h"
 #include <propertyst.h>
 #include <version-config.h>
 

hw/xwin/winprocarg.c

@@ -47,6 +47,7 @@ from The Open Group.
 #include "winprefs.h"
 
 #include "winclipboard/winclipboard.h"
+#include "ddx.h"
 
 /*
  * Function prototypes

meson.build

@@ -654,6 +654,7 @@ inc = include_directories(
     'dix',
     'dri3',
     'include',
+    'os',
     'present',
     'randr',
     'render',

os/ddx.h

@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_OS_DDX_H
+#define _XSERVER_OS_DDX_H
+
+#include "os.h"
+
+/* callbacks of the DDX, which are called by DIX or OS layer.
+   DDX's need to implement these in order to handle DDX specific things.
+*/
+
+/* called before server reset */
+void ddxBeforeReset(void);
+
+/* called by ProcessCommandLine, so DDX can catch cmdline args */
+int ddxProcessArgument(int argc, char *argv[], int i);
+
+/* print DDX specific usage message */
+void ddxUseMsg(void);
+
+void ddxGiveUp(enum ExitCode error);
+
+void ddxInputThreadInit(void);
+
+#endif /* _XSERVER_OS_DDX_H */

os/log.c

@@ -96,6 +96,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "os/osdep.h"
 
 #include "opaque.h"
+#include "ddx.h"
 
 #ifdef XF86BIGFONT
 #include "xf86bigfontsrv.h"

os/utils.c

@@ -116,6 +116,7 @@ __stdcall unsigned long GetTickCount(void);
 #include "xkbsrv.h"
 #include "picture.h"
 #include "miinitext.h"
+#include "ddx.h"
 #include "present.h"
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"