#include "prop.h"
#include "client.h"
#include "frame.h"
-#include "dispatch.h"
#include "openbox.h"
+#include "resist.h"
#include "popup.h"
#include "config.h"
#include "render/render.h"
#define POPUP_X (10)
#define POPUP_Y (10)
+static void client_dest(ObClient *c)
+{
+ if (moveresize_client == c)
+ moveresize_end(TRUE);
+}
+
void moveresize_startup()
{
XSetWindowAttributes attrib;
popup_size_to_string(popup, "W: 0000 W: 0000");
attrib.save_under = True;
+
+ client_add_destructor(client_dest);
}
void moveresize_shutdown()
{
+ client_remove_destructor(client_dest);
+
popup_free(popup);
popup = NULL;
}
start_ch = c->area.height;
start_x = x;
start_y = y;
+ corner = cnr;
+ button = b;
+
+ /*
+ have to change start_cx and start_cy if going to do this..
if (corner == prop_atoms.net_wm_moveresize_move_keyboard ||
corner == prop_atoms.net_wm_moveresize_size_keyboard)
- button = 0; /* mouse can't end it without being pressed first */
- else
- button = b;
- corner = cnr;
+ XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
+ c->area.width / 2, c->area.height / 2);
+ */
if (corner == prop_atoms.net_wm_moveresize_move ||
corner == prop_atoms.net_wm_moveresize_move_keyboard) {
moveresize_client = NULL;
}
-static void do_move()
+static void do_move(gboolean resist)
{
- dispatch_move(moveresize_client, &cur_x, &cur_y);
+ Rect *a;
+
+ if (resist)
+ resist_move(moveresize_client, &cur_x, &cur_y);
/* get where the client should be */
frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
/* this would be better with a fixed width font ... XXX can do it better
if there are 2 text boxes */
- popup_coords("X: %4d Y: %4d", moveresize_client->frame->area.x,
- moveresize_client->frame->area.y);
+ a = screen_area(screen_desktop);
+ popup_coords("X: %4d Y: %4d",
+ moveresize_client->frame->area.x - a->x,
+ moveresize_client->frame->area.y - a->y);
}
-static void do_resize()
+static void do_resize(gboolean resist)
{
- /* dispatch_resize needs the frame size */
- cur_x += moveresize_client->frame->size.left +
- moveresize_client->frame->size.right;
- cur_y += moveresize_client->frame->size.top +
- moveresize_client->frame->size.bottom;
-
- dispatch_resize(moveresize_client, &cur_x, &cur_y, lockcorner);
-
- cur_x -= moveresize_client->frame->size.left +
- moveresize_client->frame->size.right;
- cur_y -= moveresize_client->frame->size.top +
- moveresize_client->frame->size.bottom;
+ if (resist) {
+ /* resist_size needs the frame size */
+ cur_x += moveresize_client->frame->size.left +
+ moveresize_client->frame->size.right;
+ cur_y += moveresize_client->frame->size.top +
+ moveresize_client->frame->size.bottom;
+
+ resist_size(moveresize_client, &cur_x, &cur_y, lockcorner);
+
+ cur_x -= moveresize_client->frame->size.left +
+ moveresize_client->frame->size.right;
+ cur_y -= moveresize_client->frame->size.top +
+ moveresize_client->frame->size.bottom;
+ }
client_configure(moveresize_client, lockcorner,
moveresize_client->area.x, moveresize_client->area.y,
if (moving) {
cur_x = start_cx + e->xmotion.x_root - start_x;
cur_y = start_cy + e->xmotion.y_root - start_y;
- do_move();
+ do_move(TRUE);
} else {
if (corner == prop_atoms.net_wm_moveresize_size_topleft) {
cur_x = start_cw - (e->xmotion.x_root - start_x);
} else
g_assert_not_reached();
- do_resize();
+ do_resize(TRUE);
}
} else if (e->type == KeyPress) {
if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
moveresize_end(FALSE);
else {
if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
+ int dx = 0, dy = 0;
+
if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
- cur_x += MAX(4, moveresize_client->size_inc.width);
+ dx = MAX(4, moveresize_client->size_inc.width);
else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
- cur_x -= MAX(4, moveresize_client->size_inc.width);
+ dx = -MAX(4, moveresize_client->size_inc.width);
else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
- cur_y += MAX(4, moveresize_client->size_inc.height);
+ dy = MAX(4, moveresize_client->size_inc.height);
else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
- cur_y -= MAX(4, moveresize_client->size_inc.height);
+ dy = -MAX(4, moveresize_client->size_inc.height);
else
return;
- do_resize();
+
+ cur_x += dx;
+ cur_y += dy;
+ XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
+ do_resize(FALSE);
} else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
+ int dx = 0, dy = 0;
+
if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
- cur_x += 4;
+ dx = 4;
else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
- cur_x -= 4;
+ dx = -4;
else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
- cur_y += 4;
+ dy = 4;
else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
- cur_y -= 4;
+ dy = -4;
else
return;
- do_move();
+
+ cur_x += dx;
+ cur_y += dy;
+ XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
+ do_move(FALSE);
}
}
}