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

clutter: Use event source directly for debug message

Browse Source 
No need to assign things to a separate variable there, let's just read
event->any.source directly instead.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1729>
This commit is contained in:
Jonas Dreßler 2021-02-11 17:30:17 +01:00 committed by Marge Bot
parent fe96778161
commit d5b69d9cc0
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1658,7 +1658,6 @@ _clutter_process_event_details (ClutterActor *stage,
case CLUTTER_TOUCHPAD_PINCH: case CLUTTER_TOUCHPAD_PINCH:
case CLUTTER_TOUCHPAD_SWIPE: case CLUTTER_TOUCHPAD_SWIPE:
{ {
ClutterActor *actor;
gfloat x, y; gfloat x, y;
clutter_event_get_coords (event, &x, &y); clutter_event_get_coords (event, &x, &y);
@ -1702,22 +1701,17 @@ _clutter_process_event_details (ClutterActor *stage,
break; break;
} }
actor = update_device_for_event (CLUTTER_STAGE (stage), event, TRUE); event->any.source =
if (actor == NULL) update_device_for_event (CLUTTER_STAGE (stage), event, TRUE);
break;
event->any.source = actor; if (event->any.source == NULL)
} break;
else
{
/* use the source already set in the synthetic event */
actor = event->any.source;
} }
CLUTTER_NOTE (EVENT, CLUTTER_NOTE (EVENT,
"Reactive event received at %.2f, %.2f - actor: %p", "Reactive event received at %.2f, %.2f - actor: %p",
x, y, x, y,
actor); event->any.source);
/* button presses and releases need a click count */ /* button presses and releases need a click count */
if (event->type == CLUTTER_BUTTON_PRESS || if (event->type == CLUTTER_BUTTON_PRESS ||
@ -1771,7 +1765,6 @@ _clutter_process_event_details (ClutterActor *stage,
case CLUTTER_TOUCH_CANCEL: case CLUTTER_TOUCH_CANCEL:
case CLUTTER_TOUCH_END: case CLUTTER_TOUCH_END:
{ {
ClutterActor *actor;
gfloat x, y; gfloat x, y;
clutter_event_get_coords (event, &x, &y); clutter_event_get_coords (event, &x, &y);
@ -1803,22 +1796,17 @@ _clutter_process_event_details (ClutterActor *stage,
break; break;
} }
actor = update_device_for_event (CLUTTER_STAGE (stage), event, TRUE); event->any.source =
if (actor == NULL) update_device_for_event (CLUTTER_STAGE (stage), event, TRUE);
break;
event->any.source = actor; if (event->any.source == NULL)
} break;
else
{
/* use the source already set in the synthetic event */
actor = event->any.source;
} }
CLUTTER_NOTE (EVENT, CLUTTER_NOTE (EVENT,
"Reactive event received at %.2f, %.2f - actor: %p", "Reactive event received at %.2f, %.2f - actor: %p",
x, y, x, y,
actor); event->any.source);
emit_touch_event (event, device); emit_touch_event (event, device);