X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=7f930f8f574ca55191cb2347c17a4ffd5a78bad7;hb=b2b8ad92bfbc60392737fe9945e719b238d34933;hp=05d40cd06b1801c8501c4e1a0818a0d1d4b5d90b;hpb=055aa5cd7411c4563956e376523219afc6198ce1;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 05d40cd0..7f930f8f 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -1,6 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- keyboard.c for the Openbox window manager + Copyright (c) 2004 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -119,7 +120,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return FALSE; if ((t = tree_find(tree, &conflict)) != NULL) { - /* already bound to something, use the existing tree */ + /* already bound to something, use the existing tree */ tree_destroy(tree); tree = NULL; } else @@ -229,9 +230,9 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) !(s->state & e->xkey.state))) done = TRUE; else if (e->type == KeyPress) { - if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) + /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) done = TRUE; - else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) + else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) cancel = done = TRUE; } if (done) {