Make the Focus action stop all interactive actions (Fixes bug #4436)

[chaz/openbox] / openbox / actions / cyclewindows.c

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 6fba17ffb1f3113ffd0b8d26a936cb91ff2f57d0..32d6a4535dfdd3a9a7f18394be17233f6cbfab07 100644 (file)
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -146,13 +146,13 @@ static gboolean i_input_func(guint initial_state,
 {
     if (e->type == KeyPress) {
         /* Escape cancels no matter what */
-        if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+        if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) {
             end_cycle(TRUE, e->xkey.state, options);
             return FALSE;
         }
 
         /* There were no modifiers and they pressed enter */
-        else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) &&
+        else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) &&
                  !initial_state)
         {
             end_cycle(FALSE, e->xkey.state, options);