frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Julien Cristau 2010-04-06 11:51:53 +02:00 committed by Keith Packard
parent 0b676acd47
commit fc5d767408
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Xext/geext.c
View File

@ -36,11 +36,8 @@
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
int GEEventBase;
int GEErrorBase;
static int GEClientPrivateKeyIndex; static int GEClientPrivateKeyIndex;
DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex; DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
int GEEventType; /* The opcode for all GenericEvents will have. */
int RT_GECLIENT = 0; int RT_GECLIENT = 0;
@ -178,10 +175,6 @@ GEResetProc(ExtensionEntry *extEntry)
{ {
DeleteCallback(&ClientStateCallback, GEClientCallback, 0); DeleteCallback(&ClientStateCallback, GEClientCallback, 0);
EventSwapVector[GenericEvent] = NotImplemented; EventSwapVector[GenericEvent] = NotImplemented;
GEEventBase = 0;
GEErrorBase = 0;
GEEventType = 0;
} }
/* Calls the registered event swap function for the extension. /* Calls the registered event swap function for the extension.
@ -225,14 +218,10 @@ GEExtensionInit(void)
} }
if((extEntry = AddExtension(GE_NAME, if((extEntry = AddExtension(GE_NAME,
GENumberEvents, GENumberErrors, 0, GENumberErrors,
ProcGEDispatch, SProcGEDispatch, ProcGEDispatch, SProcGEDispatch,
GEResetProc, StandardMinorOpcode)) != 0) GEResetProc, StandardMinorOpcode)) != 0)
{ {
GEEventBase = extEntry->eventBase;
GEErrorBase = extEntry->errorBase;
GEEventType = GEEventBase;
memset(GEExtensions, 0, sizeof(GEExtensions)); memset(GEExtensions, 0, sizeof(GEExtensions));
EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent; EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent;

3
Xext/geint.h
View File

@ -37,9 +37,6 @@
#include "extnsionst.h" #include "extnsionst.h"
#include <X11/extensions/geproto.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; extern _X_EXPORT DevPrivateKey GEClientPrivateKey;
typedef struct _GEClientInfo { typedef struct _GEClientInfo {