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

get the modifier mask for a modifier key that is pressed/released more accurately, using the table we built already for other purposes

Browse source
This commit is contained in:
Dana Jansens 2010-02-19 16:58:33 -05:00
parent 4418e6988b
commit b7ddaa5728
5 changed files with 41 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
obt/keyboard.c
View file

@ -191,23 +191,40 @@ void xim_init(void)
g_free(aname); g_free(aname);
} }
guint obt_keyboard_keycode_to_modmask(guint keycode) ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e)
{ {
gint i, j; KeySym sym;
guint mask = 0;
if (keycode == NoSymbol) return 0; g_return_val_if_fail(e->type == KeyPress || e->type == KeyRelease,
OBT_KEYBOARD_MODKEY_NONE);
/* go through each of the modifier masks (eg ShiftMask, CapsMask...) */ XLookupString(&e->xkey, NULL, 0, &sym, NULL);
for (i = 0; i < NUM_MASKS; ++i) {
/* go through each keycode that is bound to the mask */ switch (sym) {
for (j = 0; j < modmap->max_keypermod; ++j) { case XK_Num_Lock: return OBT_KEYBOARD_MODKEY_NUMLOCK;
/* compare with a keycode that is bound to the mask (i) */ case XK_Scroll_Lock: return OBT_KEYBOARD_MODKEY_SCROLLLOCK;
if (modmap->modifiermap[i*modmap->max_keypermod + j] == keycode) case XK_Caps_Lock: return OBT_KEYBOARD_MODKEY_SHIFT;
mask |= nth_mask(i); case XK_Alt_L:
} case XK_Alt_R: return OBT_KEYBOARD_MODKEY_ALT;
case XK_Super_L:
case XK_Super_R: return OBT_KEYBOARD_MODKEY_SUPER;
case XK_Hyper_L:
case XK_Hyper_R: return OBT_KEYBOARD_MODKEY_SUPER;
case XK_Meta_L:
case XK_Meta_R: return OBT_KEYBOARD_MODKEY_SUPER;
case XK_Control_L:
case XK_Control_R: return OBT_KEYBOARD_MODKEY_CONTROL;
case XK_Shift_L:
case XK_Shift_R: return OBT_KEYBOARD_MODKEY_SHIFT;
default: return OBT_KEYBOARD_MODKEY_NONE;
} }
return mask; }
guint obt_keyboard_keyevent_to_modmask(XEvent *e)
{
g_return_val_if_fail(e->type == KeyPress || e->type == KeyRelease, 0);
return obt_keyboard_modkey_to_modmask(obt_keyboard_keyevent_to_modkey(e));
} }
guint obt_keyboard_only_modmasks(guint mask) guint obt_keyboard_only_modmasks(guint mask)

11
obt/keyboard.h
View file

@ -28,6 +28,7 @@ G_BEGIN_DECLS
/*! 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. */ except for CapsLock, Shift, and Control. */
typedef enum { typedef enum {
OBT_KEYBOARD_MODKEY_NONE,
OBT_KEYBOARD_MODKEY_CAPSLOCK, OBT_KEYBOARD_MODKEY_CAPSLOCK,
OBT_KEYBOARD_MODKEY_NUMLOCK, OBT_KEYBOARD_MODKEY_NUMLOCK,
OBT_KEYBOARD_MODKEY_SCROLLLOCK, OBT_KEYBOARD_MODKEY_SCROLLLOCK,
@ -45,9 +46,10 @@ typedef struct _ObtIC ObtIC;
void obt_keyboard_reload(void); void obt_keyboard_reload(void);
/*! Get the modifier mask(s) for a KeyCode. (eg. a keycode bound to Alt_L could /*! Get the modifier mask(s) for a keyboard event.
return a mask of (Mod1Mask | Mask3Mask)) */ (eg. a keycode bound to Alt_L could return a mask of (Mod1Mask | Mask3Mask))
guint obt_keyboard_keycode_to_modmask(guint keycode); */
guint obt_keyboard_keyevent_to_modmask(XEvent *e);
/*! Strip off all modifiers except for the modifier keys. This strips stuff /*! Strip off all modifiers except for the modifier keys. This strips stuff
like Button1Mask, and also LockMask, NumlockMask, and ScrolllockMask */ like Button1Mask, and also LockMask, NumlockMask, and ScrolllockMask */
@ -57,6 +59,9 @@ guint obt_keyboard_only_modmasks(guint mask);
right keys when there are both. */ right keys when there are both. */
guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key); guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key);
/*! Get the modifier key which was pressed or released in a keyboard event */
ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e);
/*! Convert a KeySym to all the KeyCodes which generate it. */ /*! Convert a KeySym to all the KeyCodes which generate it. */
KeyCode* obt_keyboard_keysym_to_keycode(KeySym sym); KeyCode* obt_keyboard_keysym_to_keycode(KeySym sym);

2
openbox/actions/cyclewindows.c
View file

@ -181,7 +181,7 @@ static gboolean i_input_func(guint initial_state,
if (e->type == KeyRelease) { if (e->type == KeyRelease) {
/* remove from the state the mask of the modifier key being /* remove from the state the mask of the modifier key being
released, if it is a modifier key being released that is */ released, if it is a modifier key being released that is */
mods &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode); mods &= ~obt_keyboard_keyevent_to_modmask(e);
} }
if (e->type == KeyPress) { if (e->type == KeyPress) {

2
openbox/actions/desktop.c
View file

@ -316,7 +316,7 @@ static gboolean i_input_func(guint initial_state,
if (e->type == KeyRelease) { if (e->type == KeyRelease) {
/* remove from the state the mask of the modifier key being /* remove from the state the mask of the modifier key being
released, if it is a modifier key being released that is */ released, if it is a modifier key being released that is */
mods &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode); mods &= ~obt_keyboard_keyevent_to_modmask(e);
} }
if (e->type == KeyPress) { if (e->type == KeyPress) {

2
openbox/actions/directionalwindows.c
View file

@ -265,7 +265,7 @@ static gboolean i_input_func(guint initial_state,
if (e->type == KeyRelease) { if (e->type == KeyRelease) {
/* remove from the state the mask of the modifier key being /* remove from the state the mask of the modifier key being
released, if it is a modifier key being released that is */ released, if it is a modifier key being released that is */
mods &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode); mods &= ~obt_keyboard_keyevent_to_modmask(e);
} }
if (e->type == KeyPress) { if (e->type == KeyPress) {