(submit/unexport-ddx-callbacks) os: rename ddx.h to ddx_priv.h

Make it clear that stuff from this file really isn't supposed to be used
by dynamically loaded modules like drivers.

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

dix/dispatch.c

@@ -120,7 +120,6 @@ 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,7 +112,6 @@ 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,7 +30,6 @@
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 
-#include "ddx.h"
 #include "ephyr.h"
 #include "ephyrlog.h"
 #include "glx_extinit.h"

hw/kdrive/src/kdrive.c

@@ -26,7 +26,6 @@
 #include "dix/screenint_priv.h"
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
-
 #include "os/osdep.h"
 
 #include "kdrive.h"

hw/vfb/InitOutput.c

@@ -69,7 +69,6 @@ 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,7 +32,6 @@
 #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,7 +25,6 @@ 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,7 +25,6 @@ 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,7 +46,6 @@
 #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,7 +51,6 @@
 #include <glx_extinit.h>
 #include <opaque.h>
 #include <os.h>
-#include "ddx.h"
 #include <propertyst.h>
 #include <version-config.h>
 

hw/xwin/winprocarg.c

@@ -36,6 +36,7 @@ from The Open Group.
 #endif
 
 #include "os/cmdline.h"
+#include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/ddx_priv.h"
 
@@ -47,7 +48,6 @@ from The Open Group.
 #include "winprefs.h"
 
 #include "winclipboard/winclipboard.h"
-#include "ddx.h"
 
 /*
  * Function prototypes

meson.build

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

os/ddx.h

@@ -1,27 +0,0 @@
-/* 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/inputthread.c

@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <pthread.h>
 
+#include "os/ddx_priv.h"
 #include "dix/input_priv.h"
 #include "os/ddx_priv.h"
 

os/log.c

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

os/utils.c

@@ -116,7 +116,6 @@ __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"