From 6a91ee1bd1d4751d09f2e4aa832913bc66ae4602 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 12 Feb 2008 19:19:58 +1030 Subject: [PATCH] Remove RawDeviceEvent - for now anyway. Wasn't quite as thought-out as it should be. Throwing it out for now, to get the rest of MPX more stable. --- XI.h | 1 - XInput.h | 20 -------------------- XIproto.h | 30 ------------------------------ 3 files changed, 51 deletions(-) diff --git a/XI.h b/XI.h index 9e79120..7d9d90a 100644 --- a/XI.h +++ b/XI.h @@ -319,7 +319,6 @@ SOFTWARE. /* GE masks */ #define XI_DeviceHierarchyChangedMask (1 << 0) #define XI_DeviceClassesChangedMask (1 << 1) -#define XI_RawDeviceEventMask (1 << 2) /* Make XEventClass be a CARD32 for 64 bit servers. Don't affect client diff --git a/XInput.h b/XInput.h index 1579a00..f0326fc 100644 --- a/XInput.h +++ b/XInput.h @@ -530,26 +530,6 @@ typedef struct { XAnyClassPtr inputclassinfo; /* same as in XDeviceInfo */ } XDeviceClassesChangedEvent; -/* - * RawDeviceEvent. - * Data as received directly from the device. - */ -typedef struct { - int type; /* GenericEvent */ - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came from a SendEvent request */ - Display *display; /* Display the event was read from */ - int extension; /* XI extension offset */ - int evtype; /* XI_RawDeviceEvent */ - int event_type; /* MotionNotify, ButtonPress or - ButtonRelease*/ - XID deviceid; - int buttons; - int num_valuators; - int first_valuator; - int* valuators; -} XRawDeviceEvent; - /******************************************************************* * diff --git a/XIproto.h b/XIproto.h index a84491e..8ccd8c9 100644 --- a/XIproto.h +++ b/XIproto.h @@ -121,7 +121,6 @@ struct tmask /* GE events */ #define XI_DeviceHierarchyChangedNotify 0 #define XI_DeviceClassesChangedNotify 1 -#define XI_RawDeviceEvent 2 /********************************************************* @@ -2030,35 +2029,6 @@ typedef deviceEnterNotify deviceLeaveNotify; /********************************************************* - * RawDeviceEvent. - * - * GE event, may be larger than 32 bytes. If length is > 0, then the event is - * followed by (length * CARD32) fields denoting the values of valuator4 to - * valuator(num_valuators-1). - */ - -typedef struct - { - BYTE type; /* always GenericEvent */ - BYTE extension; /* XI extension offset */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 evtype B16; /* XI_RawDeviceEvent */ - CARD8 buttons; - CARD8 num_valuators; - CARD8 first_valuator; - CARD8 deviceid; - CARD8 event_type; /* one of MotionNotify, - ButtonPress, ButtonRelase */ - CARD8 pad0; - CARD32 valuator0 B32; - CARD32 valuator1 B32; - CARD32 valuator2 B32; - CARD32 valuator3 B32; - } rawDeviceEvent; - - -/********************************************************* * DeviceHierarchyChangedEvent. * * Intended as a notification event only, the client is expected to query the -- 2.7.4