diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-10 10:15:45 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-20 15:17:54 +1000 |
commit | 6b6b660c3633af75a94302725137549df0dbe446 (patch) | |
tree | 0c435fa5c01aba8de38aa1557c7ae1558edee195 /Xext | |
parent | 445daa62e720fe58fa2d6c3cdc26663671b2bc48 (diff) |
Xext: remove ev_fill from GEExtensions.
Diffstat (limited to 'Xext')
-rw-r--r-- | Xext/geext.c | 5 | ||||
-rw-r--r-- | Xext/geext.h | 17 |
2 files changed, 4 insertions, 18 deletions
diff --git a/Xext/geext.c b/Xext/geext.c index be2bac3f2..1ddcbb1f6 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -261,16 +261,13 @@ GEExtensionInit(void) */ void GERegisterExtension(int extension, - void (*ev_swap)(xGenericEvent* from, xGenericEvent* to), - void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev, - WindowPtr pWin, GrabPtr pGrab)) + void (*ev_swap)(xGenericEvent* from, xGenericEvent* to)) { if ((extension & 0x7F) >= MAXEXTENSIONS) FatalError("GE: extension > MAXEXTENSIONS. This should not happen.\n"); /* extension opcodes are > 128, might as well save some space here */ GEExtensions[extension & 0x7f].evswap = ev_swap; - GEExtensions[extension & 0x7f].evfill = ev_fill; } diff --git a/Xext/geext.h b/Xext/geext.h index fbf29cc0d..8e6dbeb24 100644 --- a/Xext/geext.h +++ b/Xext/geext.h @@ -34,18 +34,10 @@ from the author. #define _GEEXT_H_ #include <X11/extensions/geproto.h> -/* Struct to keep information about registered extensions - * - * evswap ... use to swap event fields for different byte ordered clients. - * evfill ... use to fill various event fields from the given parameters. - */ +/** Struct to keep information about registered extensions */ typedef struct _GEExtension { + /** Event swapping routine */ void (*evswap)(xGenericEvent* from, xGenericEvent* to); - void (*evfill)(xGenericEvent* ev, - DeviceIntPtr pDev, /* device */ - WindowPtr pWin, /* event window */ - GrabPtr pGrab /* current grab, may be NULL */ - ); } GEExtension, *GEExtensionPtr; @@ -82,10 +74,7 @@ extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS]; /* Interface for other extensions */ extern _X_EXPORT void GERegisterExtension( int extension, - void (*ev_dispatch)(xGenericEvent* from, xGenericEvent* to), - void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev, - WindowPtr pWin, GrabPtr pGrab) - ); + void (*ev_dispatch)(xGenericEvent* from, xGenericEvent* to)); extern _X_EXPORT void GEInitEvent(xGenericEvent* ev, int extension); |