all repos — openbox @ 58d8b90122b33f608b5c4c5b91d15207eb2cecf1

openbox fork - make it a bit more like ryudo

add restart action
Dana Jansens danakj@orodu.net
commit

58d8b90122b33f608b5c4c5b91d15207eb2cecf1

parent

5d57a39b702a0f198c8a180a20058e3c82615523

5 files changed, 57 insertions(+), 19 deletions(-)

jump to
M Makefile.amMakefile.am

@@ -160,6 +160,7 @@ openbox/actions/debug.c \

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 \
M openbox/action.copenbox/action.c

@@ -781,16 +781,6 @@ action_desktop_last,

NULL }, { - "restart", - action_restart, - NULL - }, - { - "exit", - action_exit, - NULL - }, - { "sendtotoplayer", action_send_to_layer, setup_action_top_layer

@@ -1699,15 +1689,6 @@ c->area.height + c->frame->size.top +

c->frame->size.bottom, c->shaded); 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)
M openbox/actions/all.copenbox/actions/all.c

@@ -8,4 +8,5 @@ action_showmenu_startup();

action_showdesktop_startup(); action_reconfigure_startup(); action_exit_startup(); + action_restart_startup(); }
M openbox/actions/all.hopenbox/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
A 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; +}