X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=7d06f12e46a29d647cadd4e8ee5eae24a3bff83e;hb=b543af60b3b625f978bec0eacc7da31cd9d347f6;hp=eb19426b7eee06eeee61a73a913763e757e94c15;hpb=e48325700788622cc82b34f1ede5f02f74911d41;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index eb19426b..7d06f12e 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "client.h" #include "focus.h" #include "moveresize.h" @@ -7,7 +8,6 @@ #include "frame.h" #include "screen.h" #include "action.h" -#include "dispatch.h" #include "openbox.h" #include @@ -15,18 +15,18 @@ typedef struct ActionString { char *name; void (*func)(union ActionData *); - void (*setup)(Action *); + void (*setup)(ObAction *); } ActionString; -Action *action_new(void (*func)(union ActionData *data)) +ObAction *action_new(void (*func)(union ActionData *data)) { - Action *a = g_new0(Action, 1); + ObAction *a = g_new0(ObAction, 1); a->func = func; return a; } -void action_free(Action *a) +void action_free(ObAction *a) { if (a == NULL) return; @@ -39,137 +39,260 @@ void action_free(Action *a) g_free(a); } -void setup_action_directional_focus_north(Action *a) -{ - a->data.diraction.direction = Direction_North; +void setup_action_directional_focus_north(ObAction *a) +{ + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_NORTH; } -void setup_action_directional_focus_east(Action *a) +void setup_action_directional_focus_east(ObAction *a) { - a->data.diraction.direction = Direction_East; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_EAST; } -void setup_action_directional_focus_south(Action *a) +void setup_action_directional_focus_south(ObAction *a) { - a->data.diraction.direction = Direction_South; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_SOUTH; } -void setup_action_directional_focus_west(Action *a) +void setup_action_directional_focus_west(ObAction *a) { - a->data.diraction.direction = Direction_West; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_WEST; } -void setup_action_directional_focus_northeast(Action *a) +void setup_action_directional_focus_northeast(ObAction *a) { - a->data.diraction.direction = Direction_NorthEast; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_NORTHEAST; } -void setup_action_directional_focus_southeast(Action *a) +void setup_action_directional_focus_southeast(ObAction *a) { - a->data.diraction.direction = Direction_SouthEast; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST; } -void setup_action_directional_focus_southwest(Action *a) +void setup_action_directional_focus_southwest(ObAction *a) { - a->data.diraction.direction = Direction_SouthWest; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST; } -void setup_action_directional_focus_northwest(Action *a) +void setup_action_directional_focus_northwest(ObAction *a) { - a->data.diraction.direction = Direction_NorthWest; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_NORTHWEST; } -void setup_action_send_to_desktop(Action *a) +void setup_action_send_to_desktop(ObAction *a) { a->data.sendto.follow = TRUE; } -void setup_action_send_to_desktop_direction(Action *a) +void setup_action_send_to_desktop_prev(ObAction *a) +{ + a->data.sendtodir.inter.any.interactive = TRUE; + a->data.sendtodir.dir = OB_DIRECTION_WEST; + a->data.sendtodir.linear = TRUE; + a->data.sendtodir.wrap = TRUE; + a->data.sendtodir.follow = TRUE; +} + +void setup_action_send_to_desktop_next(ObAction *a) +{ + a->data.sendtodir.inter.any.interactive = TRUE; + a->data.sendtodir.dir = OB_DIRECTION_EAST; + a->data.sendtodir.linear = TRUE; + a->data.sendtodir.wrap = TRUE; + a->data.sendtodir.follow = TRUE; +} + +void setup_action_send_to_desktop_left(ObAction *a) +{ + a->data.sendtodir.inter.any.interactive = TRUE; + a->data.sendtodir.dir = OB_DIRECTION_WEST; + a->data.sendtodir.linear = FALSE; + a->data.sendtodir.wrap = TRUE; + a->data.sendtodir.follow = TRUE; +} + +void setup_action_send_to_desktop_right(ObAction *a) +{ + a->data.sendtodir.inter.any.interactive = TRUE; + a->data.sendtodir.dir = OB_DIRECTION_EAST; + a->data.sendtodir.linear = FALSE; + a->data.sendtodir.wrap = TRUE; + a->data.sendtodir.follow = TRUE; +} + +void setup_action_send_to_desktop_up(ObAction *a) +{ + a->data.sendtodir.inter.any.interactive = TRUE; + a->data.sendtodir.dir = OB_DIRECTION_NORTH; + a->data.sendtodir.linear = FALSE; + a->data.sendtodir.wrap = TRUE; + a->data.sendtodir.follow = TRUE; +} + +void setup_action_send_to_desktop_down(ObAction *a) { + a->data.sendtodir.inter.any.interactive = TRUE; + a->data.sendtodir.dir = OB_DIRECTION_SOUTH; + a->data.sendtodir.linear = FALSE; a->data.sendtodir.wrap = TRUE; a->data.sendtodir.follow = TRUE; } -void setup_action_desktop_direction(Action *a) +void setup_action_desktop_prev(ObAction *a) { + a->data.desktopdir.inter.any.interactive = TRUE; + a->data.desktopdir.dir = OB_DIRECTION_WEST; + a->data.desktopdir.linear = TRUE; a->data.desktopdir.wrap = TRUE; } -void setup_action_move_keyboard(Action *a) +void setup_action_desktop_next(ObAction *a) +{ + a->data.desktopdir.inter.any.interactive = TRUE; + a->data.desktopdir.dir = OB_DIRECTION_EAST; + a->data.desktopdir.linear = TRUE; + a->data.desktopdir.wrap = TRUE; +} + +void setup_action_desktop_left(ObAction *a) +{ + a->data.desktopdir.inter.any.interactive = TRUE; + a->data.desktopdir.dir = OB_DIRECTION_WEST; + a->data.desktopdir.linear = FALSE; + a->data.desktopdir.wrap = TRUE; +} + +void setup_action_desktop_right(ObAction *a) +{ + a->data.desktopdir.inter.any.interactive = TRUE; + a->data.desktopdir.dir = OB_DIRECTION_EAST; + a->data.desktopdir.linear = FALSE; + a->data.desktopdir.wrap = TRUE; +} + +void setup_action_desktop_up(ObAction *a) +{ + a->data.desktopdir.inter.any.interactive = TRUE; + a->data.desktopdir.dir = OB_DIRECTION_NORTH; + a->data.desktopdir.linear = FALSE; + a->data.desktopdir.wrap = TRUE; +} + +void setup_action_desktop_down(ObAction *a) +{ + a->data.desktopdir.inter.any.interactive = TRUE; + a->data.desktopdir.dir = OB_DIRECTION_SOUTH; + a->data.desktopdir.linear = FALSE; + a->data.desktopdir.wrap = TRUE; +} + +void setup_action_move_keyboard(ObAction *a) { a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard; } -void setup_action_move(Action *a) +void setup_action_move(ObAction *a) { a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move; } -void setup_action_resize(Action *a) +void setup_action_resize(ObAction *a) { a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft; } -void setup_action_resize_keyboard(Action *a) +void setup_action_resize_keyboard(ObAction *a) { a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard; } -void setup_action_cycle_windows_linear_next(Action *a) +void setup_action_cycle_windows_linear_next(ObAction *a) { + a->data.cycle.inter.any.interactive = TRUE; a->data.cycle.linear = TRUE; a->data.cycle.forward = TRUE; } -void setup_action_cycle_windows_linear_previous(Action *a) +void setup_action_cycle_windows_linear_previous(ObAction *a) { + a->data.cycle.inter.any.interactive = TRUE; a->data.cycle.linear = TRUE; a->data.cycle.forward = FALSE; } -void setup_action_cycle_windows_next(Action *a) +void setup_action_cycle_windows_next(ObAction *a) { + a->data.cycle.inter.any.interactive = TRUE; a->data.cycle.linear = FALSE; a->data.cycle.forward = TRUE; } -void setup_action_cycle_windows_previous(Action *a) +void setup_action_cycle_windows_previous(ObAction *a) { + a->data.cycle.inter.any.interactive = TRUE; a->data.cycle.linear = FALSE; a->data.cycle.forward = FALSE; } -void setup_action_movetoedge_north(Action *a) +void setup_action_movetoedge_north(ObAction *a) { - a->data.diraction.direction = Direction_North; + a->data.diraction.direction = OB_DIRECTION_NORTH; } -void setup_action_movetoedge_south(Action *a) +void setup_action_movetoedge_south(ObAction *a) { - a->data.diraction.direction = Direction_South; + a->data.diraction.direction = OB_DIRECTION_SOUTH; } -void setup_action_movetoedge_east(Action *a) +void setup_action_movetoedge_east(ObAction *a) { - a->data.diraction.direction = Direction_East; + a->data.diraction.direction = OB_DIRECTION_EAST; } -void setup_action_movetoedge_west(Action *a) +void setup_action_movetoedge_west(ObAction *a) { - a->data.diraction.direction = Direction_West; + a->data.diraction.direction = OB_DIRECTION_WEST; } -void setup_action_top_layer(Action *a) +void setup_action_growtoedge_north(ObAction *a) +{ + a->data.diraction.direction = OB_DIRECTION_NORTH; +} + +void setup_action_growtoedge_south(ObAction *a) +{ + a->data.diraction.direction = OB_DIRECTION_SOUTH; +} + +void setup_action_growtoedge_east(ObAction *a) +{ + a->data.diraction.direction = OB_DIRECTION_EAST; +} + +void setup_action_growtoedge_west(ObAction *a) +{ + a->data.diraction.direction = OB_DIRECTION_WEST; +} + +void setup_action_top_layer(ObAction *a) { a->data.layer.layer = 1; } -void setup_action_normal_layer(Action *a) +void setup_action_normal_layer(ObAction *a) { a->data.layer.layer = 0; } -void setup_action_bottom_layer(Action *a) +void setup_action_bottom_layer(ObAction *a) { a->data.layer.layer = -1; } @@ -221,6 +344,11 @@ ActionString actionstrings[] = action_directional_focus, setup_action_directional_focus_northwest }, + { + "activate", + action_activate, + NULL, + }, { "focus", action_focus, @@ -236,6 +364,11 @@ ActionString actionstrings[] = action_iconify, NULL }, + { + "raiselower", + action_raiselower, + NULL + }, { "raise", action_raise, @@ -246,11 +379,6 @@ ActionString actionstrings[] = action_lower, NULL }, - { - "focusraise", - action_focusraise, - NULL - }, { "close", action_close, @@ -361,50 +489,70 @@ ActionString actionstrings[] = action_send_to_desktop, setup_action_send_to_desktop }, + { + "sendtodesktopnext", + action_send_to_desktop_dir, + setup_action_send_to_desktop_next + }, + { + "sendtodesktopprevious", + action_send_to_desktop_dir, + setup_action_send_to_desktop_prev + }, { "sendtodesktopright", - action_send_to_desktop_right, - setup_action_send_to_desktop_direction + action_send_to_desktop_dir, + setup_action_send_to_desktop_right }, { "sendtodesktopleft", - action_send_to_desktop_left, - setup_action_send_to_desktop_direction + action_send_to_desktop_dir, + setup_action_send_to_desktop_left }, { "sendtodesktopup", - action_send_to_desktop_up, - setup_action_send_to_desktop_direction + action_send_to_desktop_dir, + setup_action_send_to_desktop_up }, { "sendtodesktopdown", - action_send_to_desktop_down, - setup_action_send_to_desktop_direction + action_send_to_desktop_dir, + setup_action_send_to_desktop_down }, { "desktop", action_desktop, NULL }, + { + "desktopnext", + action_desktop_dir, + setup_action_desktop_next + }, + { + "desktopprevious", + action_desktop_dir, + setup_action_desktop_prev + }, { "desktopright", - action_desktop_right, - setup_action_desktop_direction + action_desktop_dir, + setup_action_desktop_right }, { "desktopleft", - action_desktop_left, - setup_action_desktop_direction + action_desktop_dir, + setup_action_desktop_left }, { "desktopup", - action_desktop_up, - setup_action_desktop_direction + action_desktop_dir, + setup_action_desktop_up }, { "desktopdown", - action_desktop_down, - setup_action_desktop_direction + action_desktop_dir, + setup_action_desktop_down }, { "toggledecorations", @@ -431,6 +579,26 @@ ActionString actionstrings[] = action_moveresize, setup_action_resize_keyboard }, + { + "toggleshowdesktop", + action_toggle_show_desktop, + NULL + }, + { + "showdesktop", + action_show_desktop, + NULL + }, + { + "unshowdesktop", + action_unshow_desktop, + NULL + }, + { + "desktoplast", + action_desktop_last, + NULL + }, { "restart", action_restart, @@ -511,6 +679,26 @@ ActionString actionstrings[] = action_movetoedge, setup_action_movetoedge_east }, + { + "growtoedgenorth", + action_growtoedge, + setup_action_growtoedge_north + }, + { + "growtoedgesouth", + action_growtoedge, + setup_action_growtoedge_south + }, + { + "growtoedgewest", + action_growtoedge, + setup_action_growtoedge_west + }, + { + "growtoedgeeast", + action_growtoedge, + setup_action_growtoedge_east + }, { NULL, NULL, @@ -518,9 +706,9 @@ ActionString actionstrings[] = } }; -Action *action_from_string(char *name) +ObAction *action_from_string(char *name) { - Action *a = NULL; + ObAction *a = NULL; int i; for (i = 0; actionstrings[i].name; i++) @@ -533,135 +721,221 @@ Action *action_from_string(char *name) return a; } +ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) +{ + char *actname; + ObAction *act = NULL; + xmlNodePtr n; + + if (parse_attr_string("name", node, &actname)) { + if ((act = action_from_string(actname))) { + if (act->func == action_execute || act->func == action_restart) { + if ((n = parse_find_node("execute", node->xmlChildrenNode))) { + gchar *s = parse_string(doc, n); + act->data.execute.path = expand_tilde(s); + g_free(s); + } + } 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_desktop) { + if ((n = parse_find_node("desktop", node->xmlChildrenNode))) + act->data.desktop.desk = parse_int(doc, n); + if (act->data.desktop.desk > 0) act->data.desktop.desk--; + } else if (act->func == action_send_to_desktop) { + if ((n = parse_find_node("desktop", node->xmlChildrenNode))) + act->data.sendto.desk = parse_int(doc, n); + if (act->data.sendto.desk > 0) act->data.sendto.desk--; + } else if (act->func == action_move_relative_horz || + act->func == action_move_relative_vert || + act->func == action_resize_relative_horz || + act->func == action_resize_relative_vert) { + if ((n = parse_find_node("delta", node->xmlChildrenNode))) + act->data.relative.delta = parse_int(doc, n); + } else if (act->func == action_desktop_dir) { + if ((n = parse_find_node("wrap", node->xmlChildrenNode))) + act->data.desktopdir.wrap = parse_bool(doc, n); + } else if (act->func == action_send_to_desktop) { + if ((n = parse_find_node("follow", node->xmlChildrenNode))) + act->data.sendto.follow = parse_bool(doc, n); + } else if (act->func == action_send_to_desktop_dir) { + if ((n = parse_find_node("wrap", node->xmlChildrenNode))) + act->data.sendtodir.wrap = parse_bool(doc, n); + if ((n = parse_find_node("follow", node->xmlChildrenNode))) + act->data.sendtodir.follow = parse_bool(doc, n); + } else if (act->func == action_activate) { + if ((n = parse_find_node("here", node->xmlChildrenNode))) + act->data.activate.here = parse_bool(doc, n); + } + } + g_free(actname); + } + return act; +} + void action_execute(union ActionData *data) { GError *e = NULL; - if (data->execute.path) - if (!g_spawn_command_line_async(data->execute.path, &e)) { - g_warning("failed to execute '%s': %s", - data->execute.path, e->message); + char *cmd; + 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)) { + g_warning("failed to execute '%s': %s", + cmd, e->message); + } + } else { + g_warning("failed to convert '%s' from utf8", data->execute.path); } + } +} + +void action_activate(union ActionData *data) +{ + if (data->activate.any.c) + client_activate(data->activate.any.c, data->activate.here); } void action_focus(union ActionData *data) { - if (data->client.c) - client_focus(data->client.c); + if (data->client.any.c) + client_focus(data->client.any.c); } void action_unfocus (union ActionData *data) { - if (data->client.c) - client_unfocus(data->client.c); + if (data->client.any.c) + client_unfocus(data->client.any.c); } void action_iconify(union ActionData *data) { - if (data->client.c) - client_iconify(data->client.c, TRUE, TRUE); + if (data->client.any.c) + client_iconify(data->client.any.c, TRUE, TRUE); } -void action_focusraise(union ActionData *data) +void action_raiselower(union ActionData *data) { - if (data->client.c) { - client_focus(data->client.c); - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); + ObClient *c = data->client.any.c; + GList *it; + gboolean raise = FALSE; + + if (!c) return; + + for (it = stacking_list; it; it = g_list_next(it)) { + ObClient *cit = it->data; + + if (cit == c) break; + if (client_normal(cit) == client_normal(c) && + cit->layer == c->layer && + cit->frame->visible) + { + if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) { + raise = TRUE; + break; + } + } } + + if (raise) + stacking_raise(CLIENT_AS_WINDOW(c)); + else + stacking_lower(CLIENT_AS_WINDOW(c)); } void action_raise(union ActionData *data) { - if (data->client.c) - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); + if (data->client.any.c) + stacking_raise(CLIENT_AS_WINDOW(data->client.any.c)); } void action_unshaderaise(union ActionData *data) { - if (data->client.c) { - if (data->client.c->shaded) - client_shade(data->client.c, FALSE); + if (data->client.any.c) { + if (data->client.any.c->shaded) + client_shade(data->client.any.c, FALSE); else - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); + stacking_raise(CLIENT_AS_WINDOW(data->client.any.c)); } } void action_shadelower(union ActionData *data) { - if (data->client.c) { - if (data->client.c->shaded) - stacking_lower(CLIENT_AS_WINDOW(data->client.c)); + if (data->client.any.c) { + if (data->client.any.c->shaded) + stacking_lower(CLIENT_AS_WINDOW(data->client.any.c)); else - client_shade(data->client.c, TRUE); + client_shade(data->client.any.c, TRUE); } } void action_lower(union ActionData *data) { - if (data->client.c) - stacking_lower(CLIENT_AS_WINDOW(data->client.c)); + if (data->client.any.c) + stacking_lower(CLIENT_AS_WINDOW(data->client.any.c)); } void action_close(union ActionData *data) { - if (data->client.c) - client_close(data->client.c); + if (data->client.any.c) + client_close(data->client.any.c); } void action_kill(union ActionData *data) { - if (data->client.c) - client_kill(data->client.c); + if (data->client.any.c) + client_kill(data->client.any.c); } void action_shade(union ActionData *data) { - if (data->client.c) - client_shade(data->client.c, TRUE); + if (data->client.any.c) + client_shade(data->client.any.c, TRUE); } void action_unshade(union ActionData *data) { - if (data->client.c) - client_shade(data->client.c, FALSE); + if (data->client.any.c) + client_shade(data->client.any.c, FALSE); } void action_toggle_shade(union ActionData *data) { - if (data->client.c) - client_shade(data->client.c, !data->client.c->shaded); + if (data->client.any.c) + client_shade(data->client.any.c, !data->client.any.c->shaded); } void action_toggle_omnipresent(union ActionData *data) { - if (data->client.c) - client_set_desktop(data->client.c, - data->client.c->desktop == DESKTOP_ALL ? + if (data->client.any.c) + client_set_desktop(data->client.any.c, + data->client.any.c->desktop == DESKTOP_ALL ? screen_desktop : DESKTOP_ALL, FALSE); } void action_move_relative_horz(union ActionData *data) { - Client *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c) - client_configure(c, Corner_TopLeft, + client_configure(c, OB_CORNER_TOPLEFT, c->area.x + data->relative.delta, c->area.y, c->area.width, c->area.height, TRUE, TRUE); } void action_move_relative_vert(union ActionData *data) { - Client *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c) - client_configure(c, Corner_TopLeft, + client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y + data->relative.delta, c->area.width, c->area.height, TRUE, TRUE); } void action_resize_relative_horz(union ActionData *data) { - Client *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c) - client_configure(c, Corner_TopLeft, c->area.x, c->area.y, + client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y, c->area.width + data->relative.delta * c->size_inc.width, c->area.height, TRUE, TRUE); @@ -669,9 +943,9 @@ void action_resize_relative_horz(union ActionData *data) void action_resize_relative_vert(union ActionData *data) { - Client *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c && !c->shaded) - client_configure(c, Corner_TopLeft, c->area.x, c->area.y, + client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y, c->area.width, c->area.height + data->relative.delta * c->size_inc.height, TRUE, TRUE); @@ -679,70 +953,73 @@ void action_resize_relative_vert(union ActionData *data) void action_maximize_full(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 0, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, TRUE, 0, TRUE); } void action_unmaximize_full(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 0, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, FALSE, 0, TRUE); } void action_toggle_maximize_full(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, - !(data->client.c->max_horz || - data->client.c->max_vert), + if (data->client.any.c) + client_maximize(data->client.any.c, + !(data->client.any.c->max_horz || + data->client.any.c->max_vert), 0, TRUE); } void action_maximize_horz(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 1, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, TRUE, 1, TRUE); } void action_unmaximize_horz(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 1, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, FALSE, 1, TRUE); } void action_toggle_maximize_horz(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, + !data->client.any.c->max_horz, 1, TRUE); } void action_maximize_vert(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, TRUE, 2, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, TRUE, 2, TRUE); } void action_unmaximize_vert(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, FALSE, 2, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, FALSE, 2, TRUE); } void action_toggle_maximize_vert(union ActionData *data) { - if (data->client.c) - client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE); + if (data->client.any.c) + client_maximize(data->client.any.c, !data->client.any.c->max_vert, 2, TRUE); } void action_send_to_desktop(union ActionData *data) { - if (data->sendto.c) { - if (data->sendto.desk < screen_num_desktops || - data->sendto.desk == DESKTOP_ALL) { - client_set_desktop(data->desktop.c, - data->sendto.desk, data->sendto.follow); - if (data->sendto.follow) screen_set_desktop(data->sendto.desk); - } + ObClient *c = data->sendto.any.c; + + if (!c || !client_normal(c)) return; + + if (data->sendto.desk < screen_num_desktops || + data->sendto.desk == DESKTOP_ALL) { + client_set_desktop(c, data->sendto.desk, data->sendto.follow); + if (data->sendto.follow) + screen_set_desktop(data->sendto.desk); } } @@ -753,303 +1030,54 @@ void action_desktop(union ActionData *data) screen_set_desktop(data->desktop.desk); } -static void cur_row_col(guint *r, guint *c) -{ - switch (screen_desktop_layout.orientation) { - case Orientation_Horz: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - *r = screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop % screen_desktop_layout.columns; - break; - case Corner_BottomLeft: - *r = screen_desktop_layout.rows - 1 - - screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop % screen_desktop_layout.columns; - break; - case Corner_TopRight: - *r = screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop_layout.columns - 1 - - screen_desktop % screen_desktop_layout.columns; - break; - case Corner_BottomRight: - *r = screen_desktop_layout.rows - 1 - - screen_desktop / screen_desktop_layout.columns; - *c = screen_desktop_layout.columns - 1 - - screen_desktop % screen_desktop_layout.columns; - break; - } - break; - case Orientation_Vert: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - *r = screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop / screen_desktop_layout.rows; - break; - case Corner_BottomLeft: - *r = screen_desktop_layout.rows - 1 - - screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop / screen_desktop_layout.rows; - break; - case Corner_TopRight: - *r = screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop_layout.columns - 1 - - screen_desktop / screen_desktop_layout.rows; - break; - case Corner_BottomRight: - *r = screen_desktop_layout.rows - 1 - - screen_desktop % screen_desktop_layout.rows; - *c = screen_desktop_layout.columns - 1 - - screen_desktop / screen_desktop_layout.rows; - break; - } - break; - } -} - -static guint translate_row_col(guint r, guint c) -{ - switch (screen_desktop_layout.orientation) { - case Orientation_Horz: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - return r % screen_desktop_layout.rows * - screen_desktop_layout.columns + - c % screen_desktop_layout.columns; - case Corner_BottomLeft: - return (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows) * - screen_desktop_layout.columns + - c % screen_desktop_layout.columns; - case Corner_TopRight: - return r % screen_desktop_layout.rows * - screen_desktop_layout.columns + - (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns); - case Corner_BottomRight: - return (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows) * - screen_desktop_layout.columns + - (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns); - } - case Orientation_Vert: - switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: - return c % screen_desktop_layout.columns * - screen_desktop_layout.rows + - r % screen_desktop_layout.rows; - case Corner_BottomLeft: - return c % screen_desktop_layout.columns * - screen_desktop_layout.rows + - (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows); - case Corner_TopRight: - return (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns) * - screen_desktop_layout.rows + - r % screen_desktop_layout.rows; - case Corner_BottomRight: - return (screen_desktop_layout.columns - 1 - - c % screen_desktop_layout.columns) * - screen_desktop_layout.rows + - (screen_desktop_layout.rows - 1 - - r % screen_desktop_layout.rows); - } - } - g_assert_not_reached(); - return 0; -} - -void action_desktop_right(union ActionData *data) -{ - guint r, c, d; - - cur_row_col(&r, &c); - ++c; - if (c >= screen_desktop_layout.columns) { - if (!data->desktopdir.wrap) return; - c = 0; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->desktopdir.wrap) return; - ++c; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); -} - -void action_send_to_desktop_right(union ActionData *data) -{ - guint r, c, d; - - if (data->sendtodir.c) { - cur_row_col(&r, &c); - ++c; - if (c >= screen_desktop_layout.columns) { - if (!data->sendtodir.wrap) return; - c = 0; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->sendtodir.wrap) return; - ++c; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) { - client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow); - if (data->sendtodir.follow) screen_set_desktop(d); - } - } -} - -void action_desktop_left(union ActionData *data) -{ - guint r, c, d; - - cur_row_col(&r, &c); - --c; - if (c >= screen_desktop_layout.columns) { - if (!data->desktopdir.wrap) return; - c = screen_desktop_layout.columns - 1; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->desktopdir.wrap) return; - --c; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); -} - -void action_send_to_desktop_left(union ActionData *data) -{ - guint r, c, d; - - if (data->sendtodir.c) { - cur_row_col(&r, &c); - --c; - if (c >= screen_desktop_layout.columns) { - if (!data->sendtodir.wrap) return; - c = screen_desktop_layout.columns - 1; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->sendtodir.wrap) return; - --c; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) { - client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow); - if (data->sendtodir.follow) screen_set_desktop(d); - } - } -} - -void action_desktop_down(union ActionData *data) +void action_desktop_dir(union ActionData *data) { - guint r, c, d; + guint d; - cur_row_col(&r, &c); - ++r; - if (r >= screen_desktop_layout.rows) { - if (!data->desktopdir.wrap) return; - r = 0; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->desktopdir.wrap) return; - ++r; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) - screen_set_desktop(d); + d = screen_cycle_desktop(data->desktopdir.dir, + data->desktopdir.wrap, + data->sendtodir.linear, + data->desktopdir.inter.any.interactive, + data->desktopdir.inter.final, + data->desktopdir.inter.cancel); + screen_set_desktop(d); } -void action_send_to_desktop_down(union ActionData *data) +void action_send_to_desktop_dir(union ActionData *data) { - guint r, c, d; + ObClient *c = data->sendtodir.inter.any.c; + guint d; - if (data->sendtodir.c) { - cur_row_col(&r, &c); - ++r; - if (r >= screen_desktop_layout.rows) { - if (!data->sendtodir.wrap) return; - r = 0; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->sendtodir.wrap) return; - ++r; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) { - client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow); - if (data->sendtodir.follow) screen_set_desktop(d); - } - } -} - -void action_desktop_up(union ActionData *data) -{ - guint r, c, d; + if (!c || !client_normal(c)) return; - cur_row_col(&r, &c); - --r; - if (r >= screen_desktop_layout.rows) { - if (!data->desktopdir.wrap) return; - r = screen_desktop_layout.rows - 1; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->desktopdir.wrap) return; - --r; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) + d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap, + data->sendtodir.linear, + data->sendtodir.inter.any.interactive, + data->sendtodir.inter.final, + data->sendtodir.inter.cancel); + client_set_desktop(c, d, data->sendtodir.follow); + if (data->sendtodir.follow) screen_set_desktop(d); } -void action_send_to_desktop_up(union ActionData *data) +void action_desktop_last(union ActionData *data) { - guint r, c, d; - - if (data->sendtodir.c) { - cur_row_col(&r, &c); - --r; - if (r >= screen_desktop_layout.rows) { - if (!data->sendtodir.wrap) return; - r = screen_desktop_layout.rows - 1; - } - d = translate_row_col(r, c); - if (d >= screen_num_desktops) { - if (!data->sendtodir.wrap) return; - --r; - } - d = translate_row_col(r, c); - if (d < screen_num_desktops) { - client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow); - if (data->sendtodir.follow) screen_set_desktop(d); - } - } + screen_set_desktop(screen_last_desktop); } void action_toggle_decorations(union ActionData *data) { - Client *c = data->client.c;; + ObClient *c = data->client.any.c; if (!c) return; - c->disabled_decorations = c->disabled_decorations ? 0 : ~0; + c->decorate = !c->decorate; client_setup_decor_and_functions(c); } void action_moveresize(union ActionData *data) { - Client *c = data->moveresize.c; + ObClient *c = data->moveresize.any.c; if (!c || !client_normal(c)) return; @@ -1059,83 +1087,142 @@ void action_moveresize(union ActionData *data) void action_restart(union ActionData *data) { - ob_restart_path = data->execute.path; - ob_shutdown = ob_restart = TRUE; + ob_restart_other(data->execute.path); } void action_exit(union ActionData *data) { - ob_shutdown = TRUE; + ob_exit(); } void action_showmenu(union ActionData *data) { if (data->showmenu.name) { menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y, - data->showmenu.c); + data->showmenu.any.c); } } void action_cycle_windows(union ActionData *data) { - Client *c; - - c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final, - data->cycle.cancel); + focus_cycle(data->cycle.forward, data->cycle.linear, + data->cycle.inter.any.interactive, + data->cycle.inter.final, data->cycle.inter.cancel); } void action_directional_focus(union ActionData *data) { - Client *nf; - - if (!data->diraction.c) - return; - if ((nf = client_find_directional(data->diraction.c, - data->diraction.direction))) - client_activate(nf); + focus_directional_cycle(data->interdiraction.direction, + data->interdiraction.inter.any.interactive, + data->interdiraction.inter.final, + data->interdiraction.inter.cancel); } void action_movetoedge(union ActionData *data) { - int x, y, h, w; - Client *c = data->diraction.c; + int x, y; + ObClient *c = data->diraction.any.c; if (!c) return; x = c->frame->area.x; y = c->frame->area.y; - h = screen_area(c->desktop)->height; - w = screen_area(c->desktop)->width; switch(data->diraction.direction) { - case Direction_North: - y = 0; + case OB_DIRECTION_NORTH: + y = client_directional_edge_search(c, OB_DIRECTION_NORTH); break; - case Direction_West: - x = 0; + case OB_DIRECTION_WEST: + x = client_directional_edge_search(c, OB_DIRECTION_WEST); break; - case Direction_South: - y = h - c->frame->area.height; + case OB_DIRECTION_SOUTH: + y = client_directional_edge_search(c, OB_DIRECTION_SOUTH) - + c->frame->area.height; break; - case Direction_East: - x = w - c->frame->area.width; + case OB_DIRECTION_EAST: + x = client_directional_edge_search(c, OB_DIRECTION_EAST) - + c->frame->area.width; break; + default: + g_assert_not_reached(); } frame_frame_gravity(c->frame, &x, &y); - client_configure(c, Corner_TopLeft, + client_configure(c, OB_CORNER_TOPLEFT, x, y, c->area.width, c->area.height, TRUE, TRUE); } +void action_growtoedge(union ActionData *data) +{ + int x, y, width, height, dest; + ObClient *c = data->diraction.any.c; + Rect *a = screen_area(c->desktop); + + if (!c) + return; + + x = c->frame->area.x; + y = c->frame->area.y; + width = c->frame->area.width; + height = c->frame->area.height; + + switch(data->diraction.direction) { + case OB_DIRECTION_NORTH: + dest = client_directional_edge_search(c, OB_DIRECTION_NORTH); + if (a->y == y) + height = c->frame->area.height / 2; + else { + height = c->frame->area.y + c->frame->area.height - dest; + y = dest; + } + break; + case OB_DIRECTION_WEST: + dest = client_directional_edge_search(c, OB_DIRECTION_WEST); + if (a->x == x) + width = c->frame->area.width / 2; + else { + width = c->frame->area.x + c->frame->area.width - dest; + x = dest; + } + break; + case OB_DIRECTION_SOUTH: + dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH); + if (a->y + a->height == y + c->frame->area.height) { + height = c->frame->area.height / 2; + y = a->y + a->height - height; + } else + height = dest - c->frame->area.y; + y += (height - c->frame->area.height) % c->size_inc.height; + height -= (height - c->frame->area.height) % c->size_inc.height; + break; + case OB_DIRECTION_EAST: + dest = client_directional_edge_search(c, OB_DIRECTION_EAST); + if (a->x + a->width == x + c->frame->area.width) { + width = c->frame->area.width / 2; + x = a->x + a->width - width; + } else + width = dest - c->frame->area.x; + x += (width - c->frame->area.width) % c->size_inc.width; + width -= (width - c->frame->area.width) % c->size_inc.width; + break; + default: + g_assert_not_reached(); + } + frame_frame_gravity(c->frame, &x, &y); + width -= c->frame->size.left + c->frame->size.right; + height -= c->frame->size.top + c->frame->size.bottom; + client_configure(c, OB_CORNER_TOPLEFT, x, y, width, height, TRUE, TRUE); +} + void action_send_to_layer(union ActionData *data) { - if (data->layer.c) - client_set_layer(data->layer.c, data->layer.layer); + if (data->layer.any.c) + client_set_layer(data->layer.any.c, data->layer.layer); } void action_toggle_layer(union ActionData *data) { - Client *c = data->layer.c; + ObClient *c = data->layer.any.c; if (c) { if (data->layer.layer < 0) @@ -1144,3 +1231,18 @@ void action_toggle_layer(union ActionData *data) client_set_layer(c, c->above ? 0 : 1); } } + +void action_toggle_show_desktop(union ActionData *data) +{ + screen_show_desktop(!screen_showing_desktop); +} + +void action_show_desktop(union ActionData *data) +{ + screen_show_desktop(TRUE); +} + +void action_unshow_desktop(union ActionData *data) +{ + screen_show_desktop(FALSE); +}