xserver: Branch 'master' - 34 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 6 15:15:10 UTC 2025
Xext/xtest.c | 2
Xi/exevents.c | 2
Xi/xibarriers.c | 2
dix/devices.c | 2
dix/gestures.c | 2
dix/getevents.c | 3
dix/pixmap.c | 6 +
dix/touch.c | 2
dix/window.c | 2
fb/fbcmap_mi.c | 1
fb/fboverlay.c | 2
hw/kdrive/src/kinput.c | 1
hw/vfb/InitInput.c | 8 +-
hw/xfree86/common/xf86DGA.c | 2
hw/xfree86/common/xf86Events.c | 8 --
hw/xfree86/common/xf86Helper.c | 2
hw/xfree86/common/xf86Init.c | 2
hw/xfree86/common/xf86cmap.c | 4 -
hw/xfree86/modes/xf86Rotate.c | 2
hw/xnest/Events.c | 2
hw/xnest/Init.c | 2
hw/xnest/Window.c | 4 -
hw/xquartz/darwinEvents.c | 4 -
hw/xwayland/xwayland-input.c | 2
hw/xwin/InitInput.c | 3
hw/xwin/winkeybd.c | 3
mi/mi.h | 154 ---------------------------------------
mi/mi_priv.h | 69 +++++++++++++++++
mi/miarc.c | 6 +
mi/micmap.c | 1
mi/micmap.h | 4 -
mi/midash.c | 2
mi/mieq.c | 4 -
mi/miexpose.c | 6 -
mi/mioverlay.c | 2
mi/mipointer.c | 8 +-
mi/miscrinit.c | 1
mi/mivaltree.c | 4 -
mi/miwideline.c | 4 -
mi/miwindow.c | 2
mi/mizerarc.c | 4 -
miext/rootless/rootlessScreen.c | 2
miext/rootless/rootlessValTree.c | 6 +
miext/rootless/rootlessWindow.c | 4 -
test/input.c | 2
xkb/xkbActions.c | 2
46 files changed, 152 insertions(+), 210 deletions(-)
New commits:
commit aae9bd3f62ef88f5925c2270c7400314c6c40a6b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 17:18:30 2024 +0200
mi: unexport SetInstalledmiColormap() macro
Not neeed by any drivers/modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index ca547cc33..84f6a495d 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -36,9 +36,11 @@
#include "misc.h"
#include "dix/colormap_priv.h"
+#include "mi/mi_priv.h"
+
+#include "misc.h"
#include "colormapst.h"
#include "scrnintstr.h"
-
#include "resource.h"
#include "xf86.h"
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 33256bc09..1264e03b1 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -20,6 +20,9 @@
#include "include/window.h"
#include "mi/mi.h"
+#define SetInstalledmiColormap(s,c) \
+ (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c))
+
void miScreenClose(ScreenPtr pScreen);
void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
diff --git a/mi/micmap.c b/mi/micmap.c
index e3675c301..1259bbba2 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -33,6 +33,7 @@
#include <X11/Xproto.h>
#include "dix/colormap_priv.h"
+#include "mi/mi_priv.h"
#include "scrnintstr.h"
#include "colormapst.h"
diff --git a/mi/micmap.h b/mi/micmap.h
index 18c06427b..eeb70c4ae 100644
--- a/mi/micmap.h
+++ b/mi/micmap.h
@@ -6,8 +6,6 @@
#define GetInstalledmiColormap(s) \
((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, micmapScrPrivateKey))
-#define SetInstalledmiColormap(s,c) \
- (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c))
extern _X_EXPORT DevPrivateKeyRec micmapScrPrivateKeyRec;
commit c3c538784a5a0399a5cf0ad98bc51613d55ea918
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 17:14:50 2024 +0200
mi: unexport miExpandDirectColors()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
index d9447e095..4fd96e6c0 100644
--- a/fb/fbcmap_mi.c
+++ b/fb/fbcmap_mi.c
@@ -32,6 +32,7 @@
#include <X11/X.h>
#include "dix/colormap_priv.h"
+#include "mi/mi_priv.h"
#include "fb.h"
#include "micmap.h"
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 8e3829208..33256bc09 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -6,6 +6,7 @@
#define _XSERVER_MI_PRIV_H
#include <X11/Xdefs.h>
+#include <X11/Xproto.h>
#include <X11/Xprotostr.h>
#include "dix/screenint_priv.h"
@@ -70,4 +71,6 @@ void miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure
WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y);
WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y);
+int miExpandDirectColors(ColormapPtr, int, xColorItem *, xColorItem *);
+
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/micmap.h b/mi/micmap.h
index bb71c7cb1..18c06427b 100644
--- a/mi/micmap.h
+++ b/mi/micmap.h
@@ -25,8 +25,6 @@ extern _X_EXPORT void miUninstallColormap(ColormapPtr pmap);
extern _X_EXPORT void miResolveColor(unsigned short *, unsigned short *,
unsigned short *, VisualPtr);
extern _X_EXPORT Bool miInitializeColormap(ColormapPtr);
-extern _X_EXPORT int miExpandDirectColors(ColormapPtr, int, xColorItem *,
- xColorItem *);
extern _X_EXPORT Bool miCreateDefColormap(ScreenPtr);
extern _X_EXPORT void miClearVisualTypes(void);
extern _X_EXPORT Bool miSetVisualTypes(int, int, int, int);
commit 3cf24082329131c330586f7582f37753d1d2adf1
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:56:52 2024 +0200
mi: unexport miXYToWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index fcbeb93ad..0adb915cd 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -278,10 +278,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
int npt,
DDXPointPtr pPts);
-/* miwindow.c */
-
-extern _X_EXPORT WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y);
-
/* mizerarc.c */
extern _X_EXPORT void miZeroPolyArc(DrawablePtr /*pDraw */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 6f1fc235c..8e3829208 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -68,5 +68,6 @@ void miSetShape(WindowPtr pWin, int kind);
void miChangeBorderWidth(WindowPtr pWin, unsigned int width);
void miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure);
WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y);
+WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y);
#endif /* _XSERVER_MI_PRIV_H */
commit 85be6c82b0431731be261e04457a11b74a46fb4a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:54:48 2024 +0200
mi: unexport miSpriteTrace()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 97931bf25..fcbeb93ad 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,8 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y);
-
extern _X_EXPORT WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y);
/* mizerarc.c */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index b81185845..6f1fc235c 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -67,5 +67,6 @@ WindowPtr miGetLayerWindow(WindowPtr pWin);
void miSetShape(WindowPtr pWin, int kind);
void miChangeBorderWidth(WindowPtr pWin, unsigned int width);
void miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure);
+WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y);
#endif /* _XSERVER_MI_PRIV_H */
commit 6c3b43205302ea4c9c5908ba93cb335af78674aa
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:52:29 2024 +0200
mi: unexport miMarkUnrealizedWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 577bd006e..97931bf25 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,11 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miMarkUnrealizedWindow(WindowPtr /*pChild */ ,
- WindowPtr /*pWin */ ,
- Bool /*fromConfigure */
- );
-
extern _X_EXPORT WindowPtr miSpriteTrace(SpritePtr pSprite, int x, int y);
extern _X_EXPORT WindowPtr miXYToWindow(ScreenPtr pScreen, SpritePtr pSprite, int x, int y);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 69b7a1fae..b81185845 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -66,5 +66,6 @@ void miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w,
WindowPtr miGetLayerWindow(WindowPtr pWin);
void miSetShape(WindowPtr pWin, int kind);
void miChangeBorderWidth(WindowPtr pWin, unsigned int width);
+void miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure);
#endif /* _XSERVER_MI_PRIV_H */
commit b23ecec2f431a4c2cf1c8442625b772f1160f412
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:36:49 2024 +0200
mi: unexport miChangeBorderWidth()
Not used by any driveres/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 04f4f08ea..577bd006e 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,10 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miChangeBorderWidth(WindowPtr /*pWin */ ,
- unsigned int /*width */
- );
-
extern _X_EXPORT void miMarkUnrealizedWindow(WindowPtr /*pChild */ ,
WindowPtr /*pWin */ ,
Bool /*fromConfigure */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index be0ad5e90..69b7a1fae 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -65,5 +65,6 @@ void miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w,
unsigned int h, WindowPtr pSib);
WindowPtr miGetLayerWindow(WindowPtr pWin);
void miSetShape(WindowPtr pWin, int kind);
+void miChangeBorderWidth(WindowPtr pWin, unsigned int width);
#endif /* _XSERVER_MI_PRIV_H */
commit 597ba690d3eabf127297504d18dc2b6c0ede7eee
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:35:33 2024 +0200
mi: unexport miSetShape()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index c5f3063c2..04f4f08ea 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,10 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miSetShape(WindowPtr /*pWin */ ,
- int /*kind */
- );
-
extern _X_EXPORT void miChangeBorderWidth(WindowPtr /*pWin */ ,
unsigned int /*width */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index f41afd25b..be0ad5e90 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -64,5 +64,6 @@ void miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind)
void miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w,
unsigned int h, WindowPtr pSib);
WindowPtr miGetLayerWindow(WindowPtr pWin);
+void miSetShape(WindowPtr pWin, int kind);
#endif /* _XSERVER_MI_PRIV_H */
commit f11e2032151d26707374fbf2453d5c39e61b1d4c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:33:50 2024 +0200
mi: unexport miGetLayerWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 710d9f790..c5f3063c2 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,9 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT WindowPtr miGetLayerWindow(WindowPtr /*pWin */
- );
-
extern _X_EXPORT void miSetShape(WindowPtr /*pWin */ ,
int /*kind */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 20ad1a532..f41afd25b 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -63,5 +63,6 @@ void miHandleValidateExposures(WindowPtr pWin);
void miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind);
void miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w,
unsigned int h, WindowPtr pSib);
+WindowPtr miGetLayerWindow(WindowPtr pWin);
#endif /* _XSERVER_MI_PRIV_H */
commit 14565a4561625b94ff5fe3b2531b76a7175e6334
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:32:02 2024 +0200
mi: unexport miResizeWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index bb818c872..710d9f790 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,14 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miResizeWindow(WindowPtr /*pWin */ ,
- int /*x */ ,
- int /*y */ ,
- unsigned int /*w */ ,
- unsigned int /*h */ ,
- WindowPtr /*pSib */
- );
-
extern _X_EXPORT WindowPtr miGetLayerWindow(WindowPtr /*pWin */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 7d963a53b..20ad1a532 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -61,5 +61,7 @@ Bool miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
WindowPtr *ppLayerWin);
void miHandleValidateExposures(WindowPtr pWin);
void miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind);
+void miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w,
+ unsigned int h, WindowPtr pSib);
#endif /* _XSERVER_MI_PRIV_H */
commit faad8ed1c6dff23da9935bbfcea8e5805c4df86e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:29:04 2024 +0200
mi: unexport miMoveWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 54150e370..bb818c872 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,13 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miMoveWindow(WindowPtr /*pWin */ ,
- int /*x */ ,
- int /*y */ ,
- WindowPtr /*pNextSib */ ,
- VTKind /*kind */
- );
-
extern _X_EXPORT void miResizeWindow(WindowPtr /*pWin */ ,
int /*x */ ,
int /*y */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 6a4f60999..7d963a53b 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -15,6 +15,7 @@
#include "include/pixmap.h"
#include "include/regionstr.h"
#include "include/screenint.h"
+#include "include/validate.h"
#include "include/window.h"
#include "mi/mi.h"
@@ -59,5 +60,6 @@ void miMarkWindow(WindowPtr pWin);
Bool miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
WindowPtr *ppLayerWin);
void miHandleValidateExposures(WindowPtr pWin);
+void miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind);
#endif /* _XSERVER_MI_PRIV_H */
commit 0624a8bad4cb092ba98354b1f6f6af9c04aedadf
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:25:14 2024 +0200
mi: unexport miHandleValidateExposures()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index b1317bfc1..54150e370 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,9 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miHandleValidateExposures(WindowPtr /*pWin */
- );
-
extern _X_EXPORT void miMoveWindow(WindowPtr /*pWin */ ,
int /*x */ ,
int /*y */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 55b4580da..6a4f60999 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -58,5 +58,6 @@ void miClearToBackground(WindowPtr pWin, int x, int y, int w, int h,
void miMarkWindow(WindowPtr pWin);
Bool miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
WindowPtr *ppLayerWin);
+void miHandleValidateExposures(WindowPtr pWin);
#endif /* _XSERVER_MI_PRIV_H */
commit ade6650a8148f322a38e34f58fbf22523957c718
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:24:12 2024 +0200
mi: unexport miMarkOverlappedWindows()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index fe6f476c4..b1317bfc1 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,11 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT Bool miMarkOverlappedWindows(WindowPtr /*pWin */ ,
- WindowPtr /*pFirst */ ,
- WindowPtr * /*ppLayerWin */
- );
-
extern _X_EXPORT void miHandleValidateExposures(WindowPtr /*pWin */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 4f303f379..55b4580da 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -56,5 +56,7 @@ int miValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
void miClearToBackground(WindowPtr pWin, int x, int y, int w, int h,
Bool generateExposures);
void miMarkWindow(WindowPtr pWin);
+Bool miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
+ WindowPtr *ppLayerWin);
#endif /* _XSERVER_MI_PRIV_H */
commit bcbb6eec62390f793d6feb6ab5c28b2595e46a81
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:22:32 2024 +0200
mi: unexport miMarkWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index b69afa862..fe6f476c4 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,9 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miMarkWindow(WindowPtr /*pWin */
- );
-
extern _X_EXPORT Bool miMarkOverlappedWindows(WindowPtr /*pWin */ ,
WindowPtr /*pFirst */ ,
WindowPtr * /*ppLayerWin */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index cab0e7967..4f303f379 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -55,5 +55,6 @@ int miValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
void miClearToBackground(WindowPtr pWin, int x, int y, int w, int h,
Bool generateExposures);
+void miMarkWindow(WindowPtr pWin);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 5e380cd7e..7aec6e513 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -4,12 +4,12 @@
#include <X11/X.h>
#include "dix/cursor_priv.h"
+#include "mi/mi_priv.h"
#include "scrnintstr.h"
#include <X11/extensions/shapeproto.h>
#include "validate.h"
#include "windowstr.h"
-#include "mi.h"
#include "gcstruct.h"
#include "regionstr.h"
#include "privates.h"
commit 3856b6cb5ee3ba3116d36589006d173d8d5024bc
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 16:07:47 2024 +0200
mi: unexport miClearToBackground()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 882ebb41a..b69afa862 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -280,14 +280,6 @@ extern _X_EXPORT void miPolylines(DrawablePtr pDrawable,
/* miwindow.c */
-extern _X_EXPORT void miClearToBackground(WindowPtr /*pWin */ ,
- int /*x */ ,
- int /*y */ ,
- int /*w */ ,
- int /*h */ ,
- Bool /*generateExposures */
- );
-
extern _X_EXPORT void miMarkWindow(WindowPtr /*pWin */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 1c15462c9..cab0e7967 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -53,4 +53,7 @@ int miShapedWindowIn(RegionPtr universe, RegionPtr bounding, BoxPtr rect,
int x, int y);
int miValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
+void miClearToBackground(WindowPtr pWin, int x, int y, int w, int h,
+ Bool generateExposures);
+
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 40b81eec7..a4b97a7b8 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -51,10 +51,10 @@ SOFTWARE.
#include "dix/cursor_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "regionstr.h"
#include "region.h"
-#include "mi.h"
#include "windowstr.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
commit 7e21a514d7f88da511800297fe908e2d54991d9c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 15:59:15 2024 +0200
mi: unexport miValidateTree()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 89870d523..882ebb41a 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -258,11 +258,6 @@ extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
/* mivaltree.c */
-extern _X_EXPORT int miValidateTree(WindowPtr /*pParent */ ,
- WindowPtr /*pChild */ ,
- VTKind /*kind */
- );
-
extern _X_EXPORT void miWideLine(DrawablePtr /*pDrawable */ ,
GCPtr /*pGC */ ,
int /*mode */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 865fe2b56..1c15462c9 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -51,5 +51,6 @@ void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
Bool miCreateScreenResources(ScreenPtr pScreen);
int miShapedWindowIn(RegionPtr universe, RegionPtr bounding, BoxPtr rect,
int x, int y);
+int miValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
#endif /* _XSERVER_MI_PRIV_H */
commit c2ee74c5236e0b578f91ac713f837d520b13603e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 15:57:02 2024 +0200
mi: unexport miShapedWindowIn()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 380a380c9..89870d523 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -258,13 +258,6 @@ extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
/* mivaltree.c */
-extern _X_EXPORT int miShapedWindowIn(RegionPtr /*universe */ ,
- RegionPtr /*bounding */ ,
- BoxPtr /*rect */ ,
- int /*x */ ,
- int /*y */
- );
-
extern _X_EXPORT int miValidateTree(WindowPtr /*pParent */ ,
WindowPtr /*pChild */ ,
VTKind /*kind */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index bb2c3d413..865fe2b56 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -49,5 +49,7 @@ void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
unsigned int subWindowMode);
Bool miCreateScreenResources(ScreenPtr pScreen);
+int miShapedWindowIn(RegionPtr universe, RegionPtr bounding, BoxPtr rect,
+ int x, int y);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 0dff150c2..edab5dc1b 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -91,10 +91,12 @@ Equipment Corporation.
#include <dix-config.h>
#include <X11/X.h>
+
+#include "mi/mi_priv.h"
+
#include "scrnintstr.h"
#include "validate.h"
#include "windowstr.h"
-#include "mi.h"
#include "regionstr.h"
#include "mivalidate.h"
#include "globals.h"
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index e311021db..beacff99f 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -92,11 +92,13 @@ Equipment Corporation.
#include <dix-config.h>
#include <stddef.h> /* For NULL */
-#include <X11/X.h>
+#include <X11/X.h>
+
+#include "mi/mi_priv.h"
+
#include "scrnintstr.h"
#include "validate.h"
#include "windowstr.h"
-#include "mi.h"
#include "regionstr.h"
#include "mivalidate.h"
commit d14ae53e1fa6386c3d6a8f57d12374b28a92c958
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 15:50:08 2024 +0200
mi: unexport miCreateScreenResources()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 83183bd26..380a380c9 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -241,9 +241,6 @@ extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
void *pPixData
);
-extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
- );
-
extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
void *pbits,
int xsize,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 0eec45c29..bb2c3d413 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -46,8 +46,8 @@ void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
void miWindowExposures(WindowPtr pWin, RegionPtr prgn);
void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
-
void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
unsigned int subWindowMode);
+Bool miCreateScreenResources(ScreenPtr pScreen);
#endif /* _XSERVER_MI_PRIV_H */
commit 191cca09058a7b9ae64c3ab50fa64d499b9e6ec0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 15:42:24 2024 +0200
mi: unexport miSourceValidate()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 3324f947b..020ceb83a 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -29,8 +29,11 @@ from The Open Group.
#include <dix-config.h>
#include <X11/X.h>
+#include <X11/extensions/render.h>
+
+#include "mi/mi_priv.h"
+
#include "scrnintstr.h"
-#include "mi.h"
#include "misc.h"
#include "os.h"
#include "windowstr.h"
@@ -38,7 +41,6 @@ from The Open Group.
#include "dixstruct.h"
#include "gcstruct.h"
#include "servermd.h"
-#include "X11/extensions/render.h"
#include "picturestr.h"
#include "randrstr.h"
/*
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index d94c77cdf..da0aa7635 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -33,8 +33,8 @@
#include <X11/extensions/dpmsconst.h>
#include "dix/dix_priv.h"
+#include "mi/mi_priv.h"
-#include "mi.h"
#include "xf86.h"
#include "xf86DDC.h"
#include "windowstr.h"
diff --git a/mi/mi.h b/mi/mi.h
index e0eef7f28..83183bd26 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -232,11 +232,6 @@ extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ ,
);
/* miscrinit.c */
-
-extern _X_EXPORT void
-miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
- unsigned int subWindowMode);
-
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 360820146..0eec45c29 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -47,4 +47,7 @@ void miWindowExposures(WindowPtr pWin, RegionPtr prgn);
void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
+void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
+ unsigned int subWindowMode);
+
#endif /* _XSERVER_MI_PRIV_H */
commit a54e8f5343bdab6c26832719479d094dd64554f9
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 14:33:29 2024 +0200
mi: unexport miPaintWindow()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/dix/window.c b/dix/window.c
index 573d195ab..f3823e823 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -104,6 +104,7 @@ Equipment Corporation.
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
#include "dix/property_priv.h"
+#include "mi/mi_priv.h" /* miPaintWindow */
#include "os/auth.h"
#include "os/client_priv.h"
#include "os/screensaver.h"
@@ -129,7 +130,6 @@ Equipment Corporation.
#endif
#include "dixevents.h"
#include "globals.h"
-#include "mi.h" /* miPaintWindow */
#ifdef COMPOSITE
#include "compint.h"
#endif
diff --git a/mi/mi.h b/mi/mi.h
index 7f256bac5..e0eef7f28 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -127,11 +127,6 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
int /*dsty */
);
-extern _X_EXPORT void miPaintWindow(WindowPtr /*pWin */ ,
- RegionPtr /*prgn */ ,
- int /*what */
- );
-
extern _X_EXPORT void miClearDrawable(DrawablePtr /*pDraw */ ,
GCPtr /*pGC */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 74621f5a0..360820146 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -45,4 +45,6 @@ void mieqSetHandler(int event, mieqHandler handler);
void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
void miWindowExposures(WindowPtr pWin, RegionPtr prgn);
+void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what);
+
#endif /* _XSERVER_MI_PRIV_H */
commit e424f49cdb04ad343c72aed2457ed9b543fa8aea
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 14:31:05 2024 +0200
mi: unexport miWindowExposures()
Not used by any modules/drivers, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 5ead17315..7ea8e660b 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -26,6 +26,8 @@
#include <stdlib.h>
+#include "mi/mi_priv.h"
+
#include "fb.h"
#include "fboverlay.h"
#include "shmint.h"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 82090db5c..3630c7d98 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -18,6 +18,8 @@ is" without express or implied warranty.
#include <X11/Xdefs.h>
#include <X11/Xproto.h>
+#include "mi/mi_priv.h"
+
#include "gcstruct.h"
#include "window.h"
#include "windowstr.h"
@@ -26,8 +28,6 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "region.h"
-#include "mi.h"
-
#include "Xnest.h"
#include "Display.h"
diff --git a/mi/mi.h b/mi/mi.h
index f2c925fe8..7f256bac5 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -127,9 +127,6 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
int /*dsty */
);
-extern _X_EXPORT void miWindowExposures(WindowPtr /*pWin */ ,
- RegionPtr /*prgn */);
-
extern _X_EXPORT void miPaintWindow(WindowPtr /*pWin */ ,
RegionPtr /*prgn */ ,
int /*what */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 56b3e985b..74621f5a0 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -43,5 +43,6 @@ typedef void (*mieqHandler) (int screen, InternalEvent *event,
void mieqSetHandler(int event, mieqHandler handler);
void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
+void miWindowExposures(WindowPtr pWin, RegionPtr prgn);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index b80f74e63..76a3c5a96 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -34,7 +34,6 @@ from The Open Group.
#include "servermd.h"
#include "misc.h"
-#include "mi.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
#include "dix.h"
commit 8d07450904a087679005386e5b7aa055a3128d2b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 14:08:38 2024 +0200
mi: unexport miSendExposures()
Not used by any drivers/modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index aa7e7fa02..f2c925fe8 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -127,12 +127,6 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
int /*dsty */
);
-extern _X_EXPORT void miSendExposures(WindowPtr /*pWin */ ,
- RegionPtr /*pRgn */ ,
- int /*dx */ ,
- int /*dy */
- );
-
extern _X_EXPORT void miWindowExposures(WindowPtr /*pWin */ ,
RegionPtr /*prgn */);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 43352b68c..56b3e985b 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -13,7 +13,9 @@
#include "include/events.h"
#include "include/gc.h"
#include "include/pixmap.h"
+#include "include/regionstr.h"
#include "include/screenint.h"
+#include "include/window.h"
#include "mi/mi.h"
void miScreenClose(ScreenPtr pScreen);
@@ -40,4 +42,6 @@ typedef void (*mieqHandler) (int screen, InternalEvent *event,
DeviceIntPtr dev);
void mieqSetHandler(int event, mieqHandler handler);
+void miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy);
+
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 7b13b034f..6490f35cc 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -74,10 +74,12 @@ Equipment Corporation.
#include <dix-config.h>
#include <X11/X.h>
+#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include <X11/Xprotostr.h>
#include "dix/dix_priv.h"
+#include "mi/mi_priv.h"
#include "misc.h"
#include "regionstr.h"
@@ -86,11 +88,7 @@ Equipment Corporation.
#include "windowstr.h"
#include "pixmap.h"
#include "input.h"
-
#include "dixstruct.h"
-#include "mi.h"
-#include <X11/Xmd.h>
-
#include "globals.h"
#ifdef PANORAMIX
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index b57018242..ddb1cf607 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -37,8 +37,8 @@
#include <string.h>
#include "dix/colormap_priv.h"
+#include "mi/mi_priv.h"
-#include "mi.h"
#include "scrnintstr.h"
#include "gcstruct.h"
#include "pixmapstr.h"
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 68df06c89..7ba375f95 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -35,9 +35,11 @@
#include <limits.h> /* For CHAR_BIT */
#include <assert.h>
#include <X11/Xatom.h>
+
+#include "mi/mi_priv.h"
+
#ifdef __APPLE__
#include <Xplugin.h>
-#include "mi.h"
#include "pixmapstr.h"
#include "windowstr.h"
//#include <X11/extensions/applewm.h>
commit 7748984e3ad355c5b23815f9baff717c75e62290
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 13:54:53 2024 +0200
mi: unexport mieqSetHandler()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 4132bc334..aa7e7fa02 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,15 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-/**
- * Custom input event handler. If you need to process input events in some
- * other way than the default path, register an input event handler for the
- * given internal event type.
- */
-typedef void (*mieqHandler) (int screen, InternalEvent *event,
- DeviceIntPtr dev);
-void _X_EXPORT mieqSetHandler(int event, mieqHandler handler);
-
/* miexpose.c */
extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 9da95f50c..43352b68c 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -31,4 +31,13 @@ void mieqProcessInputEvents(void);
void mieqAddCallbackOnDrained(CallbackProcPtr callback, void *param);
void mieqRemoveCallbackOnDrained(CallbackProcPtr callback, void *param);
+/**
+ * Custom input event handler. If you need to process input events in some
+ * other way than the default path, register an input event handler for the
+ * given internal event type.
+ */
+typedef void (*mieqHandler) (int screen, InternalEvent *event,
+ DeviceIntPtr dev);
+void mieqSetHandler(int event, mieqHandler handler);
+
#endif /* _XSERVER_MI_PRIV_H */
commit 964127ce10514056c37e5c79df60c7afc4050dc8
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 13:46:48 2024 +0200
mi: unexport mieqRemoveCallbackOnDrained()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 4e01e9efe..4132bc334 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,9 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqRemoveCallbackOnDrained(CallbackProcPtr callback,
- void *param);
-
/**
* Custom input event handler. If you need to process input events in some
* other way than the default path, register an input event handler for the
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 2a2a8b617..9da95f50c 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -29,5 +29,6 @@ void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_scr
void mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen);
void mieqProcessInputEvents(void);
void mieqAddCallbackOnDrained(CallbackProcPtr callback, void *param);
+void mieqRemoveCallbackOnDrained(CallbackProcPtr callback, void *param);
#endif /* _XSERVER_MI_PRIV_H */
commit 269d54c48f7618f0e640045a3898dd406a6e5fa3
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 13:45:26 2024 +0200
mi: unexport mieqAddCallbackOnDrained()
Not used by any modules/drivers, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index caac5c078..09cbac6f1 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -43,8 +43,8 @@
#include "dix/dix_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
-#include "mi.h"
#include "os.h"
#include "servermd.h"
#include "pixmapstr.h"
diff --git a/mi/mi.h b/mi/mi.h
index 670b3e606..4e01e9efe 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,9 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqAddCallbackOnDrained(CallbackProcPtr callback,
- void *param);
-
extern _X_EXPORT void mieqRemoveCallbackOnDrained(CallbackProcPtr callback,
void *param);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index fa6205131..2a2a8b617 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -9,6 +9,7 @@
#include <X11/Xprotostr.h>
#include "dix/screenint_priv.h"
+#include "include/callback.h"
#include "include/events.h"
#include "include/gc.h"
#include "include/pixmap.h"
@@ -27,5 +28,6 @@ void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_screen);
void mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen);
void mieqProcessInputEvents(void);
+void mieqAddCallbackOnDrained(CallbackProcPtr callback, void *param);
#endif /* _XSERVER_MI_PRIV_H */
commit 9aa23b6abd7d30535ff037add8acaa5631e778d5
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 13:43:20 2024 +0200
mi: unexport mieqProcessInputEvents()
Not used by any drivers/modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 0ce862fc9..2a595b6e3 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -59,17 +59,17 @@
#include <X11/Xatom.h>
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
-
-#include "dix/input_priv.h"
+#include <X11/keysym.h>
#include "dix/dix_priv.h"
+#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "misc.h"
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
#include "xf86_OSlib.h"
-#include <X11/keysym.h>
#ifdef XFreeXDGA
#include "dgaproc.h"
@@ -78,9 +78,7 @@
#include "inputstr.h"
#include "xf86Xinput.h"
-#include "mi.h"
#include "mipointer.h"
-
#include "xkbsrv.h"
#include "xkbstr.h"
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 09ac2b955..155296785 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -19,6 +19,7 @@ is" without express or implied warranty.
#include <X11/Xproto.h>
#include "dix/cursor_priv.h"
+#include "mi/mi_priv.h"
#include "screenint.h"
#include "input.h"
@@ -28,7 +29,6 @@ is" without express or implied warranty.
#include "servermd.h"
#include "inputstr.h"
#include "inpututils.h"
-#include "mi.h"
#include "Xnest.h"
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index 037ab1ecc..8956b859e 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -34,6 +34,9 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
+
+#include "mi/mi_priv.h"
+
#include "win.h"
#include "dix/dix_priv.h"
diff --git a/mi/mi.h b/mi/mi.h
index d2858fe50..670b3e606 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,9 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqProcessInputEvents(void
- );
-
extern _X_EXPORT void mieqAddCallbackOnDrained(CallbackProcPtr callback,
void *param);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index d03ff0869..fa6205131 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -26,5 +26,6 @@ void mieqFini(void);
void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_screen);
void mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen);
+void mieqProcessInputEvents(void);
#endif /* _XSERVER_MI_PRIV_H */
commit 0f7770bce3ccbd388c43c3ea0650ce34f00f7c18
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 13:37:33 2024 +0200
mi: unexport mieqProcessDeviceEvent()
Not used by any drivers/modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 02df5f94c..388a5699d 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -38,6 +38,7 @@
#include "dix/input_priv.h"
#include "dix/dix_priv.h"
#include "dix/exevents_priv.h"
+#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "os/osdep.h"
@@ -50,7 +51,6 @@
#include "scrnintstr.h"
#include "dixevents.h"
#include "sleepuntil.h"
-#include "mi.h"
#include "xkbsrv.h"
#include "xkbstr.h"
#include "exglobals.h"
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 3604fd329..a9c2300cc 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -95,6 +95,7 @@ SOFTWARE.
#include "dix/eventconvert.h"
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "inputstr.h"
#include "windowstr.h"
@@ -110,7 +111,6 @@ SOFTWARE.
#include "xiquerydevice.h" /* For List*Info */
#include "eventstr.h"
#include "inpututils.h"
-#include "mi.h"
#include "xkbsrv.h"
#define WID(w) ((w) ? ((w)->drawable.id) : 0)
diff --git a/dix/devices.c b/dix/devices.c
index 750437ab2..969819534 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -60,6 +60,7 @@ SOFTWARE.
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
#include "dix/ptrveloc_priv.h"
+#include "mi/mi_priv.h"
#include "os/osdep.h"
#include "xkb/xkbsrv_priv.h"
@@ -73,7 +74,6 @@ SOFTWARE.
#include "ptrveloc.h"
#include "privates.h"
#include "xace.h"
-#include "mi.h"
#include "dispatch.h"
#include "swaprep.h"
#include "dixevents.h"
diff --git a/dix/gestures.c b/dix/gestures.c
index 05c5d0656..6b0f24728 100644
--- a/dix/gestures.c
+++ b/dix/gestures.c
@@ -29,6 +29,7 @@
#include "dix/dixgrabs_priv.h"
#include "dix/eventconvert.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "inputstr.h"
#include "scrnintstr.h"
@@ -37,7 +38,6 @@
#include "exglobals.h"
#include "inpututils.h"
#include "windowstr.h"
-#include "mi.h"
#define GESTURE_HISTORY_SIZE 100
diff --git a/dix/touch.c b/dix/touch.c
index d7d6f2ec7..7c509fb26 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -31,6 +31,7 @@
#include "dix/eventconvert.h"
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "inputstr.h"
#include "scrnintstr.h"
@@ -38,7 +39,6 @@
#include "exglobals.h"
#include "inpututils.h"
#include "windowstr.h"
-#include "mi.h"
#define TOUCH_HISTORY_SIZE 100
diff --git a/mi/mi.h b/mi/mi.h
index 36c4fb179..d2858fe50 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,11 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqProcessDeviceEvent(DeviceIntPtr /* dev */ ,
- InternalEvent * /* event */ ,
- ScreenPtr /* screen */
- );
-
extern _X_EXPORT void mieqProcessInputEvents(void
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index bba4c9a29..d03ff0869 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -25,5 +25,6 @@ Bool mieqInit(void);
void mieqFini(void);
void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_screen);
+void mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 9474f29ff..aad475e6f 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -38,6 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "dix/dix_priv.h"
#include "dix/dixgrabs_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "xkb/xkbsrv_priv.h"
@@ -45,7 +46,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "inputstr.h"
#include "exevents.h"
#include "eventstr.h"
-#include "mi.h"
#include "mipointer.h"
#include "inpututils.h"
commit 413e6ed2c890bb497268800fbd12e18a655f51ce
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 13:18:16 2024 +0200
mi: unexport mieqSwitchScreen()
Not used by any drivers/modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 231f0d1a6..36c4fb179 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,11 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqSwitchScreen(DeviceIntPtr /* pDev */ ,
- ScreenPtr /*pScreen */ ,
- Bool /*set_dequeue_screen */
- );
-
extern _X_EXPORT void mieqProcessDeviceEvent(DeviceIntPtr /* dev */ ,
InternalEvent * /* event */ ,
ScreenPtr /* screen */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 906238a81..bba4c9a29 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -8,6 +8,7 @@
#include <X11/Xdefs.h>
#include <X11/Xprotostr.h>
+#include "dix/screenint_priv.h"
#include "include/events.h"
#include "include/gc.h"
#include "include/pixmap.h"
@@ -23,5 +24,6 @@ void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
Bool mieqInit(void);
void mieqFini(void);
void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
+void mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool set_dequeue_screen);
#endif /* _XSERVER_MI_PRIV_H */
commit 9dd280607f51cf1bb0337283c9f9dc0540c35ab0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 12:48:44 2024 +0200
mi: unexport mieqEnqueue()
Not used by any (known) drivers, so no need to keep it exported.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 067f71be7..bd664ae8a 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -46,6 +46,7 @@
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "xibarriers.h"
#include "scrnintstr.h"
@@ -59,7 +60,6 @@
#include "list.h"
#include "exglobals.h"
#include "eventstr.h"
-#include "mi.h"
RESTYPE PointerBarrierType;
diff --git a/dix/getevents.c b/dix/getevents.c
index 66f3e19aa..76b16fa04 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -42,6 +42,8 @@
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
+
#include "misc.h"
#include "resource.h"
#include "inputstr.h"
@@ -54,7 +56,6 @@
#include "eventstr.h"
#include "eventconvert.h"
#include "inpututils.h"
-#include "mi.h"
#include "windowstr.h"
#include "xkbsrv.h"
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 3ce1f1259..72bf4f115 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -50,6 +50,7 @@
#include "dix/dix_priv.h"
#include "dix/eventconvert.h"
#include "dix/exevents_priv.h"
+#include "mi/mi_priv.h"
#include "xf86.h"
#include "xf86str.h"
@@ -67,7 +68,6 @@
#include "exglobals.h"
#include "eventstr.h"
#include "xf86Extensions.h"
-#include "mi.h"
#include "misc.h"
#include "dixstruct.h"
#include "dixevents.h"
diff --git a/mi/mi.h b/mi/mi.h
index 5e8339ef8..231f0d1a6 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,10 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,
- InternalEvent * /*e */
- );
-
extern _X_EXPORT void mieqSwitchScreen(DeviceIntPtr /* pDev */ ,
ScreenPtr /*pScreen */ ,
Bool /*set_dequeue_screen */
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 1324dcac1..906238a81 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -8,6 +8,7 @@
#include <X11/Xdefs.h>
#include <X11/Xprotostr.h>
+#include "include/events.h"
#include "include/gc.h"
#include "include/pixmap.h"
#include "include/screenint.h"
@@ -18,7 +19,9 @@ void miScreenClose(ScreenPtr pScreen);
void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
int numInDashList, int *pDashOffset);
+
Bool mieqInit(void);
void mieqFini(void);
+void mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 0f7d61f69..a74f50e85 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -55,12 +55,12 @@ in this Software without prior written authorization from The Open Group.
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "misc.h"
#include "windowstr.h"
#include "pixmapstr.h"
-#include "mi.h"
#include "scrnintstr.h"
#include "mipointrst.h"
#include "cursorstr.h"
commit 47427903515ada60deeef593fbb543aeb24fc64c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 12:42:50 2024 +0200
mi: unexport mieqFini()
Not used by any driver/module, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 4f41fbe72..5e8339ef8 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,8 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT void mieqFini(void);
-
extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,
InternalEvent * /*e */
);
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 90c231ed1..1324dcac1 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -19,5 +19,6 @@ void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
int numInDashList, int *pDashOffset);
Bool mieqInit(void);
+void mieqFini(void);
#endif /* _XSERVER_MI_PRIV_H */
commit 5ac361cce9b22b2200d39ca4cc8191d90035b8bb
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 12:40:00 2024 +0200
mi: unexport mieqInit()
Not used by any drivers/modules so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 3d94871dc..8b4b99d61 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -49,6 +49,7 @@
#include "inpututils.h"
#include "optionstr.h"
+#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "os/cmdline.h"
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index ca451604d..447f23931 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -29,14 +29,16 @@ from The Open Group.
#include <dix-config.h>
#include <X11/X.h>
-#include "mi.h"
#include <X11/Xproto.h>
+#include <X11/Xos.h>
+#include <X11/keysym.h>
+
+#include "mi/mi_priv.h"
+
#include "scrnintstr.h"
#include "inputstr.h"
-#include <X11/Xos.h>
#include "mipointer.h"
#include "xkbsrv.h"
-#include <X11/keysym.h>
#include "xserver-properties.h"
#include "exevents.h"
#include "extinit.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 52cf2de56..7346bbcb1 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -52,6 +52,7 @@
#include "config/dbus-core.h"
#include "dix/input_priv.h"
#include "dix/screenint_priv.h"
+#include "mi/mi_priv.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
@@ -59,7 +60,6 @@
#include "servermd.h"
#include "windowstr.h"
#include "scrnintstr.h"
-#include "mi.h"
#include "systemd-logind.h"
#include "loaderProcs.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 5754a90ee..95b271777 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -22,6 +22,7 @@ is" without express or implied warranty.
#include <X11/fonts/libxfont2.h>
#include "dix/screenint_priv.h"
+#include "mi/mi_priv.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
@@ -31,7 +32,6 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "windowstr.h"
#include "servermd.h"
-#include "mi.h"
#include "dixfontstr.h"
#include "extinit_priv.h"
#include "Xnest.h"
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index ea5693be1..35e33bab1 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -45,13 +45,15 @@
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
+
+#include "mi/mi_priv.h"
+
#include "misc.h"
#include "windowstr.h"
#include "pixmapstr.h"
#include "inputstr.h"
#include "inpututils.h"
#include "eventstr.h"
-#include "mi.h"
#include "scrnintstr.h"
#include "mipointer.h"
#include "os.h"
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 144ff0fc6..e354dd8e8 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -32,13 +32,13 @@
#include "dix/dix_priv.h"
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include <inputstr.h>
#include <xkbsrv.h>
#include <xserver-properties.h>
#include <inpututils.h>
-#include <mi.h>
#include <mipointer.h>
#include <mipointrst.h>
#include <misc.h>
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 6aced4f9c..c50464a60 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -29,6 +29,9 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
+
+#include "mi/mi_priv.h"
+
#include "win.h"
#include "dixstruct_priv.h"
#include "inputstr.h"
diff --git a/mi/mi.h b/mi/mi.h
index e1d37a285..4f41fbe72 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -114,9 +114,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
typedef struct _DeviceRec *DevicePtr;
#endif
-extern _X_EXPORT Bool mieqInit(void
- );
-
extern _X_EXPORT void mieqFini(void);
extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index bd92ba171..90c231ed1 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -5,6 +5,7 @@
#ifndef _XSERVER_MI_PRIV_H
#define _XSERVER_MI_PRIV_H
+#include <X11/Xdefs.h>
#include <X11/Xprotostr.h>
#include "include/gc.h"
@@ -17,5 +18,6 @@ void miScreenClose(ScreenPtr pScreen);
void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
int numInDashList, int *pDashOffset);
+Bool mieqInit(void);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/mieq.c b/mi/mieq.c
index bca6f8be7..852732b98 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -42,6 +42,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/geproto.h>
#include "dix/cursor_priv.h"
+#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "os/screensaver.h"
@@ -50,7 +51,6 @@ in this Software without prior written authorization from The Open Group.
#include "pixmapstr.h"
#include "inputstr.h"
#include "inpututils.h"
-#include "mi.h"
#include "mipointer.h"
#include "scrnintstr.h"
#include "extinit.h"
diff --git a/test/input.c b/test/input.c
index ef1d14cd9..39057c828 100644
--- a/test/input.c
+++ b/test/input.c
@@ -37,6 +37,7 @@
#include "dix/eventconvert.h"
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
+#include "mi/mi_priv.h"
#include "misc.h"
#include "resource.h"
@@ -45,7 +46,6 @@
#include "exglobals.h"
#include "eventstr.h"
#include "inpututils.h"
-#include "mi.h"
#include "assert.h"
#include "tests-common.h"
commit 8a6bbc80f3e0e2dbe583f39f3360aaed9a77312b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 12:28:25 2024 +0200
mi: unexport miStepDash()
Not used by any module/driver, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index c2a1c4a10..e1d37a285 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -108,15 +108,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
int xOut,
int yOut, miCopyProc copyProc, Pixel bitplane, void *closure);
-/* midash.c */
-
-extern _X_EXPORT void miStepDash(int /*dist */ ,
- int * /*pDashIndex */ ,
- unsigned char * /*pDash */ ,
- int /*numInDashList */ ,
- int * /*pDashOffset */
- );
-
/* mieq.c */
#ifndef INPUT_H
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 7711d4255..bd92ba171 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -15,5 +15,7 @@
void miScreenClose(ScreenPtr pScreen);
void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
+void miStepDash(int dist, int * pDashIndex, unsigned char * pDash,
+ int numInDashList, int *pDashOffset);
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/midash.c b/mi/midash.c
index 76bd4266d..fa3a02074 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -45,6 +45,8 @@ SOFTWARE.
******************************************************************/
#include <dix-config.h>
+#include "mi/mi_priv.h"
+
#include "regionstr.h"
#include "mistruct.h"
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 0d81519cf..0498e9cd8 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -63,11 +63,13 @@ SOFTWARE.
#undef _XOPEN_SOURCE
#endif
#include <X11/X.h>
+
+#include "mi/mi_priv.h"
+
#include "windowstr.h"
#include "gcstruct.h"
#include "regionstr.h"
#include "miwideline.h"
-#include "mi.h"
typedef struct {
int count; /* number of spans */
commit aaaa0a35e5981b77f5bc9303799db566e746b600
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 12:22:55 2024 +0200
mi: unexport miWideArc()
It's not used by any modules/drivers, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index d0c50a35d..c2a1c4a10 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -67,11 +67,6 @@ typedef struct _miDash *miDashPtr;
/* miarc.c */
-extern _X_EXPORT void miWideArc(DrawablePtr pDraw,
- GCPtr pGC,
- int narcs,
- xArc * parcs);
-
extern _X_EXPORT void miPolyArc(DrawablePtr /*pDraw */ ,
GCPtr /*pGC */ ,
int /*narcs */ ,
diff --git a/mi/mi_priv.h b/mi/mi_priv.h
index 26c9d158f..7711d4255 100644
--- a/mi/mi_priv.h
+++ b/mi/mi_priv.h
@@ -5,8 +5,15 @@
#ifndef _XSERVER_MI_PRIV_H
#define _XSERVER_MI_PRIV_H
-#include "screenint.h"
+#include <X11/Xprotostr.h>
+
+#include "include/gc.h"
+#include "include/pixmap.h"
+#include "include/screenint.h"
+#include "mi/mi.h"
void miScreenClose(ScreenPtr pScreen);
+void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs);
+
#endif /* _XSERVER_MI_PRIV_H */
diff --git a/mi/miarc.c b/mi/miarc.c
index 602ccbf76..9ea4a6155 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -51,15 +51,17 @@ SOFTWARE.
#include <math.h>
#include <X11/X.h>
#include <X11/Xprotostr.h>
+#include <X11/Xfuncproto.h>
+
+#include "mi/mi_priv.h"
+
#include "misc.h"
#include "gcstruct.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
#include "windowstr.h"
#include "mifpoly.h"
-#include "mi.h"
#include "mifillarc.h"
-#include <X11/Xfuncproto.h>
#define EPSILON 0.000001
#define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON)
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index ca2cb4087..90dde9f8b 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -37,10 +37,12 @@ Author: Bob Scheifler, MIT X Consortium
#include <math.h>
#include <X11/X.h>
#include <X11/Xprotostr.h>
+
+#include "mi/mi_priv.h"
+
#include "regionstr.h"
#include "gcstruct.h"
#include "pixmapstr.h"
-#include "mi.h"
#include "mizerarc.h"
#define FULLCIRCLE (360 * 64)
commit 12c507cd1fb3d6f1849313a539f5d0c952535872
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Apr 22 17:09:11 2024 +0200
mi: make CopyGetMasterEvent() static
It's not used outside mieq.c, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index 10432a71a..d0c50a35d 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -156,11 +156,6 @@ extern _X_EXPORT void mieqAddCallbackOnDrained(CallbackProcPtr callback,
extern _X_EXPORT void mieqRemoveCallbackOnDrained(CallbackProcPtr callback,
void *param);
-extern DeviceIntPtr CopyGetMasterEvent(DeviceIntPtr /* sdev */ ,
- InternalEvent * /* original */ ,
- InternalEvent * /* copy */
- );
-
/**
* Custom input event handler. If you need to process input events in some
* other way than the default path, register an input event handler for the
diff --git a/mi/mieq.c b/mi/mieq.c
index 0d41324ee..bca6f8be7 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -385,7 +385,7 @@ FixUpEventForMaster(DeviceIntPtr mdev, DeviceIntPtr sdev,
* @param copy The event after being copied
* @return The master device or NULL if the device is a floating slave.
*/
-DeviceIntPtr
+static DeviceIntPtr
CopyGetMasterEvent(DeviceIntPtr sdev,
InternalEvent *original, InternalEvent *copy)
{
commit 6dbb957922754dbe386c1604170fe13850023020
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Apr 18 20:57:31 2024 +0200
mi: make miRecolorCursor() static
It's only used inside mipointer.c, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1727>
diff --git a/mi/mi.h b/mi/mi.h
index b7b320d2c..10432a71a 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -113,14 +113,6 @@ miDoCopy(DrawablePtr pSrcDrawable,
int xOut,
int yOut, miCopyProc copyProc, Pixel bitplane, void *closure);
-/* micursor.c */
-
-extern _X_EXPORT void miRecolorCursor(DeviceIntPtr /* pDev */ ,
- ScreenPtr /*pScr */ ,
- CursorPtr /*pCurs */ ,
- Bool /*displayed */
- );
-
/* midash.c */
extern _X_EXPORT void miStepDash(int /*dist */ ,
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 6011da475..0f7d61f69 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -116,6 +116,10 @@ static void miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x,
static InternalEvent *mipointermove_events; /* for WarpPointer MotionNotifies */
+static void
+miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
+ CursorPtr pCurs, Bool displayed);
+
Bool
miPointerInitialize(ScreenPtr pScreen,
miPointerSpriteFuncPtr spriteFuncs,
@@ -289,7 +293,7 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
return TRUE;
}
-void
+static void
miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
CursorPtr pCurs, Bool displayed)
{
More information about the xorg-commit
mailing list