fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 04:40:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "dix: unexport global variables"

Browse source 
This reverts commit 040e41c7e9.
This commit is contained in:
kohnish 2025-11-21 20:23:19 +01:00
parent 543bf972a5
commit 9b5ab4f6da
10 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Xext/bigreq.c
View file

@ -30,14 +30,12 @@ from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/extensions/bigreqsproto.h>
#include "dix/dix_priv.h"
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
#include "dix_priv.h"
#include "extnsionst.h"
#include <X11/extensions/bigreqsproto.h>
#include "opaque.h"
#include "extinit_priv.h"

4
dix/dispatch.c
View file

@ -100,6 +100,9 @@ Equipment Corporation.
#include <version-config.h>
#include <stddef.h>
#include "dix/registry_priv.h"
#include "windowstr.h"
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/libxfont2.h>
@ -117,6 +120,7 @@ Equipment Corporation.
#include "windowstr.h"
#include "dixfontstr.h"
#include "dix_priv.h"
#include "gcstruct.h"
#include "selection.h"
#include "colormapst.h"

12
dix/dix_priv.h
View file

@ -29,21 +29,9 @@
#define MAX_BIG_REQUEST_SIZE 4194303
extern long maxBigRequestSize;
extern char dispatchExceptionAtReset;
extern int terminateDelay;
extern Bool touchEmulatePointer;
extern HWEventQueuePtr checkForInput[2];
/* -retro mode */
extern Bool party_like_its_1989;
static inline _X_NOTSAN Bool
InputCheckPending(void)
{
return (*checkForInput[0] != *checkForInput[1]);
}
void ClearWorkQueue(void);
void ProcessWorkQueue(void);
void ProcessWorkQueueZombies(void);

4
dix/globals.c
View file

@ -48,15 +48,13 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xmd.h>
#include "dix/dix_priv.h"
#include "misc.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "input.h"
#include "dixfont.h"
#include "dixstruct.h"
#include "dix_priv.h"
#include "os.h"
ScreenInfo screenInfo;

1
hw/xwayland/xwayland.c
View file

@ -35,7 +35,6 @@
#include <X11/Xatom.h>
#include <X11/Xfuncproto.h>
#include "dix/dix_priv.h"
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
#include "os/client_priv.h"

17
include/dix.h
View file

@ -130,15 +130,26 @@ typedef struct _WorkQueue *WorkQueuePtr;
extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
extern _X_EXPORT ClientPtr serverClient;
extern _X_EXPORT int currentMaxClients;
extern _X_EXPORT char dispatchExceptionAtReset;
extern _X_EXPORT int terminateDelay;
extern _X_EXPORT Bool touchEmulatePointer;
typedef int HWEventQueueType;
typedef HWEventQueueType *HWEventQueuePtr;
extern _X_EXPORT HWEventQueuePtr checkForInput[2];
static inline _X_NOTSAN Bool
InputCheckPending(void)
{
return (*checkForInput[0] != *checkForInput[1]);
}
typedef struct _TimeStamp {
CARD32 months; /* really ~49.7 days */
CARD32 milliseconds;
} TimeStamp;
typedef int HWEventQueueType;
typedef HWEventQueueType *HWEventQueuePtr;
/* dispatch.c */
extern _X_EXPORT void SetInputCheck(HWEventQueuePtr /*c0 */ ,
HWEventQueuePtr /*c1 */ );

4
os/WaitFor.c
View file

@ -54,12 +54,12 @@ SOFTWARE.
#include <dix-config.h>
#include <errno.h>
#include <stdio.h>
#ifdef WIN32
#include <X11/Xwinsock.h>
#endif
#include <X11/Xos.h> /* for strings, fcntl, time */
#include <errno.h>
#include <stdio.h>
#include <X11/X.h>
#include "dix/dix_priv.h"

1
os/io.c
View file

@ -80,6 +80,7 @@ SOFTWARE.
#include "os.h"
#include "opaque.h"
#include "dixstruct.h"
#include "dix_priv.h"
#include "misc.h"
CallbackListPtr ReplyCallback;

1
os/utils.c
View file

@ -112,6 +112,7 @@ __stdcall unsigned long GetTickCount(void);
#include "os/osdep.h"
#include "dixstruct.h"
#include "dix_priv.h"
#include "xkbsrv.h"
#include "picture.h"
#include "miinitext.h"

2
xfixes/disconnect.c
View file

@ -44,8 +44,6 @@
#include <dix-config.h>
#include "dix/dix_priv.h"
#include "xfixesint.h"
#include "opaque.h"