X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=90e06c3619d4ec733dc7fbdde61ef5d600ec3306;hb=096dad0c6c027100494ede811b33cb8558d32e25;hp=19bed579d234d2a9124c86a0ef1ac67d5860e977;hpb=01a35904fec67a7f92a0eb7f19457e79ca3d0988;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 19bed579..90e06c36 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -20,21 +20,20 @@ #include "grab.h" #include "framerender.h" #include "screen.h" -#include "prop.h" #include "client.h" #include "frame.h" #include "openbox.h" #include "resist.h" -#include "mainloop.h" -#include "modkeys.h" #include "popup.h" #include "moveresize.h" #include "config.h" #include "event.h" #include "debug.h" -#include "extensions.h" -#include "render/render.h" -#include "render/theme.h" +#include "obrender/render.h" +#include "obrender/theme.h" +#include "obt/display.h" +#include "obt/prop.h" +#include "obt/keyboard.h" #include #include @@ -51,29 +50,35 @@ XSyncAlarm moveresize_alarm = None; static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */ static gint start_x, start_y, start_cx, start_cy, start_cw, start_ch; -static gint cur_x, cur_y; +static gint cur_x, cur_y, cur_w, cur_h; static guint button; static guint32 corner; -static ObCorner lockcorner; static ObDirection edge_warp_dir = -1; +static gboolean edge_warp_odd = FALSE; +static ObDirection key_resize_edge = -1; #ifdef SYNC static gboolean waiting_for_sync; #endif static ObPopup *popup = NULL; +static void do_move(gboolean keyboard, gint keydist); +static void do_resize(void); static void do_edge_warp(gint x, gint y); static void cancel_edge_warp(); +#ifdef SYNC +static gboolean sync_timeout_func(gpointer data); +#endif static void client_dest(ObClient *client, gpointer data) { if (moveresize_client == client) - moveresize_end(TRUE); + moveresize_end(TRUE); } void moveresize_startup(gboolean reconfig) { - popup = popup_new(FALSE); + popup = popup_new(); popup_set_text_align(popup, RR_JUSTIFY_CENTER); if (!reconfig) @@ -92,66 +97,69 @@ void moveresize_shutdown(gboolean reconfig) popup = NULL; } -static void get_resize_position(gint *x, gint *y, gboolean cancel) -{ - gint dw, dh; - gint w, h, lw, lh; - - *x = moveresize_client->frame->area.x; - *y = moveresize_client->frame->area.y; - - if (cancel) { - w = start_cw; - h = start_ch; - } else { - w = cur_x; - h = cur_y; - } - - /* see how much it is actually going to resize */ - { - gint cx = *x, cy = *y; - frame_frame_gravity(moveresize_client->frame, &cx, &cy); - client_try_configure(moveresize_client, &cx, &cy, &w, &h, - &lw, &lh, TRUE); - } - dw = w - moveresize_client->area.width; - dh = h - moveresize_client->area.height; - - switch (lockcorner) { - case OB_CORNER_TOPLEFT: - break; - case OB_CORNER_TOPRIGHT: - *x -= dw; - break; - case OB_CORNER_BOTTOMLEFT: - *y -= dh; - break; - case OB_CORNER_BOTTOMRIGHT: - *x -= dw; - *y -= dh; - break; - } - - frame_frame_gravity(moveresize_client->frame, x, y); -} - static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) { gchar *text; text = g_strdup_printf(format, a, b); - if (config_resize_popup_pos == 1) /* == "Top" */ + if (config_resize_popup_pos == OB_RESIZE_POS_TOP) popup_position(popup, SouthGravity, c->frame->area.x + c->frame->area.width/2, c->frame->area.y - ob_rr_theme->fbwidth); - else /* == "Center" */ + else if (config_resize_popup_pos == OB_RESIZE_POS_CENTER) 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); + c->frame->area.x + c->frame->area.width / 2, + c->frame->area.y + c->frame->area.height / 2); + else /* Fixed */ { + Rect *area = screen_physical_area_active(); + gint gravity, x, y; + + x = config_resize_popup_fixed.x.pos; + if (config_resize_popup_fixed.x.center) + x = area->x + area->width/2; + else if (config_resize_popup_fixed.x.opposite) + x = RECT_RIGHT(*area) - x; + else + x = area->x + x; + + y = config_resize_popup_fixed.y.pos; + if (config_resize_popup_fixed.y.center) + y = area->y + area->height/2; + else if (config_resize_popup_fixed.y.opposite) + y = RECT_RIGHT(*area) - y; + else + y = area->y + y; + + if (config_resize_popup_fixed.x.center) { + if (config_resize_popup_fixed.y.center) + gravity = CenterGravity; + else if (config_resize_popup_fixed.y.opposite) + gravity = SouthGravity; + else + gravity = NorthGravity; + } + else if (config_resize_popup_fixed.x.opposite) { + if (config_resize_popup_fixed.y.center) + gravity = EastGravity; + else if (config_resize_popup_fixed.y.opposite) + gravity = SouthEastGravity; + else + gravity = NorthEastGravity; + } + else { + if (config_resize_popup_fixed.y.center) + gravity = WestGravity; + else if (config_resize_popup_fixed.y.opposite) + gravity = SouthWestGravity; + else + gravity = NorthWestGravity; + } + + popup_position(popup, gravity, x, y); + + g_free(area); + } popup_show(popup, text); g_free(text); } @@ -159,8 +167,10 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) { ObCursor cur; - gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move || - cnr == prop_atoms.net_wm_moveresize_move_keyboard); + gboolean mv = (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE) || + cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)); + gint up = 1; + gint left = 1; if (moveresize_in_progress || !c->frame->visible || !(mv ? @@ -168,27 +178,37 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) (c->functions & OB_CLIENT_FUNC_RESIZE))) return; - if (cnr == prop_atoms.net_wm_moveresize_size_topleft) + if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT)) { cur = OB_CURSOR_NORTHWEST; - else if (cnr == prop_atoms.net_wm_moveresize_size_top) + up = left = -1; + } + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP)) { cur = OB_CURSOR_NORTH; - else if (cnr == prop_atoms.net_wm_moveresize_size_topright) + up = -1; + } + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT)) { cur = OB_CURSOR_NORTHEAST; - else if (cnr == prop_atoms.net_wm_moveresize_size_right) + up = -1; + } + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT)) cur = OB_CURSOR_EAST; - else if (cnr == prop_atoms.net_wm_moveresize_size_bottomright) + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)) cur = OB_CURSOR_SOUTHEAST; - else if (cnr == prop_atoms.net_wm_moveresize_size_bottom) + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM)) cur = OB_CURSOR_SOUTH; - else if (cnr == prop_atoms.net_wm_moveresize_size_bottomleft) + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)) { cur = OB_CURSOR_SOUTHWEST; - else if (cnr == prop_atoms.net_wm_moveresize_size_left) + left = -1; + } + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT)) { cur = OB_CURSOR_WEST; - else if (cnr == prop_atoms.net_wm_moveresize_size_keyboard) + left = -1; + } + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) cur = OB_CURSOR_SOUTHEAST; - else if (cnr == prop_atoms.net_wm_moveresize_move) + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE)) cur = OB_CURSOR_MOVE; - else if (cnr == prop_atoms.net_wm_moveresize_move_keyboard) + else if (cnr == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)) cur = OB_CURSOR_MOVE; else g_assert_not_reached(); @@ -207,17 +227,17 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) moveresize_client = c; start_cx = c->area.x; start_cy = c->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; + either way instead of a full increment one and 1 px the other. */ + start_x = x - (mv ? 0 : left * c->size_inc.width / 2); + start_y = y - (mv ? 0 : up * c->size_inc.height / 2); corner = cnr; button = b; + key_resize_edge = -1; /* have to change start_cx and start_cy if going to do this.. @@ -227,19 +247,17 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) c->area.width / 2, c->area.height / 2); */ - if (moving) { - cur_x = start_cx; - cur_y = start_cy; - } else { - cur_x = start_cw; - cur_y = start_ch; - } + cur_x = start_cx; + cur_y = start_cy; + cur_w = start_cw; + cur_h = start_ch; moveresize_in_progress = TRUE; #ifdef SYNC - if (config_resize_redraw && !moving && extensions_shape && - moveresize_client->sync_request && moveresize_client->sync_counter) + if (config_resize_redraw && !moving && obt_display_extension_sync && + moveresize_client->sync_request && moveresize_client->sync_counter && + !moveresize_client->not_responding) { /* Initialize values for the resize syncing, and create an alarm for the client's xsync counter */ @@ -249,7 +267,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) /* set the counter to an initial value */ XSyncIntToValue(&val, 0); - XSyncSetCounter(ob_display, moveresize_client->sync_counter, val); + XSyncSetCounter(obt_display, moveresize_client->sync_counter, val); /* this will be incremented when we tell the client what we're looking for */ @@ -265,7 +283,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) aa.trigger.test_type = XSyncPositiveTransition; aa.events = True; XSyncIntToValue(&aa.delta, 1); - moveresize_alarm = XSyncCreateAlarm(ob_display, + moveresize_alarm = XSyncCreateAlarm(obt_display, XSyncCACounter | XSyncCAValue | XSyncCAValueType | @@ -281,33 +299,34 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) void moveresize_end(gboolean cancel) { - gint x, y; - ungrab_keyboard(); ungrab_pointer(); popup_hide(popup); - if (moving) { - client_move(moveresize_client, - (cancel ? start_cx : cur_x), - (cancel ? start_cy : cur_y)); - } else { + if (!moving) { #ifdef SYNC /* turn off the alarm */ if (moveresize_alarm != None) { - XSyncDestroyAlarm(ob_display, moveresize_alarm); + XSyncDestroyAlarm(obt_display, moveresize_alarm); moveresize_alarm = None; } -#endif - get_resize_position(&x, &y, cancel); - client_configure(moveresize_client, x, y, - (cancel ? start_cw : cur_x), - (cancel ? start_ch : cur_y), - TRUE, TRUE, FALSE); + obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); +#endif } + /* don't use client_move() here, use the same width/height as + we've been using during the move, otherwise we get different results + when moving maximized windows between monitors of different sizes ! + */ + client_configure(moveresize_client, + (cancel ? start_cx : cur_x), + (cancel ? start_cy : cur_y), + (cancel ? start_cw : cur_w), + (cancel ? start_ch : cur_h), + TRUE, TRUE, FALSE); + /* dont edge warp after its ended */ cancel_edge_warp(); @@ -315,19 +334,17 @@ void moveresize_end(gboolean cancel) moveresize_client = NULL; } -static void do_move(gboolean keyboard) +static void do_move(gboolean keyboard, gint keydist) { gint resist; - if (keyboard) resist = KEY_DIST - 1; /* resist for one key press */ + if (keyboard) resist = keydist - 1; /* resist for one key press */ else resist = config_resist_win; resist_move_windows(moveresize_client, resist, &cur_x, &cur_y); if (!keyboard) resist = config_resist_edge; resist_move_monitors(moveresize_client, resist, &cur_x, &cur_y); - client_configure(moveresize_client, cur_x, cur_y, - moveresize_client->area.width, - moveresize_client->area.height, + client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, TRUE, FALSE, FALSE); if (config_resize_popup_show == 2) /* == "Always" */ popup_coords(moveresize_client, "%d x %d", @@ -335,58 +352,63 @@ static void do_move(gboolean keyboard) moveresize_client->frame->area.y); } -static void do_resize() +static void do_resize(void) { gint x, y, w, h, lw, lh; /* see if it is actually going to resize */ x = 0; y = 0; - w = cur_x; - h = cur_y; + w = cur_w; + h = cur_h; client_try_configure(moveresize_client, &x, &y, &w, &h, &lw, &lh, TRUE); - if (w == moveresize_client->area.width && - h == moveresize_client->area.height) + if (!(w == moveresize_client->area.width && + h == moveresize_client->area.height)) { - return; - } #ifdef SYNC - if (config_resize_redraw && extensions_sync && - moveresize_client->sync_request && moveresize_client->sync_counter) - { - XEvent ce; - XSyncValue val; - - /* are we already waiting for the sync counter to catch up? */ - if (waiting_for_sync) - return; - - /* increment the value we're waiting for */ - ++moveresize_client->sync_counter_value; - XSyncIntToValue(&val, moveresize_client->sync_counter_value); - - /* tell the client what we're waiting for */ - ce.xclient.type = ClientMessage; - ce.xclient.message_type = prop_atoms.wm_protocols; - ce.xclient.display = ob_display; - ce.xclient.window = moveresize_client->window; - ce.xclient.format = 32; - ce.xclient.data.l[0] = prop_atoms.net_wm_sync_request; - ce.xclient.data.l[1] = event_curtime; - ce.xclient.data.l[2] = XSyncValueLow32(val); - ce.xclient.data.l[3] = XSyncValueHigh32(val); - ce.xclient.data.l[4] = 0l; - XSendEvent(ob_display, moveresize_client->window, FALSE, - NoEventMask, &ce); - - waiting_for_sync = TRUE; - } + if (config_resize_redraw && obt_display_extension_sync && + moveresize_client->sync_request && moveresize_client->sync_counter && + !moveresize_client->not_responding) + { + XEvent ce; + XSyncValue val; + + /* are we already waiting for the sync counter to catch up? */ + if (waiting_for_sync) + return; + + /* increment the value we're waiting for */ + ++moveresize_client->sync_counter_value; + XSyncIntToValue(&val, moveresize_client->sync_counter_value); + + /* tell the client what we're waiting for */ + ce.xclient.type = ClientMessage; + ce.xclient.message_type = OBT_PROP_ATOM(WM_PROTOCOLS); + ce.xclient.display = obt_display; + ce.xclient.window = moveresize_client->window; + ce.xclient.format = 32; + ce.xclient.data.l[0] = OBT_PROP_ATOM(NET_WM_SYNC_REQUEST); + ce.xclient.data.l[1] = event_curtime; + ce.xclient.data.l[2] = XSyncValueLow32(val); + ce.xclient.data.l[3] = XSyncValueHigh32(val); + ce.xclient.data.l[4] = 0l; + XSendEvent(obt_display, moveresize_client->window, FALSE, + NoEventMask, &ce); + + waiting_for_sync = TRUE; + + obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); + obt_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC * 2, + sync_timeout_func, + NULL, NULL, NULL); + } #endif - get_resize_position(&x, &y, FALSE); - client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE, FALSE); + client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, + TRUE, FALSE, FALSE); + } /* this would be better with a fixed width font ... XXX can do it better if there are 2 text boxes */ @@ -394,43 +416,134 @@ static void do_resize() (config_resize_popup_show == 1 && /* == "Nonpixel" */ 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); + popup_coords(moveresize_client, "%d x %d", lw, lh); } -static void calc_resize(gboolean keyboard) +#ifdef SYNC +static gboolean sync_timeout_func(gpointer data) { - gint resist; + waiting_for_sync = FALSE; /* we timed out waiting for our sync... */ + do_resize(); /* ...so let any pending resizes through */ + + return FALSE; /* don't repeat */ +} +#endif + +static void calc_resize(gboolean keyboard, gint keydist, gint *dw, gint *dh, + ObDirection dir) +{ + gint resist, x = 0, y = 0, lw, lh, ow, oh, nw, nh; + gint trydw, trydh; + + ow = cur_w; + oh = cur_h; + nw = ow + *dw; + nh = oh + *dh; + + if (!keyboard && + (moveresize_client->max_ratio || moveresize_client->min_ratio)) + { + switch (dir) { + case OB_DIRECTION_NORTH: + case OB_DIRECTION_SOUTH: + /* resize the width based on the height */ + if (moveresize_client->min_ratio) { + if (nh * moveresize_client->min_ratio > nw) + nw = (gint)(nh * moveresize_client->min_ratio); + } + if (moveresize_client->max_ratio) { + if (nh * moveresize_client->max_ratio < nw) + nw = (gint)(nh * moveresize_client->max_ratio); + } + break; + default: + /* resize the height based on the width */ + if (moveresize_client->min_ratio) { + if (nh * moveresize_client->min_ratio > nw) + nh = (gint)(nw / moveresize_client->min_ratio); + } + if (moveresize_client->max_ratio) { + if (nh * moveresize_client->max_ratio < nw) + nh = (gint)(nw / moveresize_client->max_ratio); + } + break; + } + + /* see its actual size (apply aspect ratios) */ + client_try_configure(moveresize_client, &x, &y, &nw, &nh, &lw, &lh, + TRUE); + trydw = nw - ow; + trydh = nh - oh; + } /* resist_size_* needs the frame size */ - cur_x += moveresize_client->frame->size.left + + nw += moveresize_client->frame->size.left + moveresize_client->frame->size.right; - cur_y += moveresize_client->frame->size.top + + nh += moveresize_client->frame->size.top + moveresize_client->frame->size.bottom; - if (keyboard) resist = KEY_DIST - 1; /* resist for one key press */ + if (keyboard) resist = keydist - 1; /* resist for one key press */ else resist = config_resist_win; - resist_size_windows(moveresize_client, resist, &cur_x, &cur_y, lockcorner); + resist_size_windows(moveresize_client, resist, &nw, &nh, dir); if (!keyboard) resist = config_resist_edge; - resist_size_monitors(moveresize_client, resist, &cur_x, &cur_y,lockcorner); + resist_size_monitors(moveresize_client, resist, &nw, &nh, dir); - cur_x -= moveresize_client->frame->size.left + + nw -= moveresize_client->frame->size.left + moveresize_client->frame->size.right; - cur_y -= moveresize_client->frame->size.top + + nh -= moveresize_client->frame->size.top + moveresize_client->frame->size.bottom; + + *dw = nw - ow; + *dh = nh - oh; + + /* take aspect ratios into account for resistance */ + if (!keyboard && + (moveresize_client->max_ratio || moveresize_client->min_ratio)) + { + if (*dh != trydh) { /* got resisted */ + /* resize the width based on the height */ + if (moveresize_client->min_ratio) { + if (nh * moveresize_client->min_ratio > nw) + nw = (gint)(nh * moveresize_client->min_ratio); + } + if (moveresize_client->max_ratio) { + if (nh * moveresize_client->max_ratio < nw) + nw = (gint)(nh * moveresize_client->max_ratio); + } + } + if (*dw != trydw) { /* got resisted */ + /* resize the height based on the width */ + if (moveresize_client->min_ratio) { + if (nh * moveresize_client->min_ratio > nw) + nh = (gint)(nw / moveresize_client->min_ratio); + } + if (moveresize_client->max_ratio) { + if (nh * moveresize_client->max_ratio < nw) + nh = (gint)(nw / moveresize_client->max_ratio); + } + } + } + + /* make sure it's all valid */ + client_try_configure(moveresize_client, &x, &y, &nw, &nh, &lw, &lh, TRUE); + + *dw = nw - ow; + *dh = nh - oh; } static gboolean edge_warp_delay_func(gpointer data) { guint d; - d = screen_find_desktop(screen_desktop, edge_warp_dir, TRUE, FALSE); - if (d != screen_desktop) screen_set_desktop(d, TRUE); - - edge_warp_dir = -1; + /* only fire every second time. so it's fast the first time, but slower + after that */ + if (edge_warp_odd) { + d = screen_find_desktop(screen_desktop, edge_warp_dir, TRUE, FALSE); + if (d != screen_desktop) screen_set_desktop(d, TRUE); + } + edge_warp_odd = !edge_warp_odd; - return FALSE; /* don't repeat */ + return TRUE; /* do repeat ! */ } static void do_edge_warp(gint x, gint y) @@ -464,20 +577,245 @@ static void do_edge_warp(gint x, gint y) } if (dir != edge_warp_dir) { - if (dir == (ObDirection)-1) - cancel_edge_warp(); - else - ob_main_loop_timeout_add(ob_main_loop, - config_mouse_screenedgetime * 1000, - edge_warp_delay_func, - NULL, NULL, NULL); + cancel_edge_warp(); + if (dir != (ObDirection)-1) { + edge_warp_odd = TRUE; /* switch on the first timeout */ + obt_main_loop_timeout_add(ob_main_loop, + config_mouse_screenedgetime * 1000, + edge_warp_delay_func, + NULL, NULL, NULL); + } edge_warp_dir = dir; } } -static void cancel_edge_warp() +static void cancel_edge_warp(void) +{ + obt_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func); +} + +static void move_with_keys(KeySym sym, guint state) +{ + gint dx = 0, dy = 0, ox = cur_x, oy = cur_y; + gint opx, px, opy, py; + gint dist = 0; + + /* shift means jump to edge */ + if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) + { + gint x, y; + ObDirection dir; + + if (sym == XK_Right) + dir = OB_DIRECTION_EAST; + else if (sym == XK_Left) + dir = OB_DIRECTION_WEST; + else if (sym == XK_Down) + dir = OB_DIRECTION_SOUTH; + else /* sym == XK_Up */ + dir = OB_DIRECTION_NORTH; + + client_find_move_directional(moveresize_client, dir, &x, &y); + dx = x - moveresize_client->area.x; + dy = y - moveresize_client->area.y; + } else { + /* control means fine grained */ + if (state & + obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL)) + { + dist = 1; + } + else + dist = KEY_DIST; + + if (sym == XK_Right) + dx = dist; + else if (sym == XK_Left) + dx = -dist; + else if (sym == XK_Down) + dy = dist; + else /* if (sym == XK_Up) */ + dy = -dist; + } + + screen_pointer_pos(&opx, &opy); + XWarpPointer(obt_display, None, None, 0, 0, 0, 0, dx, dy); + /* steal the motion events this causes */ + XSync(obt_display, FALSE); + { + XEvent ce; + while (XCheckTypedEvent(obt_display, MotionNotify, &ce)); + } + screen_pointer_pos(&px, &py); + + cur_x += dx; + cur_y += dy; + do_move(TRUE, dist); + + /* 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); +} + +static void resize_with_keys(KeySym sym, guint state) { - ob_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func); + gint dw = 0, dh = 0, pdx = 0, pdy = 0, opx, opy, px, py; + gint resist = 0; + ObDirection dir; + + /* pick the edge if it needs to move */ + if (sym == XK_Right) { + dir = OB_DIRECTION_EAST; + if (key_resize_edge != OB_DIRECTION_WEST && + key_resize_edge != OB_DIRECTION_EAST) + { + key_resize_edge = OB_DIRECTION_EAST; + return; + } + } else if (sym == XK_Left) { + dir = OB_DIRECTION_WEST; + if (key_resize_edge != OB_DIRECTION_WEST && + key_resize_edge != OB_DIRECTION_EAST) + { + key_resize_edge = OB_DIRECTION_WEST; + return; + } + } else if (sym == XK_Up) { + dir = OB_DIRECTION_NORTH; + if (key_resize_edge != OB_DIRECTION_NORTH && + key_resize_edge != OB_DIRECTION_SOUTH) + { + key_resize_edge = OB_DIRECTION_NORTH; + return; + } + } else /* if (sym == XK_Down) */ { + dir = OB_DIRECTION_SOUTH; + if (key_resize_edge != OB_DIRECTION_NORTH && + key_resize_edge != OB_DIRECTION_SOUTH) + { + key_resize_edge = OB_DIRECTION_SOUTH; + return; + } + } + + /* shift means jump to edge */ + if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) + { + gint x, y, w, h; + + if (sym == XK_Right) + dir = OB_DIRECTION_EAST; + else if (sym == XK_Left) + dir = OB_DIRECTION_WEST; + else if (sym == XK_Down) + dir = OB_DIRECTION_SOUTH; + else /* if (sym == XK_Up)) */ + dir = OB_DIRECTION_NORTH; + + client_find_resize_directional(moveresize_client, key_resize_edge, + key_resize_edge == dir, + &x, &y, &w, &h); + dw = w - moveresize_client->area.width; + dh = h - moveresize_client->area.height; + } else { + gint distw, disth; + + /* control means fine grained */ + if (moveresize_client->size_inc.width > 1) { + distw = moveresize_client->size_inc.width; + resist = 1; + } + else if (state & + obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL)) + { + distw = 1; + resist = 1; + } + else { + distw = KEY_DIST; + resist = KEY_DIST; + } + if (moveresize_client->size_inc.height > 1) { + disth = moveresize_client->size_inc.height; + resist = 1; + } + else if (state & + obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL)) + { + disth = 1; + resist = 1; + } + else { + disth = KEY_DIST; + resist = KEY_DIST; + } + + if (key_resize_edge == OB_DIRECTION_WEST) { + if (dir == OB_DIRECTION_WEST) + dw = distw; + else + dw = -distw; + } + else if (key_resize_edge == OB_DIRECTION_EAST) { + if (dir == OB_DIRECTION_EAST) + dw = distw; + else + dw = -distw; + } + else if (key_resize_edge == OB_DIRECTION_NORTH) { + if (dir == OB_DIRECTION_NORTH) + dh = disth; + else + dh = -disth; + } + else /*if (key_resize_edge == OB_DIRECTION_SOUTH)*/ { + if (dir == OB_DIRECTION_SOUTH) + dh = disth; + else + dh = -disth; + } + } + + calc_resize(TRUE, resist, &dw, &dh, dir); + if (key_resize_edge == OB_DIRECTION_WEST) + cur_x -= dw; + else if (key_resize_edge == OB_DIRECTION_NORTH) + cur_y -= dh; + cur_w += dw; + cur_h += dh; + + /* how to move the pointer to keep up with the change */ + if (key_resize_edge == OB_DIRECTION_WEST) + pdx = -dw; + else if (key_resize_edge == OB_DIRECTION_EAST) + pdx = dw; + else if (key_resize_edge == OB_DIRECTION_NORTH) + pdy = -dh; + else if (key_resize_edge == OB_DIRECTION_SOUTH) + pdy = dh; + + screen_pointer_pos(&opx, &opy); + XWarpPointer(obt_display, None, None, 0, 0, 0, 0, pdx, pdy); + /* steal the motion events this causes */ + XSync(obt_display, FALSE); + { + XEvent ce; + while (XCheckTypedEvent(obt_display, MotionNotify, &ce)); + } + screen_pointer_pos(&px, &py); + + do_resize(); + + /* because the cursor moves even though the window does + not nessesarily (resistance), this adjusts where the cursor + thinks it started so that it keeps up with where the window + actually is */ + start_x += (px - opx) - dw; + start_y += (py - opy) - dh; + } gboolean moveresize_event(XEvent *e) @@ -502,165 +840,104 @@ gboolean 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(FALSE); + do_move(FALSE, 0); do_edge_warp(e->xmotion.x_root, e->xmotion.y_root); } 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 = 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 = 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 = 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 = OB_CORNER_BOTTOMLEFT; + gint dw, dh; + ObDirection dir; + + if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT)) { + dw = -(e->xmotion.x_root - start_x); + dh = -(e->xmotion.y_root - start_y); + dir = OB_DIRECTION_NORTHWEST; + } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP)) { + dw = 0; + dh = -(e->xmotion.y_root - start_y); + dir = OB_DIRECTION_NORTH; + } else if (corner == + OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT)) { + dw = (e->xmotion.x_root - start_x); + dh = -(e->xmotion.y_root - start_y); + dir = OB_DIRECTION_NORTHEAST; + } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_RIGHT)) { + dw = (e->xmotion.x_root - start_x); + dh = 0; + dir = OB_DIRECTION_EAST; + } else if (corner == + OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT)) { + dw = (e->xmotion.x_root - start_x); + dh = (e->xmotion.y_root - start_y); + dir = OB_DIRECTION_SOUTHEAST; + } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOM)) + { + dw = 0; + dh = (e->xmotion.y_root - start_y); + dir = OB_DIRECTION_SOUTH; } 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 = 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 = OB_CORNER_TOPLEFT; + OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)) { + dw = -(e->xmotion.x_root - start_x); + dh = (e->xmotion.y_root - start_y); + dir = OB_DIRECTION_SOUTHWEST; + } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT)) { + dw = -(e->xmotion.x_root - start_x); + dh = 0; + dir = OB_DIRECTION_WEST; } 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 = 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 = 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 = OB_CORNER_TOPLEFT; + OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { + dw = (e->xmotion.x_root - start_x); + dh = (e->xmotion.y_root - start_y); + dir = OB_DIRECTION_SOUTHEAST; } else g_assert_not_reached(); - calc_resize(FALSE); + dw -= cur_w - start_cw; + dh -= cur_h - start_ch; + + calc_resize(FALSE, 0, &dw, &dh, dir); + cur_w += dw; + cur_h += dh; + + if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT) || + corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_LEFT) || + corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT)) + { + cur_x -= dw; + } + if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPLEFT) || + corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOP) || + corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_TOPRIGHT)) + { + cur_y -= dh; + } + do_resize(); } used = TRUE; } else if (e->type == KeyPress) { - if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { + KeySym sym = obt_keyboard_keypress_to_keysym(e); + + if (sym == XK_Escape) { moveresize_end(TRUE); used = TRUE; - } else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) { + } else if (sym == XK_Return) { moveresize_end(FALSE); used = TRUE; - } else if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT) || - e->xkey.keycode == ob_keycode(OB_KEY_LEFT) || - e->xkey.keycode == ob_keycode(OB_KEY_DOWN) || - e->xkey.keycode == ob_keycode(OB_KEY_UP)) + } else if (sym == XK_Right || sym == XK_Left || + sym == XK_Up || sym == XK_Down) { - if (corner == prop_atoms.net_wm_moveresize_size_keyboard) { - gint dx = 0, dy = 0, ox = cur_x, oy = cur_y; - - if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) - dx = MAX(KEY_DIST, moveresize_client->size_inc.width); - else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) - dx = -MAX(KEY_DIST, moveresize_client->size_inc.width); - else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN)) - dy = MAX(KEY_DIST, moveresize_client->size_inc.height); - else /* if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) */ - dy = -MAX(KEY_DIST, moveresize_client->size_inc.height); - - 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)); - } - - calc_resize(TRUE); - do_resize(); - - /* 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); - + if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { + resize_with_keys(sym, e->xkey.state); used = TRUE; - } else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) { - gint dx = 0, dy = 0, ox = cur_x, oy = cur_y; - gint opx, px, opy, py; - gint dist = KEY_DIST; - - /* shift means jump to edge */ - if (e->xkey.state & modkeys_key_to_mask(OB_MODKEY_KEY_SHIFT)) { - gint x, y; - ObDirection dir; - - if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) - dir = OB_DIRECTION_EAST; - else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) - dir = OB_DIRECTION_WEST; - else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN)) - dir = OB_DIRECTION_SOUTH; - else /* if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) */ - dir = OB_DIRECTION_NORTH; - - client_find_move_directional(moveresize_client, dir, - &x, &y); - dx = x - moveresize_client->area.x; - dy = y - moveresize_client->area.y; - } else { - /* control means fine grained */ - if (e->xkey.state & - modkeys_key_to_mask(OB_MODKEY_KEY_CONTROL)) - dist = 1; - - if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) - dx = dist; - else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) - dx = -dist; - else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN)) - dy = dist; - else /* if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) */ - dy = -dist; - } - - 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(TRUE); - - /* 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); - + } else if (corner == + OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)) + { + move_with_keys(sym, e->xkey.state); used = TRUE; } } } #ifdef SYNC - else if (e->type == extensions_sync_event_basep + XSyncAlarmNotify) + else if (e->type == obt_display_extension_sync_basep + XSyncAlarmNotify) { waiting_for_sync = FALSE; /* we got our sync... */ do_resize(); /* ...so try resize if there is more change pending */