X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=8f92f71f958f34af73564ba2a84e2edddbf5d502;hb=5d4cbbc67444c3955f705b3aeddf29be1c731866;hp=564bf7117513cb71ed148192e278586ea248b2a9;hpb=20aca7fb7a21e5b88eae0d749a3c4a34dde39ebb;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 564bf711..8f92f71f 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -4,8 +4,8 @@ #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" @@ -30,6 +30,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 +44,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; } @@ -72,12 +82,16 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) 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) { @@ -145,11 +159,12 @@ void moveresize_end(gboolean cancel) moveresize_client = NULL; } -static void do_move() +static void do_move(gboolean resist) { Rect *a; - dispatch_move(moveresize_client, &cur_x, &cur_y); + 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); @@ -164,20 +179,22 @@ static void do_move() 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, @@ -207,7 +224,7 @@ void moveresize_event(XEvent *e) 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); @@ -250,7 +267,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)) @@ -259,29 +276,43 @@ void moveresize_event(XEvent *e) 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); } } }