xserver: Branch 'master' - 13 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Feb 23 17:59:18 UTC 2025
Xext/geext.c | 29 ++++++++++++++++-------------
Xext/geext.h | 44 ++------------------------------------------
Xext/geint.h | 51 ---------------------------------------------------
Xext/meson.build | 1 -
dix/events.c | 1 -
5 files changed, 18 insertions(+), 108 deletions(-)
New commits:
commit 90bc9950165ee44906514d9cd8a0828bdc6c0dcd
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 15:34:46 2025 +0100
Xext: geext: move geeint.h stuff into geext.c
Everything in here only used by geext.c, so no need to keep
a separate header file for that.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.c b/Xext/geext.c
index 05b5073dd..d2a32f999 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -27,7 +27,6 @@
#include "windowstr.h"
#include <X11/extensions/ge.h>
-#include "geint.h"
#include "geext.h"
#include "protocol-versions.h"
#include "extinit_priv.h"
@@ -36,6 +35,8 @@ Bool noGEExtension = FALSE;
DevPrivateKeyRec GEClientPrivateKeyRec;
+#define GEClientPrivateKey (&GEClientPrivateKeyRec)
+
/** Struct to keep information about registered extensions */
typedef struct _GEExtension {
/** Event swapping routine */
@@ -44,6 +45,13 @@ typedef struct _GEExtension {
static GEExtension GEExtensions[MAXEXTENSIONS];
+typedef struct _GEClientInfo {
+ CARD32 major_version;
+ CARD32 minor_version;
+} GEClientInfoRec, *GEClientInfoPtr;
+
+#define GEGetClient(pClient) ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))
+
/* Forward declarations */
static void SGEGenericEvent(xEvent *from, xEvent *to);
diff --git a/Xext/geint.h b/Xext/geint.h
deleted file mode 100644
index 0ee28e471..000000000
--- a/Xext/geint.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2007-2008 Peter Hutterer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Peter Hutterer, University of South Australia, NICTA
- */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _GEINT_H_
-#define _GEINT_H_
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include <X11/extensions/geproto.h>
-
-extern DevPrivateKeyRec GEClientPrivateKeyRec;
-
-#define GEClientPrivateKey (&GEClientPrivateKeyRec)
-
-typedef struct _GEClientInfo {
- CARD32 major_version;
- CARD32 minor_version;
-} GEClientInfoRec, *GEClientInfoPtr;
-
-#define GEGetClient(pClient) ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))
-
-#endif /* _GEINT_H_ */
diff --git a/Xext/meson.build b/Xext/meson.build
index bfe40b7f3..457c7ef2c 100644
--- a/Xext/meson.build
+++ b/Xext/meson.build
@@ -10,7 +10,6 @@ srcs_xext = [
hdrs_xext = [
'geext.h',
- 'geint.h',
'syncsdk.h',
]
diff --git a/dix/events.c b/dix/events.c
index e732fdc30..f4cd7bb62 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -149,7 +149,6 @@ Equipment Corporation.
#include "dixevents.h"
#include "dispatch.h"
#include "geext.h"
-#include "geint.h"
#include "dixstruct_priv.h"
#include "eventstr.h"
#include "enterleave.h"
commit 658f1b34ee119b6f68c4abbe7ee4678b960e91aa
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 14:42:41 2025 +0100
Xext: geext.h: fix missing include of Xfuncproto.h
Needed for _X_EXPORT.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index aa36f39d7..836a10103 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -27,6 +27,8 @@ from the author.
*/
#ifndef _GEEXT_H_
#define _GEEXT_H_
+
+#include <X11/Xfuncproto.h>
#include <X11/extensions/geproto.h>
/* Interface for other extensions */
commit 20d4c40df4fcbf1912ef223352ffd6b6936fb2a5
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 14:33:30 2025 +0100
Xext: geext.h: don't include <dix-config.h>
Really no need to ever include it from here.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index 71fd3f061..aa36f39d7 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -25,11 +25,6 @@ other dealings in this Software without prior written authorization
from the author.
*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
#ifndef _GEEXT_H_
#define _GEEXT_H_
#include <X11/extensions/geproto.h>
commit a7600ac8840cd191a81894a2b493009121f6aa63
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 14:30:14 2025 +0100
Xext: geext: move struct _GEExtension into geext.c
Not used anywhere outside geext implementation itself,
so shouldn't be public at all.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.c b/Xext/geext.c
index a861a779b..05b5073dd 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -36,6 +36,12 @@ Bool noGEExtension = FALSE;
DevPrivateKeyRec GEClientPrivateKeyRec;
+/** Struct to keep information about registered extensions */
+typedef struct _GEExtension {
+ /** Event swapping routine */
+ void (*evswap) (xGenericEvent *from, xGenericEvent *to);
+} GEExtension, *GEExtensionPtr;
+
static GEExtension GEExtensions[MAXEXTENSIONS];
/* Forward declarations */
diff --git a/Xext/geext.h b/Xext/geext.h
index d48df8ca9..71fd3f061 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -34,12 +34,6 @@ from the author.
#define _GEEXT_H_
#include <X11/extensions/geproto.h>
-/** Struct to keep information about registered extensions */
-typedef struct _GEExtension {
- /** Event swapping routine */
- void (*evswap) (xGenericEvent *from, xGenericEvent *to);
-} GEExtension, *GEExtensionPtr;
-
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
void (*ev_dispatch) (xGenericEvent
commit 896937298bfb8a2fdc936590fc1ea0b1649c0748
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 14:07:01 2025 +0100
Xext: geext: unexport GEExtensions[]
This field isn't used by anybody outside, nor should it be accessed
directly. So better make it local.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.c b/Xext/geext.c
index 1067b8b3d..a861a779b 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -36,7 +36,7 @@ Bool noGEExtension = FALSE;
DevPrivateKeyRec GEClientPrivateKeyRec;
-GEExtension GEExtensions[MAXEXTENSIONS];
+static GEExtension GEExtensions[MAXEXTENSIONS];
/* Forward declarations */
static void SGEGenericEvent(xEvent *from, xEvent *to);
diff --git a/Xext/geext.h b/Xext/geext.h
index f4f80b5a4..d48df8ca9 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -40,9 +40,6 @@ typedef struct _GEExtension {
void (*evswap) (xGenericEvent *from, xGenericEvent *to);
} GEExtension, *GEExtensionPtr;
-/* All registered extensions and their handling functions. */
-extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
-
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
void (*ev_dispatch) (xGenericEvent
commit 6fa340c5784736264467ba904f9005c75ec8d67e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 14:03:26 2025 +0100
Xext: geext: drop unused GEInitEvent()
This function isn't called by anybody, so no need to keep it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.c b/Xext/geext.c
index 8eb4631f2..1067b8b3d 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -198,14 +198,3 @@ GERegisterExtension(int extension,
/* extension opcodes are > 128, might as well save some space here */
GEExtensions[EXT_MASK(extension)].evswap = ev_swap;
}
-
-/* Sets type and extension field for a generic event. This is just an
- * auxiliary function, extensions could do it manually too.
- */
-void
-GEInitEvent(xGenericEvent *ev, int extension)
-{
- ev->type = GenericEvent;
- ev->extension = extension;
- ev->length = 0;
-}
diff --git a/Xext/geext.h b/Xext/geext.h
index ba8ff5c4d..f4f80b5a4 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -50,6 +50,4 @@ extern _X_EXPORT void GERegisterExtension(int extension,
xGenericEvent
*to));
-extern _X_EXPORT void GEInitEvent(xGenericEvent *ev, int extension);
-
#endif /* _GEEXT_H_ */
commit 480a7e4b113edf0880a8bed43c322426c0f6bcaf
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 13:56:02 2025 +0100
Xext: geext: drop unused GEV() macro
Not used anywhere, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index 380b606b4..ba8ff5c4d 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -43,9 +43,6 @@ typedef struct _GEExtension {
/* All registered extensions and their handling functions. */
extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
-/* Typecast to generic event */
-#define GEV(ev) ((xGenericEvent*)(ev))
-
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
void (*ev_dispatch) (xGenericEvent
commit ae7bbd36dffcc15bd1d0b6889bc7a3aa53b85181
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 13:49:58 2025 +0100
Xext: geext: drop unused GEEXT() macro
Not used by anybody, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index 0daa37486..380b606b4 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -45,8 +45,6 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
/* Typecast to generic event */
#define GEV(ev) ((xGenericEvent*)(ev))
-/* Returns the extension offset from the event */
-#define GEEXT(ev) (GEV(ev)->extension)
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
commit b865f44f5e2b4af9d93fff3b756e2ecc4def397f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 12:59:20 2025 +0100
Xext: geext: drop unused GEEXTIDX() macro
Not used anywhere, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index 8eb0f2750..0daa37486 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -48,9 +48,6 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
/* Returns the extension offset from the event */
#define GEEXT(ev) (GEV(ev)->extension)
-/* Return zero-based extension offset (offset - 128). Only for use in arrays */
-#define GEEXTIDX(ev) (GEEXT(ev) & 0x7F)
-
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
void (*ev_dispatch) (xGenericEvent
commit 1006a37f7d000ef693e5b36b97bcd9640088c228
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 12:58:08 2025 +0100
Xext: geext: drop unused GEMaskIsSet() macro
Not used anywhere, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index 129c47dda..8eb0f2750 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -50,11 +50,6 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
/* Return zero-based extension offset (offset - 128). Only for use in arrays */
#define GEEXTIDX(ev) (GEEXT(ev) & 0x7F)
-/* True if mask is set for extension on window */
-#define GEMaskIsSet(pWin, extension, mask) \
- ((pWin)->optional && \
- (pWin)->optional->geMasks && \
- ((pWin)->optional->geMasks->eventMasks[(extension) & 0x7F] & (mask)))
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
commit c1d49e19b94896e84ba08cc1be3ece4ed47334e3
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 12:56:48 2025 +0100
Xext: geext: drop unused GECLIENT() macro
Not used anywhere, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index bd34457c2..129c47dda 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -56,10 +56,6 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
(pWin)->optional->geMasks && \
((pWin)->optional->geMasks->eventMasks[(extension) & 0x7F] & (mask)))
-/* Returns first client */
-#define GECLIENT(pWin) \
- (((pWin)->optional) ? (pWin)->optional->geMasks->geClients : NULL)
-
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
void (*ev_dispatch) (xGenericEvent
commit 01ad88b8c88858b917368166b4225387518d50f1
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 12:55:42 2025 +0100
Xext: geext: drop unused GEIsType() macro
Not used anywhere, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index e740a1a5f..bd34457c2 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -60,11 +60,6 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
#define GECLIENT(pWin) \
(((pWin)->optional) ? (pWin)->optional->geMasks->geClients : NULL)
-#define GEIsType(ev, ext, ev_type) \
- ((GEV(ev)->type == GenericEvent) && \
- GEEXT(ev) == (ext) && \
- GEV(ev)->evtype == (ev_type))
-
/* Interface for other extensions */
extern _X_EXPORT void GERegisterExtension(int extension,
void (*ev_dispatch) (xGenericEvent
commit bdb5d4867a4e80ffc906ae0df8140f2aeeffba20
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 18 12:54:32 2025 +0100
Xext: geext: drop unused GEEventFill() macro
It's not used anywhere, so no need to keep it around any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1811>
diff --git a/Xext/geext.h b/Xext/geext.h
index f46897966..e740a1a5f 100644
--- a/Xext/geext.h
+++ b/Xext/geext.h
@@ -60,10 +60,6 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
#define GECLIENT(pWin) \
(((pWin)->optional) ? (pWin)->optional->geMasks->geClients : NULL)
-/* Returns the event_fill for the given event */
-#define GEEventFill(ev) \
- GEExtensions[GEEXTIDX(ev)].evfill
-
#define GEIsType(ev, ext, ev_type) \
((GEV(ev)->type == GenericEvent) && \
GEEXT(ev) == (ext) && \
More information about the xorg-commit
mailing list