brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device-manager: Don't pass the event mask around

Browse Source 
There's no point in doing this, as we always use a constant event mask.
Simply do what everything else does.

https://bugzilla.gnome.org/show_bug.cgi?id=703969
This commit is contained in:
Jasper St. Pierre
2013-07-10 16:34:48 -04:00
parent e38ea7a20f
commit 032688800c
6 changed files with 21 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
clutter/x11/clutter-input-device-xi2.c
View File

@ -55,8 +55,7 @@ G_DEFINE_TYPE (ClutterInputDeviceXI2,
static void
clutter_input_device_xi2_select_stage_events (ClutterInputDevice *device,
ClutterStage *stage,
gint event_mask)
ClutterStage *stage)
{
ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
ClutterBackendX11 *backend_x11;
@ -71,26 +70,13 @@ clutter_input_device_xi2_select_stage_events (ClutterInputDevice *device,
len = XIMaskLen (XI_LASTEVENT);
mask = g_new0 (unsigned char, len);
if (event_mask & PointerMotionMask)
XISetMask (mask, XI_Motion);
if (event_mask & ButtonPressMask)
XISetMask (mask, XI_ButtonPress);
if (event_mask & ButtonReleaseMask)
XISetMask (mask, XI_ButtonRelease);
if (event_mask & KeyPressMask)
XISetMask (mask, XI_KeyPress);
if (event_mask & KeyReleaseMask)
XISetMask (mask, XI_KeyRelease);
if (event_mask & EnterWindowMask)
XISetMask (mask, XI_Enter);
if (event_mask & LeaveWindowMask)
XISetMask (mask, XI_Leave);
XISetMask (mask, XI_Motion);
XISetMask (mask, XI_ButtonPress);
XISetMask (mask, XI_ButtonRelease);
XISetMask (mask, XI_KeyPress);
XISetMask (mask, XI_KeyRelease);
XISetMask (mask, XI_Enter);
XISetMask (mask, XI_Leave);
#ifdef HAVE_XINPUT_2_2
/* enable touch event support if we're running on XInput 2.2 */