#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"
gboolean moveresize_in_progress = FALSE;
ObClient *moveresize_client = NULL;
+#ifdef SYNC
+XSyncAlarm moveresize_alarm = None;
+#endif
static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */
static guint button;
static guint32 corner;
static ObCorner lockcorner;
+#ifdef SYNC
+static gboolean waiting_for_sync;
+#endif
static ObPopup *popup = NULL;
else
g_assert_not_reached();
+#ifdef SYNC
+ if (config_resize_redraw && !moving && extensions_shape &&
+ moveresize_client->sync_request && moveresize_client->sync_counter)
+ {
+ /* Initialize values for the resize syncing, and create an alarm for
+ the client's xsync counter */
+
+ XSyncValue val;
+ XSyncAlarmAttributes aa;
+
+ /* set the counter to an initial value */
+ XSyncIntToValue(&val, 0);
+ XSyncSetCounter(ob_display, moveresize_client->sync_counter, val);
+
+ /* this will be incremented when we tell the client what we're
+ looking for */
+ moveresize_client->sync_counter_value = 0;
+
+ /* the next sequence we're waiting for with the alarm */
+ XSyncIntToValue(&val, 1);
+
+ /* set an alarm on the counter */
+ aa.trigger.counter = moveresize_client->sync_counter;
+ aa.trigger.wait_value = val;
+ aa.trigger.value_type = XSyncAbsolute;
+ aa.trigger.test_type = XSyncPositiveTransition;
+ aa.events = True;
+ XSyncIntToValue(&aa.delta, 1);
+ moveresize_alarm = XSyncCreateAlarm(ob_display,
+ XSyncCACounter |
+ XSyncCAValue |
+ XSyncCAValueType |
+ XSyncCATestType |
+ XSyncCADelta |
+ XSyncCAEvents,
+ &aa);
+
+ waiting_for_sync = FALSE;
+ }
+#endif
+
grab_pointer(TRUE, FALSE, cur);
grab_keyboard(TRUE);
}
(cancel ? start_cx : cur_x),
(cancel ? start_cy : cur_y));
} else {
+#ifdef SYNC
+ /* turn off the alarm */
+ if (moveresize_alarm != None) {
+ XSyncDestroyAlarm(ob_display, moveresize_alarm);
+ moveresize_alarm = None;
+ }
+#endif
+
client_configure(moveresize_client, lockcorner,
moveresize_client->area.x,
moveresize_client->area.y,
moveresize_client->frame->area.y);
}
-static void do_resize(gboolean resist)
+static void do_resize()
{
- /* resist_size_* 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;
+#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 = moveresize_client->area.x;
+ y = moveresize_client->area.y;
+ w = cur_x;
+ h = cur_y;
+ client_try_configure(moveresize_client, lockcorner, &x, &y, &w, &h,
+ &lw, &lh, TRUE);
+ if (w == moveresize_client->area.width &&
+ h == moveresize_client->area.height)
+ {
+ return;
+ }
- if (resist) {
- resist_size_windows(moveresize_client, &cur_x, &cur_y, lockcorner);
- resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+ /* 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;
}
+#endif
- cur_x -= moveresize_client->frame->size.left +
- moveresize_client->frame->size.right;
- cur_y -= moveresize_client->frame->size.top +
- moveresize_client->frame->size.bottom;
-
client_configure(moveresize_client, lockcorner,
moveresize_client->area.x, moveresize_client->area.y,
cur_x, cur_y, TRUE, FALSE);
moveresize_client->logical_size.height);
}
+static void calc_resize(gboolean resist)
+{
+ /* resist_size_* 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_windows(moveresize_client, &cur_x, &cur_y, lockcorner);
+ resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+ }
+
+ cur_x -= moveresize_client->frame->size.left +
+ moveresize_client->frame->size.right;
+ cur_y -= moveresize_client->frame->size.top +
+ moveresize_client->frame->size.bottom;
+}
+
void moveresize_event(XEvent *e)
{
g_assert(moveresize_in_progress);
} else
g_assert_not_reached();
- do_resize(TRUE);
+ calc_resize(TRUE);
+ do_resize();
}
} else if (e->type == KeyPress) {
if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
}
}
}
+#ifdef SYNC
+ else if (e->type == extensions_sync_event_basep + XSyncAlarmNotify)
+ {
+ waiting_for_sync = FALSE; /* we got our sync... */
+ do_resize(); /* ...so try resize if there is more change pending */
+ }
+#endif
}