X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=81a9ef3e1703f40c80cb95887c10c6f471492da1;hb=a70e22c557cb0aebbb39100681b2772b731947de;hp=c07fa1625826cbf47cc5a220a6bbde9f30e23ba8;hpb=2e90dfbfecb558d0aaa13577e3147f3d66cb7691;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index c07fa162..81a9ef3e 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -395,7 +395,7 @@ void setup_action_showmenu(ObAction **a, ObUserAction uact) a time! */ if (uact == OB_USER_ACTION_MENU_SELECTION) { action_unref(*a); - a = NULL; + *a = NULL; } } @@ -676,6 +676,11 @@ ActionString actionstrings[] = action_moveresize, setup_action_resize }, + { + "toggledockautohide", + action_toggle_dockautohide, + NULL + }, { "toggleshowdesktop", action_toggle_show_desktop, @@ -817,7 +822,8 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact) a = action_new(actionstrings[i].func); if (actionstrings[i].setup) actionstrings[i].setup(&a, uact); - INTERACTIVE_LIMIT(a, uact); + if (a) + INTERACTIVE_LIMIT(a, uact); break; } if (!exist) @@ -978,13 +984,23 @@ void action_run_string(const gchar *name, struct _ObClient *c) void action_execute(union ActionData *data) { GError *e = NULL; - gchar *cmd; + gchar *cmd, **argv = 0; if (data->execute.path) { cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL); if (cmd) { - if (!g_spawn_command_line_async(cmd, &e)) { + if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) { g_warning("failed to execute '%s': %s", cmd, e->message); + g_error_free(e); + } else { + if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | + G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, NULL, &e)) { + g_warning("failed to execute '%s': %s", + cmd, e->message); + g_error_free(e); + } + g_strfreev(argv); } g_free(cmd); } else { @@ -1039,7 +1055,10 @@ void action_raiselower(union ActionData *data) } } - action_run_string((raise ? "Raise" : "Lower"), c); + if (raise) + action_raise(data); + else + action_lower(data); } void action_raise(union ActionData *data) @@ -1052,17 +1071,17 @@ void action_raise(union ActionData *data) void action_unshaderaise(union ActionData *data) { if (data->client.any.c->shaded) - action_run_string("Unshade", data->client.any.c); + action_unshade(data); else - action_run_string("Raise", data->client.any.c); + action_raise(data); } void action_shadelower(union ActionData *data) { if (data->client.any.c->shaded) - action_run_string("Lower", data->client.any.c); + action_lower(data); else - action_run_string("Shade", data->client.any.c); + action_shade(data); } void action_lower(union ActionData *data) @@ -1522,6 +1541,12 @@ void action_toggle_layer(union ActionData *data) client_action_end(data); } +void action_toggle_dockautohide(union ActionData *data) +{ + config_dock_hide = !config_dock_hide; + dock_configure(); +} + void action_toggle_show_desktop(union ActionData *data) { screen_show_desktop(!screen_showing_desktop);