diff --git a/dix/grabs.c b/dix/grabs.c index 8025bfd1b..11e25364e 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -219,7 +219,7 @@ AllocGrab(const GrabPtr src) GrabPtr CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice, WindowPtr window, enum InputLevel grabtype, GrabMask *mask, - GrabParameters *param, int type, + GrabParameters *param, int eventType, KeyCode keybut, /* key or button */ WindowPtr confineTo, CursorPtr cursor) { @@ -242,7 +242,7 @@ CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice, grab->modifiersDetail.exact = param->modifiers; grab->modifiersDetail.pMask = NULL; grab->modifierDevice = modDevice; - grab->type = type; + grab->type = eventType; grab->grabtype = grabtype; grab->detail.exact = keybut; grab->detail.pMask = NULL; @@ -253,7 +253,6 @@ CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice, if (grabtype == XI2) xi2mask_merge(grab->xi2mask, mask->xi2mask); return grab; - } void diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 8e2b40dc4..3a00b6419 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -41,7 +41,7 @@ extern GrabPtr CreateGrab(int /* client */ , enum InputLevel /* grabtype */ , GrabMask * /* mask */ , struct _GrabParameters * /* param */ , - int /* type */ , + int /* eventType */ , KeyCode /* keybut */ , WindowPtr /* confineTo */ , CursorPtr /* cursor */ );