X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=d59c55143a6e85435ca455c3861cee56d9489150;hb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;hp=9aeeff5800fd2713de32f0124ae2a6a748029ffa;hpb=5a7953b36aa0e23ae21f707d9fb8b6b9e882946d;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 9aeeff58..d59c5514 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" @@ -41,42 +42,42 @@ void action_free(Action *a) void setup_action_directional_focus_north(Action *a) { - a->data.dfocus.direction = Direction_North; + a->data.diraction.direction = OB_DIRECTION_NORTH; } void setup_action_directional_focus_east(Action *a) { - a->data.dfocus.direction = Direction_East; + a->data.diraction.direction = OB_DIRECTION_EAST; } void setup_action_directional_focus_south(Action *a) { - a->data.dfocus.direction = Direction_South; + a->data.diraction.direction = OB_DIRECTION_SOUTH; } void setup_action_directional_focus_west(Action *a) { - a->data.dfocus.direction = Direction_West; + a->data.diraction.direction = OB_DIRECTION_WEST; } void setup_action_directional_focus_northeast(Action *a) { - a->data.dfocus.direction = Direction_NorthEast; + a->data.diraction.direction = OB_DIRECTION_NORTHEAST; } void setup_action_directional_focus_southeast(Action *a) { - a->data.dfocus.direction = Direction_SouthEast; + a->data.diraction.direction = OB_DIRECTION_SOUTHEAST; } void setup_action_directional_focus_southwest(Action *a) { - a->data.dfocus.direction = Direction_SouthWest; + a->data.diraction.direction = OB_DIRECTION_SOUTHWEST; } void setup_action_directional_focus_northwest(Action *a) { - a->data.dfocus.direction = Direction_NorthWest; + a->data.diraction.direction = OB_DIRECTION_NORTHWEST; } void setup_action_send_to_desktop(Action *a) @@ -84,26 +85,15 @@ void setup_action_send_to_desktop(Action *a) a->data.sendto.follow = TRUE; } -void setup_action_send_to_np_desktop(Action *a) +void setup_action_send_to_desktop_direction(Action *a) { - a->data.sendtonextprev.wrap = FALSE; - a->data.sendtonextprev.follow = TRUE; + a->data.sendtodir.wrap = TRUE; + a->data.sendtodir.follow = TRUE; } -void setup_action_send_to_np_desktop_wrap(Action *a) +void setup_action_desktop_direction(Action *a) { - a->data.sendtonextprev.wrap = TRUE; - a->data.sendtonextprev.follow = TRUE; -} - -void setup_action_np_desktop(Action *a) -{ - a->data.nextprevdesktop.wrap = FALSE; -} - -void setup_action_np_desktop_wrap(Action *a) -{ - a->data.nextprevdesktop.wrap = TRUE; + a->data.desktopdir.wrap = TRUE; } void setup_action_move_keyboard(Action *a) @@ -149,7 +139,42 @@ void setup_action_cycle_windows_previous(Action *a) a->data.cycle.linear = FALSE; a->data.cycle.forward = FALSE; } - + +void setup_action_movetoedge_north(Action *a) +{ + a->data.diraction.direction = OB_DIRECTION_NORTH; +} + +void setup_action_movetoedge_south(Action *a) +{ + a->data.diraction.direction = OB_DIRECTION_SOUTH; +} + +void setup_action_movetoedge_east(Action *a) +{ + a->data.diraction.direction = OB_DIRECTION_EAST; +} + +void setup_action_movetoedge_west(Action *a) +{ + a->data.diraction.direction = OB_DIRECTION_WEST; +} + +void setup_action_top_layer(Action *a) +{ + a->data.layer.layer = 1; +} + +void setup_action_normal_layer(Action *a) +{ + a->data.layer.layer = 0; +} + +void setup_action_bottom_layer(Action *a) +{ + a->data.layer.layer = -1; +} + ActionString actionstrings[] = { { @@ -222,11 +247,6 @@ ActionString actionstrings[] = action_lower, NULL }, - { - "focusraise", - action_focusraise, - NULL - }, { "close", action_close, @@ -338,24 +358,24 @@ ActionString actionstrings[] = setup_action_send_to_desktop }, { - "sendtonextdesktop", - action_send_to_next_desktop, - setup_action_send_to_np_desktop + "sendtodesktopright", + action_send_to_desktop_right, + setup_action_send_to_desktop_direction }, { - "sendtonextdesktopwrap", - action_send_to_next_desktop, - setup_action_send_to_np_desktop_wrap + "sendtodesktopleft", + action_send_to_desktop_left, + setup_action_send_to_desktop_direction }, { - "sendtopreviousdesktop", - action_send_to_previous_desktop, - setup_action_send_to_np_desktop + "sendtodesktopup", + action_send_to_desktop_up, + setup_action_send_to_desktop_direction }, { - "sendtopreviousdesktopwrap", - action_send_to_previous_desktop, - setup_action_send_to_np_desktop_wrap + "sendtodesktopdown", + action_send_to_desktop_down, + setup_action_send_to_desktop_direction }, { "desktop", @@ -363,64 +383,24 @@ ActionString actionstrings[] = NULL }, { - "nextdesktop", - action_next_desktop, - setup_action_np_desktop - }, - { - "nextdesktopwrap", - action_next_desktop, - setup_action_np_desktop_wrap - }, - { - "previousdesktop", - action_previous_desktop, - setup_action_np_desktop - }, - { - "previousdesktopwrap", - action_previous_desktop, - setup_action_np_desktop_wrap + "desktopright", + action_desktop_right, + setup_action_desktop_direction }, { - "nextdesktopcolumn", - action_next_desktop_column, - setup_action_np_desktop + "desktopleft", + action_desktop_left, + setup_action_desktop_direction }, { - "nextdesktopcolumnwrap", - action_next_desktop_column, - setup_action_np_desktop_wrap + "desktopup", + action_desktop_up, + setup_action_desktop_direction }, { - "previousdesktopcolumn", - action_previous_desktop_column, - setup_action_np_desktop - }, - { - "previousdesktopcolumnwrap", - action_previous_desktop_column, - setup_action_np_desktop_wrap - }, - { - "nextdesktoprow", - action_next_desktop_row, - setup_action_np_desktop - }, - { - "nextdesktoprowwrap", - action_next_desktop_row, - setup_action_np_desktop_wrap - }, - { - "previousdesktoprow", - action_previous_desktop_row, - setup_action_np_desktop - }, - { - "previousdesktoprowwrap", - action_previous_desktop_row, - setup_action_np_desktop_wrap + "desktopdown", + action_desktop_down, + setup_action_desktop_direction }, { "toggledecorations", @@ -447,6 +427,21 @@ ActionString actionstrings[] = action_moveresize, setup_action_resize_keyboard }, + { + "toggleshowdesktop", + action_toggle_show_desktop, + NULL + }, + { + "showdesktop", + action_show_desktop, + NULL + }, + { + "unshowdesktop", + action_unshow_desktop, + NULL + }, { "restart", action_restart, @@ -462,6 +457,31 @@ ActionString actionstrings[] = action_showmenu, NULL }, + { + "sendtotoplayer", + action_send_to_layer, + setup_action_top_layer + }, + { + "togglealwaysontop", + action_toggle_layer, + setup_action_top_layer + }, + { + "sendtonormallayer", + action_send_to_layer, + setup_action_normal_layer + }, + { + "sendtobottomlayer", + action_send_to_layer, + setup_action_bottom_layer + }, + { + "togglealwaysonbottom", + action_toggle_layer, + setup_action_bottom_layer + }, { "nextwindowlinear", action_cycle_windows, @@ -482,6 +502,26 @@ ActionString actionstrings[] = action_cycle_windows, setup_action_cycle_windows_previous }, + { + "movetoedgenorth", + action_movetoedge, + setup_action_movetoedge_north + }, + { + "movetoedgesouth", + action_movetoedge, + setup_action_movetoedge_south + }, + { + "movetoedgewest", + action_movetoedge, + setup_action_movetoedge_west + }, + { + "movetoedgeeast", + action_movetoedge, + setup_action_movetoedge_east + }, { NULL, NULL, @@ -504,14 +544,71 @@ Action *action_from_string(char *name) return a; } +Action *action_parse(xmlDocPtr doc, xmlNodePtr node) +{ + char *actname; + Action *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))) + act->data.execute.path = parse_string(doc, n); + } 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_right || + act->func == action_desktop_left || + act->func == action_desktop_up || + act->func == action_desktop_down) { + if ((n = parse_find_node("wrap", node->xmlChildrenNode))) { + act->data.desktopdir.wrap = parse_bool(doc, n); + } + } else if (act->func == action_send_to_desktop_right || + act->func == action_send_to_desktop_left || + act->func == action_send_to_desktop_up || + act->func == action_send_to_desktop_down) { + 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); + } + } + 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_focus(union ActionData *data) @@ -532,14 +629,6 @@ void action_iconify(union ActionData *data) client_iconify(data->client.c, TRUE, TRUE); } -void action_focusraise(union ActionData *data) -{ - if (data->client.c) { - client_focus(data->client.c); - stacking_raise(CLIENT_AS_WINDOW(data->client.c)); - } -} - void action_raise(union ActionData *data) { if (data->client.c) @@ -612,37 +701,39 @@ void action_toggle_omnipresent(union ActionData *data) void action_move_relative_horz(union ActionData *data) { - Client *c = data->relative.c; + ObClient *c = data->relative.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.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.c; if (c) - client_configure(c, Corner_TopLeft, c->area.x, c->area.y, - c->area.width + data->relative.delta, + 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); } void action_resize_relative_vert(union ActionData *data) { - Client *c = data->relative.c; + ObClient *c = data->relative.c; if (c && !c->shaded) - client_configure(c, Corner_TopLeft, c->area.x, c->area.y, - c->area.width, c->area.height + data->relative.delta, + 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); } @@ -705,44 +796,15 @@ void action_toggle_maximize_vert(union ActionData *data) 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); - } - } -} - -void action_send_to_next_desktop(union ActionData *data) -{ - guint d; - - if (!data->sendtonextprev.c) return; - - d = screen_desktop + 1; - if (d >= screen_num_desktops) { - if (!data->sendtonextprev.wrap) return; - d = 0; - } - client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow); - if (data->sendtonextprev.follow) screen_set_desktop(d); -} - -void action_send_to_previous_desktop(union ActionData *data) -{ - guint d; + ObClient *c = data->sendto.c; - if (!data->sendtonextprev.c) return; + if (!c || !client_normal(c)) return; - d = screen_desktop - 1; - if (d >= screen_num_desktops) { - if (!data->sendtonextprev.wrap) return; - d = screen_num_desktops - 1; + 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); } - client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow); - if (data->sendtonextprev.follow) screen_set_desktop(d); } void action_desktop(union ActionData *data) @@ -752,50 +814,26 @@ void action_desktop(union ActionData *data) screen_set_desktop(data->desktop.desk); } -void action_next_desktop(union ActionData *data) -{ - guint d; - - d = screen_desktop + 1; - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - d = 0; - } - screen_set_desktop(d); -} - -void action_previous_desktop(union ActionData *data) -{ - guint d; - - d = screen_desktop - 1; - if (d >= screen_num_desktops) { - if (!data->nextprevdesktop.wrap) return; - d = screen_num_desktops - 1; - } - screen_set_desktop(d); -} - static void cur_row_col(guint *r, guint *c) { switch (screen_desktop_layout.orientation) { - case Orientation_Horz: + case OB_ORIENTATION_HORZ: switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: + case OB_CORNER_TOPLEFT: *r = screen_desktop / screen_desktop_layout.columns; *c = screen_desktop % screen_desktop_layout.columns; break; - case Corner_BottomLeft: + case OB_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: + case OB_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: + case OB_CORNER_BOTTOMRIGHT: *r = screen_desktop_layout.rows - 1 - screen_desktop / screen_desktop_layout.columns; *c = screen_desktop_layout.columns - 1 - @@ -803,23 +841,23 @@ static void cur_row_col(guint *r, guint *c) break; } break; - case Orientation_Vert: + case OB_ORIENTATION_VERT: switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: + case OB_CORNER_TOPLEFT: *r = screen_desktop % screen_desktop_layout.rows; *c = screen_desktop / screen_desktop_layout.rows; break; - case Corner_BottomLeft: + case OB_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: + case OB_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: + case OB_CORNER_BOTTOMRIGHT: *r = screen_desktop_layout.rows - 1 - screen_desktop % screen_desktop_layout.rows; *c = screen_desktop_layout.columns - 1 - @@ -833,46 +871,46 @@ static void cur_row_col(guint *r, guint *c) static guint translate_row_col(guint r, guint c) { switch (screen_desktop_layout.orientation) { - case Orientation_Horz: + case OB_ORIENTATION_HORZ: switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: + case OB_CORNER_TOPLEFT: return r % screen_desktop_layout.rows * screen_desktop_layout.columns + c % screen_desktop_layout.columns; - case Corner_BottomLeft: + case OB_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: + case OB_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: + case OB_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: + case OB_ORIENTATION_VERT: switch (screen_desktop_layout.start_corner) { - case Corner_TopLeft: + case OB_CORNER_TOPLEFT: return c % screen_desktop_layout.columns * screen_desktop_layout.rows + r % screen_desktop_layout.rows; - case Corner_BottomLeft: + case OB_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: + case OB_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: + case OB_CORNER_BOTTOMRIGHT: return (screen_desktop_layout.columns - 1 - c % screen_desktop_layout.columns) * screen_desktop_layout.rows + @@ -884,17 +922,19 @@ static guint translate_row_col(guint r, guint c) return 0; } -void action_next_desktop_column(union ActionData *data) +void action_desktop_right(union ActionData *data) { guint r, c, d; cur_row_col(&r, &c); ++c; - if (c >= screen_desktop_layout.columns) + 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->nextprevdesktop.wrap) return; + if (!data->desktopdir.wrap) return; ++c; } d = translate_row_col(r, c); @@ -902,17 +942,44 @@ void action_next_desktop_column(union ActionData *data) screen_set_desktop(d); } -void action_previous_desktop_column(union ActionData *data) +void action_send_to_desktop_right(union ActionData *data) +{ + ObClient *cl = data->sendto.c; + guint r, c, d; + + if (!cl || !client_normal(cl)) return; + + 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(cl, 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 (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->nextprevdesktop.wrap) return; + if (!data->desktopdir.wrap) return; --c; } d = translate_row_col(r, c); @@ -920,17 +987,44 @@ void action_previous_desktop_column(union ActionData *data) screen_set_desktop(d); } -void action_next_desktop_row(union ActionData *data) +void action_send_to_desktop_left(union ActionData *data) +{ + ObClient *cl = data->sendto.c; + guint r, c, d; + + if (!cl || !client_normal(cl)) return; + + 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(cl, d, data->sendtodir.follow); + if (data->sendtodir.follow) screen_set_desktop(d); + } +} + +void action_desktop_down(union ActionData *data) { guint r, c, d; cur_row_col(&r, &c); ++r; - if (r >= screen_desktop_layout.rows) + 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->nextprevdesktop.wrap) return; + if (!data->desktopdir.wrap) return; ++r; } d = translate_row_col(r, c); @@ -938,17 +1032,43 @@ void action_next_desktop_row(union ActionData *data) screen_set_desktop(d); } -void action_previous_desktop_row(union ActionData *data) +void action_send_to_desktop_down(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 = 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; cur_row_col(&r, &c); --r; - if (r >= screen_desktop_layout.rows) + 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->nextprevdesktop.wrap) return; + if (!data->desktopdir.wrap) return; --r; } d = translate_row_col(r, c); @@ -956,19 +1076,43 @@ void action_previous_desktop_row(union ActionData *data) screen_set_desktop(d); } +void action_send_to_desktop_up(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); + } + } +} + void action_toggle_decorations(union ActionData *data) { - Client *c = data->client.c;; + ObClient *c = data->client.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.c; if (!c || !client_normal(c)) return; @@ -978,13 +1122,12 @@ 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) @@ -997,7 +1140,7 @@ void action_showmenu(union ActionData *data) void action_cycle_windows(union ActionData *data) { - Client *c; + ObClient *c; c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final, data->cycle.cancel); @@ -1005,10 +1148,78 @@ void action_cycle_windows(union ActionData *data) void action_directional_focus(union ActionData *data) { - Client *nf; + ObClient *nf; - if (!data->dfocus.c) + if (!data->diraction.c) return; - if ((nf = client_find_directional(data->dfocus.c, data->dfocus.direction))) + if ((nf = client_find_directional(data->diraction.c, + data->diraction.direction))) client_activate(nf); } + +void action_movetoedge(union ActionData *data) +{ + int x, y, h, w; + ObClient *c = data->diraction.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 OB_DIRECTION_NORTH: + y = 0; + break; + case OB_DIRECTION_WEST: + x = 0; + break; + case OB_DIRECTION_SOUTH: + y = h - c->frame->area.height; + break; + case OB_DIRECTION_EAST: + x = w - c->frame->area.width; + break; + default: + g_assert_not_reached(); + } + frame_frame_gravity(c->frame, &x, &y); + client_configure(c, OB_CORNER_TOPLEFT, + x, y, c->area.width, c->area.height, TRUE, TRUE); + +} + +void action_send_to_layer(union ActionData *data) +{ + if (data->layer.c) + client_set_layer(data->layer.c, data->layer.layer); +} + +void action_toggle_layer(union ActionData *data) +{ + ObClient *c = data->layer.c; + + if (c) { + if (data->layer.layer < 0) + client_set_layer(c, c->below ? 0 : -1); + else if (data->layer.layer > 0) + 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); +}