#include "client.h"
+#include "focus.h"
#include "stacking.h"
#include "frame.h"
+#include "framerender.h"
#include "screen.h"
#include "action.h"
#include "dispatch.h"
a = action_new(action_close);
} else if (!g_ascii_strcasecmp(name, "kill")) {
a = action_new(action_kill);
+ } else if (!g_ascii_strcasecmp(name, "shadelower")) {
+ a = action_new(action_shadelower);
+ } else if (!g_ascii_strcasecmp(name, "unshaderaise")) {
+ a = action_new(action_unshaderaise);
} else if (!g_ascii_strcasecmp(name, "shade")) {
a = action_new(action_shade);
} else if (!g_ascii_strcasecmp(name, "unshade")) {
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")) {
a = action_new(action_unmaximize_vert);
} else if (!g_ascii_strcasecmp(name, "togglemaximizevert")) {
a = action_new(action_toggle_maximize_vert);
+ } else if (!g_ascii_strcasecmp(name, "sendtodesktop")) {
+ a = action_new(action_send_to_desktop);
+ a->data.sendto.follow = TRUE;
} else if (!g_ascii_strcasecmp(name, "sendtonextdesktop")) {
a = action_new(action_send_to_next_desktop);
a->data.sendtonextprev.wrap = FALSE;
} 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")) {
a = action_new(action_restart);
} else if (!g_ascii_strcasecmp(name, "exit")) {
a = action_new(action_exit);
+ } else if (!g_ascii_strcasecmp(name, "showmenu")) {
+ a = action_new(action_showmenu);
+ } else if (!g_ascii_strcasecmp(name, "nextwindowlinear")) {
+ a = action_new(action_cycle_windows);
+ a->data.cycle.linear = TRUE;
+ a->data.cycle.forward = TRUE;
+ } else if (!g_ascii_strcasecmp(name, "previouswindowlinear")) {
+ a = action_new(action_cycle_windows);
+ a->data.cycle.linear = TRUE;
+ a->data.cycle.forward = FALSE;
+ } else if (!g_ascii_strcasecmp(name, "nextwindow")) {
+ a = action_new(action_cycle_windows);
+ a->data.cycle.linear = FALSE;
+ a->data.cycle.forward = TRUE;
+ } else if (!g_ascii_strcasecmp(name, "previouswindow")) {
+ a = action_new(action_cycle_windows);
+ a->data.cycle.linear = FALSE;
+ a->data.cycle.forward = FALSE;
}
+
return a;
}
stacking_raise(data->client.c);
}
+void action_unshaderaise(union ActionData *data)
+{
+ if (data->client.c) {
+ if (data->client.c->shaded)
+ client_shade(data->client.c, FALSE);
+ else
+ stacking_raise(data->client.c);
+ }
+}
+
+void action_shadelower(union ActionData *data)
+{
+ if (data->client.c) {
+ if (data->client.c->shaded)
+ stacking_lower(data->client.c);
+ else
+ client_shade(data->client.c, TRUE);
+ }
+}
+
void action_lower(union ActionData *data)
{
if (data->client.c)
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_horz(union ActionData *data)
+{
+ Client *c = data->relative.c;
+ if (c)
+ client_configure(c, Corner_TopLeft,
+ c->area.x + data->relative.delta, c->area.y,
+ c->area.width, c->area.height, TRUE, TRUE);
}
-void action_move_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 + data->relative.dx,
- c->area.y + data->relative.dy,
+ c->area.x, c->area.y + data->relative.delta,
c->area.width, c->area.height, TRUE, TRUE);
}
-void action_resize_relative(union ActionData *data)
+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 && !c->shaded)
+ 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)
void action_send_to_desktop(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);
+ 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->sendto.c) return;
+ 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);
+ client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
if (data->sendtonextprev.follow) screen_set_desktop(d);
}
{
guint d;
- if (!data->sendto.c) return;
+ if (!data->sendtonextprev.c) return;
d = screen_desktop - 1;
if (d >= screen_num_desktops) {
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);
}
screen_desktop / screen_desktop_layout.columns;
*c = screen_desktop % screen_desktop_layout.columns;
break;
- break;
case Corner_TopRight:
*r = screen_desktop / screen_desktop_layout.columns;
*c = screen_desktop_layout.columns - 1 -
*c = screen_desktop_layout.columns - 1 -
screen_desktop % screen_desktop_layout.columns;
break;
- break;
}
+ break;
case Orientation_Vert:
switch (screen_desktop_layout.start_corner) {
case Corner_TopLeft:
screen_desktop % screen_desktop_layout.rows;
*c = screen_desktop / screen_desktop_layout.rows;
break;
- break;
case Corner_TopRight:
*r = screen_desktop % screen_desktop_layout.rows;
*c = screen_desktop_layout.columns - 1 -
*c = screen_desktop_layout.columns - 1 -
screen_desktop / screen_desktop_layout.rows;
break;
- break;
}
break;
}
void action_toggle_decorations(union ActionData *data)
{
- Client *c = data->client.c;
+ Client *c = data->client.c;;
+
+ if (!c) return;
+
c->disabled_decorations = c->disabled_decorations ? 0 : ~0;
client_setup_decor_and_functions(c);
}
+static void popup_coords(char *format, int a, int b, gboolean hide)
+{
+ XSetWindowAttributes attrib;
+ static Window coords = None;
+
+ if (coords == None) {
+ attrib.override_redirect = TRUE;
+ coords = XCreateWindow(ob_display, ob_root,
+ 0, 0, 1, 1, 0, render_depth, InputOutput,
+ render_visual, CWOverrideRedirect, &attrib);
+ g_assert(coords != None);
+ }
+
+ if (hide)
+ XUnmapWindow(ob_display, coords);
+ else {
+ Size s;
+ char *text;
+
+ text = g_strdup_printf(format, a, b);
+ framerender_size_popup_label(text, &s);
+ XMoveResizeWindow(ob_display, coords,
+ 10, 10, s.width, s.height);
+ framerender_popup_label(coords, &s, text);
+ g_free(text);
+
+ XMapWindow(ob_display, coords);
+ }
+}
+
void action_move(union ActionData *data)
{
Client *c = data->move.c;
dispatch_move(c, &x, &y);
+ popup_coords("X: %d Y: %d", x, y, data->move.final);
+
frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */
client_configure(c, Corner_TopLeft, x, y, c->area.width, c->area.height,
TRUE, data->move.final);
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;
+ if (!c || c->shaded || !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);
+
+ popup_coords("W: %d H: %d", c->logical_size.width,
+ c->logical_size.height, data->move.final);
}
void action_restart(union ActionData *data)
{
ob_shutdown = TRUE;
}
+
+void action_showmenu(union ActionData *data)
+{
+ g_message(__FUNCTION__);
+}
+
+static void popup_cycle(Client *c, gboolean hide)
+{
+ XSetWindowAttributes attrib;
+ static Window coords = None;
+
+ if (coords == None) {
+ attrib.override_redirect = TRUE;
+ coords = XCreateWindow(ob_display, ob_root,
+ 0, 0, 1, 1, 0, render_depth, InputOutput,
+ render_visual, CWOverrideRedirect, &attrib);
+ g_assert(coords != None);
+ }
+
+ if (hide)
+ XUnmapWindow(ob_display, coords);
+ else {
+ Rect *a;
+ Size s;
+
+ a = screen_area(c->desktop);
+
+ framerender_size_popup_label(c->title, &s);
+ XMoveResizeWindow(ob_display, coords,
+ a->x + (a->width - s.width) / 2,
+ a->y + (a->height - s.height) / 2,
+ s.width, s.height);
+ framerender_popup_label(coords, &s, c->title);
+
+ XMapWindow(ob_display, coords);
+ }
+}
+
+void action_cycle_windows(union ActionData *data)
+{
+ Client *c;
+
+ c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
+ data->cycle.cancel);
+ popup_cycle(c, !c || data->cycle.final || data->cycle.cancel);
+}
+
projects / chaz / openbox / blobdiff