#include "client.h"
+#include "grab.h"
#include "focus.h"
+#include "moveresize.h"
#include "menu.h"
+#include "prop.h"
#include "stacking.h"
#include "frame.h"
#include "framerender.h"
a->data.nextprevdesktop.wrap = TRUE;
} else if (!g_ascii_strcasecmp(name, "toggledecorations")) {
a = action_new(action_toggle_decorations);
+ } else if (!g_ascii_strcasecmp(name, "keyboardmove")) {
+ a = action_new(action_moveresize);
+ a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard;
} else if (!g_ascii_strcasecmp(name, "move")) {
- a = action_new(action_move);
+ a = action_new(action_moveresize);
+ a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move;
} else if (!g_ascii_strcasecmp(name, "resize")) {
- a = action_new(action_resize);
+ a = action_new(action_moveresize);
+ a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft;
+ } else if (!g_ascii_strcasecmp(name, "keyboardresize")) {
+ a = action_new(action_moveresize);
+ a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard;
} else if (!g_ascii_strcasecmp(name, "restart")) {
a = action_new(action_restart);
} else if (!g_ascii_strcasecmp(name, "exit")) {
case Orientation_Horz:
switch (screen_desktop_layout.start_corner) {
case Corner_TopLeft:
- return r * screen_desktop_layout.columns + c;
+ return r % screen_desktop_layout.rows *
+ screen_desktop_layout.columns +
+ c % screen_desktop_layout.columns;
case Corner_BottomLeft:
- return (screen_desktop_layout.rows - 1 - r) *
- screen_desktop_layout.columns + c;
+ return (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows) *
+ screen_desktop_layout.columns +
+ c % screen_desktop_layout.columns;
case Corner_TopRight:
- return r * screen_desktop_layout.columns +
- (screen_desktop_layout.columns - 1 - c);
+ return r % screen_desktop_layout.rows *
+ screen_desktop_layout.columns +
+ (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns);
case Corner_BottomRight:
- return (screen_desktop_layout.rows - 1 - r) *
+ 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 - 1 -
+ c % screen_desktop_layout.columns);
}
case Orientation_Vert:
switch (screen_desktop_layout.start_corner) {
case Corner_TopLeft:
- return c * screen_desktop_layout.rows + r;
+ return c % screen_desktop_layout.columns *
+ screen_desktop_layout.rows +
+ r % screen_desktop_layout.rows;
case Corner_BottomLeft:
- return c * screen_desktop_layout.rows +
- (screen_desktop_layout.rows - 1 - r);
+ return c % screen_desktop_layout.columns *
+ screen_desktop_layout.rows +
+ (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows);
case Corner_TopRight:
- return (screen_desktop_layout.columns - 1 - c) *
- screen_desktop_layout.rows + r;
+ return (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns) *
+ screen_desktop_layout.rows +
+ r % screen_desktop_layout.rows;
case Corner_BottomRight:
- return (screen_desktop_layout.columns - 1 - c) *
+ return (screen_desktop_layout.columns - 1 -
+ c % screen_desktop_layout.columns) *
screen_desktop_layout.rows +
- (screen_desktop_layout.rows - 1 - r);
+ (screen_desktop_layout.rows - 1 -
+ r % screen_desktop_layout.rows);
}
}
g_assert_not_reached();
cur_row_col(&r, &c);
++c;
+ if (c >= screen_desktop_layout.columns)
+ c = 0;
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (!data->nextprevdesktop.wrap) return;
- c = 0;
- }
- if (d >= screen_num_desktops)
++c;
+ }
d = translate_row_col(r, c);
if (d < screen_num_desktops)
screen_set_desktop(d);
cur_row_col(&r, &c);
--c;
+ if (c >= screen_desktop_layout.columns)
+ c = screen_desktop_layout.columns - 1;
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (!data->nextprevdesktop.wrap) return;
- c = screen_desktop_layout.columns - 1;
- }
- if (d >= screen_num_desktops)
--c;
+ }
d = translate_row_col(r, c);
if (d < screen_num_desktops)
screen_set_desktop(d);
cur_row_col(&r, &c);
++r;
+ if (r >= screen_desktop_layout.rows)
+ r = 0;
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (!data->nextprevdesktop.wrap) return;
- r = 0;
- }
- if (d >= screen_num_desktops)
++r;
+ }
d = translate_row_col(r, c);
if (d < screen_num_desktops)
screen_set_desktop(d);
cur_row_col(&r, &c);
--r;
+ if (r >= screen_desktop_layout.rows)
+ r = screen_desktop_layout.rows - 1;
d = translate_row_col(r, c);
if (d >= screen_num_desktops) {
if (!data->nextprevdesktop.wrap) return;
- c = screen_desktop_layout.rows - 1;
- }
- if (d >= screen_num_desktops)
--r;
+ }
d = translate_row_col(r, c);
if (d < screen_num_desktops)
screen_set_desktop(d);
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)
+void action_moveresize(union ActionData *data)
{
- Client *c = data->move.c;
- int x = data->move.x;
- int y = data->move.y;
+ Client *c = data->moveresize.c;
if (!c || !client_normal(c)) return;
- 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;
- int h = data->resize.y;
-
- if (!c || c->shaded || !client_normal(c)) return;
-
- 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);
+ moveresize_start(c, data->moveresize.x, data->moveresize.y,
+ data->moveresize.button, data->moveresize.corner);
}
void action_restart(union ActionData *data)
void action_showmenu(union ActionData *data)
{
- menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y,
- data->showmenu.c);
+ if (data->showmenu.name) {
+ menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y,
+ data->showmenu.c);
+ }
}
static void popup_cycle(Client *c, gboolean hide)
0, 0, 1, 1, 0, render_depth, InputOutput,
render_visual, CWOverrideRedirect, &attrib);
g_assert(coords != None);
+
+ grab_pointer(TRUE, None);
+
+ XMapWindow(ob_display, coords);
}
- if (hide)
- XUnmapWindow(ob_display, coords);
- else {
+ if (hide) {
+ XDestroyWindow(ob_display, coords);
+ coords = None;
+
+ grab_pointer(FALSE, None);
+ } else {
Rect *a;
Size s;
a->y + (a->height - s.height) / 2,
s.width, s.height);
framerender_popup_label(coords, &s, c->title);
-
- XMapWindow(ob_display, coords);
}
}
projects / chaz / openbox / blobdiff