isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Eliminate the use of the stored modmap

Browse Source 
We can simply check the XKB keysym here to see if it's a modifier.
This commit is contained in:
Jasper St. Pierre 2014-04-07 15:41:37 -04:00
parent b38b037092
commit 15cf804dbc
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/display-private.h
View File

@ -230,7 +230,6 @@ struct _MetaDisplay
int max_keycode; int max_keycode;
KeySym *keymap; KeySym *keymap;
int keysyms_per_keycode; int keysyms_per_keycode;
XModifierKeymap *modmap;
unsigned int above_tab_keycode; unsigned int above_tab_keycode;
unsigned int ignored_modifier_mask; unsigned int ignored_modifier_mask;
unsigned int hyper_mask; unsigned int hyper_mask;

55
src/core/keybindings.c
View File

@ -48,6 +48,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <xkbcommon/xkbcommon.h>
#ifdef HAVE_XKB #ifdef HAVE_XKB
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#endif #endif
@ -203,12 +205,7 @@ reload_modmap (MetaDisplay *display)
int num_lock_mask = 0; int num_lock_mask = 0;
int scroll_lock_mask = 0; int scroll_lock_mask = 0;
if (display->modmap)
XFreeModifiermap (display->modmap);
modmap = XGetModifierMapping (display->xdisplay); modmap = XGetModifierMapping (display->xdisplay);
display->modmap = modmap;
display->ignored_modifier_mask = 0; display->ignored_modifier_mask = 0;
/* Multiple bits may get set in each of these */ /* Multiple bits may get set in each of these */
@ -296,6 +293,8 @@ reload_modmap (MetaDisplay *display)
display->hyper_mask, display->hyper_mask,
display->super_mask, display->super_mask,
display->meta_mask); display->meta_mask);
XFreeModifiermap (modmap);
} }
/* Original code from gdk_x11_keymap_get_entries_for_keyval() in /* Original code from gdk_x11_keymap_get_entries_for_keyval() in
@ -1017,9 +1016,6 @@ meta_display_shutdown_keys (MetaDisplay *display)
if (display->keymap) if (display->keymap)
meta_XFree (display->keymap); meta_XFree (display->keymap);
if (display->modmap)
XFreeModifiermap (display->modmap);
g_hash_table_destroy (display->key_bindings_index); g_hash_table_destroy (display->key_bindings_index);
g_hash_table_destroy (display->key_bindings); g_hash_table_destroy (display->key_bindings);
} }
@ -1610,28 +1606,28 @@ meta_display_unfreeze_keyboard (MetaDisplay *display, guint32 timestamp)
} }
static gboolean static gboolean
is_modifier (MetaDisplay *display, is_modifier (xkb_keysym_t keysym)
unsigned int keycode)
{ {
int i; switch (keysym)
int map_size;
gboolean retval = FALSE;
g_assert (display->modmap);
map_size = 8 * display->modmap->max_keypermod;
i = 0;
while (i < map_size)
{ {
if (keycode == display->modmap->modifiermap[i]) case XKB_KEY_Shift_L:
{ case XKB_KEY_Shift_R:
retval = TRUE; case XKB_KEY_Control_L:
break; case XKB_KEY_Control_R:
} case XKB_KEY_Caps_Lock:
++i; case XKB_KEY_Shift_Lock:
case XKB_KEY_Meta_L:
case XKB_KEY_Meta_R:
case XKB_KEY_Alt_L:
case XKB_KEY_Alt_R:
case XKB_KEY_Super_L:
case XKB_KEY_Super_R:
case XKB_KEY_Hyper_L:
case XKB_KEY_Hyper_R:
return TRUE;
default:
return FALSE;
} }
return retval;
} }
static void static void
@ -2009,7 +2005,7 @@ process_keyboard_move_grab (MetaDisplay *display,
return TRUE; return TRUE;
/* don't end grab on modifier key presses */ /* don't end grab on modifier key presses */
if (is_modifier (display, event->hardware_keycode)) if (is_modifier (event->keyval))
return TRUE; return TRUE;
meta_window_get_position (window, &x, &y); meta_window_get_position (window, &x, &y);
@ -2251,7 +2247,7 @@ process_keyboard_resize_grab (MetaDisplay *display,
return TRUE; return TRUE;
/* don't end grab on modifier key presses */ /* don't end grab on modifier key presses */
if (is_modifier (display, event->hardware_keycode)) if (is_modifier (event->keyval))
return TRUE; return TRUE;
if (event->keyval == CLUTTER_KEY_Escape) if (event->keyval == CLUTTER_KEY_Escape)
@ -3909,7 +3905,6 @@ meta_display_init_keys (MetaDisplay *display)
/* Keybindings */ /* Keybindings */
display->keymap = NULL; display->keymap = NULL;
display->keysyms_per_keycode = 0; display->keysyms_per_keycode = 0;
display->modmap = NULL;
display->min_keycode = 0; display->min_keycode = 0;
display->max_keycode = 0; display->max_keycode = 0;
display->ignored_modifier_mask = 0; display->ignored_modifier_mask = 0;