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>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1332>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-22 17:32:26 +01:00
parent 1fdf97f28d
commit e5c8b664d3
18 changed files with 50 additions and 21 deletions

View File

@ -110,6 +110,7 @@ Equipment Corporation.
#include "dix/registry_priv.h"
#include "dix/screenint_priv.h"
#include "os/auth.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "windowstr.h"

View File

@ -90,6 +90,7 @@ Equipment Corporation.
#include "os/audit.h"
#include "os/auth.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "scrnintstr.h"

View File

@ -29,6 +29,7 @@
#include "dix/dix_priv.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "ephyr.h"

View File

@ -26,6 +26,7 @@
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
@ -33,6 +34,7 @@
#include <mivalidate.h>
#include <dixstruct.h>
#include "privates.h"
#ifdef RANDR
#include <randrstr.h>
#endif

View File

@ -40,6 +40,7 @@ from The Open Group.
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "scrnintstr.h"

View File

@ -29,6 +29,7 @@
#include <errno.h>
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "xf86.h"

View File

@ -52,6 +52,7 @@
#include "config/dbus-core.h"
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "input.h"

View File

@ -20,6 +20,8 @@ is" without express or implied warranty.
#include <X11/Xdefs.h>
#include <X11/Xproto.h>
#include "os/ddx_priv.h"
#include "screenint.h"
#include "input.h"
#include "misc.h"

View File

@ -22,6 +22,7 @@ is" without express or implied warranty.
#include <X11/fonts/fontstruct.h>
#include "dix/screenint_priv.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "screenint.h"

View File

@ -36,6 +36,7 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "os.h"

View File

@ -37,6 +37,7 @@
#include "dix/dix_priv.h"
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include <selection.h>

View File

@ -32,10 +32,13 @@ from The Open Group.
#include <xwin-config.h>
#endif
#include "win.h"
#include "dix/dix_priv.h"
#include "dix/screenint_priv.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "win.h"
#include "winmsg.h"
#include "winconfig.h"
#include "winprefs.h"
@ -60,9 +63,6 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
DWORD dwFlags, LPTSTR pszPath);
#endif
#include "dix/screenint_priv.h"
#include "os/osdep.h"
#include "winmonitors.h"
#include "nonsdk_extinit.h"
#include "extinit_priv.h"

View File

@ -37,6 +37,7 @@ from The Open Group.
#include "os/cmdline.h"
#include "os/osdep.h"
#include "os/ddx_priv.h"
#include <../xfree86/common/xorgVersion.h>
#include "win.h"

View File

@ -86,10 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
#include <stdio.h>
#include <stdarg.h>
#ifdef DDXBEFORERESET
extern void ddxBeforeReset(void);
#endif
extern _X_EXPORT Bool WaitForSomething(Bool clients_are_ready);
extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client */ );
@ -273,12 +269,6 @@ GetClientFd(ClientPtr);
extern _X_EXPORT Bool
ClientIsLocal(ClientPtr client);
extern _X_EXPORT int
ddxProcessArgument(int /*argc */ , char * /*argv */ [], int /*i */ );
extern _X_EXPORT void
ddxUseMsg(void);
/* stuff for ReplyCallback */
extern _X_EXPORT CallbackListPtr ReplyCallback;
typedef struct {
@ -300,10 +290,6 @@ enum ExitCode {
EXIT_ERR_DRIVERS = 3,
};
extern _X_EXPORT void
ddxGiveUp(enum ExitCode error);
extern _X_EXPORT void
ddxInputThreadInit(void);
extern _X_EXPORT int
TimeSinceLastInputEvent(void);

27
os/ddx_priv.h Normal file
View File

@ -0,0 +1,27 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_OS_DDX_PRIV_H
#define _XSERVER_OS_DDX_PRIV_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_PRIV_H */

View File

@ -35,6 +35,8 @@
#include <unistd.h>
#include <pthread.h>
#include "os/ddx_priv.h"
#include "inputstr.h"
#include "opaque.h"
#include "osdep.h"

View File

@ -87,10 +87,10 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <time.h>
#include <X11/Xos.h>
#include "os/osdep.h"
#include "os/audit.h"
#include "os/ddx_priv.h"
#include "os/fmt.h"
#include "os/osdep.h"
#include "input.h"
#include "opaque.h"

View File

@ -97,7 +97,6 @@ __stdcall unsigned long GetTickCount(void);
#include <sys/stat.h>
#include <ctype.h> /* for isspace */
#include <stdarg.h>
#include <stdlib.h> /* for malloc() */
#if defined(TCPCONN)
@ -109,6 +108,7 @@ __stdcall unsigned long GetTickCount(void);
#include "dix/dix_priv.h"
#include "os/auth.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "dixstruct.h"