#include "framerender.h"
#include "screen.h"
#include "client.h"
+#include "focus.h"
#include "frame.h"
#include "openbox.h"
#include "resist.h"
#include "obrender/render.h"
#include "obrender/theme.h"
#include "obt/display.h"
+#include "obt/xqueue.h"
#include "obt/prop.h"
#include "obt/keyboard.h"
/* 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;
static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */
+/* starting geometry for the window being moved/resized, so it can be
+ restored */
static gint start_x, start_y, start_cx, start_cy, start_cw, start_ch;
+static gboolean was_max_horz, was_max_vert;
+static Rect pre_max_area;
static gint cur_x, cur_y, cur_w, cur_h;
static guint button;
static guint32 corner;
static ObDirection edge_warp_dir = -1;
static gboolean edge_warp_odd = FALSE;
+static guint edge_warp_timer = 0;
static ObDirection key_resize_edge = -1;
+static guint waiting_for_sync;
#ifdef SYNC
-static gboolean waiting_for_sync;
+static guint sync_timer = 0;
#endif
static ObPopup *popup = NULL;
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;
}
popup_position(popup, gravity, x, y);
-
- g_free(area);
}
popup_show(popup, text);
g_free(text);
button = b;
key_resize_edge = -1;
+ /* default to not putting max back on cancel */
+ was_max_horz = was_max_vert = FALSE;
+
/*
have to change start_cx and start_cy if going to do this..
if (corner == prop_atoms.net_wm_moveresize_move_keyboard ||
cur_h = start_ch;
moveresize_in_progress = TRUE;
+ waiting_for_sync = 0;
#ifdef SYNC
if (config_resize_redraw && !moving && obt_display_extension_sync &&
XSyncCADelta |
XSyncCAEvents,
&aa);
-
- waiting_for_sync = FALSE;
}
#endif
}
moveresize_alarm = None;
}
- obt_main_loop_timeout_remove(ob_main_loop, sync_timeout_func);
+ if (sync_timer) g_source_remove(sync_timer);
+ sync_timer = 0;
#endif
}
(cancel ? start_ch : cur_h),
TRUE, TRUE, FALSE);
+ /* restore the client's maximized state. do this after putting the window
+ back in its original spot to minimize visible flicker */
+ if (cancel && (was_max_horz || was_max_vert)) {
+ const gboolean h = moveresize_client->max_horz;
+ const gboolean v = moveresize_client->max_vert;
+
+ client_maximize(moveresize_client, TRUE,
+ was_max_horz && was_max_vert ? 0 :
+ (was_max_horz ? 1 : 2));
+
+ /* replace the premax values with the ones we had saved if
+ the client doesn't have any already set */
+ if (was_max_horz && !h) {
+ moveresize_client->pre_max_area.x = pre_max_area.x;
+ moveresize_client->pre_max_area.width = pre_max_area.width;
+ }
+ if (was_max_vert && !v) {
+ moveresize_client->pre_max_area.y = pre_max_area.y;
+ moveresize_client->pre_max_area.height = pre_max_area.height;
+ }
+ }
+
/* dont edge warp after its ended */
cancel_edge_warp();
{
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);
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,
- sync_timeout_func,
- NULL, NULL, NULL);
+ if (sync_timer) g_source_remove(sync_timer);
+ sync_timer = g_timeout_add(2000, sync_timeout_func, NULL);
}
#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
#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) {
+ sync_timer = 0;
+ return FALSE; /* don't repeat */
+ }
+ else
+ return TRUE; /* keep waiting */
}
#endif
*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;
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;
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 (!RECT_CONTAINS(*a, x, y))
+ continue;
+
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;
{
dir = -1;
}
- g_free(a);
}
if (dir != edge_warp_dir) {
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_timer = g_timeout_add(config_mouse_screenedgetime,
+ edge_warp_delay_func, NULL);
}
edge_warp_dir = dir;
}
static void cancel_edge_warp(void)
{
- obt_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func);
+ if (edge_warp_timer) g_source_remove(edge_warp_timer);
+ edge_warp_timer = 0;
}
static void move_with_keys(KeySym sym, guint 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);
}
}
+ if (moveresize_client->max_horz &&
+ (key_resize_edge == OB_DIRECTION_WEST ||
+ key_resize_edge == OB_DIRECTION_EAST))
+ {
+ /* unmax horz */
+ was_max_horz = TRUE;
+ pre_max_area.x = moveresize_client->pre_max_area.x;
+ pre_max_area.width = moveresize_client->pre_max_area.width;
+
+ moveresize_client->pre_max_area.x = cur_x;
+ moveresize_client->pre_max_area.width = cur_w;
+ client_maximize(moveresize_client, FALSE, 1);
+ }
+ else if (moveresize_client->max_vert &&
+ (key_resize_edge == OB_DIRECTION_NORTH ||
+ key_resize_edge == OB_DIRECTION_SOUTH))
+ {
+ /* unmax vert */
+ was_max_vert = TRUE;
+ pre_max_area.y = moveresize_client->pre_max_area.y;
+ pre_max_area.height = moveresize_client->pre_max_area.height;
+
+ moveresize_client->pre_max_area.y = cur_y;
+ moveresize_client->pre_max_area.height = cur_h;
+ client_maximize(moveresize_client, FALSE, 2);
+ }
+
calc_resize(TRUE, resist, &dw, &dh, dir);
if (key_resize_edge == OB_DIRECTION_WEST)
cur_x -= dw;
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);
} else
g_assert_not_reached();
+ /* override the client's max state if desired */
+ if (ABS(dw) >= config_resist_edge) {
+ if (moveresize_client->max_horz) {
+ /* unmax horz */
+ was_max_horz = TRUE;
+ pre_max_area.x = moveresize_client->pre_max_area.x;
+ pre_max_area.width = moveresize_client->pre_max_area.width;
+
+ moveresize_client->pre_max_area.x = cur_x;
+ moveresize_client->pre_max_area.width = cur_w;
+ client_maximize(moveresize_client, FALSE, 1);
+ }
+ }
+ else if (was_max_horz && !moveresize_client->max_horz) {
+ /* remax horz and put the premax back */
+ client_maximize(moveresize_client, TRUE, 1);
+ moveresize_client->pre_max_area.x = pre_max_area.x;
+ moveresize_client->pre_max_area.width = pre_max_area.width;
+ }
+
+ if (ABS(dh) >= config_resist_edge) {
+ if (moveresize_client->max_vert) {
+ /* unmax vert */
+ was_max_vert = TRUE;
+ pre_max_area.y = moveresize_client->pre_max_area.y;
+ pre_max_area.height =
+ moveresize_client->pre_max_area.height;
+
+ moveresize_client->pre_max_area.y = cur_y;
+ moveresize_client->pre_max_area.height = cur_h;
+ client_maximize(moveresize_client, FALSE, 2);
+ }
+ }
+ else if (was_max_vert && !moveresize_client->max_vert) {
+ /* remax vert and put the premax back */
+ client_maximize(moveresize_client, TRUE, 2);
+ moveresize_client->pre_max_area.y = pre_max_area.y;
+ moveresize_client->pre_max_area.height = pre_max_area.height;
+ }
+
dw -= cur_w - start_cw;
dh -= cur_h - start_ch;
if (sym == XK_Escape) {
moveresize_end(TRUE);
used = TRUE;
- } else if (sym == XK_Return) {
+ } else if (sym == XK_Return || sym == XK_KP_Enter) {
moveresize_end(FALSE);
used = TRUE;
} else if (sym == XK_Right || sym == XK_Left ||
#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;
}
#endif
+
+ if (used && moveresize_client == focus_client)
+ event_update_user_time();
+
return used;
}
projects / dana / openbox.git / blobdiff