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

keybindings: Move X11 bits to a separate header

Browse Source 
Reduces the noise in terms of ifdef and makes it much easier
to spot which X11 bits are still mixed in the generic
keybindings file

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3776>
This commit is contained in:
Bilal Elmoussaoui
2024-06-10 12:06:16 +02:00
parent beae45a060
commit fd9957b81a
11 changed files with 575 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/window.c
View File

@ -87,6 +87,7 @@
#include "x11/meta-x11-display-private.h"
#include "x11/meta-x11-frame.h"
#include "x11/meta-x11-group-private.h"
#include "x11/meta-x11-keybindings-private.h"
#include "x11/window-props.h"
#include "x11/window-x11-private.h"
#include "x11/window-x11.h"
@ -5274,10 +5275,12 @@ meta_window_set_focused_internal (MetaWindow *window,
if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
!meta_prefs_get_raise_on_click())
{
meta_display_ungrab_focus_window_button (window->display, window);
meta_x11_keybindings_ungrab_focus_window_button (&window->display->key_binding_manager,
window);
/* Since we ungrab with XIAnyModifier above, all button
grabs go way so we need to re-grab the window buttons. */
meta_display_grab_window_buttons (window->display, window);
meta_x11_keybindings_grab_window_buttons (&window->display->key_binding_manager,
window);
}
#endif
@ -5303,7 +5306,7 @@ meta_window_set_focused_internal (MetaWindow *window,
#ifdef HAVE_X11
if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
!meta_prefs_get_raise_on_click ())
meta_display_grab_focus_window_button (window->display, window);
meta_x11_keybindings_grab_focus_window_button (&window->display->key_binding_manager, window);
#endif
}
}