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

Use libX11's Xkb* API unconditionally

Browse Source 
At this point there shouldn't be any system capable of running mutter
that doesn't have it and we're introducing functionality like setting
the keymap that has an hard requirement on it.

https://bugzilla.gnome.org/show_bug.cgi?id=734301
This commit is contained in:
Rui Matos
2014-08-05 15:53:03 +02:00
parent e5c4fedd55
commit 6af48de0b8
6 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/keybindings.c
View File

@@ -51,9 +51,7 @@
#include <xkbcommon/xkbcommon.h>
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
#endif
#include "backends/x11/meta-backend-x11.h"
#include "x11/window-x11.h"
@@ -930,7 +928,6 @@ meta_display_process_mapping_event (MetaDisplay *display,
gboolean keymap_changed = FALSE;
gboolean modmap_changed = FALSE;
#ifdef HAVE_XKB
if (event->type == display->xkb_base_event_type)
{
meta_topic (META_DEBUG_KEYBINDINGS,
@@ -939,9 +936,7 @@ meta_display_process_mapping_event (MetaDisplay *display,
keymap_changed = TRUE;
modmap_changed = TRUE;
}
else
#endif
if (event->xmapping.request == MappingModifier)
else if (event->xmapping.request == MappingModifier)
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Received MappingModifier event, will reload modmap and redo keybindings\n");
@@ -3966,11 +3961,9 @@ meta_display_init_keys (MetaDisplay *display)
meta_prefs_add_listener (bindings_changed_callback, display);
#ifdef HAVE_XKB
/* meta_display_init_keys() should have already called XkbQueryExtension() */
if (display->xkb_base_event_type != -1)
XkbSelectEvents (display->xdisplay, XkbUseCoreKbd,
XkbNewKeyboardNotifyMask | XkbMapNotifyMask,
XkbNewKeyboardNotifyMask | XkbMapNotifyMask);
#endif
}