X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Factions%2Fcyclewindows.c;h=52349091f8954689796212bf074e7de57d5509f5;hp=782a4c604ee79e4f7f89b43bf48b0ec0e494c9a7;hb=096dad0c6c027100494ede811b33cb8558d32e25;hpb=6c760c5a63a2e49bc2a5a4f39f8b4b9ed285bd7e

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 782a4c60..52349091 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -185,17 +185,17 @@ 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) {
             o->cancel = TRUE;
             o->state = e->xkey.state;
             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) {
             o->cancel = FALSE;
             o->state = e->xkey.state;
             return FALSE;