X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=b43aa57626b942629615643f6b125edb5e60386e;hb=5a44164be9c7171f7775f7a3f88fe4a1f93d9a1b;hp=88c764311a0450cfc774e84365c12a0545d82f8c;hpb=26827d875ad1fc1b8738f9456f20296241e0bdee;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 88c76431..b43aa576 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -4,9 +4,10 @@ #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" @@ -30,6 +31,12 @@ static Popup *popup = NULL; #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; @@ -38,10 +45,14 @@ void moveresize_startup() 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; } @@ -68,16 +79,25 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) 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; + 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) { @@ -129,10 +149,9 @@ void moveresize_end(gboolean cancel) 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, @@ -145,36 +164,45 @@ void moveresize_end(gboolean cancel) 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_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); + g_message("%d %d", 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 */ - 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 */ + /* 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; - dispatch_resize(moveresize_client, &cur_x, &cur_y, lockcorner); + if (resist) + 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); @@ -201,9 +229,10 @@ void moveresize_event(XEvent *e) } } else if (e->type == MotionNotify) { if (moving) { + g_message("root %d start %d", e->xmotion.x_root, start_x); 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); @@ -246,7 +275,7 @@ void moveresize_event(XEvent *e) } else g_assert_not_reached(); - do_resize(); + do_resize(TRUE); } } else if (e->type == KeyPress) { if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) @@ -255,29 +284,72 @@ void moveresize_event(XEvent *e) moveresize_end(FALSE); else { if (corner == prop_atoms.net_wm_moveresize_size_keyboard) { + int dx = 0, dy = 0, ox = cur_x, oy = cur_y; + 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); + /* 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, ox = cur_x, oy = cur_y; + int opx, px, opy, py; + 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; + 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); } } }