xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Apr 16 01:23:02 UTC 2024
Xext/panoramiX.c | 5 ++++-
Xext/panoramiXprocs.c | 3 +++
Xext/saver.c | 9 +++++----
Xext/shape.c | 2 +-
Xext/shm.c | 2 ++
Xext/sync.c | 8 +++++---
Xext/xselinux_ext.c | 2 ++
Xext/xtest.c | 10 ++++++----
Xext/xvdisp.c | 8 +++++---
Xi/chgprop.c | 7 ++++---
Xi/exevents.c | 6 +++---
Xi/getprop.c | 8 +++++---
Xi/getselev.c | 4 +++-
Xi/selectev.c | 7 +++++--
Xi/ungrdevb.c | 8 +++++---
Xi/ungrdevk.c | 8 +++++---
Xi/xiallowev.c | 8 +++++---
Xi/xibarriers.c | 2 ++
Xi/xichangecursor.c | 8 +++++---
Xi/xigetclientpointer.c | 8 +++++---
Xi/xipassivegrab.c | 8 +++++---
Xi/xiquerypointer.c | 5 +++--
Xi/xiselectev.c | 6 ++++--
Xi/xisetclientpointer.c | 4 +++-
Xi/xiwarppointer.c | 9 ++++++---
composite/compwindow.c | 2 ++
damageext/damageext.c | 2 ++
dbe/dbe.c | 3 +++
dix/devices.c | 5 +++--
dix/dix_priv.h | 25 +++++++++++++++++++++++++
dix/dixfonts.c | 5 ++++-
dix/events.c | 3 ++-
dix/property.c | 3 +++
dix/selection.c | 2 ++
dri3/dri3_request.c | 6 +++++-
glx/glxcmds.c | 6 ++++--
glx/xfont.c | 2 ++
hw/xfree86/dri/dri.c | 14 ++++++++------
hw/xfree86/dri/xf86dri.c | 7 ++++---
hw/xfree86/dri2/dri2ext.c | 3 +++
hw/xfree86/drivers/modesetting/dri2.c | 2 ++
hw/xfree86/drivers/modesetting/driver.c | 6 ++++--
include/dix.h | 21 ---------------------
mi/miexpose.c | 2 ++
present/present_notify.c | 4 +++-
present/present_request.c | 3 +++
randr/rrdispatch.c | 5 ++++-
randr/rrlease.c | 8 ++++++--
randr/rrmode.c | 4 +++-
randr/rrmonitor.c | 5 ++++-
randr/rroutput.c | 5 ++++-
randr/rrprovider.c | 9 ++++++---
randr/rrscreen.c | 4 +++-
randr/rrxinerama.c | 9 +++++++--
render/render.c | 9 ++++++---
xfixes/cursor.c | 2 ++
xfixes/region.c | 4 +++-
xfixes/saveset.c | 2 ++
xfixes/select.c | 2 ++
xkb/xkb.c | 7 +++++--
60 files changed, 244 insertions(+), 112 deletions(-)
New commits:
commit d444cd4237e008f148ed000fb4b15efa7981072a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Mar 7 17:07:04 2024 +0100
dix: unexport some lookup functions
These aren't used by any drivers, so no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1380>
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 71713f14b..94c81a7c8 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -31,6 +31,10 @@ Equipment Corporation.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xarch.h>
+#include <X11/extensions/panoramiXproto.h>
+
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "cursor.h"
#include "cursorstr.h"
@@ -43,7 +47,6 @@ Equipment Corporation.
#include "windowstr.h"
#include "pixmapstr.h"
#include "panoramiX.h"
-#include <X11/extensions/panoramiXproto.h>
#include "panoramiXsrv.h"
#include "globals.h"
#include "servermd.h"
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 32424fcbd..9c46e3291 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -32,6 +32,9 @@ Equipment Corporation.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
#include "windowstr.h"
#include "dixfontstr.h"
#include "gcstruct.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index fd6153c31..d9f0c9a64 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -30,8 +30,13 @@ in this Software without prior written authorization from the X Consortium.
#include <dix-config.h>
#endif
+#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/saverproto.h>
+
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "os.h"
#include "windowstr.h"
@@ -41,7 +46,6 @@ in this Software without prior written authorization from the X Consortium.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-#include <X11/extensions/saverproto.h>
#include "gcstruct.h"
#include "cursorstr.h"
#include "colormapst.h"
@@ -56,9 +60,6 @@ in this Software without prior written authorization from the X Consortium.
#include "dpmsproc.h"
#endif
#include "protocol-versions.h"
-
-#include <stdio.h>
-
#include "extinit.h"
static int ScreenSaverEventBase = 0;
diff --git a/Xext/shape.c b/Xext/shape.c
index 3af0e4b68..9d46cd3d6 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group.
#endif
#include <stdlib.h>
-
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/extensions/shapeproto.h>
+#include "dix/dix_priv.h"
#include "dix/gc_priv.h"
#include "misc.h"
diff --git a/Xext/shm.c b/Xext/shm.c
index 295866480..e8a8dd460 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -96,6 +96,8 @@ in this Software without prior written authorization from The Open Group.
#include "panoramiXsrv.h"
#endif
+#include "dix/dix_priv.h"
+
#include "extinit.h"
typedef struct _ShmScrPrivateRec {
diff --git a/Xext/sync.c b/Xext/sync.c
index 8da5bf616..7a814a479 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -54,10 +54,14 @@ PERFORMANCE OF THIS SOFTWARE.
#endif
#include <string.h>
-
+#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xmd.h>
+#include <X11/extensions/syncproto.h>
+
+#include "dix/dix_priv.h"
+
#include "scrnintstr.h"
#include "os.h"
#include "extnsionst.h"
@@ -65,14 +69,12 @@ PERFORMANCE OF THIS SOFTWARE.
#include "pixmapstr.h"
#include "resource.h"
#include "opaque.h"
-#include <X11/extensions/syncproto.h>
#include "syncsrv.h"
#include "syncsdk.h"
#include "protocol-versions.h"
#include "inputstr.h"
#include "misync_priv.h"
-#include <stdio.h>
#if !defined(WIN32)
#include <sys/time.h>
#endif
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 321620c11..c7ce19c49 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -21,6 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "selection.h"
#include "inputstr.h"
#include "windowstr.h"
diff --git a/Xext/xtest.c b/Xext/xtest.c
index f03d8c951..a938d813a 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -33,6 +33,12 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xatom.h>
+#include <X11/extensions/xtestproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
@@ -45,16 +51,12 @@
#include "mi.h"
#include "xkbsrv.h"
#include "xkbstr.h"
-#include <X11/extensions/xtestproto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
#include "exglobals.h"
#include "mipointer.h"
#include "xserver-properties.h"
#include "exevents.h"
#include "eventstr.h"
#include "inpututils.h"
-
#include "extinit.h"
/* XTest events are sent during request processing and may be interrupted by
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 5232b37d6..eb80561b7 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -29,6 +29,11 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "scrnintstr.h"
#include "windowstr.h"
@@ -37,9 +42,6 @@ SOFTWARE.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
#include "xvdix.h"
#ifdef MITSHM
#include <X11/extensions/shmproto.h>
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 1d72770f1..892ac4a23 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -54,14 +54,15 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h"
#include "exevents.h"
#include "exglobals.h"
-
#include "chgprop.h"
#include "grabdev.h"
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 4ffc93bbd..e8267d3ea 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -82,16 +82,18 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h"
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include <X11/extensions/XI2proto.h>
#include <X11/extensions/geproto.h>
+#include <X11/extensions/XKBproto.h>
+#include "dix/dix_priv.h"
#include "dix/eventconvert.h"
+#include "inputstr.h"
#include "windowstr.h"
#include "miscstruct.h"
#include "region.h"
@@ -108,8 +110,6 @@ SOFTWARE.
#include "eventstr.h"
#include "inpututils.h"
#include "mi.h"
-
-#include <X11/extensions/XKBproto.h>
#include "xkbsrv.h"
#define WID(w) ((w) ? ((w)->drawable.id) : 0)
diff --git a/Xi/getprop.c b/Xi/getprop.c
index b744f35cb..282831310 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -54,13 +54,15 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structs */
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structs */
#include "exglobals.h"
#include "swaprep.h"
-
#include "getprop.h"
extern XExtEventInfo EventInfo[];
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 0623c7ac4..b85eca3ff 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -56,11 +56,13 @@ SOFTWARE.
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window struct */
#include "exglobals.h"
#include "swaprep.h"
-
#include "getprop.h"
#include "getselev.h"
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 65c7bc868..6b7bdc512 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -54,11 +54,14 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
#include <X11/extensions/XI.h>
#include <X11/extensions/XI2.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include "exevents.h"
#include "exglobals.h"
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 47b97d716..0f5c7913c 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -54,13 +54,15 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include "exglobals.h"
#include "dixgrabs.h"
-
#include "ungrdevb.h"
#define AllModifiersMask ( \
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index 753b14d70..8aa797b4d 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -54,15 +54,17 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include "exglobals.h"
#include "dixgrabs.h"
#include "xkbsrv.h"
#include "xkbstr.h"
-
#include "ungrdevk.h"
#define AllModifiersMask ( \
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 676480157..ab83a19e7 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -33,13 +33,15 @@
#include <dix-config.h>
#endif
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "mi.h"
#include "eventstr.h"
-#include <X11/extensions/XI2.h>
-#include <X11/extensions/XI2proto.h>
-
#include "exglobals.h" /* BadDevice */
#include "exevents.h"
#include "xiallowev.h"
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 1926762ad..809a81a0a 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -45,6 +45,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "xibarriers.h"
#include "scrnintstr.h"
#include "cursorstr.h"
diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index a9a1ac9fc..bfa2e777c 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -35,16 +35,18 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
#include "input.h"
-
#include "xichangecursor.h"
/***********************************************************************
diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c
index c3d494d61..f63d6006e 100644
--- a/Xi/xigetclientpointer.c
+++ b/Xi/xigetclientpointer.c
@@ -29,16 +29,18 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "extinit.h" /* LookupDeviceIntRec */
#include "exevents.h"
#include "exglobals.h"
-
#include "xigetclientpointer.h"
/***********************************************************************
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 896233bec..6f1eca2a1 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -33,12 +33,14 @@
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
-#include "swaprep.h"
+#include "dix/dix_priv.h"
+
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
+#include "swaprep.h"
#include "exglobals.h" /* BadDevice */
#include "exevents.h"
#include "xipassivegrab.h"
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 02efdffb9..7da45fdc2 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -35,13 +35,14 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+#include "dix/dix_priv.h"
#include "dix/eventconvert.h"
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index ac1494987..4d025b6e0 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -27,13 +27,15 @@
#include <dix-config.h>
#endif
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "dixstruct.h"
#include "windowstr.h"
#include "exglobals.h"
#include "exevents.h"
-#include <X11/extensions/XI2proto.h>
#include "inpututils.h"
-
#include "xiselectev.h"
/**
diff --git a/Xi/xisetclientpointer.c b/Xi/xisetclientpointer.c
index e02eac4bc..a865c164c 100644
--- a/Xi/xisetclientpointer.c
+++ b/Xi/xisetclientpointer.c
@@ -36,6 +36,9 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
@@ -44,7 +47,6 @@
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
-
#include "xisetclientpointer.h"
int _X_COLD
diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index 955fdb965..1d8926935 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -35,17 +35,20 @@
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2proto.h>
+
+#include "dix/dix_priv.h"
+
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
#include "scrnintstr.h" /* screen structure */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2proto.h>
#include "extnsionst.h"
#include "exevents.h"
#include "exglobals.h"
#include "mipointer.h" /* for miPointerUpdateSprite */
-
#include "xiwarppointer.h"
+
/***********************************************************************
*
* This procedure allows a client to warp the pointer of a device.
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 83ac1ca80..c71a1fa7d 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -45,6 +45,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "compint.h"
#include "compositeext_priv.h"
diff --git a/damageext/damageext.c b/damageext/damageext.c
index c8194da07..099278a36 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -25,6 +25,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "damageextint.h"
#include "damagestr.h"
#include "protocol-versions.h"
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 882c327b6..237dd0fa9 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -40,6 +40,9 @@
#include <stdint.h>
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
#include "scrnintstr.h"
#include "extnsionst.h"
#include "extinit.h"
diff --git a/dix/devices.c b/dix/devices.c
index 0011be77c..b37523262 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -49,13 +49,14 @@ SOFTWARE.
#endif
#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
+#include "dix/dix_priv.h"
#include "dix/ptrveloc_priv.h"
#include "misc.h"
#include "resource.h"
-#include <X11/Xproto.h>
-#include <X11/Xatom.h>
#include "windowstr.h"
#include "inputstr.h"
#include "scrnintstr.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 13f135e62..4b3c9ba29 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -17,6 +17,7 @@
#include <X11/Xfuncproto.h>
#include "include/dix.h"
+#include "include/gc.h"
#include "include/window.h"
/* server setting: maximum size for big requests */
@@ -53,4 +54,28 @@ Bool dixLookupBuiltinColor(int screen,
void DeleteWindowFromAnySaveSet(WindowPtr pWin);
+#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode) \
+ do { \
+ int tmprc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode); \
+ if (tmprc != Success) \
+ return tmprc; \
+ tmprc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess); \
+ if (tmprc != Success) \
+ return tmprc; \
+ if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen)) \
+ return BadMatch; \
+ if (pGC->serialNumber != pDraw->serialNumber) \
+ ValidateGC(pDraw, pGC); \
+ } while (0)
+
+int dixLookupGC(GCPtr *result,
+ XID id,
+ ClientPtr client,
+ Mask access_mode);
+
+int dixLookupClient(ClientPtr *result,
+ XID id,
+ ClientPtr client,
+ Mask access_mode);
+
#endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 4169a6637..6d3c8e127 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -52,10 +52,14 @@ Equipment Corporation.
#include <dix-config.h>
#endif
+#include <stddef.h>
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
+#include "dix/dix_priv.h"
#include "dix/gc_priv.h"
#include "os/auth.h"
@@ -69,7 +73,6 @@ Equipment Corporation.
#include "closestr.h"
#include "dixfont.h"
#include "xace.h"
-#include <X11/fonts/libxfont2.h>
#ifdef XF86BIGFONT
#include "xf86bigfontsrv.h"
diff --git a/dix/events.c b/dix/events.c
index b28da9489..05bb98f02 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -106,12 +106,13 @@ Equipment Corporation.
#endif
#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "dix/dix_priv.h"
#include "dix/eventconvert.h"
#include "misc.h"
#include "resource.h"
-#include <X11/Xproto.h>
#include "windowstr.h"
#include "inputstr.h"
#include "inpututils.h"
diff --git a/dix/property.c b/dix/property.c
index acce94b2c..22f4d1603 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -50,6 +50,9 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
#include "windowstr.h"
#include "propertyst.h"
#include "dixstruct.h"
diff --git a/dix/selection.c b/dix/selection.c
index 088924e2e..a107eb6cf 100644
--- a/dix/selection.c
+++ b/dix/selection.c
@@ -48,6 +48,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "windowstr.h"
#include "dixstruct.h"
#include "dispatch.h"
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 98c37aa91..7e728b0af 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -19,10 +19,14 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
+
+#include <unistd.h>
+
+#include "dix/dix_priv.h"
#include "dri3_priv.h"
#include <syncsrv.h>
-#include <unistd.h>
#include <xace.h>
#include "../Xext/syncsdk.h"
#include <protocol-versions.h>
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 1e46d0c72..a5069eb10 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -34,10 +34,12 @@
#include <string.h>
#include <assert.h>
-
-#include "glxserver.h"
#include <GL/glxtokens.h>
#include <X11/extensions/presenttokens.h>
+
+#include "dix/dix_priv.h"
+
+#include "glxserver.h"
#include <unpack.h>
#include <pixmapstr.h>
#include <windowstr.h>
diff --git a/glx/xfont.c b/glx/xfont.c
index bd2fdae52..bd090cb15 100644
--- a/glx/xfont.c
+++ b/glx/xfont.c
@@ -32,6 +32,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "glxserver.h"
#include "glxutil.h"
#include "unpack.h"
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index d1b092bdb..05e1c2696 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -37,16 +37,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <xorg-config.h>
#endif
-#include "xf86.h"
-#include <sys/time.h>
-#include <unistd.h>
-#include <string.h>
+#include <errno.h>
#include <stdio.h>
+#include <string.h>
#include <sys/ioctl.h>
-#include <errno.h>
-
+#include <sys/time.h>
+#include <unistd.h>
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "xf86.h"
#include "xf86drm.h"
#include "misc.h"
#include "dixstruct.h"
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index d356db990..b74544cad 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -39,11 +39,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include <string.h>
-
-#include "xf86.h"
-
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/dix_priv.h"
+
+#include "xf86.h"
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 4f98639aa..c43ce95ca 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -38,6 +38,9 @@
#include <X11/Xproto.h>
#include <X11/extensions/dri2proto.h>
#include <X11/extensions/xfixeswire.h>
+
+#include "dix/dix_priv.h"
+
#include "dixstruct.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index f2094a910..8be3810bf 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -39,6 +39,8 @@
#include <errno.h>
#include <time.h>
+#include "dix/dix_priv.h"
+
#include "list.h"
#include "xf86.h"
#include "driver.h"
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 66a074e0e..f3400a1cd 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -39,6 +39,10 @@
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
+#include <X11/extensions/randr.h>
+#include <X11/extensions/Xv.h>
+
+#include "dix/dix_priv.h"
#include "xf86.h"
#include "xf86Priv.h"
@@ -48,7 +52,6 @@
#include "mipointer.h"
#include "mipointrst.h"
#include "micmap.h"
-#include <X11/extensions/randr.h>
#include "fb.h"
#include "edid.h"
#include "xf86i2c.h"
@@ -56,7 +59,6 @@
#include "miscstruct.h"
#include "dixstruct.h"
#include "xf86xv.h"
-#include <X11/extensions/Xv.h>
#include <xorg-config.h>
#ifdef XSERVER_PLATFORM_BUS
#include "xf86platformBus.h"
diff --git a/include/dix.h b/include/dix.h
index d98af9e6e..f4f17ff29 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -101,20 +101,6 @@ SOFTWARE.
} \
} while (0)
-#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode) \
- do { \
- int tmprc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode); \
- if (tmprc != Success) \
- return tmprc; \
- tmprc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess); \
- if (tmprc != Success) \
- return tmprc; \
- if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen)) \
- return BadMatch; \
- if (pGC->serialNumber != pDraw->serialNumber) \
- ValidateGC(pDraw, pGC); \
- } while (0)
-
#define WriteReplyToClient(pClient, size, pReply) \
do { \
if ((pClient)->swapped) \
@@ -188,17 +174,10 @@ extern _X_EXPORT int dixLookupDrawable(DrawablePtr *result,
ClientPtr client,
Mask type_mask, Mask access_mode);
-extern _X_EXPORT int dixLookupGC(GCPtr *result,
- XID id, ClientPtr client, Mask access_mode);
-
extern _X_EXPORT int dixLookupFontable(FontPtr *result,
XID id,
ClientPtr client, Mask access_mode);
-extern _X_EXPORT int dixLookupClient(ClientPtr *result,
- XID id,
- ClientPtr client, Mask access_mode);
-
extern _X_EXPORT void NoopDDA(void);
extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 6239365b5..29ac46486 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -79,6 +79,8 @@ Equipment Corporation.
#include <X11/Xproto.h>
#include <X11/Xprotostr.h>
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "regionstr.h"
#include "scrnintstr.h"
diff --git a/present/present_notify.c b/present/present_notify.c
index 445954998..7d19d9cfe 100644
--- a/present/present_notify.c
+++ b/present/present_notify.c
@@ -19,8 +19,10 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
-#include "present_priv.h"
+#include "dix/dix_priv.h"
+#include "present/present_priv.h"
/*
* Mark all pending notifies for 'window' as invalid when
diff --git a/present/present_request.c b/present/present_request.c
index a9c6ffe66..ff1d71cc4 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -19,6 +19,9 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
#include "present_priv.h"
#include "randrstr_priv.h"
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index 98b8f1807..5d6914c62 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -19,8 +19,11 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
-#include "randrstr_priv.h"
#include "protocol-versions.h"
Bool
diff --git a/randr/rrlease.c b/randr/rrlease.c
index 51709c8c2..48f02c5b8 100644
--- a/randr/rrlease.c
+++ b/randr/rrlease.c
@@ -19,11 +19,15 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
-#include "randrstr_priv.h"
-#include "swaprep.h"
#include <unistd.h>
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
+#include "swaprep.h"
+
RESTYPE RRLeaseType;
/*
diff --git a/randr/rrmode.c b/randr/rrmode.c
index 51163616c..23d5c70d8 100644
--- a/randr/rrmode.c
+++ b/randr/rrmode.c
@@ -19,8 +19,10 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
-#include "randrstr_priv.h"
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
RESTYPE RRModeType;
diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
index bc7e6c87c..9280061ff 100644
--- a/randr/rrmonitor.c
+++ b/randr/rrmonitor.c
@@ -19,8 +19,11 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
-#include "randrstr_priv.h"
#include "swaprep.h"
static Atom
diff --git a/randr/rroutput.c b/randr/rroutput.c
index 18003c92e..0b4639aa6 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -20,10 +20,13 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
-#include "randrstr_priv.h"
#include <X11/Xatom.h>
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
RESTYPE RROutputType;
/*
diff --git a/randr/rrprovider.c b/randr/rrprovider.c
index 46469d548..9c874aa37 100644
--- a/randr/rrprovider.c
+++ b/randr/rrprovider.c
@@ -22,12 +22,15 @@
*
* Authors: Dave Airlie
*/
-
-#include "randrstr_priv.h"
-#include "swaprep.h"
+#include <dix-config.h>
#include <X11/Xatom.h>
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
+#include "swaprep.h"
+
RESTYPE RRProviderType = 0;
/*
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index ef6fb12a6..1403a3cf4 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -19,8 +19,10 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <dix-config.h>
-#include "randrstr_priv.h"
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
static CARD16
RR10CurrentSizeID(ScreenPtr pScreen);
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 1f5c74fc0..36d53dc1e 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -67,10 +67,15 @@
* Mitani Hiroshi <hmitani at drl.mei.co.jp>,
* David Thomas <davtom at dream.org.uk>.
*/
+#include <dix-config.h>
-#include "randrstr_priv.h"
-#include "swaprep.h"
+#include <X11/Xmd.h>
#include <X11/extensions/panoramiXproto.h>
+
+#include "dix/dix_priv.h"
+#include "randr/randrstr_priv.h"
+
+#include "swaprep.h"
#include "protocol-versions.h"
/* Xinerama is not multi-screen capable; just report about screen 0 */
diff --git a/render/render.c b/render/render.c
index fe5e37dd9..8652efb34 100644
--- a/render/render.c
+++ b/render/render.c
@@ -28,6 +28,12 @@
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
+#include <X11/Xfuncproto.h>
+
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
@@ -39,11 +45,8 @@
#include "extnsionst.h"
#include "extinit.h"
#include "servermd.h"
-#include <X11/extensions/render.h>
-#include <X11/extensions/renderproto.h>
#include "picturestr_priv.h"
#include "glyphstr_priv.h"
-#include <X11/Xfuncproto.h>
#include "cursorstr.h"
#include "xace.h"
#include "protocol-versions.h"
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 83282ff0e..1c8d7b26d 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -46,6 +46,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "xfixesint.h"
#include "scrnintstr.h"
#include "cursorstr.h"
diff --git a/xfixes/region.c b/xfixes/region.c
index 42031faf3..19a8930b6 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -24,9 +24,11 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+#include "render/picturestr_priv.h"
+
#include "xfixesint.h"
#include "scrnintstr.h"
-#include "picturestr_priv.h"
#include <regionstr.h>
#include <gcstruct.h>
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index fd9c7a124..981d15b86 100644
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -24,6 +24,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "xfixesint.h"
int
diff --git a/xfixes/select.c b/xfixes/select.c
index 19b2c7324..ebdd77181 100644
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -24,6 +24,8 @@
#include <dix-config.h>
#endif
+#include "dix/dix_priv.h"
+
#include "xfixesint.h"
#include "xace.h"
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 8d52e25df..b324aeaa8 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -31,6 +31,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XKMformat.h>
+
+#include "dix/dix_priv.h"
+
#include "misc.h"
#include "inputstr.h"
#include <xkbsrv.h>
@@ -40,8 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkb-procs.h"
#include "protocol-versions.h"
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XKMformat.h>
int XkbEventBase;
static int XkbErrorBase;
More information about the xorg-commit
mailing list