X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=0abb8e8d5a8d53fbda25ec1122653b464bfabc28;hb=e68e6c6a536a2132570ddf1d1d3759bb31ef781e;hp=9356468378bc301a3171bdc89b04cb0c065fe4f1;hpb=276b2be581c6cb138b439537761ff2ca42201805;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 93564683..0abb8e8d 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -3,9 +3,11 @@ #include "screen.h" #include "prop.h" #include "client.h" -#include "dispatch.h" +#include "frame.h" #include "openbox.h" +#include "resist.h" #include "popup.h" +#include "moveresize.h" #include "config.h" #include "render/render.h" #include "render/theme.h" @@ -14,7 +16,7 @@ #include gboolean moveresize_in_progress = FALSE; -Client *moveresize_client = NULL; +ObClient *moveresize_client = NULL; static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */ @@ -25,80 +27,75 @@ static guint32 corner; static ObCorner lockcorner; static Popup *popup = NULL; -static InternalWindow opaque_window = { { Window_Internal }, None }; -static GC opaque_gc = None; -static gboolean first_draw = FALSE; -#define POPUP_X (10) -#define POPUP_Y (10) - -void moveresize_startup() +static void client_dest(gpointer client) { - XSetWindowAttributes attrib; - XGCValues gcv; + 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; - opaque_window.win = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0, - RrDepth(ob_rr_inst), InputOutput, - RrVisual(ob_rr_inst), - CWSaveUnder, &attrib); - stacking_add(INTERNAL_AS_WINDOW(&opaque_window)); - stacking_raise(INTERNAL_AS_WINDOW(&opaque_window)); - - /* a GC to invert stuff */ - gcv.function = GXxor; - gcv.line_width = ob_rr_theme->bwidth; - gcv.foreground = (WhitePixel(ob_display, ob_screen) ^ - BlackPixel(ob_display, ob_screen)); - opaque_gc = XCreateGC(ob_display, opaque_window.win, - GCFunction | GCForeground | GCLineWidth, &gcv); + + 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; - stacking_remove(&opaque_window); - XFreeGC(ob_display, opaque_gc); - XDestroyWindow(ob_display, opaque_window.win); } -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); } -void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr) +void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) { ObCursor cur; - Rect *a; 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; - 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 / 2; + start_ch = c->area.height + c->size_inc.height / 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) { @@ -140,37 +137,19 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr) grab_pointer(TRUE, cur); grab_keyboard(TRUE); - - a = screen_physical_area(); - - XMoveResizeWindow(ob_display, opaque_window.win, - a->x, a->y, a->width, a->height); - stacking_raise(INTERNAL_AS_WINDOW(&opaque_window)); - if (corner == prop_atoms.net_wm_moveresize_move || - corner == prop_atoms.net_wm_moveresize_move_keyboard) { - if (!config_opaque_move) - XMapWindow(ob_display, opaque_window.win); - } else { - if (!config_opaque_resize) - XMapWindow(ob_display, opaque_window.win); - } - first_draw = TRUE; } void moveresize_end(gboolean cancel) { - XUnmapWindow(ob_display, opaque_window.win); - 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, @@ -183,85 +162,46 @@ void moveresize_end(gboolean cancel) moveresize_client = NULL; } -static void do_move() +static void do_move(gboolean resist) { - int oldx, oldy, oldw, oldh; - - dispatch_move(moveresize_client, &cur_x, &cur_y); + if (resist) + resist_move_windows(moveresize_client, &cur_x, &cur_y); + resist_move_monitors(moveresize_client, &cur_x, &cur_y); - oldx = moveresize_client->frame->area.x; - oldy = moveresize_client->frame->area.y; - oldw = moveresize_client->frame->area.width; - oldh = moveresize_client->frame->area.height; /* 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); - /* draw the new one */ - if (moveresize_client->frame->area.x != oldx || - moveresize_client->frame->area.y != oldy || - moveresize_client->frame->area.width != oldw || - moveresize_client->frame->area.height != oldh) { - if (!config_opaque_move) - XDrawRectangle(ob_display, opaque_window.win, opaque_gc, - moveresize_client->frame->area.x, - moveresize_client->frame->area.y, - moveresize_client->frame->area.width - 1, - moveresize_client->frame->area.height - 1); - /* erase the old one */ - if (!config_opaque_move && !first_draw) - XDrawRectangle(ob_display, opaque_window.win, opaque_gc, - oldx, oldy, oldw - 1, oldh - 1); - first_draw = 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); } -static void do_resize() +static void do_resize(gboolean resist) { - int oldx, oldy, oldw, oldh; - - /* 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; - - oldx = moveresize_client->frame->area.x; - oldy = moveresize_client->frame->area.y; - oldw = moveresize_client->frame->area.width; - oldh = moveresize_client->frame->area.height; + client_configure(moveresize_client, lockcorner, moveresize_client->area.x, moveresize_client->area.y, cur_x, cur_y, TRUE, FALSE); - /* draw the new one */ - if (!config_opaque_resize) - XDrawRectangle(ob_display, opaque_window.win, opaque_gc, - moveresize_client->frame->area.x, - moveresize_client->frame->area.y, - moveresize_client->frame->area.width - 1, - moveresize_client->frame->area.height - 1); - /* erase the old one */ - if (!config_opaque_resize && !first_draw) - XDrawRectangle(ob_display, opaque_window.win, opaque_gc, - oldx, oldy, oldw - 1, oldh - 1); - first_draw = 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) @@ -282,7 +222,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); @@ -325,7 +265,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)) @@ -334,29 +274,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); } } }