isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-02 04:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends: Unify cursor visibility checks

Browse Source 
We are adding more to this logic, so make this check be its own
function that checks devices individually.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/285>
This commit is contained in:
Carlos Garnacho 2022-01-12 12:30:38 +01:00 committed by Marge Bot
parent 2dc3478dc2
commit f2ff9dcc01
1 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,30 +354,29 @@ meta_backend_monitors_changed (MetaBackend *backend)
} }
static inline gboolean static inline gboolean
check_has_pointing_device (ClutterSeat *seat) determine_hotplug_pointer_visibility (ClutterSeat *seat)
{ {
GList *l, *devices; g_autoptr (GList) devices = NULL;
gboolean found = FALSE; const GList *l;
gboolean has_touchscreen = FALSE, has_pointer = FALSE;
devices = clutter_seat_list_devices (seat); devices = clutter_seat_list_devices (seat);
for (l = devices; l; l = l->next) for (l = devices; l; l = l->next)
{ {
ClutterInputDevice *device = l->data; ClutterInputDevice *device = l->data;
ClutterInputDeviceType device_type;
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL) device_type = clutter_input_device_get_device_type (device);
continue;
if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
clutter_input_device_get_device_type (device) == CLUTTER_KEYBOARD_DEVICE)
continue;
found = TRUE; if (device_type == CLUTTER_TOUCHSCREEN_DEVICE)
break; has_touchscreen = TRUE;
if (device_type == CLUTTER_POINTER_DEVICE ||
device_type == CLUTTER_TOUCHPAD_DEVICE)
has_pointer = TRUE;
} }
g_list_free (devices); return has_pointer && !has_touchscreen;
return found;
} }
static void static void
@ -395,11 +394,12 @@ on_device_added (ClutterSeat *seat,
device_type = clutter_input_device_get_device_type (device); device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_TOUCHSCREEN_DEVICE) if (device_type == CLUTTER_TOUCHSCREEN_DEVICE ||
meta_cursor_tracker_set_pointer_visible (priv->cursor_tracker, FALSE); device_type == CLUTTER_POINTER_DEVICE)
else if (device_type == CLUTTER_POINTER_DEVICE && {
!clutter_seat_has_touchscreen (seat)) meta_cursor_tracker_set_pointer_visible (priv->cursor_tracker,
meta_cursor_tracker_set_pointer_visible (priv->cursor_tracker, TRUE); determine_hotplug_pointer_visibility (seat));
}
if (device_type == CLUTTER_TOUCHSCREEN_DEVICE || if (device_type == CLUTTER_TOUCHSCREEN_DEVICE ||
device_type == CLUTTER_TABLET_DEVICE || device_type == CLUTTER_TABLET_DEVICE ||
@ -430,27 +430,12 @@ on_device_removed (ClutterSeat *seat,
if (priv->current_device == device) if (priv->current_device == device)
{ {
MetaCursorTracker *cursor_tracker = priv->cursor_tracker; MetaCursorTracker *cursor_tracker = priv->cursor_tracker;
gboolean has_touchscreen, has_pointing_device;
ClutterInputDeviceType device_type;
g_clear_object (&priv->current_device); g_clear_object (&priv->current_device);
g_clear_handle_id (&priv->device_update_idle_id, g_source_remove); g_clear_handle_id (&priv->device_update_idle_id, g_source_remove);
device_type = clutter_input_device_get_device_type (device);
has_touchscreen = clutter_seat_has_touchscreen (seat);
if (device_type == CLUTTER_TOUCHSCREEN_DEVICE && has_touchscreen)
{
/* There's more touchscreens left, keep the pointer hidden */
meta_cursor_tracker_set_pointer_visible (cursor_tracker, FALSE);
}
else if (device_type != CLUTTER_KEYBOARD_DEVICE)
{
has_pointing_device = check_has_pointing_device (seat);
meta_cursor_tracker_set_pointer_visible (cursor_tracker, meta_cursor_tracker_set_pointer_visible (cursor_tracker,
has_pointing_device && determine_hotplug_pointer_visibility (seat));
!has_touchscreen);
}
} }
if (priv->current_device == device) if (priv->current_device == device)
@ -489,25 +474,9 @@ on_stage_shown_cb (MetaBackend *backend)
{ {
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
ClutterSeat *seat = priv->default_seat; ClutterSeat *seat = priv->default_seat;
g_autoptr (GList) devices = NULL;
const GList *l;
devices = clutter_seat_list_devices (seat); meta_cursor_tracker_set_pointer_visible (priv->cursor_tracker,
for (l = devices; l; l = l->next) determine_hotplug_pointer_visibility (seat));
{
ClutterInputDevice *device = l->data;
if (clutter_input_device_get_device_mode (device) ==
CLUTTER_INPUT_MODE_LOGICAL)
continue;
if (clutter_input_device_get_device_type (device) !=
CLUTTER_POINTER_DEVICE)
continue;
meta_cursor_tracker_set_pointer_visible (priv->cursor_tracker, TRUE);
break;
}
} }
static void static void