isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-10-06 22:27:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Move check for device type into remove_device_for_event()

Browse Source 
We'll call this function from a few more places for the
CLUTTER_DEVICE_REMOVED case, so move the check for which devices are
valid into the function itself to avoid having to check everywhere.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2696>
This commit is contained in:
Jonas Dreßler 2022-11-16 13:22:53 +01:00 committed by Marge Bot
parent 425e80adc2
commit 2d85e84136
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clutter/clutter/clutter-main.c
View File

@ -709,15 +709,28 @@ update_device_for_event (ClutterStage *stage,
} }
static void static void
remove_device_for_event (ClutterStage *stage, maybe_remove_device_for_event (ClutterStage *stage,
ClutterEvent *event, ClutterEvent *event,
gboolean emit_crossing) gboolean emit_crossing)
{ {
ClutterInputDevice *device = clutter_event_get_device (event); ClutterInputDevice *device = clutter_event_get_device (event);
ClutterEventSequence *sequence = clutter_event_get_event_sequence (event); ClutterEventSequence *sequence = clutter_event_get_event_sequence (event);
graphene_point_t point; graphene_point_t point;
uint32_t time; uint32_t time;
if (event->type == CLUTTER_DEVICE_REMOVED)
{
ClutterInputDeviceType device_type =
clutter_input_device_get_device_type (device);
if (device_type != CLUTTER_POINTER_DEVICE &&
device_type != CLUTTER_TABLET_DEVICE &&
device_type != CLUTTER_PEN_DEVICE &&
device_type != CLUTTER_ERASER_DEVICE &&
device_type != CLUTTER_CURSOR_DEVICE)
return;
}
clutter_event_get_coords (event, &point.x, &point.y); clutter_event_get_coords (event, &point.x, &point.y);
time = clutter_event_get_time (event); time = clutter_event_get_time (event);
@ -793,7 +806,7 @@ clutter_do_event (ClutterEvent *event)
event->type == CLUTTER_TOUCH_CANCEL) event->type == CLUTTER_TOUCH_CANCEL)
{ {
_clutter_stage_process_queued_events (event->any.stage); _clutter_stage_process_queued_events (event->any.stage);
remove_device_for_event (event->any.stage, event, TRUE); maybe_remove_device_for_event (event->any.stage, event, TRUE);
} }
return; return;
@ -901,7 +914,7 @@ _clutter_process_event_details (ClutterActor *stage,
if (event->type == CLUTTER_TOUCH_END || if (event->type == CLUTTER_TOUCH_END ||
event->type == CLUTTER_TOUCH_CANCEL) event->type == CLUTTER_TOUCH_CANCEL)
remove_device_for_event (CLUTTER_STAGE (stage), event, TRUE); maybe_remove_device_for_event (CLUTTER_STAGE (stage), event, TRUE);
break; break;
} }
@ -917,19 +930,8 @@ _clutter_process_event_details (ClutterActor *stage,
break; break;
case CLUTTER_DEVICE_REMOVED: case CLUTTER_DEVICE_REMOVED:
{ maybe_remove_device_for_event (CLUTTER_STAGE (stage), event, TRUE);
ClutterInputDeviceType device_type; break;
device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE ||
device_type == CLUTTER_TABLET_DEVICE ||
device_type == CLUTTER_PEN_DEVICE ||
device_type == CLUTTER_ERASER_DEVICE ||
device_type == CLUTTER_CURSOR_DEVICE)
remove_device_for_event (CLUTTER_STAGE (stage), event, TRUE);
break;
}
case CLUTTER_DEVICE_ADDED: case CLUTTER_DEVICE_ADDED:
case CLUTTER_EVENT_LAST: case CLUTTER_EVENT_LAST: