nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignore control_l/r shift_l/r and caps_lock bindings. Control, Shift and NumLock are hardcoded to the modmasks for them.

Browse source
This commit is contained in:
Dana Jansens 2007-06-05 18:48:14 +00:00
parent b1c209c174
commit ca0c927201
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/modkeys.c
View file

@ -77,6 +77,11 @@ void modkeys_startup(gboolean reconfigure)
}
}
}
/* CapsLock, Shift, and Control are special and hard-coded */
modkeys_keys[OB_MODKEY_KEY_CAPSLOCK] = LockMask;
modkeys_keys[OB_MODKEY_KEY_SHIFT] = ShiftMask;
modkeys_keys[OB_MODKEY_KEY_CONTROL] = ControlMask;
}
void modkeys_shutdown(gboolean reconfigure)
@ -130,12 +135,6 @@ static void set_modkey_mask(guchar mask, KeySym sym)
modkeys_keys[OB_MODKEY_KEY_NUMLOCK] |= mask;
else if (sym == XK_Scroll_Lock)
modkeys_keys[OB_MODKEY_KEY_SCROLLLOCK] |= mask;
else if (sym == XK_Caps_Lock)
modkeys_keys[OB_MODKEY_KEY_CAPSLOCK] |= mask;
else if (sym == XK_Shift_L || sym == XK_Shift_R)
modkeys_keys[OB_MODKEY_KEY_SHIFT] |= mask;
else if (sym == XK_Control_L || sym == XK_Control_R)
modkeys_keys[OB_MODKEY_KEY_CONTROL] |= mask;
else if (sym == XK_Super_L || sym == XK_Super_R)
modkeys_keys[OB_MODKEY_KEY_SUPER] |= mask;
else if (sym == XK_Hyper_L || sym == XK_Hyper_R)
@ -144,6 +143,7 @@ static void set_modkey_mask(guchar mask, KeySym sym)
modkeys_keys[OB_MODKEY_KEY_ALT] |= mask;
else if (sym == XK_Meta_L || sym == XK_Meta_R)
modkeys_keys[OB_MODKEY_KEY_META] |= mask;
/* CapsLock, Shift, and Control are special and hard-coded */
}
KeyCode modkeys_sym_to_code(KeySym sym)

3
openbox/modkeys.h
View file

@ -22,7 +22,8 @@
#include <glib.h>
#include <X11/Xlib.h>
/*! These keys are bound to the modifier masks in any fashion */
/*! These keys are bound to the modifier masks in any fashion,
except for CapsLock, Shift, and Control. */
typedef enum {
OB_MODKEY_KEY_CAPSLOCK,
OB_MODKEY_KEY_NUMLOCK,