diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-16 15:39:25 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-16 15:39:25 -0500 |
| commit | 50d662681160c309ea86268c0d05794b87b75593 (patch) | |
| tree | f8ee31f3becc85527581072f9ab1ee6486f62465 /openbox/actions/cyclewindows.c | |
| parent | a93b00a5e93281c7c2c31112f0b6b827d605a19d (diff) | |
| parent | 8ada991d829671ab5e6dd4c5526b6a0238ba6a16 (diff) | |
Merge branch 'backport' into work
Conflicts:
obt/keyboard.c
obt/keyboard.h
openbox/event.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
Diffstat (limited to 'openbox/actions/cyclewindows.c')
| -rw-r--r-- | openbox/actions/cyclewindows.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |