diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-04-06 11:51:53 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-13 09:27:32 -0700 |
| commit | fc5d76740851725e3788c68e14474a012a205892 (patch) | |
| tree | 92b2a16e980f88cc6ed703d134e800bb1c7c73af /Xext | |
| parent | 0b676acd47e0d6a675df374b42ddb200deab5d06 (diff) | |
XGE: don't register an extension event
The GenericEvent is a core event, we never send an extension event, so
don't reserve an id for one.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/geext.c | 13 | ||||
| -rw-r--r-- | Xext/geint.h | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/Xext/geext.c b/Xext/geext.c index 2ba0ca824..f0a3d8778 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -36,11 +36,8 @@ #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) -int GEEventBase; -int GEErrorBase; static int GEClientPrivateKeyIndex; DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex; -int GEEventType; /* The opcode for all GenericEvents will have. */ int RT_GECLIENT = 0; @@ -178,10 +175,6 @@ GEResetProc(ExtensionEntry *extEntry) { DeleteCallback(&ClientStateCallback, GEClientCallback, 0); EventSwapVector[GenericEvent] = NotImplemented; - - GEEventBase = 0; - GEErrorBase = 0; - GEEventType = 0; } /* Calls the registered event swap function for the extension. @@ -225,14 +218,10 @@ GEExtensionInit(void) } if((extEntry = AddExtension(GE_NAME, - GENumberEvents, GENumberErrors, + 0, GENumberErrors, ProcGEDispatch, SProcGEDispatch, GEResetProc, StandardMinorOpcode)) != 0) { - GEEventBase = extEntry->eventBase; - GEErrorBase = extEntry->errorBase; - GEEventType = GEEventBase; - memset(GEExtensions, 0, sizeof(GEExtensions)); EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent; diff --git a/Xext/geint.h b/Xext/geint.h index 881d30661..10a33cea3 100644 --- a/Xext/geint.h +++ b/Xext/geint.h @@ -37,9 +37,6 @@ #include "extnsionst.h" #include <X11/extensions/geproto.h> -extern _X_EXPORT int GEEventType; -extern _X_EXPORT int GEEventBase; -extern _X_EXPORT int GEErrorBase; extern _X_EXPORT DevPrivateKey GEClientPrivateKey; typedef struct _GEClientInfo { |