xserver: Branch 'master' - 11 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Apr 15 23:15:42 UTC 2024
Xext/shape.c | 5 ++++-
dix/dispatch.c | 11 ++++++-----
dix/dixfonts.c | 1 +
dix/gc.c | 6 ++++--
dix/gc_priv.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
dix/main.c | 1 +
dix/resource.c | 1 +
include/gc.h | 43 -------------------------------------------
mi/midispcur.c | 3 +++
9 files changed, 64 insertions(+), 51 deletions(-)
New commits:
commit 2b7a2f8ed2edbb54bf777603f058b2faf143ae58
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Mar 6 10:46:03 2024 +0100
dix: unexport SetClipRects()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 61704a79e..18d5fefbe 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -34,4 +34,11 @@ int SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash);
int VerifyRectOrder(int nrects, xRectangle *prects, int ordering);
+int SetClipRects(GCPtr pGC,
+ int xOrigin,
+ int yOrigin,
+ int nrects,
+ xRectangle *prects,
+ int ordering);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 8b37e566c..66e27bcea 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,13 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT int SetClipRects(GCPtr /*pGC */ ,
- int /*xOrigin */ ,
- int /*yOrigin */ ,
- int /*nrects */ ,
- xRectangle * /*prects */ ,
- int /*ordering */ );
-
extern _X_EXPORT GCPtr GetScratchGC(unsigned /*depth */ ,
ScreenPtr /*pScreen */ );
commit 9a8e6c5bfdbed6c7b187281242601bd19bec49a7
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Mar 6 10:44:08 2024 +0100
dix: unexport VerifyRectOrder
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/Xext/shape.c b/Xext/shape.c
index e7c7a45b0..3af0e4b68 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/shapeproto.h>
+
+#include "dix/gc_priv.h"
+
#include "misc.h"
#include "os.h"
#include "windowstr.h"
@@ -41,7 +45,6 @@ in this Software without prior written authorization from The Open Group.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-#include <X11/extensions/shapeproto.h>
#include "regionstr.h"
#include "gcstruct.h"
#include "extinit.h"
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 87f975eef..61704a79e 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -32,4 +32,6 @@ void FreeDefaultStipple(int screenNum);
int SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash);
+int VerifyRectOrder(int nrects, xRectangle *prects, int ordering);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 4b25aaea0..8b37e566c 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,10 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT int VerifyRectOrder(int /*nrects */ ,
- xRectangle * /*prects */ ,
- int /*ordering */ );
-
extern _X_EXPORT int SetClipRects(GCPtr /*pGC */ ,
int /*xOrigin */ ,
int /*yOrigin */ ,
commit 407fe604835210d9a2d2e7a629457e8eab59d790
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Mar 6 10:37:33 2024 +0100
dix: unexport SetDashes
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index c9fd0f9ff..87f975eef 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -30,4 +30,6 @@ Bool CreateDefaultStipple(int screenNum);
void FreeDefaultStipple(int screenNum);
+int SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index e701a3be5..4b25aaea0 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,11 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT int SetDashes(GCPtr /*pGC */ ,
- unsigned /*offset */ ,
- unsigned /*ndash */ ,
- unsigned char * /*pdash */ );
-
extern _X_EXPORT int VerifyRectOrder(int /*nrects */ ,
xRectangle * /*prects */ ,
int /*ordering */ );
commit 30670e72c70bd6f2f1de5f0c3bed165d30f261d6
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 20:05:42 2024 +0100
dix: unexport FreeDefaultStipple()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index d5f83c148..c9fd0f9ff 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -28,4 +28,6 @@ Bool CreateGCperDepth(int screenNum);
Bool CreateDefaultStipple(int screenNum);
+void FreeDefaultStipple(int screenNum);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index bb86ad64c..e701a3be5 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,8 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT void FreeDefaultStipple(int /*screenNum */ );
-
extern _X_EXPORT int SetDashes(GCPtr /*pGC */ ,
unsigned /*offset */ ,
unsigned /*ndash */ ,
commit f6af37992865424a4e97670d5ca54f5d78fd8119
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 20:01:27 2024 +0100
dix: unexport CreateDefaultStipple()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index c1de92c8d..d5f83c148 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -26,4 +26,6 @@ void FreeGCperDepth(int screenNum);
Bool CreateGCperDepth(int screenNum);
+Bool CreateDefaultStipple(int screenNum);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 56aaa9ea1..bb86ad64c 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,8 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT Bool CreateDefaultStipple(int /*screenNum */ );
-
extern _X_EXPORT void FreeDefaultStipple(int /*screenNum */ );
extern _X_EXPORT int SetDashes(GCPtr /*pGC */ ,
commit bdf8ae3fc1c7287643e1b0155fee103b832eab72
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 19:58:11 2024 +0100
dix: unexport CreateGCperDepth()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 7c0896588..c1de92c8d 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -24,4 +24,6 @@ int FreeGC(void *pGC, XID gid);
void FreeGCperDepth(int screenNum);
+Bool CreateGCperDepth(int screenNum);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 887989371..56aaa9ea1 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,8 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT Bool CreateGCperDepth(int /*screenNum */ );
-
extern _X_EXPORT Bool CreateDefaultStipple(int /*screenNum */ );
extern _X_EXPORT void FreeDefaultStipple(int /*screenNum */ );
commit fc1a7363eb4bdf674418e80de83c9da7399cb432
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 19:55:09 2024 +0100
dix: unexport FreeGCperDepth()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 24115082b..7c0896588 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -22,4 +22,6 @@ int CopyGC(GCPtr pgcSrc, GCPtr pgcDst, BITS32 mask);
int FreeGC(void *pGC, XID gid);
+void FreeGCperDepth(int screenNum);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/dix/main.c b/dix/main.c
index 36771a280..ac189a367 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -85,6 +85,7 @@ Equipment Corporation.
#include "dix/callback_priv.h"
#include "dix/dix_priv.h"
+#include "dix/gc_priv.h"
#include "dix/registry_priv.h"
#include "os/audit.h"
#include "os/auth.h"
diff --git a/include/gc.h b/include/gc.h
index 7fce379da..887989371 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,8 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ );
-
extern _X_EXPORT Bool CreateGCperDepth(int /*screenNum */ );
extern _X_EXPORT Bool CreateDefaultStipple(int /*screenNum */ );
commit 32512c579e6f6c3dd0c2f84a894a6733c78752cf
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 19:51:58 2024 +0100
dix: unexport FreeGC()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 2505eca5d..24115082b 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -20,4 +20,6 @@ GCPtr CreateGC(DrawablePtr pDrawable,
int CopyGC(GCPtr pgcSrc, GCPtr pgcDst, BITS32 mask);
+int FreeGC(void *pGC, XID gid);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/dix/resource.c b/dix/resource.c
index f8be25c2c..35015ca33 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -123,6 +123,7 @@ Equipment Corporation.
#include <X11/X.h>
+#include "dix/gc_priv.h"
#include "dix/registry_priv.h"
#include "misc.h"
diff --git a/include/gc.h b/include/gc.h
index aa906cdcd..7fce379da 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,9 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT int FreeGC(void *pGC,
- XID gid);
-
extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ );
extern _X_EXPORT Bool CreateGCperDepth(int /*screenNum */ );
commit 7e30f2c8e14b349521438c5d6a1bedd139383412
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 19:42:24 2024 +0100
dix: unexport CopyGC()
Not used by any driver, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 3bad522ac..4169a6637 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -56,6 +56,7 @@ Equipment Corporation.
#include <X11/Xmd.h>
#include <X11/Xproto.h>
+#include "dix/gc_priv.h"
#include "os/auth.h"
#include "scrnintstr.h"
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 47e69ee2e..2505eca5d 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -18,4 +18,6 @@ GCPtr CreateGC(DrawablePtr pDrawable,
XID gcid,
ClientPtr client);
+int CopyGC(GCPtr pgcSrc, GCPtr pgcDst, BITS32 mask);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 3618f644b..aa906cdcd 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,10 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ ,
- GCPtr /*pgcDst */ ,
- BITS32 /*mask */ );
-
extern _X_EXPORT int FreeGC(void *pGC,
XID gid);
commit 6896396456a1f88286dbd532779c9cc552bc8a9d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 19:35:42 2024 +0100
dix: unexport CreateGC()
Not used by any drivers, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
index 58bf99872..47e69ee2e 100644
--- a/dix/gc_priv.h
+++ b/dix/gc_priv.h
@@ -11,4 +11,11 @@
int ChangeGCXIDs(ClientPtr client, GCPtr pGC, BITS32 mask, CARD32 * pval);
+GCPtr CreateGC(DrawablePtr pDrawable,
+ BITS32 mask,
+ XID *pval,
+ int *pStatus,
+ XID gcid,
+ ClientPtr client);
+
#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index 10da25521..3618f644b 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,13 +88,6 @@ extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
BITS32 /*mask */ ,
ChangeGCValPtr /*pCGCV */ );
-extern _X_EXPORT GCPtr CreateGC(DrawablePtr /*pDrawable */ ,
- BITS32 /*mask */ ,
- XID * /*pval */ ,
- int * /*pStatus */ ,
- XID /*gcid */ ,
- ClientPtr /*client */ );
-
extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ ,
GCPtr /*pgcDst */ ,
BITS32 /*mask */ );
diff --git a/mi/midispcur.c b/mi/midispcur.c
index d1da0fd58..b2984a0bb 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group.
#endif
#include <X11/X.h>
+
+#include "dix/gc_priv.h"
+
#include "misc.h"
#include "input.h"
#include "cursorstr.h"
commit 46c0ac8c702d313ec0945aadc90be8ed7f6f6e1e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Mar 5 17:03:19 2024 +0100
dix: unexport ChangeGCXIDs()
Move non-exported gc functions to private header
No need to clutter public headers with non-exported stuff.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1365>
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 71c3aea4d..6411a5389 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -101,16 +101,17 @@ Equipment Corporation.
#include <version-config.h>
#endif
-#include "dix/dix_priv.h"
-#include "dix/registry_priv.h"
-#include "os/auth.h"
-
-#include "windowstr.h"
+#include <stddef.h>
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/libxfont2.h>
+#include "dix/dix_priv.h"
+#include "dix/gc_priv.h"
+#include "dix/registry_priv.h"
#include "dix/screenint_priv.h"
+#include "os/auth.h"
+#include "windowstr.h"
#include "dixfontstr.h"
#include "gcstruct.h"
#include "selection.h"
diff --git a/dix/gc.c b/dix/gc.c
index 0e75e8765..f2369591b 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -48,9 +48,13 @@ SOFTWARE.
#include <dix-config.h>
#endif
+#include <assert.h>
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
+
+#include "dix/gc_priv.h"
+
#include "misc.h"
#include "resource.h"
#include "gcstruct.h"
@@ -59,11 +63,9 @@ SOFTWARE.
#include "scrnintstr.h"
#include "region.h"
#include "dixstruct.h"
-
#include "privates.h"
#include "dix.h"
#include "xace.h"
-#include <assert.h>
extern FontPtr defaultFont;
diff --git a/dix/gc_priv.h b/dix/gc_priv.h
new file mode 100644
index 000000000..58bf99872
--- /dev/null
+++ b/dix/gc_priv.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ * Copyright © 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+ * Copyright © 1987, 1998 The Open Group
+ */
+#ifndef _XSERVER_DIX_GC_PRIV_H
+#define _XSERVER_DIX_GC_PRIV_H
+
+#include "include/gc.h"
+
+int ChangeGCXIDs(ClientPtr client, GCPtr pGC, BITS32 mask, CARD32 * pval);
+
+#endif /* _XSERVER_DIX_GC_PRIV_H */
diff --git a/include/gc.h b/include/gc.h
index bb25ee493..10da25521 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -83,11 +83,6 @@ typedef union {
void *ptr;
} ChangeGCVal, *ChangeGCValPtr;
-extern int ChangeGCXIDs(ClientPtr /*client */ ,
- GCPtr /*pGC */ ,
- BITS32 /*mask */ ,
- CARD32 * /*pval */ );
-
extern _X_EXPORT int ChangeGC(ClientPtr /*client */ ,
GCPtr /*pGC */ ,
BITS32 /*mask */ ,
More information about the xorg-commit
mailing list