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

Drop xinput2 version checks

Browse Source 
We always request XInput >= 2.3 and fail otherwise, we don't need to
check for lower versions for touch events.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/672
This commit is contained in:
Carlos Garnacho 2019-03-26 14:49:47 +01:00 committed by Jonas Ådahl
parent a32559e5ae
commit f304fa4869
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter/x11/clutter-backend-x11.c
View File

@ -255,8 +255,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
"backend", backend_x11, "backend", backend_x11,
"opcode", event_base, "opcode", event_base,
NULL); NULL);
backend_x11->xi_minor = minor;
} }
} }
} }
@ -264,7 +262,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
if (backend_x11->device_manager == NULL) if (backend_x11->device_manager == NULL)
{ {
g_critical ("XI2 extension is missing."); g_critical ("XI2 extension is missing.");
backend_x11->xi_minor = -1;
} }
backend = CLUTTER_BACKEND (backend_x11); backend = CLUTTER_BACKEND (backend_x11);

1
clutter/clutter/x11/clutter-backend-x11.h
View File

@ -100,7 +100,6 @@ struct _ClutterBackendX11
Time last_event_time; Time last_event_time;
ClutterDeviceManager *device_manager; ClutterDeviceManager *device_manager;
int xi_minor;
XSettingsClient *xsettings; XSettingsClient *xsettings;
Window xsettings_xwin; Window xsettings_xwin;

10
clutter/clutter/x11/clutter-device-manager-xi2.c
View File

@ -1131,13 +1131,9 @@ clutter_device_manager_xi2_select_stage_events (ClutterDeviceManager *manager,
XISetMask (mask, XI_Enter); XISetMask (mask, XI_Enter);
XISetMask (mask, XI_Leave); XISetMask (mask, XI_Leave);
/* enable touch event support if we're running on XInput 2.2 */ XISetMask (mask, XI_TouchBegin);
if (backend_x11->xi_minor >= 2) XISetMask (mask, XI_TouchUpdate);
{ XISetMask (mask, XI_TouchEnd);
XISetMask (mask, XI_TouchBegin);
XISetMask (mask, XI_TouchUpdate);
XISetMask (mask, XI_TouchEnd);
}
xi_event_mask.deviceid = XIAllMasterDevices; xi_event_mask.deviceid = XIAllMasterDevices;
xi_event_mask.mask = mask; xi_event_mask.mask = mask;