X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=966ac742acd9a04199850d22086b691b113af7fb;hb=4463bb6e2f038a90bf296d63ae555fc693be2778;hp=99222577c4e9c1127e026e91360415fedd319f3e;hpb=73575c10ce3ede1637e4f959b56e1f7d5f110b91;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 99222577..966ac742 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -32,6 +32,7 @@ #include "obrender/render.h" #include "obrender/theme.h" #include "obt/display.h" +#include "obt/xqueue.h" #include "obt/prop.h" #include "obt/keyboard.h" @@ -40,6 +41,7 @@ /* how far windows move and resize with the keyboard arrows */ #define KEY_DIST 8 +#define SYNC_TIMEOUTS 4 gboolean moveresize_in_progress = FALSE; ObClient *moveresize_client = NULL; @@ -57,7 +59,7 @@ 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; +static guint waiting_for_sync; #endif static ObPopup *popup = NULL; @@ -112,7 +114,7 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) 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(); + const Rect *area = screen_physical_area_active(); gint gravity, x, y; x = config_resize_popup_fixed.x.pos; @@ -157,8 +159,6 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) } popup_position(popup, gravity, x, y); - - g_free(area); } popup_show(popup, text); g_free(text); @@ -292,7 +292,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) XSyncCAEvents, &aa); - waiting_for_sync = FALSE; + waiting_for_sync = 0; } #endif } @@ -304,11 +304,7 @@ void moveresize_end(gboolean cancel) 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) { @@ -318,15 +314,19 @@ void moveresize_end(gboolean cancel) obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); #endif - - 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); } + /* 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(); @@ -356,29 +356,34 @@ static void do_resize(void) { gint x, y, w, h, lw, lh; - /* see if it is actually going to resize */ - x = 0; - y = 0; + /* see if it is actually going to resize + USE cur_x AND cur_y HERE ! Otherwise the try_configure won't know + what struts to use !! + */ + x = cur_x; + y = 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)) + h == moveresize_client->area.height) && + /* if waiting_for_sync == 0, then we aren't waiting. + if it is > SYNC_TIMEOUTS, then we have timed out + that many times already, so forget about waiting more */ + (waiting_for_sync == 0 || waiting_for_sync > SYNC_TIMEOUTS)) { - #ifdef SYNC if (config_resize_redraw && obt_display_extension_sync && - moveresize_client->sync_request && moveresize_client->sync_counter && + /* don't send another sync when one is pending */ + waiting_for_sync == 0 && + 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); @@ -390,14 +395,14 @@ static void do_resize(void) 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[1] = event_time(); 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; + waiting_for_sync = 1; obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); obt_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC * 2, @@ -406,8 +411,10 @@ static void do_resize(void) } #endif + /* force a ConfigureNotify, it is part of the spec for SYNC resizing + and MUST follow the sync counter notification */ client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, - TRUE, FALSE, FALSE); + TRUE, FALSE, TRUE); } /* this would be better with a fixed width font ... XXX can do it better @@ -422,10 +429,13 @@ static void do_resize(void) #ifdef SYNC static gboolean sync_timeout_func(gpointer data) { - waiting_for_sync = FALSE; /* we timed out waiting for our sync... */ + ++waiting_for_sync; /* we timed out waiting for our sync... */ do_resize(); /* ...so let any pending resizes through */ - return FALSE; /* don't repeat */ + if (waiting_for_sync > SYNC_TIMEOUTS) + return FALSE; /* don't repeat */ + else + return TRUE; /* keep waiting */ } #endif @@ -531,6 +541,34 @@ static void calc_resize(gboolean keyboard, gint keydist, gint *dw, gint *dh, *dh = nh - oh; } +static void edge_warp_move_ptr(void) +{ + gint x, y; + const Rect* a; + + screen_pointer_pos(&x, &y); + a = screen_physical_area_all_monitors(); + + switch (edge_warp_dir) { + case OB_DIRECTION_NORTH: + y = a->height - 1; + break; + case OB_DIRECTION_EAST: + x = a->x; + break; + case OB_DIRECTION_SOUTH: + y = a->y; + break; + case OB_DIRECTION_WEST: + x = a->width - 1; + break; + default: + g_assert_not_reached(); + } + + XWarpPointer(obt_display, 0, obt_root(ob_screen), 0, 0, 0, 0, x, y); +} + static gboolean edge_warp_delay_func(gpointer data) { guint d; @@ -539,7 +577,10 @@ static gboolean edge_warp_delay_func(gpointer data) 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); + if (d != screen_desktop) { + if (config_mouse_screenedgewarp) edge_warp_move_ptr(); + screen_set_desktop(d, TRUE); + } } edge_warp_odd = !edge_warp_odd; @@ -556,7 +597,7 @@ static void do_edge_warp(gint x, gint y) dir = -1; for (i = 0; i < screen_num_monitors; ++i) { - Rect *a = screen_physical_area_monitor(i); + const 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; @@ -573,7 +614,6 @@ static void do_edge_warp(gint x, gint y) { dir = -1; } - g_free(a); } if (dir != edge_warp_dir) { @@ -594,24 +634,25 @@ static void cancel_edge_warp(void) obt_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func); } -static void move_with_keys(gint keycode, gint state) +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)) { + if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) + { gint x, y; ObDirection dir; - if (ob_keycode_match(keycode, OB_KEY_RIGHT)) + if (sym == XK_Right) dir = OB_DIRECTION_EAST; - else if (ob_keycode_match(keycode, OB_KEY_LEFT)) + else if (sym == XK_Left) dir = OB_DIRECTION_WEST; - else if (ob_keycode_match(keycode, OB_KEY_DOWN)) + else if (sym == XK_Down) dir = OB_DIRECTION_SOUTH; - else /* if (ob_keycode_match(keycode, OB_KEY_UP)) */ + else /* sym == XK_Up */ dir = OB_DIRECTION_NORTH; client_find_move_directional(moveresize_client, dir, &x, &y); @@ -627,13 +668,13 @@ static void move_with_keys(gint keycode, gint state) else dist = KEY_DIST; - if (ob_keycode_match(keycode, OB_KEY_RIGHT)) + if (sym == XK_Right) dx = dist; - else if (ob_keycode_match(keycode, OB_KEY_LEFT)) + else if (sym == XK_Left) dx = -dist; - else if (ob_keycode_match(keycode, OB_KEY_DOWN)) + else if (sym == XK_Down) dy = dist; - else /* if (ob_keycode_match(keycode, OB_KEY_UP)) */ + else /* if (sym == XK_Up) */ dy = -dist; } @@ -643,7 +684,8 @@ static void move_with_keys(gint keycode, gint state) XSync(obt_display, FALSE); { XEvent ce; - while (XCheckTypedEvent(obt_display, MotionNotify, &ce)); + while (xqueue_remove_local(&ce, xqueue_match_type, + GINT_TO_POINTER(MotionNotify))); } screen_pointer_pos(&px, &py); @@ -659,14 +701,14 @@ static void move_with_keys(gint keycode, gint state) start_y += (py - opy) - (cur_y - oy); } -static void resize_with_keys(gint keycode, gint state) +static void resize_with_keys(KeySym sym, guint state) { 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 (ob_keycode_match(keycode, OB_KEY_RIGHT)) { + if (sym == XK_Right) { dir = OB_DIRECTION_EAST; if (key_resize_edge != OB_DIRECTION_WEST && key_resize_edge != OB_DIRECTION_EAST) @@ -674,7 +716,7 @@ static void resize_with_keys(gint keycode, gint state) key_resize_edge = OB_DIRECTION_EAST; return; } - } else if (ob_keycode_match(keycode, OB_KEY_LEFT)) { + } else if (sym == XK_Left) { dir = OB_DIRECTION_WEST; if (key_resize_edge != OB_DIRECTION_WEST && key_resize_edge != OB_DIRECTION_EAST) @@ -682,7 +724,7 @@ static void resize_with_keys(gint keycode, gint state) key_resize_edge = OB_DIRECTION_WEST; return; } - } else if (ob_keycode_match(keycode, OB_KEY_UP)) { + } else if (sym == XK_Up) { dir = OB_DIRECTION_NORTH; if (key_resize_edge != OB_DIRECTION_NORTH && key_resize_edge != OB_DIRECTION_SOUTH) @@ -690,7 +732,7 @@ static void resize_with_keys(gint keycode, gint state) key_resize_edge = OB_DIRECTION_NORTH; return; } - } else /* if (ob_keycode_match(keycode, OB_KEY_DOWN)) */ { + } else /* if (sym == XK_Down) */ { dir = OB_DIRECTION_SOUTH; if (key_resize_edge != OB_DIRECTION_NORTH && key_resize_edge != OB_DIRECTION_SOUTH) @@ -701,16 +743,17 @@ static void resize_with_keys(gint keycode, gint state) } /* shift means jump to edge */ - if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) { + if (state & obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT)) + { gint x, y, w, h; - if (ob_keycode_match(keycode, OB_KEY_RIGHT)) + if (sym == XK_Right) dir = OB_DIRECTION_EAST; - else if (ob_keycode_match(keycode, OB_KEY_LEFT)) + else if (sym == XK_Left) dir = OB_DIRECTION_WEST; - else if (ob_keycode_match(keycode, OB_KEY_DOWN)) + else if (sym == XK_Down) dir = OB_DIRECTION_SOUTH; - else /* if (ob_keycode_match(keycode, OB_KEY_UP)) */ + else /* if (sym == XK_Up)) */ dir = OB_DIRECTION_NORTH; client_find_resize_directional(moveresize_client, key_resize_edge, @@ -801,7 +844,8 @@ static void resize_with_keys(gint keycode, gint state) XSync(obt_display, FALSE); { XEvent ce; - while (XCheckTypedEvent(obt_display, MotionNotify, &ce)); + while (xqueue_remove_local(&ce, xqueue_match_type, + GINT_TO_POINTER(MotionNotify))); } screen_pointer_pos(&px, &py); @@ -912,24 +956,24 @@ gboolean moveresize_event(XEvent *e) } used = TRUE; } else if (e->type == KeyPress) { - if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) { + KeySym sym = obt_keyboard_keypress_to_keysym(e); + + if (sym == XK_Escape) { moveresize_end(TRUE); used = TRUE; - } else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN)) { + } else if (sym == XK_Return || sym == XK_KP_Enter) { moveresize_end(FALSE); used = TRUE; - } else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RIGHT) || - ob_keycode_match(e->xkey.keycode, OB_KEY_LEFT) || - ob_keycode_match(e->xkey.keycode, OB_KEY_DOWN) || - ob_keycode_match(e->xkey.keycode, OB_KEY_UP)) + } else if (sym == XK_Right || sym == XK_Left || + sym == XK_Up || sym == XK_Down) { if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_SIZE_KEYBOARD)) { - resize_with_keys(e->xkey.keycode, e->xkey.state); + resize_with_keys(sym, e->xkey.state); used = TRUE; } else if (corner == OBT_PROP_ATOM(NET_WM_MOVERESIZE_MOVE_KEYBOARD)) { - move_with_keys(e->xkey.keycode, e->xkey.state); + move_with_keys(sym, e->xkey.state); used = TRUE; } } @@ -937,7 +981,7 @@ gboolean moveresize_event(XEvent *e) #ifdef SYNC else if (e->type == obt_display_extension_sync_basep + XSyncAlarmNotify) { - waiting_for_sync = FALSE; /* we got our sync... */ + waiting_for_sync = 0; /* we got our sync... */ do_resize(); /* ...so try resize if there is more change pending */ used = TRUE; }