diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-04-15 18:29:55 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-04-15 18:29:55 +0000 |
| commit | 0e28a07e3d6677aa6af9ad97fbc55f8101f3fdf2 (patch) | |
| tree | e180e7b7162d9d75e7e307bd236784730547cf74 /openbox/action.c | |
| parent | 1c3689d0c725202eba7191d32480aa2cc3addfea (diff) | |
start of showing/rendering menus. woot!
Diffstat (limited to 'openbox/action.c')
| -rw-r--r-- | openbox/action.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openbox/action.c b/openbox/action.c index 683e205f..33950daa 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,5 +1,6 @@ #include "client.h" #include "focus.h" +#include "menu.h" #include "stacking.h" #include "frame.h" #include "framerender.h" @@ -15,10 +16,6 @@ Action *action_new(void (*func)(union ActionData *data)) Action *a = g_new0(Action, 1); a->func = func; - /* deal with pointers */ - if (func == action_execute) - a->data.execute.path = NULL; - return a; } @@ -29,6 +26,8 @@ void action_free(Action *a) /* deal with pointers */ if (a->func == action_execute || a->func == action_restart) g_free(a->data.execute.path); + else if (a->func == action_showmenu) + g_free(a->data.showmenu.name); g_free(a); } @@ -708,7 +707,8 @@ void action_exit(union ActionData *data) void action_showmenu(union ActionData *data) { - g_message(__FUNCTION__); + menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y, + data->showmenu.c); } static void popup_cycle(Client *c, gboolean hide) |