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

core: Move display->current_time out of meta_display_handle_event()

Browse Source 
While this updates the display current time a bit earlier, it allows
for early returns in the big bad function.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3420>
This commit is contained in:
Carlos Garnacho 2023-11-22 00:36:44 +01:00 committed by Robert Mader
parent 93a9e7f3f4
commit c496b17b3d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/events.c
View File

@ -237,7 +237,6 @@ meta_display_handle_event (MetaDisplay *display,
ClutterEventSequence *sequence; ClutterEventSequence *sequence;
ClutterEventType event_type; ClutterEventType event_type;
gboolean has_grab; gboolean has_grab;
uint32_t time_ms;
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
MetaWaylandCompositor *wayland_compositor; MetaWaylandCompositor *wayland_compositor;
MetaWaylandTextInput *wayland_text_input = NULL; MetaWaylandTextInput *wayland_text_input = NULL;
@ -261,7 +260,6 @@ meta_display_handle_event (MetaDisplay *display,
sequence = clutter_event_get_event_sequence (event); sequence = clutter_event_get_event_sequence (event);
event_type = clutter_event_type (event); event_type = clutter_event_type (event);
time_ms = clutter_event_get_time (event);
if (meta_display_process_captured_input (display, event)) if (meta_display_process_captured_input (display, event))
{ {
@ -373,8 +371,6 @@ meta_display_handle_event (MetaDisplay *display,
window = get_window_for_event (display, event, event_actor); window = get_window_for_event (display, event, event_actor);
display->current_time = time_ms;
if (window && !window->override_redirect && if (window && !window->override_redirect &&
(event_type == CLUTTER_KEY_PRESS || (event_type == CLUTTER_KEY_PRESS ||
event_type == CLUTTER_BUTTON_PRESS || event_type == CLUTTER_BUTTON_PRESS ||
@ -522,6 +518,9 @@ meta_display_handle_event (MetaDisplay *display,
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
if (wayland_compositor && !bypass_wayland) if (wayland_compositor && !bypass_wayland)
{ {
uint32_t time_ms;
time_ms = clutter_event_get_time (event);
if (window && event_type == CLUTTER_MOTION && if (window && event_type == CLUTTER_MOTION &&
time_ms != CLUTTER_CURRENT_TIME) time_ms != CLUTTER_CURRENT_TIME)
meta_window_check_alive_on_event (window, time_ms); meta_window_check_alive_on_event (window, time_ms);
@ -531,7 +530,6 @@ meta_display_handle_event (MetaDisplay *display,
} }
#endif #endif
display->current_time = META_CURRENT_TIME;
return bypass_clutter; return bypass_clutter;
} }
@ -541,8 +539,13 @@ event_callback (const ClutterEvent *event,
gpointer data) gpointer data)
{ {
MetaDisplay *display = data; MetaDisplay *display = data;
gboolean retval;
return meta_display_handle_event (display, event, event_actor); display->current_time = clutter_event_get_time (event);
retval = meta_display_handle_event (display, event, event_actor);
display->current_time = META_CURRENT_TIME;
return retval;
} }
void void