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

keybindings: Don't bother saving num_lock / caps_lock in MetaDisplay

Browse Source 
It's unused outside of this one function.
This commit is contained in:
Jasper St. Pierre 2014-04-07 17:19:39 -04:00
parent 42bcad6549
commit b38b037092
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,8 +233,6 @@ struct _MetaDisplay
XModifierKeymap *modmap; XModifierKeymap *modmap;
unsigned int above_tab_keycode; unsigned int above_tab_keycode;
unsigned int ignored_modifier_mask; unsigned int ignored_modifier_mask;
unsigned int num_lock_mask;
unsigned int scroll_lock_mask;
unsigned int hyper_mask; unsigned int hyper_mask;
unsigned int super_mask; unsigned int super_mask;
unsigned int meta_mask; unsigned int meta_mask;

18
src/core/keybindings.c
View File

@ -200,6 +200,8 @@ reload_modmap (MetaDisplay *display)
XModifierKeymap *modmap; XModifierKeymap *modmap;
int map_size; int map_size;
int i; int i;
int num_lock_mask = 0;
int scroll_lock_mask = 0;
if (display->modmap) if (display->modmap)
XFreeModifiermap (display->modmap); XFreeModifiermap (display->modmap);
@ -210,8 +212,6 @@ reload_modmap (MetaDisplay *display)
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 */
display->num_lock_mask = 0;
display->scroll_lock_mask = 0;
display->meta_mask = 0; display->meta_mask = 0;
display->hyper_mask = 0; display->hyper_mask = 0;
display->super_mask = 0; display->super_mask = 0;
@ -255,11 +255,11 @@ reload_modmap (MetaDisplay *display)
* index * index
*/ */
display->num_lock_mask |= (1 << ( i / modmap->max_keypermod)); num_lock_mask |= (1 << ( i / modmap->max_keypermod));
} }
else if (syms[j] == XK_Scroll_Lock) else if (syms[j] == XK_Scroll_Lock)
{ {
display->scroll_lock_mask |= (1 << ( i / modmap->max_keypermod)); scroll_lock_mask |= (1 << ( i / modmap->max_keypermod));
} }
else if (syms[j] == XK_Super_L || else if (syms[j] == XK_Super_L ||
syms[j] == XK_Super_R) syms[j] == XK_Super_R)
@ -284,15 +284,15 @@ reload_modmap (MetaDisplay *display)
++i; ++i;
} }
display->ignored_modifier_mask = (display->num_lock_mask | display->ignored_modifier_mask = (num_lock_mask |
display->scroll_lock_mask | scroll_lock_mask |
LockMask); LockMask);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Ignoring modmask 0x%x num lock 0x%x scroll lock 0x%x hyper 0x%x super 0x%x meta 0x%x\n", "Ignoring modmask 0x%x num lock 0x%x scroll lock 0x%x hyper 0x%x super 0x%x meta 0x%x\n",
display->ignored_modifier_mask, display->ignored_modifier_mask,
display->num_lock_mask, num_lock_mask,
display->scroll_lock_mask, scroll_lock_mask,
display->hyper_mask, display->hyper_mask,
display->super_mask, display->super_mask,
display->meta_mask); display->meta_mask);
@ -3913,8 +3913,6 @@ meta_display_init_keys (MetaDisplay *display)
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;
display->num_lock_mask = 0;
display->scroll_lock_mask = 0;
display->hyper_mask = 0; display->hyper_mask = 0;
display->super_mask = 0; display->super_mask = 0;
display->meta_mask = 0; display->meta_mask = 0;