hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

input: replace GRABTYPE_* with the InputLevel enums

Browse source 
They achieve the same thing, re-use the more generic InputLevel so we can
convert to/fro easier.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-08 14:27:01 +10:00
commit 218752bdc5
18 changed files with 152 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/dixgrabs.h
View file

@ -40,7 +40,7 @@ extern GrabPtr CreateGrab(
DeviceIntPtr /* device */,
DeviceIntPtr /* modDevice */,
WindowPtr /* window */,
GrabType /* grabtype */,
enum InputLevel /* grabtype */,
GrabMask * /* mask */,
struct _GrabParameters * /* param */,
int /* type */,

6
include/eventconvert.h
View file

@ -31,12 +31,6 @@
#define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))
enum InputLevel {
CORE,
XI,
XI2,
};
_X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count);
_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);

6
include/exevents.h
View file

@ -159,7 +159,7 @@ typedef struct _XIClientRec {
typedef struct _GrabParameters {
int grabtype; /* GRABTYPE_CORE, etc. */
int grabtype; /* CORE, etc. */
unsigned int ownerEvents;
unsigned int this_device_mode;
unsigned int other_devices_mode;
@ -200,7 +200,7 @@ GrabButton(
DeviceIntPtr /* modifier_device */,
int /* button */,
GrabParameters* /* param */,
GrabType /* grabtype */,
enum InputLevel /* grabtype */,
GrabMask* /* eventMask */);
extern int
@ -210,7 +210,7 @@ GrabKey(
DeviceIntPtr /* modifier_device */,
int /* key */,
GrabParameters* /* param */,
GrabType /* grabtype */,
enum InputLevel /* grabtype */,
GrabMask* /* eventMask */);
extern int

6
include/input.h
View file

@ -102,6 +102,12 @@ SOFTWARE.
#define RevertToFollowKeyboard 3
#endif
enum InputLevel {
CORE,
XI,
XI2,
};
typedef unsigned long Leds;
typedef struct _OtherClients *OtherClientsPtr;
typedef struct _InputClients *InputClientsPtr;

8
include/inputstr.h
View file

@ -167,12 +167,6 @@ typedef struct _DetailRec { /* Grab details may be bit masks */
Mask *pMask;
} DetailRec;
typedef enum {
GRABTYPE_CORE,
GRABTYPE_XI,
GRABTYPE_XI2
} GrabType;
union _GrabMask {
Mask core;
Mask xi;
@ -200,7 +194,7 @@ typedef struct _GrabRec {
unsigned ownerEvents:1;
unsigned keyboardMode:1;
unsigned pointerMode:1;
GrabType grabtype;
enum InputLevel grabtype;
CARD8 type; /* event type */
DetailRec modifiersDetail;
DeviceIntPtr modifierDevice;