isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends/x11: Rename function to reset X11 cached current monitor info

Browse Source 
This is done from the backend X11 connection, but needs directing at times
from the frontend X11 connection. Commit 5a8509f895 added a XEvent
argument presumably for possible future expansions that did never come.

Since this function is nothing about events, drop the XEvent argument and
make the name a little bit more ad-hoc (according to what it does, at
least).

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3153>
This commit is contained in:
Carlos Garnacho 2023-08-07 17:30:39 +02:00
parent d5938958c0
commit ca3256ee97
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backends/x11/meta-backend-x11.c
View File

@ -523,9 +523,8 @@ on_monitors_changed (MetaMonitorManager *manager,
MetaBackend *backend) MetaBackend *backend)
{ {
MetaBackendX11 *x11 = META_BACKEND_X11 (backend); MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
priv->cached_current_logical_monitor = NULL; meta_backend_x11_reset_cached_logical_monitor (x11);
} }
static void static void
@ -801,10 +800,10 @@ meta_backend_x11_get_keymap_layout_group (MetaBackend *backend)
} }
void void
meta_backend_x11_handle_event (MetaBackendX11 *x11, meta_backend_x11_reset_cached_logical_monitor (MetaBackendX11 *backend_x11)
XEvent *xevent)
{ {
MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11); MetaBackendX11Private *priv =
meta_backend_x11_get_instance_private (backend_x11);
priv->cached_current_logical_monitor = NULL; priv->cached_current_logical_monitor = NULL;
} }

5
src/backends/x11/meta-backend-x11.h
View File

@ -55,9 +55,6 @@ Window meta_backend_x11_get_root_xwindow (MetaBackendX11 *backend_x11);
Window meta_backend_x11_get_xwindow (MetaBackendX11 *backend); Window meta_backend_x11_get_xwindow (MetaBackendX11 *backend);
void meta_backend_x11_handle_event (MetaBackendX11 *x11,
XEvent *xevent);
uint8_t meta_backend_x11_get_xkb_event_base (MetaBackendX11 *x11); uint8_t meta_backend_x11_get_xkb_event_base (MetaBackendX11 *x11);
void meta_backend_x11_reload_cursor (MetaBackendX11 *x11); void meta_backend_x11_reload_cursor (MetaBackendX11 *x11);
@ -65,3 +62,5 @@ void meta_backend_x11_reload_cursor (MetaBackendX11 *x11);
void meta_backend_x11_sync_pointer (MetaBackendX11 *backend_x11); void meta_backend_x11_sync_pointer (MetaBackendX11 *backend_x11);
MetaX11Barriers * meta_backend_x11_get_barriers (MetaBackendX11 *backend_x11); MetaX11Barriers * meta_backend_x11_get_barriers (MetaBackendX11 *backend_x11);
void meta_backend_x11_reset_cached_logical_monitor (MetaBackendX11 *backend_x11);

2
src/x11/events.c
View File

@ -1922,7 +1922,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
display->current_time = event_get_time (x11_display, event); display->current_time = event_get_time (x11_display, event);
if (META_IS_BACKEND_X11 (backend)) if (META_IS_BACKEND_X11 (backend))
meta_backend_x11_handle_event (META_BACKEND_X11 (backend), event); meta_backend_x11_reset_cached_logical_monitor (META_BACKEND_X11 (backend));
if (x11_display->focused_by_us && if (x11_display->focused_by_us &&
event->xany.serial > x11_display->focus_serial && event->xany.serial > x11_display->focus_serial &&