#include "prop.h"
#include "client.h"
#include "frame.h"
-#include "dispatch.h"
#include "openbox.h"
#include "resist.h"
#include "popup.h"
+#include "moveresize.h"
#include "config.h"
#include "render/render.h"
#include "render/theme.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;
}
popup_hide(popup);
if (moving) {
- client_configure(moveresize_client, OB_CORNER_TOPLEFT,
- (cancel ? start_cx : cur_x),
- (cancel ? start_cy : cur_y),
- start_cw, start_ch, TRUE, TRUE);
+ client_move(moveresize_client,
+ (cancel ? start_cx : cur_x),
+ (cancel ? start_cy : cur_y));
} else {
client_configure(moveresize_client, lockcorner,
moveresize_client->area.x,
if (resist)
resist_move(moveresize_client, &cur_x, &cur_y);
- dispatch_move(moveresize_client, &cur_x, &cur_y);
-
/* get where the client should be */
frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
- client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
- start_cw, start_ch, TRUE, FALSE);
+ client_move(moveresize_client, cur_x, cur_y);
/* this would be better with a fixed width font ... XXX can do it better
if there are 2 text boxes */
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;
+ 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;
- if (resist)
resist_size(moveresize_client, &cur_x, &cur_y, lockcorner);
- 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;
+ 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,