From 58d8b90122b33f608b5c4c5b91d15207eb2cecf1 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 22 Jun 2007 04:04:59 +0000 Subject: [PATCH] add restart action --- Makefile.am | 1 + openbox/action.c | 19 -------------- openbox/actions/all.c | 1 + openbox/actions/all.h | 1 + openbox/actions/restart.c | 54 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 openbox/actions/restart.c diff --git a/Makefile.am b/Makefile.am index 002b50cf..6d58e90c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,6 +160,7 @@ openbox_openbox_SOURCES = \ openbox/actions/execute.c \ openbox/actions/exit.c \ openbox/actions/reconfigure.c \ + openbox/actions/restart.c \ openbox/actions/showdesktop.c \ openbox/actions/showmenu.c \ openbox/actions.c \ diff --git a/openbox/action.c b/openbox/action.c index eba3c95a..0c241b46 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -780,16 +780,6 @@ ActionString actionstrings[] = action_desktop_last, NULL }, - { - "restart", - action_restart, - NULL - }, - { - "exit", - action_exit, - NULL - }, { "sendtotoplayer", action_send_to_layer, @@ -1701,15 +1691,6 @@ void action_resize(union ActionData *data) moveresize_start(c, data->any.x, data->any.y, data->any.button, corner); } -void action_restart(union ActionData *data) -{ - ob_restart_other(data->execute.path); -} - -void action_exit(union ActionData *data) -{ -} - void action_cycle_windows(union ActionData *data) { /* if using focus_delay, stop the timer now so that focus doesn't go moving diff --git a/openbox/actions/all.c b/openbox/actions/all.c index 13068b7b..141fd12e 100644 --- a/openbox/actions/all.c +++ b/openbox/actions/all.c @@ -8,4 +8,5 @@ void action_all_startup() action_showdesktop_startup(); action_reconfigure_startup(); action_exit_startup(); + action_restart_startup(); } diff --git a/openbox/actions/all.h b/openbox/actions/all.h index dadfc3f0..789cce37 100644 --- a/openbox/actions/all.h +++ b/openbox/actions/all.h @@ -9,5 +9,6 @@ void action_showmenu_startup(); void action_showdesktop_startup(); void action_reconfigure_startup(); void action_exit_startup(); +void action_restart_startup(); #endif diff --git a/openbox/actions/restart.c b/openbox/actions/restart.c new file mode 100644 index 00000000..f7f1dfc0 --- /dev/null +++ b/openbox/actions/restart.c @@ -0,0 +1,54 @@ +#include "openbox/actions.h" +#include "openbox/openbox.h" + +typedef struct { + gchar *cmd; +} 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); + +void action_restart_startup() +{ + actions_register("Restart", + setup_func, + free_func, + run_func, + NULL, NULL); +} + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) +{ + xmlNodePtr n; + Options *o; + + o = g_new0(Options, 1); + + if ((n = parse_find_node("execute", node))) { + gchar *s = parse_string(doc, n); + o->cmd = parse_expand_tilde(s); + g_free(s); + } + return o; +} + +static void free_func(gpointer options) +{ + Options *o = options; + + if (o) { + g_free(o->cmd); + g_free(o); + } +} + +/* Always return FALSE because its not interactive */ +static gboolean run_func(ObActionsData *data, gpointer options) +{ + Options *o = options; + + ob_restart_other(o->cmd); + + return FALSE; +} -- 2.45.2