X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Factions%2Fdirectionalwindows.c;h=7ede33339314e948cc8f615ed944f0533e33b318;hp=e8410c96cc217fb954dc611bb771ee0f3b699748;hb=096dad0c6c027100494ede811b33cb8558d32e25;hpb=6c760c5a63a2e49bc2a5a4f39f8b4b9ed285bd7e diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c index e8410c96..7ede3333 100644 --- a/openbox/actions/directionalwindows.c +++ b/openbox/actions/directionalwindows.c @@ -269,16 +269,16 @@ 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) { end_cycle(TRUE, e->xkey.state, options); 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) { end_cycle(FALSE, e->xkey.state, options); return FALSE; }