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

backends: Do not use device IDs on idle monitors

Browse Source 
Device IDs are somewhat x11 specific, seems better to avoid those
on public API. We can rely everywhere on ClutterInputDevice, so use
it instead.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/852
This commit is contained in:
Carlos Garnacho
2019-10-09 16:03:24 +02:00
parent d3160d095d
commit e9fbbd5853
8 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/events.c
View File

@ -103,7 +103,6 @@ handle_idletime_for_event (const ClutterEvent *event)
{
ClutterInputDevice *device, *source_device;
MetaIdleMonitor *core_monitor, *device_monitor;
int device_id;
device = clutter_event_get_device (event);
if (device == NULL)
@ -118,10 +117,8 @@ handle_idletime_for_event (const ClutterEvent *event)
event->type == CLUTTER_DELETE)
return;
device_id = clutter_input_device_get_device_id (device);
core_monitor = meta_idle_monitor_get_core ();
device_monitor = meta_idle_monitor_get_for_device (device_id);
device_monitor = meta_idle_monitor_get_for_device (device);
meta_idle_monitor_reset_idletime (core_monitor);
meta_idle_monitor_reset_idletime (device_monitor);
@ -129,8 +126,7 @@ handle_idletime_for_event (const ClutterEvent *event)
source_device = clutter_event_get_source_device (event);
if (source_device != device)
{
device_id = clutter_input_device_get_device_id (device);
device_monitor = meta_idle_monitor_get_for_device (device_id);
device_monitor = meta_idle_monitor_get_for_device (source_device);
meta_idle_monitor_reset_idletime (device_monitor);
}
}