diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-06-22 03:53:22 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-06-22 03:53:22 +0000 |
| commit | 38268dc917ac9e59d9e8ef87825c9489ced77e95 (patch) | |
| tree | a66a1deb0f3a9f97e1ffce690b0a7c8e6f579455 /openbox/action.c | |
| parent | 9dacac5e5e6b9ed86e76680b048bc227d8866ac6 (diff) | |
add the showmenu action
Diffstat (limited to 'openbox/action.c')
| -rw-r--r-- | openbox/action.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/openbox/action.c b/openbox/action.c index d706e370..9b8653df 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -458,18 +458,6 @@ void setup_action_resize(ObAction **a, ObUserAction uact) (*a)->data.moveresize.corner = 0; } -void setup_action_showmenu(ObAction **a, ObUserAction uact) -{ - (*a)->data.showmenu.any.client_action = OB_CLIENT_ACTION_OPTIONAL; - /* you cannot call ShowMenu from inside a menu, cuz the menu code makes - assumptions that there is only one menu (and submenus) open at - a time! */ - if (uact == OB_USER_ACTION_MENU_SELECTION) { - action_unref(*a); - *a = NULL; - } -} - void setup_action_addremove_desktop_current(ObAction **a, ObUserAction uact) { (*a)->data.addremovedesktop.current = TRUE; @@ -493,16 +481,6 @@ void setup_client_action(ObAction **a, ObUserAction uact) ActionString actionstrings[] = { { - "debug", - action_debug, - NULL - }, - { - "execute", - action_execute, - NULL - }, - { "directionalfocusnorth", action_directional_focus, setup_action_directional_focus_north @@ -833,11 +811,6 @@ ActionString actionstrings[] = NULL }, { - "showmenu", - action_showmenu, - setup_action_showmenu - }, - { "sendtotoplayer", action_send_to_layer, setup_action_top_layer @@ -1005,9 +978,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (parse_attr_string("name", node, &actname)) { if ((act = action_from_string(actname, uact))) { - } else if (act->func == action_showmenu) { - if ((n = parse_find_node("menu", node->xmlChildrenNode))) - act->data.showmenu.name = parse_string(doc, n); } else if (act->func == action_move_relative_horz || act->func == action_move_relative_vert || act->func == action_resize_relative_horz || @@ -1222,16 +1192,6 @@ void action_run_string(const gchar *name, struct _ObClient *c, Time time) action_run(l, c, 0, time); } -void action_debug(union ActionData *data) -{ - if (data->debug.string) - g_print("%s\n", data->debug.string); -} - -void action_execute(union ActionData *data) -{ -} - void action_activate(union ActionData *data) { if (data->client.any.c) { @@ -1776,14 +1736,6 @@ void action_exit(union ActionData *data) ob_exit(0); } -void action_showmenu(union ActionData *data) -{ - if (data->showmenu.name) { - menu_show(data->showmenu.name, data->any.x, data->any.y, - data->any.button, data->showmenu.any.c); - } -} - void action_cycle_windows(union ActionData *data) { /* if using focus_delay, stop the timer now so that focus doesn't go moving |
