From b7ddaa5728b5449449e3ea14cf84252285bbc794 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 19 Feb 2010 16:58:33 -0500 Subject: get the modifier mask for a modifier key that is pressed/released more accurately, using the table we built already for other purposes --- openbox/actions/cyclewindows.c | 2 +- openbox/actions/desktop.c | 2 +- openbox/actions/directionalwindows.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'openbox') diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c index a038f31a..6d852fdf 100644 --- a/openbox/actions/cyclewindows.c +++ b/openbox/actions/cyclewindows.c @@ -181,7 +181,7 @@ static gboolean i_input_func(guint initial_state, if (e->type == KeyRelease) { /* remove from the state the mask of the modifier key being 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) { diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c index 10b31acd..cc0d9653 100644 --- a/openbox/actions/desktop.c +++ b/openbox/actions/desktop.c @@ -316,7 +316,7 @@ static gboolean i_input_func(guint initial_state, if (e->type == KeyRelease) { /* remove from the state the mask of the modifier key being 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) { diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c index f8393d2d..d67c3ef4 100644 --- a/openbox/actions/directionalwindows.c +++ b/openbox/actions/directionalwindows.c @@ -265,7 +265,7 @@ static gboolean i_input_func(guint initial_state, if (e->type == KeyRelease) { /* remove from the state the mask of the modifier key being 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) { -- cgit v1.2.3