diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-07 00:49:08 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:14:44 -0500 |
| commit | 95ee6b103f116e34062bf5e1ad1cb8b0f23e7231 (patch) | |
| tree | 1da7b52939815ee6915830e505f7514a570823de /openbox/event.c | |
| parent | 0e9cfd7c77d8608a4be29f43413575d9553bf21c (diff) | |
prompt to kill windows when they are not responding
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/openbox/event.c b/openbox/event.c index 3476f627..4fbb97c6 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -86,7 +86,7 @@ static void event_process(const XEvent *e, gpointer data); static void event_handle_root(XEvent *e); static gboolean event_handle_menu_input(XEvent *e); static void event_handle_menu(ObMenuFrame *frame, XEvent *e); -static void event_handle_prompt(ObPrompt *p, XEvent *e); +static gboolean event_handle_prompt(ObPrompt *p, XEvent *e); static void event_handle_dock(ObDock *s, XEvent *e); static void event_handle_dockapp(ObDockApp *app, XEvent *e); static void event_handle_client(ObClient *c, XEvent *e); @@ -712,8 +712,8 @@ static void event_process(const XEvent *ec, gpointer data) } #endif - if (prompt) - event_handle_prompt(prompt, e); + if (prompt && event_handle_prompt(prompt, e)) + ; else if (e->type == ButtonPress || e->type == ButtonRelease) { /* If the button press was on some non-root window, or was physically on the root window, then process it */ @@ -1682,18 +1682,19 @@ static ObMenuFrame* find_active_or_last_menu(void) return ret; } -static void event_handle_prompt(ObPrompt *p, XEvent *e) +static gboolean event_handle_prompt(ObPrompt *p, XEvent *e) { switch (e->type) { case ButtonPress: case ButtonRelease: case MotionNotify: - prompt_mouse_event(p, e); + return prompt_mouse_event(p, e); break; case KeyPress: - prompt_key_event(p, e); + return prompt_key_event(p, e); break; } + return FALSE; } static gboolean event_handle_menu_input(XEvent *ev) |