diff options
Diffstat (limited to 'openbox/actions/desktop.c')
| -rw-r--r-- | openbox/actions/desktop.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c index a2d4be29..6c30d56d 100644 --- a/openbox/actions/desktop.c +++ b/openbox/actions/desktop.c @@ -312,17 +312,15 @@ static gboolean i_input_func(guint initial_state, } if (e->type == KeyPress) { + KeySym sym = obt_keyboard_keypress_to_keysym(e); + /* Escape cancels no matter what */ - if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) { + if (sym == XK_Escape) return FALSE; - } /* There were no modifiers and they pressed enter */ - else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) && - !initial_state) - { + else if (sym == XK_Return && !initial_state) return FALSE; - } } /* They released the modifiers */ else if (e->type == KeyRelease && initial_state && !(mods & initial_state)) |