isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends: Keep cursor hidden on tablet input on Wayland

Browse Source 
Tablets have their own cursor, in order to avoid confusions just
hide the regular pointer like we do on touchscreens, so there's
the illusion that there is a single cursor.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/75
This commit is contained in:
Carlos Garnacho 2018-11-02 15:50:12 +01:00
parent 0fea0e383c
commit 83f496229b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backends/meta-backend.c
View File

@ -309,6 +309,9 @@ check_has_pointing_device (ClutterDeviceManager *manager)
if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE || if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE) clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE)
continue; continue;
if (clutter_input_device_get_device_type (device) == CLUTTER_TABLET_DEVICE &&
meta_is_wayland_compositor ())
continue;
return TRUE; return TRUE;
} }
@ -328,8 +331,12 @@ check_pointer_visibility (ClutterDeviceManager *manager)
{ {
ClutterInputDevice *device = devices->data; ClutterInputDevice *device = devices->data;
if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER && if (clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_SLAVE)
clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE) continue;
if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
(clutter_input_device_get_device_type (device) == CLUTTER_TABLET_DEVICE &&
meta_is_wayland_compositor ()))
{ {
pointer_visible = FALSE; pointer_visible = FALSE;
break; break;
@ -1032,6 +1039,12 @@ update_last_device (MetaBackend *backend)
{ {
case CLUTTER_KEYBOARD_DEVICE: case CLUTTER_KEYBOARD_DEVICE:
break; break;
case CLUTTER_TABLET_DEVICE:
if (meta_is_wayland_compositor ())
meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
else
meta_cursor_tracker_set_pointer_visible (cursor_tracker, TRUE);
break;
case CLUTTER_TOUCHSCREEN_DEVICE: case CLUTTER_TOUCHSCREEN_DEVICE:
meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE); meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
break; break;