X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Factions%2Fcyclewindows.c;h=6d8478374590f6728026dd6e7db81eae0bf3bf4e;hp=5354f087c55254f5fdd5fd700a63e88a93ac6cc7;hb=50d662681160c309ea86268c0d05794b87b75593;hpb=a93b00a5e93281c7c2c31112f0b6b827d605a19d diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c index 5354f087..6d847837 100644 --- 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);