#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"
static Popup *popup = NULL;
-#define POPUP_X (10)
-#define POPUP_Y (10)
-
-void moveresize_startup()
+static void client_dest(gpointer client)
{
- XSetWindowAttributes attrib;
+ if (moveresize_client == client)
+ moveresize_end(TRUE);
+}
+void moveresize_startup(gboolean reconfig)
+{
popup = popup_new(FALSE);
- popup_size_to_string(popup, "W: 0000 W: 0000");
- attrib.save_under = True;
+ if (!reconfig)
+ client_add_destructor(client_dest);
}
-void moveresize_shutdown()
+void moveresize_shutdown(gboolean reconfig)
{
+ if (!reconfig)
+ client_remove_destructor(client_dest);
+
popup_free(popup);
popup = NULL;
}
-static void popup_coords(char *format, int a, int b)
+static void popup_coords(ObClient *c, char *format, int a, int b)
{
char *text;
- Rect *area;
text = g_strdup_printf(format, a, b);
- area = screen_physical_area_monitor(0);
- popup_position(popup, NorthWestGravity,
- POPUP_X + area->x, POPUP_Y + area->y);
+ popup_position(popup, CenterGravity,
+ c->frame->area.x + c->frame->size.left +
+ c->area.width / 2,
+ c->frame->area.y + c->frame->size.top +
+ c->area.height / 2);
popup_show(popup, text, NULL);
g_free(text);
}
moveresize_client = c;
start_cx = c->frame->area.x;
start_cy = c->frame->area.y;
- start_cw = c->area.width;
- start_ch = c->area.height;
+ /* these adjustments for the size_inc make resizing a terminal more
+ friendly. you essentially start the resize in the middle of the
+ 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_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);
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,
static void do_move(gboolean resist)
{
- Rect *a;
-
if (resist)
- resist_move(moveresize_client, &cur_x, &cur_y);
-
- dispatch_move(moveresize_client, &cur_x, &cur_y);
+ resist_move_windows(moveresize_client, &cur_x, &cur_y);
+ resist_move_monitors(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);
-
- /* this would be better with a fixed width font ... XXX can do it better
- if there are 2 text boxes */
- 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(gboolean resist)
{
- /* dispatch_resize needs the frame size */
+ /* 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);
+ resist_size_windows(moveresize_client, &cur_x, &cur_y, lockcorner);
+ resist_size_monitors(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,
cur_x, cur_y, TRUE, FALSE);
/* this would be better with a fixed width font ... XXX can do it better
if there are 2 text boxes */
- popup_coords("W: %4d H: %4d", moveresize_client->logical_size.width,
- moveresize_client->logical_size.height);
+ if (moveresize_client->size_inc.width > 1 ||
+ moveresize_client->size_inc.height > 1)
+ popup_coords(moveresize_client, "%d x %d",
+ moveresize_client->logical_size.width,
+ moveresize_client->logical_size.height);
}
void moveresize_event(XEvent *e)
moveresize_end(FALSE);
else {
if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
- int dx = 0, dy = 0;
+ int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
dx = MAX(4, moveresize_client->size_inc.width);
cur_x += dx;
cur_y += dy;
XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+ /* steal the motion events this causes */
+ XSync(ob_display, FALSE);
+ {
+ XEvent ce;
+ while (XCheckTypedEvent(ob_display, MotionNotify, &ce));
+ }
do_resize(FALSE);
+
+ /* because the cursor moves even though the window does
+ not nessesarily (resistance), this adjusts where the curor
+ thinks it started so that it keeps up with where the window
+ actually is */
+ start_x += dx - (cur_x - ox);
+ start_y += dy - (cur_y - oy);
} else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
- int dx = 0, dy = 0;
+ int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+ int opx, px, opy, py;
if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
dx = 4;
cur_x += dx;
cur_y += dy;
+ screen_pointer_pos(&opx, &opy);
XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+ /* steal the motion events this causes */
+ XSync(ob_display, FALSE);
+ {
+ XEvent ce;
+ while (XCheckTypedEvent(ob_display, MotionNotify, &ce));
+ }
+ screen_pointer_pos(&px, &py);
do_move(FALSE);
+
+ /* because the cursor moves even though the window does
+ not nessesarily (resistance), this adjusts where the curor
+ thinks it started so that it keeps up with where the window
+ actually is */
+ start_x += (px - opx) - (cur_x - ox);
+ start_y += (py - opy) - (cur_y - oy);
}
}
}
projects / chaz / openbox / blobdiff