X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=7d06f12e46a29d647cadd4e8ee5eae24a3bff83e;hb=b543af60b3b625f978bec0eacc7da31cd9d347f6;hp=7379c0ee980224c1f67468405bc6c5d78718f2f1;hpb=485fbff15da1a9001e610b3274747d76c1af57cb;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 7379c0ee..7d06f12e 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -40,43 +40,51 @@ void action_free(ObAction *a) } void setup_action_directional_focus_north(ObAction *a) -{ - a->data.diraction.direction = OB_DIRECTION_NORTH; +{ + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_NORTH; } void setup_action_directional_focus_east(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_EAST; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_EAST; } void setup_action_directional_focus_south(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_SOUTH; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_SOUTH; } void setup_action_directional_focus_west(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_WEST; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_WEST; } void setup_action_directional_focus_northeast(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_NORTHEAST; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_NORTHEAST; } void setup_action_directional_focus_southeast(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_SOUTHEAST; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST; } void setup_action_directional_focus_southwest(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_SOUTHWEST; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST; } void setup_action_directional_focus_northwest(ObAction *a) { - a->data.diraction.direction = OB_DIRECTION_NORTHWEST; + a->data.interdiraction.inter.any.interactive = TRUE; + a->data.interdiraction.direction = OB_DIRECTION_NORTHWEST; } void setup_action_send_to_desktop(ObAction *a) @@ -86,6 +94,7 @@ void setup_action_send_to_desktop(ObAction *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; @@ -94,6 +103,7 @@ void setup_action_send_to_desktop_prev(ObAction *a) 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; @@ -102,6 +112,7 @@ void setup_action_send_to_desktop_next(ObAction *a) 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; @@ -110,6 +121,7 @@ void setup_action_send_to_desktop_left(ObAction *a) 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; @@ -118,6 +130,7 @@ void setup_action_send_to_desktop_right(ObAction *a) 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; @@ -126,6 +139,7 @@ void setup_action_send_to_desktop_up(ObAction *a) 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; @@ -134,6 +148,7 @@ void setup_action_send_to_desktop_down(ObAction *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; @@ -141,6 +156,7 @@ void setup_action_desktop_prev(ObAction *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; @@ -148,6 +164,7 @@ void setup_action_desktop_next(ObAction *a) 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; @@ -155,6 +172,7 @@ void setup_action_desktop_left(ObAction *a) 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; @@ -162,6 +180,7 @@ void setup_action_desktop_right(ObAction *a) 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; @@ -169,6 +188,7 @@ void setup_action_desktop_up(ObAction *a) 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; @@ -196,24 +216,28 @@ void setup_action_resize_keyboard(ObAction *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(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(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(ObAction *a) { + a->data.cycle.inter.any.interactive = TRUE; a->data.cycle.linear = FALSE; a->data.cycle.forward = FALSE; } @@ -570,6 +594,11 @@ ActionString actionstrings[] = action_unshow_desktop, NULL }, + { + "desktoplast", + action_desktop_last, + NULL + }, { "restart", action_restart, @@ -701,8 +730,11 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) 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); + 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); @@ -721,9 +753,8 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) 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))) { + 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); @@ -761,31 +792,31 @@ void action_execute(union ActionData *data) void action_activate(union ActionData *data) { - if (data->activate.c) - client_activate(data->activate.c, data->activate.here); + 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_raiselower(union ActionData *data) { - ObClient *c = data->client.c; + ObClient *c = data->client.any.c; GList *it; gboolean raise = FALSE; @@ -814,77 +845,77 @@ void action_raiselower(union ActionData *data) 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) { - ObClient *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c) client_configure(c, OB_CORNER_TOPLEFT, c->area.x + data->relative.delta, c->area.y, @@ -893,7 +924,7 @@ void action_move_relative_horz(union ActionData *data) void action_move_relative_vert(union ActionData *data) { - ObClient *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c) client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y + data->relative.delta, @@ -902,7 +933,7 @@ void action_move_relative_vert(union ActionData *data) void action_resize_relative_horz(union ActionData *data) { - ObClient *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c) client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y, c->area.width + @@ -912,7 +943,7 @@ void action_resize_relative_horz(union ActionData *data) void action_resize_relative_vert(union ActionData *data) { - ObClient *c = data->relative.c; + ObClient *c = data->relative.any.c; if (c && !c->shaded) client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y, c->area.width, c->area.height + @@ -922,64 +953,65 @@ 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) { - ObClient *c = data->sendto.c; + ObClient *c = data->sendto.any.c; if (!c || !client_normal(c)) return; @@ -1002,222 +1034,40 @@ void action_desktop_dir(union ActionData *data) { guint d; - d = screen_cycle_desktop(data->desktopdir.dir, data->desktopdir.wrap, + d = screen_cycle_desktop(data->desktopdir.dir, + data->desktopdir.wrap, data->sendtodir.linear, - data->desktopdir.final, data->desktopdir.cancel); + data->desktopdir.inter.any.interactive, + data->desktopdir.inter.final, + data->desktopdir.inter.cancel); screen_set_desktop(d); } void action_send_to_desktop_dir(union ActionData *data) { - ObClient *c = data->sendtodir.c; + ObClient *c = data->sendtodir.inter.any.c; guint d; if (!c || !client_normal(c)) return; d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap, data->sendtodir.linear, - data->sendtodir.final, data->sendtodir.cancel); + 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); } -#if 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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); -} - -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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); - } -} - -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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); -} - -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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); - } -} - -void action_desktop_down(union ActionData *data) -{ - guint r, c, 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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); -} - -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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); - } - } -} - -void action_desktop_up(union ActionData *data) +void action_desktop_last(union ActionData *data) { - guint r, c, d; - - 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) - screen_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); + screen_set_desktop(screen_last_desktop); } -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_cycle_desktop(d, data->desktopdir.final, - data->desktopdir.cancel); - } - } -} -#endif - void action_toggle_decorations(union ActionData *data) { - ObClient *c = data->client.c; + ObClient *c = data->client.any.c; if (!c) return; @@ -1227,7 +1077,7 @@ void action_toggle_decorations(union ActionData *data) void action_moveresize(union ActionData *data) { - ObClient *c = data->moveresize.c; + ObClient *c = data->moveresize.any.c; if (!c || !client_normal(c)) return; @@ -1249,33 +1099,29 @@ 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) { - ObClient *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) { - ObClient *nf; - - if (!data->diraction.c) - return; - if ((nf = client_find_directional(data->diraction.c, - data->diraction.direction))) - client_activate(nf, FALSE); + 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; - ObClient *c = data->diraction.c; + ObClient *c = data->diraction.any.c; if (!c) return; @@ -1309,7 +1155,7 @@ void action_movetoedge(union ActionData *data) void action_growtoedge(union ActionData *data) { int x, y, width, height, dest; - ObClient *c = data->diraction.c; + ObClient *c = data->diraction.any.c; Rect *a = screen_area(c->desktop); if (!c) @@ -1370,13 +1216,13 @@ void action_growtoedge(union ActionData *data) 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) { - ObClient *c = data->layer.c; + ObClient *c = data->layer.any.c; if (c) { if (data->layer.layer < 0)