X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=981a9df25dc30fd73afb4f2919c1776d4756cfec;hb=ec9dd7fdd7531d2ca951a0b812bf8e63b6e9a377;hp=287d4ec0337fc6e63809e6173410daa0d251312d;hpb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 287d4ec0..981a9df2 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -3,8 +3,10 @@ #include "screen.h" #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" @@ -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 */ @@ -22,15 +24,9 @@ static int start_x, start_y, start_cx, start_cy, start_cw, start_ch; static int cur_x, cur_y; static guint button; static guint32 corner; -static Corner lockcorner; - -static guint button_return, button_escape, button_left, button_right, - button_up, button_down; +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) @@ -38,57 +34,35 @@ static gboolean first_draw = FALSE; void moveresize_startup() { XSetWindowAttributes attrib; - XGCValues gcv; - - button_return = XKeysymToKeycode(ob_display, XStringToKeysym("Return")); - button_escape = XKeysymToKeycode(ob_display, XStringToKeysym("Escape")); - button_left = XKeysymToKeycode(ob_display, XStringToKeysym("Left")); - button_right = XKeysymToKeycode(ob_display, XStringToKeysym("Right")); - button_up = XKeysymToKeycode(ob_display, XStringToKeysym("Up")); - button_down = XKeysymToKeycode(ob_display, XStringToKeysym("Down")); popup = popup_new(FALSE); popup_size_to_string(popup, "W: 0000 W: 0000"); - popup_position(popup, NorthWestGravity, POPUP_X, POPUP_Y); 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); } void moveresize_shutdown() { 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) { 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_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) { - Cursor cur; + ObCursor cur; g_assert(!moveresize_in_progress); @@ -99,12 +73,16 @@ void moveresize_start(Client *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) { @@ -120,58 +98,43 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr) moveresize_in_progress = TRUE; if (corner == prop_atoms.net_wm_moveresize_size_topleft) - cur = ob_cursors.tl; + cur = OB_CURSOR_NORTHWEST; else if (corner == prop_atoms.net_wm_moveresize_size_top) - cur = ob_cursors.t; + cur = OB_CURSOR_NORTH; else if (corner == prop_atoms.net_wm_moveresize_size_topright) - cur = ob_cursors.tr; + cur = OB_CURSOR_NORTHEAST; else if (corner == prop_atoms.net_wm_moveresize_size_right) - cur = ob_cursors.r; + cur = OB_CURSOR_EAST; else if (corner == prop_atoms.net_wm_moveresize_size_bottomright) - cur = ob_cursors.br; + cur = OB_CURSOR_SOUTHEAST; else if (corner == prop_atoms.net_wm_moveresize_size_bottom) - cur = ob_cursors.b; + cur = OB_CURSOR_SOUTH; else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft) - cur = ob_cursors.bl; + cur = OB_CURSOR_SOUTHWEST; else if (corner == prop_atoms.net_wm_moveresize_size_left) - cur = ob_cursors.l; + cur = OB_CURSOR_WEST; else if (corner == prop_atoms.net_wm_moveresize_size_keyboard) - cur = ob_cursors.br; + cur = OB_CURSOR_SOUTHEAST; else if (corner == prop_atoms.net_wm_moveresize_move) - cur = ob_cursors.move; + cur = OB_CURSOR_MOVE; else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) - cur = ob_cursors.move; + cur = OB_CURSOR_MOVE; else g_assert_not_reached(); grab_pointer(TRUE, cur); grab_keyboard(TRUE); - - XResizeWindow(ob_display, opaque_window.win, screen_physical_size.width, - screen_physical_size.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); popup_hide(popup); if (moving) { - client_configure(moveresize_client, Corner_TopLeft, + client_configure(moveresize_client, OB_CORNER_TOPLEFT, (cancel ? start_cx : cur_x), (cancel ? start_cy : cur_y), start_cw, start_ch, TRUE, TRUE); @@ -187,54 +150,39 @@ void moveresize_end(gboolean cancel) moveresize_client = NULL; } -static void do_move() +static void do_move(gboolean resist) { - int oldx, oldy, oldw, oldh; + Rect *a; + + if (resist) + resist_move(moveresize_client, &cur_x, &cur_y); dispatch_move(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, Corner_TopLeft, 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); + 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) { - int oldx, oldy, oldw, oldh; - /* 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; + if (resist) + resist_size(moveresize_client, &cur_x, &cur_y, lockcorner); + dispatch_resize(moveresize_client, &cur_x, &cur_y, lockcorner); cur_x -= moveresize_client->frame->size.left + @@ -242,25 +190,9 @@ static void do_resize() 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 */ @@ -286,81 +218,95 @@ 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); cur_y = start_ch - (e->xmotion.y_root - start_y); - lockcorner = Corner_BottomRight; + lockcorner = OB_CORNER_BOTTOMRIGHT; } else if (corner == prop_atoms.net_wm_moveresize_size_top) { cur_x = start_cw; cur_y = start_ch - (e->xmotion.y_root - start_y); - lockcorner = Corner_BottomRight; + lockcorner = OB_CORNER_BOTTOMRIGHT; } else if (corner == prop_atoms.net_wm_moveresize_size_topright) { cur_x = start_cw + (e->xmotion.x_root - start_x); cur_y = start_ch - (e->xmotion.y_root - start_y); - lockcorner = Corner_BottomLeft; + lockcorner = OB_CORNER_BOTTOMLEFT; } else if (corner == prop_atoms.net_wm_moveresize_size_right) { cur_x = start_cw + (e->xmotion.x_root - start_x); cur_y = start_ch; - lockcorner = Corner_BottomLeft; + lockcorner = OB_CORNER_BOTTOMLEFT; } else if (corner == prop_atoms.net_wm_moveresize_size_bottomright) { cur_x = start_cw + (e->xmotion.x_root - start_x); cur_y = start_ch + (e->xmotion.y_root - start_y); - lockcorner = Corner_TopLeft; + lockcorner = OB_CORNER_TOPLEFT; } else if (corner == prop_atoms.net_wm_moveresize_size_bottom) { cur_x = start_cw; cur_y = start_ch + (e->xmotion.y_root - start_y); - lockcorner = Corner_TopLeft; + lockcorner = OB_CORNER_TOPLEFT; } else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft) { cur_x = start_cw - (e->xmotion.x_root - start_x); cur_y = start_ch + (e->xmotion.y_root - start_y); - lockcorner = Corner_TopRight; + lockcorner = OB_CORNER_TOPRIGHT; } else if (corner == prop_atoms.net_wm_moveresize_size_left) { cur_x = start_cw - (e->xmotion.x_root - start_x); cur_y = start_ch; - lockcorner = Corner_TopRight; + lockcorner = OB_CORNER_TOPRIGHT; } else if (corner == prop_atoms.net_wm_moveresize_size_keyboard) { cur_x = start_cw + (e->xmotion.x_root - start_x); cur_y = start_ch + (e->xmotion.y_root - start_y); - lockcorner = Corner_TopLeft; + lockcorner = OB_CORNER_TOPLEFT; } else g_assert_not_reached(); - do_resize(); + do_resize(TRUE); } } else if (e->type == KeyPress) { - if (e->xkey.keycode == button_escape) + if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) moveresize_end(TRUE); - else if (e->xkey.keycode == button_return) + else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) moveresize_end(FALSE); else { if (corner == prop_atoms.net_wm_moveresize_size_keyboard) { - if (e->xkey.keycode == button_right) - cur_x += MAX(4, moveresize_client->size_inc.width); - else if (e->xkey.keycode == button_left) - cur_x -= MAX(4, moveresize_client->size_inc.width); - else if (e->xkey.keycode == button_down) - cur_y += MAX(4, moveresize_client->size_inc.height); - else if (e->xkey.keycode == button_up) - cur_y -= MAX(4, moveresize_client->size_inc.height); + int dx = 0, dy = 0; + + if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) + dx = MAX(4, moveresize_client->size_inc.width); + else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) + dx = -MAX(4, moveresize_client->size_inc.width); + else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN)) + dy = MAX(4, moveresize_client->size_inc.height); + else if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) + 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) { - if (e->xkey.keycode == button_right) - cur_x += 4; - else if (e->xkey.keycode == button_left) - cur_x -= 4; - else if (e->xkey.keycode == button_down) - cur_y += 4; - else if (e->xkey.keycode == button_up) - cur_y -= 4; + int dx = 0, dy = 0; + + if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) + dx = 4; + else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) + dx = -4; + else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN)) + dy = 4; + else if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) + 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); } } }