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>
This commit is contained in:
parent
0b676acd47
commit
fc5d767408
13
Xext/geext.c
13
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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue