a = action_new(action_toggle_shade);
} else if (!g_ascii_strcasecmp(name, "toggleomnipresent")) {
a = action_new(action_toggle_omnipresent);
- } else if (!g_ascii_strcasecmp(name, "moverelative")) {
- a = action_new(action_move_relative);
- } else if (!g_ascii_strcasecmp(name, "resizerelative")) {
- a = action_new(action_resize_relative);
+ } else if (!g_ascii_strcasecmp(name, "moverelativehorz")) {
+ a = action_new(action_move_relative_horz);
+ } else if (!g_ascii_strcasecmp(name, "moverelativevert")) {
+ a = action_new(action_move_relative_vert);
+ } else if (!g_ascii_strcasecmp(name, "resizerelativehorz")) {
+ a = action_new(action_resize_relative_horz);
+ } else if (!g_ascii_strcasecmp(name, "resizerelativevert")) {
+ a = action_new(action_resize_relative_vert);
} else if (!g_ascii_strcasecmp(name, "maximizefull")) {
a = action_new(action_maximize_full);
} else if (!g_ascii_strcasecmp(name, "unmaximizefull")) {
} else if (!g_ascii_strcasecmp(name, "previousdesktoprowwrap")) {
a = action_new(action_previous_desktop_row);
a->data.nextprevdesktop.wrap = TRUE;
+ } else if (!g_ascii_strcasecmp(name, "toggledecorations")) {
+ a = action_new(action_toggle_decorations);
} else if (!g_ascii_strcasecmp(name, "move")) {
a = action_new(action_move);
} else if (!g_ascii_strcasecmp(name, "resize")) {
if (data->client.c)
client_set_desktop(data->client.c,
data->client.c->desktop == DESKTOP_ALL ?
- screen_desktop : DESKTOP_ALL);
+ screen_desktop : DESKTOP_ALL, FALSE);
}
-void action_move_relative(union ActionData *data)
+void action_move_relative_horz(union ActionData *data)
{
Client *c = data->relative.c;
if (c)
client_configure(c, Corner_TopLeft,
- c->area.x + data->relative.dx,
- c->area.y + data->relative.dy,
+ c->area.x + data->relative.delta, c->area.y,
c->area.width, c->area.height, TRUE, TRUE);
}
-void action_resize_relative(union ActionData *data)
+void action_move_relative_vert(union ActionData *data)
+{
+ Client *c = data->relative.c;
+ if (c)
+ client_configure(c, 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;
if (c)
client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
- c->area.width + data->relative.dx,
- c->area.height + data->relative.dy, TRUE, TRUE);
+ c->area.width + data->relative.delta,
+ c->area.height, TRUE, TRUE);
+}
+
+void action_resize_relative_vert(union ActionData *data)
+{
+ Client *c = data->relative.c;
+ if (c)
+ client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
+ c->area.width, c->area.height + data->relative.delta,
+ TRUE, TRUE);
}
void action_maximize_full(union ActionData *data)
if (data->sendto.c)
if (data->sendto.desktop < screen_num_desktops ||
data->sendto.desktop == DESKTOP_ALL)
- client_set_desktop(data->sendto.c, data->sendto.desktop);
+ client_set_desktop(data->sendto.c, data->sendto.desktop, TRUE);
}
void action_send_to_next_desktop(union ActionData *data)
if (!data->sendtonextprev.wrap) return;
d = 0;
}
- client_set_desktop(data->sendtonextprev.c, d);
+ client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
if (data->sendtonextprev.follow) screen_set_desktop(d);
}
if (!data->sendtonextprev.wrap) return;
d = screen_num_desktops - 1;
}
- client_set_desktop(data->sendtonextprev.c, d);
+ client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
if (data->sendtonextprev.follow) screen_set_desktop(d);
}
void action_resize(union ActionData *data)
{
Client *c = data->resize.c;
- int w = data->resize.x - c->frame->size.left - c->frame->size.right;
- int h = data->resize.y - c->frame->size.top - c->frame->size.bottom;
+ int w = data->resize.x;
+ int h = data->resize.y;
if (!c || !client_normal(c)) return;
- /* XXX window snapping/struts */
-
+ dispatch_resize(c, &w, &h, data->resize.corner);
+
+ w -= c->frame->size.left + c->frame->size.right;
+ h -= c->frame->size.top + c->frame->size.bottom;
client_configure(c, data->resize.corner, c->area.x, c->area.y, w, h,
TRUE, data->resize.final);
}