From f227bd994d21d901790d93a962915863914b6c09 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 22 Jun 2007 15:51:10 +0000 Subject: [PATCH] add the kill/close/cyclewindows actions --- Makefile.am | 1 + openbox/action.c | 10 --- openbox/actions/all.c | 1 + openbox/actions/all.h | 1 + openbox/actions/close.c | 20 +++++ openbox/actions/cyclewindows.c | 152 +++++++++++++++++++++++++++++++++ openbox/actions/kill.c | 21 +++++ 7 files changed, 196 insertions(+), 10 deletions(-) create mode 100644 openbox/actions/close.c create mode 100644 openbox/actions/cyclewindows.c create mode 100644 openbox/actions/kill.c diff --git a/Makefile.am b/Makefile.am index a63af6c0..15c22087 100644 --- a/Makefile.am +++ b/Makefile.am @@ -165,6 +165,7 @@ openbox_openbox_SOURCES = \ openbox/actions/focus.c \ openbox/actions/fullscreen.c \ openbox/actions/iconify.c \ + openbox/actions/kill.c \ openbox/actions/lower.c \ openbox/actions/maximize.c \ openbox/actions/maximizehorizontal.c \ diff --git a/openbox/action.c b/openbox/action.c index 1bc85db2..bc1db101 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -454,11 +454,6 @@ ActionString actionstrings[] = action_directional_focus, setup_action_directional_focus_northwest }, - { - "kill", - action_kill, - setup_client_action - }, { "shadelower", action_shadelower, @@ -925,11 +920,6 @@ void action_shadelower(union ActionData *data) action_shade(data); } -void action_kill(union ActionData *data) -{ - client_kill(data->client.any.c); -} - void action_toggle_omnipresent(union ActionData *data) { client_set_desktop(data->client.any.c, diff --git a/openbox/actions/all.c b/openbox/actions/all.c index 64587f46..9b11b49b 100644 --- a/openbox/actions/all.c +++ b/openbox/actions/all.c @@ -26,4 +26,5 @@ void action_all_startup() action_moveto_startup(); action_moverelative_startup(); action_shade_startup(); + action_kill_startup(); } diff --git a/openbox/actions/all.h b/openbox/actions/all.h index bc25461f..265ec428 100644 --- a/openbox/actions/all.h +++ b/openbox/actions/all.h @@ -27,5 +27,6 @@ void action_maximizevertical_startup(); void action_moveto_startup(); void action_moverelative_startup(); void action_shade_startup(); +void action_kill_startup(); #endif diff --git a/openbox/actions/close.c b/openbox/actions/close.c new file mode 100644 index 00000000..37260e13 --- /dev/null +++ b/openbox/actions/close.c @@ -0,0 +1,20 @@ +#include "openbox/actions.h" +#include "openbox/client.h" + +static gboolean run_func(ObActionsData *data, gpointer options); + +void action_close_startup() +{ + actions_register("Close", + NULL, NULL, + run_func, + NULL, NULL); +} + +/* Always return FALSE because its not interactive */ +static gboolean run_func(ObActionsData *data, gpointer options) +{ + if (data->client) client_close(data->client); + + return FALSE; +} diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c new file mode 100644 index 00000000..3f7388ec --- /dev/null +++ b/openbox/actions/cyclewindows.c @@ -0,0 +1,152 @@ +#include "openbox/actions.h" +#include "openbox/event.h" +#include "openbox/focus_cycle.h" +#include "openbox/openbox.h" +#include "gettext.h" + +typedef struct { + gboolean linear; + gboolean dialog; + gboolean dock_windows; + gboolean desktop_windows; + gboolean all_desktops; + gboolean forward; + GSList *actions; +} Options; + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); +static void free_func(gpointer options); +static gboolean run_func(ObActionsData *data, gpointer options); +static gboolean i_input_func(guint initial_state, + XEvent *e, + gpointer options, + gboolean *used); +static void i_cancel_func(gpointer options); + +static void end_cycle(gboolean cancel, guint state, Options *o); + +void action_cyclewindows_startup() +{ + actions_register("CycleWindows", + setup_func, + free_func, + run_func, + i_input_func, + i_cancel_func); +} + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) +{ + xmlNodePtr n; + Options *o; + + o = g_new0(Options, 1); + o->dialog = TRUE; + + if ((n = parse_find_node("forward", node))) + o->forward = parse_bool(doc, n); + if ((n = parse_find_node("linear", node))) + o->linear = parse_bool(doc, n); + if ((n = parse_find_node("dialog", node))) + o->dialog = parse_bool(doc, n); + if ((n = parse_find_node("panels", node))) + o->dock_windows = parse_bool(doc, n); + if ((n = parse_find_node("desktop", node))) + o->desktop_windows = parse_bool(doc, n); + if ((n = parse_find_node("allDesktops", node))) + o->all_desktops = parse_bool(doc, n); + + if ((n = parse_find_node("actions", node))) { + xmlNodePtr m; + + m = parse_find_node("action", n->xmlChildrenNode); + while (m) { + ObActionsAct *action = actions_parse(i, doc, m); + if (action) o->actions = g_slist_prepend(o->actions, action); + m = parse_find_node("action", m->next); + } + } + return o; +} + +static void free_func(gpointer options) +{ + Options *o = options; + + g_free(o); +} + +static gboolean run_func(ObActionsData *data, gpointer options) +{ + Options *o = options; + + /* if using focus_delay, stop the timer now so that focus doesn't go moving + on us */ + event_halt_focus_delay(); + + focus_cycle(o->forward, + o->all_desktops, + o->dock_windows, + o->desktop_windows, + o->linear, + TRUE, + o->dialog, + FALSE, FALSE); + + return TRUE; +} + +static gboolean i_input_func(guint initial_state, + XEvent *e, + gpointer options, + gboolean *used) +{ + if (e->type == KeyPress) { + /* Escape cancels no matter what */ + if (e->xkey.keycode == ob_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) && + !initial_state) + { + end_cycle(FALSE, e->xkey.state, options); + return FALSE; + } + } + /* They released the modifiers */ + else if (e->type == KeyRelease && initial_state && + (e->xkey.state & initial_state) == 0) + { + end_cycle(FALSE, e->xkey.state, options); + return FALSE; + } + + return TRUE; +} + +static void i_cancel_func(gpointer options) +{ + end_cycle(TRUE, 0, options); +} + +static void end_cycle(gboolean cancel, guint state, Options *o) +{ + struct _ObClient *ft; + + ft = focus_cycle(o->forward, + o->all_desktops, + o->dock_windows, + o->desktop_windows, + o->linear, + TRUE, + o->dialog, + TRUE, cancel); + + if (ft) { + actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY, + state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft); + } +} diff --git a/openbox/actions/kill.c b/openbox/actions/kill.c new file mode 100644 index 00000000..755a4daf --- /dev/null +++ b/openbox/actions/kill.c @@ -0,0 +1,21 @@ +#include "openbox/actions.h" +#include "openbox/stacking.h" + +static gboolean run_func(ObActionsData *data, gpointer options); + +void action_kill_startup() +{ + actions_register("Kill", + NULL, NULL, + run_func, + NULL, NULL); +} + +/* Always return FALSE because its not interactive */ +static gboolean run_func(ObActionsData *data, gpointer options) +{ + if (data->client) + client_kill(data->client); + + return FALSE; +} -- 2.45.2