X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=05c5f596a548565921e43cf910d54a36af27e3fa;hb=85c7635b9b163face21b460de7fd3877baea321b;hp=b5fe6cb00564b1c0e0bda67f8f223a1b485ffe8e;hpb=9fcb2aa1d25ec9889b45d145939fb17160b1106a;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index b5fe6cb0..05c5f596 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -25,6 +25,7 @@ #include "frame.h" #include "openbox.h" #include "resist.h" +#include "mainloop.h" #include "popup.h" #include "moveresize.h" #include "config.h" @@ -53,12 +54,16 @@ static gint cur_x, cur_y; static guint button; static guint32 corner; static ObCorner lockcorner; +static ObDirection edge_warp_dir = -1; #ifdef SYNC static gboolean waiting_for_sync; #endif static ObPopup *popup = NULL; +static void do_edge_warp(gint x, gint y); +static void cancel_edge_warp(); + static void client_dest(ObClient *client, gpointer data) { if (moveresize_client == client) @@ -68,6 +73,7 @@ static void client_dest(ObClient *client, gpointer data) void moveresize_startup(gboolean reconfig) { popup = popup_new(FALSE); + popup_set_text_align(popup, RR_JUSTIFY_CENTER); if (!reconfig) client_add_destroy_notify(client_dest, NULL); @@ -104,7 +110,7 @@ static void get_resize_position(gint *x, gint *y, gboolean cancel) /* see how much it is actually going to resize */ { gint cx = *x, cy = *y; - frame_frame_gravity(moveresize_client->frame, &cx, &cy, w, h); + frame_frame_gravity(moveresize_client->frame, &cx, &cy); client_try_configure(moveresize_client, &cx, &cy, &w, &h, &lw, &lh, TRUE); } @@ -126,7 +132,7 @@ static void get_resize_position(gint *x, gint *y, gboolean cancel) break; } - frame_frame_gravity(moveresize_client->frame, x, y, w, h); + frame_frame_gravity(moveresize_client->frame, x, y); } static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) @@ -152,37 +158,36 @@ 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; - - moving = (cnr == prop_atoms.net_wm_moveresize_move || - cnr == prop_atoms.net_wm_moveresize_move_keyboard); + gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move || + cnr == prop_atoms.net_wm_moveresize_move_keyboard); if (moveresize_in_progress || !c->frame->visible || - !(moving ? + !(mv ? (c->functions & OB_CLIENT_FUNC_MOVE) : (c->functions & OB_CLIENT_FUNC_RESIZE))) return; - if (corner == prop_atoms.net_wm_moveresize_size_topleft) + if (cnr == prop_atoms.net_wm_moveresize_size_topleft) cur = OB_CURSOR_NORTHWEST; - else if (corner == prop_atoms.net_wm_moveresize_size_top) + else if (cnr == prop_atoms.net_wm_moveresize_size_top) cur = OB_CURSOR_NORTH; - else if (corner == prop_atoms.net_wm_moveresize_size_topright) + else if (cnr == prop_atoms.net_wm_moveresize_size_topright) cur = OB_CURSOR_NORTHEAST; - else if (corner == prop_atoms.net_wm_moveresize_size_right) + else if (cnr == prop_atoms.net_wm_moveresize_size_right) cur = OB_CURSOR_EAST; - else if (corner == prop_atoms.net_wm_moveresize_size_bottomright) + else if (cnr == prop_atoms.net_wm_moveresize_size_bottomright) cur = OB_CURSOR_SOUTHEAST; - else if (corner == prop_atoms.net_wm_moveresize_size_bottom) + else if (cnr == prop_atoms.net_wm_moveresize_size_bottom) cur = OB_CURSOR_SOUTH; - else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft) + else if (cnr == prop_atoms.net_wm_moveresize_size_bottomleft) cur = OB_CURSOR_SOUTHWEST; - else if (corner == prop_atoms.net_wm_moveresize_size_left) + else if (cnr == prop_atoms.net_wm_moveresize_size_left) cur = OB_CURSOR_WEST; - else if (corner == prop_atoms.net_wm_moveresize_size_keyboard) + else if (cnr == prop_atoms.net_wm_moveresize_size_keyboard) cur = OB_CURSOR_SOUTHEAST; - else if (corner == prop_atoms.net_wm_moveresize_move) + else if (cnr == prop_atoms.net_wm_moveresize_move) cur = OB_CURSOR_MOVE; - else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) + else if (cnr == prop_atoms.net_wm_moveresize_move_keyboard) cur = OB_CURSOR_MOVE; else g_assert_not_reached(); @@ -197,6 +202,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) frame_end_iconify_animation(c->frame); + moving = mv; moveresize_client = c; start_cx = c->area.x; start_cy = c->area.y; @@ -297,9 +303,13 @@ void moveresize_end(gboolean cancel) get_resize_position(&x, &y, cancel); client_configure(moveresize_client, x, y, (cancel ? start_cw : cur_x), - (cancel ? start_ch : cur_y), TRUE, TRUE); + (cancel ? start_ch : cur_y), + TRUE, TRUE, FALSE); } + /* dont edge warp after its ended */ + cancel_edge_warp(); + moveresize_in_progress = FALSE; moveresize_client = NULL; } @@ -316,7 +326,8 @@ static void do_move(gboolean keyboard) client_configure(moveresize_client, cur_x, cur_y, moveresize_client->area.width, - moveresize_client->area.height, TRUE, FALSE); + moveresize_client->area.height, + TRUE, FALSE, FALSE); if (config_resize_popup_show == 2) /* == "Always" */ popup_coords(moveresize_client, "%d x %d", moveresize_client->frame->area.x, @@ -325,31 +336,32 @@ static void do_move(gboolean keyboard) static void do_resize() { + 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; + client_try_configure(moveresize_client, &x, &y, &w, &h, + &lw, &lh, TRUE); + 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; - gint x, y, w, h, lw, lh; /* are we already waiting for the sync counter to catch up? */ if (waiting_for_sync) return; - /* see if it is actually going to resize */ - x = 0; - y = 0; - w = cur_x; - h = cur_y; - client_try_configure(moveresize_client, &x, &y, &w, &h, - &lw, &lh, TRUE); - if (w == moveresize_client->area.width && - h == moveresize_client->area.height) - { - return; - } - /* increment the value we're waiting for */ ++moveresize_client->sync_counter_value; XSyncIntToValue(&val, moveresize_client->sync_counter_value); @@ -372,11 +384,8 @@ static void do_resize() } #endif - { - gint x, y; - get_resize_position(&x, &y, FALSE); - client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE); - } + get_resize_position(&x, &y, FALSE); + client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE, FALSE); /* this would be better with a fixed width font ... XXX can do it better if there are 2 text boxes */ @@ -411,11 +420,70 @@ static void calc_resize(gboolean keyboard) moveresize_client->frame->size.bottom; } +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; + + return FALSE; /* don't repeat */ +} + +static void do_edge_warp(gint x, gint y) +{ + guint i, d; + ObDirection dir; + + if (!config_mouse_screenedgetime) return; + + dir = -1; + + for (i = 0; i < screen_num_monitors; ++i) { + Rect *a = screen_physical_area_monitor(i); + if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST; + if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST; + if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH; + if (y == RECT_BOTTOM(*a)) dir = OB_DIRECTION_SOUTH; + + /* try check for xinerama boundaries */ + if ((x + 1 == RECT_LEFT(*a) || x - 1 == RECT_RIGHT(*a)) && + (dir == OB_DIRECTION_WEST || dir == OB_DIRECTION_EAST)) + { + dir = -1; + } + if ((y + 1 == RECT_TOP(*a) || y - 1 == RECT_BOTTOM(*a)) && + (dir == OB_DIRECTION_NORTH || dir == OB_DIRECTION_SOUTH)) + { + dir = -1; + } + g_free(a); + } + + 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); + edge_warp_dir = dir; + } +} + +static void cancel_edge_warp() +{ + ob_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func); +} + gboolean moveresize_event(XEvent *e) { gboolean used = FALSE; - g_assert(moveresize_in_progress); + if (!moveresize_in_progress) return FALSE; if (e->type == ButtonPress) { if (!button) { @@ -434,6 +502,7 @@ gboolean moveresize_event(XEvent *e) cur_x = start_cx + e->xmotion.x_root - start_x; cur_y = start_cy + e->xmotion.y_root - start_y; do_move(FALSE); + 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);