nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

yeah.. so much for lucky 6000

Browse source
This commit is contained in:
Dana Jansens 2007-05-03 04:23:55 +00:00
parent 34b89d8f71
commit d389e67d22
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
openbox/keyboard.c
View file

@ -240,22 +240,24 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
gboolean done = FALSE; gboolean done = FALSE;
gboolean cancel = FALSE; gboolean cancel = FALSE;
if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) if (istate.active) {
done = TRUE; if ((e->type == KeyRelease && !(istate.state & e->xkey.state)))
else if (e->type == KeyPress) { done = TRUE;
/*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) else if (e->type == KeyPress) {
done = TRUE; /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) done = TRUE;
cancel = done = TRUE; else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
} else if (e->type == ButtonPress) cancel = done = TRUE;
cancel = done = TRUE; } else if (e->type == ButtonPress)
cancel = done = TRUE;
if (done) { if (done) {
keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time, TRUE); keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
handled = TRUE; handled = TRUE;
} else } else
*client = istate.client; *client = istate.client;
}
return handled; return handled;
} }
@ -324,8 +326,6 @@ void keyboard_startup(gboolean reconfig)
void keyboard_shutdown(gboolean reconfig) void keyboard_shutdown(gboolean reconfig)
{ {
GSList *it;
if (!reconfig) if (!reconfig)
client_remove_destructor(keyboard_interactive_end_client); client_remove_destructor(keyboard_interactive_end_client);