X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Faction.c;h=7379c0ee980224c1f67468405bc6c5d78718f2f1;hb=485fbff15da1a9001e610b3274747d76c1af57cb;hp=275ba96a42c1088cb5db8499e875786080be1866;hpb=c90da6da781932c2d178bfb7e39ec1d5003543b7;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 275ba96a..7379c0ee 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -8,7 +8,6 @@ #include "frame.h" #include "screen.h" #include "action.h" -#include "dispatch.h" #include "openbox.h" #include @@ -82,6 +81,7 @@ void setup_action_directional_focus_northwest(ObAction *a) void setup_action_send_to_desktop(ObAction *a) { + a->data.sendto.follow = TRUE; } void setup_action_send_to_desktop_prev(ObAction *a) @@ -89,6 +89,7 @@ void setup_action_send_to_desktop_prev(ObAction *a) 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) @@ -96,6 +97,7 @@ void setup_action_send_to_desktop_next(ObAction *a) 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) @@ -103,6 +105,7 @@ void setup_action_send_to_desktop_left(ObAction *a) 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) @@ -110,6 +113,7 @@ void setup_action_send_to_desktop_right(ObAction *a) 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) @@ -117,6 +121,7 @@ void setup_action_send_to_desktop_up(ObAction *a) 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) @@ -124,6 +129,7 @@ void setup_action_send_to_desktop_down(ObAction *a) 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_prev(ObAction *a) @@ -232,6 +238,26 @@ void setup_action_movetoedge_west(ObAction *a) a->data.diraction.direction = OB_DIRECTION_WEST; } +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; @@ -294,6 +320,11 @@ ActionString actionstrings[] = action_directional_focus, setup_action_directional_focus_northwest }, + { + "activate", + action_activate, + NULL, + }, { "focus", action_focus, @@ -309,6 +340,11 @@ ActionString actionstrings[] = action_iconify, NULL }, + { + "raiselower", + action_raiselower, + NULL + }, { "raise", action_raise, @@ -614,6 +650,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, @@ -636,7 +692,7 @@ ObAction *action_from_string(char *name) return a; } -ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node) +ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) { char *actname; ObAction *act = NULL; @@ -668,9 +724,17 @@ ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node) 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); @@ -695,6 +759,12 @@ void action_execute(union ActionData *data) } } +void action_activate(union ActionData *data) +{ + if (data->activate.c) + client_activate(data->activate.c, data->activate.here); +} + void action_focus(union ActionData *data) { if (data->client.c) @@ -713,6 +783,35 @@ void action_iconify(union ActionData *data) client_iconify(data->client.c, TRUE, TRUE); } +void action_raiselower(union ActionData *data) +{ + ObClient *c = data->client.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) @@ -886,8 +985,9 @@ void action_send_to_desktop(union ActionData *data) if (data->sendto.desk < screen_num_desktops || data->sendto.desk == DESKTOP_ALL) { - client_set_desktop(c, data->sendto.desk, TRUE); - screen_set_desktop(data->sendto.desk); + client_set_desktop(c, data->sendto.desk, data->sendto.follow); + if (data->sendto.follow) + screen_set_desktop(data->sendto.desk); } } @@ -918,11 +1018,9 @@ void action_send_to_desktop_dir(union ActionData *data) d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap, data->sendtodir.linear, data->sendtodir.final, data->sendtodir.cancel); - - g_message("sendto %d", d); - - client_set_desktop(c, d, TRUE); - screen_set_desktop(d); + client_set_desktop(c, d, data->sendtodir.follow); + if (data->sendtodir.follow) + screen_set_desktop(d); } #if 0 @@ -1119,7 +1217,7 @@ void action_send_to_desktop_up(union ActionData *data) void action_toggle_decorations(union ActionData *data) { - ObClient *c = data->client.c;; + ObClient *c = data->client.c; if (!c) return; @@ -1171,12 +1269,12 @@ void action_directional_focus(union ActionData *data) return; if ((nf = client_find_directional(data->diraction.c, data->diraction.direction))) - client_activate(nf); + client_activate(nf, FALSE); } void action_movetoedge(union ActionData *data) { - int x, y, h, w; + int x, y; ObClient *c = data->diraction.c; if (!c) @@ -1184,20 +1282,20 @@ void action_movetoedge(union ActionData *data) 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; + y = client_directional_edge_search(c, OB_DIRECTION_NORTH); break; case OB_DIRECTION_WEST: - x = 0; + x = client_directional_edge_search(c, OB_DIRECTION_WEST); break; case OB_DIRECTION_SOUTH: - y = h - c->frame->area.height; + y = client_directional_edge_search(c, OB_DIRECTION_SOUTH) - + c->frame->area.height; break; case OB_DIRECTION_EAST: - x = w - c->frame->area.width; + x = client_directional_edge_search(c, OB_DIRECTION_EAST) - + c->frame->area.width; break; default: g_assert_not_reached(); @@ -1208,6 +1306,68 @@ void action_movetoedge(union ActionData *data) } +void action_growtoedge(union ActionData *data) +{ + int x, y, width, height, dest; + ObClient *c = data->diraction.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)