static guint32 corner;
static ObCorner lockcorner;
-static Popup *popup = NULL;
+static ObPopup *popup = NULL;
-static void client_dest(ObClient *c)
+static void client_dest(gpointer client)
{
- if (moveresize_client == c)
+ if (moveresize_client == client)
moveresize_end(TRUE);
}
-void moveresize_startup()
+void moveresize_startup(gboolean reconfig)
{
popup = popup_new(FALSE);
- client_add_destructor(client_dest);
+ if (!reconfig)
+ client_add_destructor(client_dest);
}
-void moveresize_shutdown()
+void moveresize_shutdown(gboolean reconfig)
{
- client_remove_destructor(client_dest);
+ if (!reconfig) {
+ if (moveresize_in_progress)
+ moveresize_end(FALSE);
+ client_remove_destructor(client_dest);
+ }
popup_free(popup);
popup = NULL;
c->area.width / 2,
c->frame->area.y + c->frame->size.top +
c->area.height / 2);
- popup_show(popup, text, NULL);
+ popup_show(popup, text);
g_free(text);
}
g_assert(!moveresize_in_progress);
+ if (!c->frame->visible)
+ return;
+
moveresize_client = c;
start_cx = c->frame->area.x;
start_cy = c->frame->area.y;
increment instead of at 0, so you have to move half an increment
either way instead of a full increment one and 1 px the other. and this
is one large mother fucking comment. */
- start_cw = c->area.width + (c->size_inc.width + 1) / 2;
- start_ch = c->area.height + (c->size_inc.height + 1) / 2;
+ start_cw = c->area.width + c->size_inc.width / 2;
+ start_ch = c->area.height + c->size_inc.height / 2;
start_x = x;
start_y = y;
corner = cnr;
void moveresize_end(gboolean cancel)
{
grab_keyboard(FALSE);
- grab_pointer(FALSE, None);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
popup_hide(popup);
/* 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);
+ moveresize_client->area.width,
+ moveresize_client->area.height, TRUE, FALSE);
}
static void do_resize(gboolean resist)