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

clutter/main: Drop dead code branches

Browse Source 
We shouldn't get an input event that has not a device.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
This commit is contained in:
Carlos Garnacho 2020-06-05 18:31:55 +02:00 committed by Jonas Ådahl
parent 6e49ad436d
commit 90001f09b3
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1774,25 +1774,9 @@ _clutter_process_event_details (ClutterActor *stage,
break; break;
} }
/* if the backend provides a device then we should
* already have everything we need to update it and
* get the actor underneath
*/
if (device != NULL)
{
actor = clutter_input_device_update (device, NULL, actor = clutter_input_device_update (device, NULL,
CLUTTER_STAGE (stage), CLUTTER_STAGE (stage),
TRUE); TRUE);
}
else
{
CLUTTER_NOTE (EVENT, "No device found: picking");
actor = _clutter_stage_do_pick (CLUTTER_STAGE (stage),
x, y,
CLUTTER_PICK_REACTIVE);
}
if (actor == NULL) if (actor == NULL)
break; break;
@ -1900,21 +1884,9 @@ _clutter_process_event_details (ClutterActor *stage,
break; break;
} }
if (device != NULL)
{
actor = clutter_input_device_update (device, sequence, actor = clutter_input_device_update (device, sequence,
CLUTTER_STAGE (stage), CLUTTER_STAGE (stage),
TRUE); TRUE);
}
else
{
CLUTTER_NOTE (EVENT, "No device found: picking");
actor = _clutter_stage_do_pick (CLUTTER_STAGE (stage),
x, y,
CLUTTER_PICK_REACTIVE);
}
if (actor == NULL) if (actor == NULL)
break; break;