add the showdesktop action
Dana Jansens danakj@orodu.net
7 files changed,
24 insertions(+),
44 deletions(-)
M
Makefile.am
→
Makefile.am
@@ -158,6 +158,7 @@ openbox/actions/all.c \
openbox/actions/all.h \ openbox/actions/debug.c \ openbox/actions/execute.c \ + openbox/actions/showdesktop.c \ openbox/actions/showmenu.c \ openbox/actions.c \ openbox/actions.h \
M
openbox/action.c
→
openbox/action.c
@@ -776,21 +776,6 @@ action_toggle_dockautohide,
NULL }, { - "toggleshowdesktop", - action_toggle_show_desktop, - NULL - }, - { - "showdesktop", - action_show_desktop, - NULL - }, - { - "unshowdesktop", - action_unshow_desktop, - NULL - }, - { "desktoplast", action_desktop_last, NULL@@ -1893,21 +1878,6 @@ 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, NULL); -} - -void action_show_desktop(union ActionData *data) -{ - screen_show_desktop(TRUE, NULL); -} - -void action_unshow_desktop(union ActionData *data) -{ - screen_show_desktop(FALSE, NULL); } void action_break_chroot(union ActionData *data)
M
openbox/actions/all.c
→
openbox/actions/all.c
@@ -5,4 +5,5 @@ {
action_execute_startup(); action_debug_startup(); action_showmenu_startup(); + action_showdesktop_startup(); }
M
openbox/actions/all.h
→
openbox/actions/all.h
@@ -6,5 +6,6 @@
void action_execute_startup(); void action_debug_startup(); void action_showmenu_startup(); +void action_showdesktop_startup(); #endif
M
openbox/actions/debug.c
→
openbox/actions/debug.c
@@ -8,13 +8,6 @@
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); -*/ void action_debug_startup() {
A
openbox/actions/showdesktop.c
@@ -0,0 +1,21 @@
+#include "openbox/actions.h" +#include "openbox/screen.h" + +static gboolean run_func(ObActionsData *data, gpointer options); + +void action_showdesktop_startup() +{ + actions_register("ShowDesktop", + NULL, + NULL, + run_func, + NULL, NULL); +} + +/* Always return FALSE because its not interactive */ +static gboolean run_func(ObActionsData *data, gpointer options) +{ + screen_show_desktop(!screen_showing_desktop, NULL); + + return FALSE; +}