+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ moveresize.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "grab.h"
#include "framerender.h"
+#include "screen.h"
#include "prop.h"
#include "client.h"
-#include "dispatch.h"
+#include "frame.h"
#include "openbox.h"
+#include "resist.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 <X11/Xlib.h>
#include <glib.h>
+/* how far windows move and resize with the keyboard arrows */
+#define KEY_DIST 4
+
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 Window coords = None;
-static int start_x, start_y, start_cx, start_cy, start_cw, start_ch;
-static int cur_x, cur_y;
-static Client *client;
+static gint start_x, start_y, start_cx, start_cy, start_cw, start_ch;
+static gint cur_x, cur_y;
static guint button;
static guint32 corner;
-static Corner lockcorner;
+static ObCorner lockcorner;
+#ifdef SYNC
+static gboolean waiting_for_sync;
+#endif
-static guint button_return, button_escape, button_left, button_right,
- button_up, button_down;
+static ObPopup *popup = NULL;
-#define POPUP_X (10)
-#define POPUP_Y (10)
+static void client_dest(ObClient *client, gpointer data)
+{
+ if (moveresize_client == client)
+ moveresize_end(TRUE);
+}
-void moveresize_startup()
+void moveresize_startup(gboolean reconfig)
{
- button_return = XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
- button_escape = XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
- button_left = XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
- button_right = XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
- button_up = XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
- button_down = XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
+ popup = popup_new(FALSE);
+ popup_set_text_align(popup, RR_JUSTIFY_CENTER);
+
+ if (!reconfig)
+ client_add_destroy_notify(client_dest, NULL);
}
-static void popup_coords(char *format, int a, int b)
+void moveresize_shutdown(gboolean reconfig)
{
- XSetWindowAttributes attrib;
- Size s;
- char *text;
-
- if (coords == None) {
- attrib.override_redirect = TRUE;
- coords = XCreateWindow(ob_display, ob_root,
- 0, 0, 1, 1, 0, render_depth, InputOutput,
- render_visual, CWOverrideRedirect, &attrib);
- g_assert(coords != None);
-
- XMapWindow(ob_display, coords);
+ if (!reconfig) {
+ if (moveresize_in_progress)
+ moveresize_end(FALSE);
+ client_remove_destroy_notify(client_dest);
}
+ popup_free(popup);
+ 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, w, h);
+ 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, w, h);
+}
+
+static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
+{
+ gchar *text;
+
text = g_strdup_printf(format, a, b);
- framerender_size_popup_label(text, &s);
- XMoveResizeWindow(ob_display, coords,
- POPUP_X, POPUP_Y, s.width, s.height);
- framerender_popup_label(coords, &s, text);
+ if (config_resize_popup_pos == 1) /* == "Top" */
+ popup_position(popup, SouthGravity,
+ c->frame->area.x
+ + c->frame->area.width/2,
+ c->frame->area.y - ob_rr_theme->fbwidth);
+ else /* == "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);
+ popup_show(popup, text);
g_free(text);
}
-void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr)
+void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
{
- Cursor cur;
+ ObCursor cur;
+ gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move ||
+ cnr == prop_atoms.net_wm_moveresize_move_keyboard);
+
+ if (moveresize_in_progress || !c->frame->visible ||
+ !(mv ?
+ (c->functions & OB_CLIENT_FUNC_MOVE) :
+ (c->functions & OB_CLIENT_FUNC_RESIZE)))
+ return;
+
+ if (cnr == prop_atoms.net_wm_moveresize_size_topleft)
+ cur = OB_CURSOR_NORTHWEST;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_top)
+ cur = OB_CURSOR_NORTH;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_topright)
+ cur = OB_CURSOR_NORTHEAST;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_right)
+ cur = OB_CURSOR_EAST;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_bottomright)
+ cur = OB_CURSOR_SOUTHEAST;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_bottom)
+ cur = OB_CURSOR_SOUTH;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_bottomleft)
+ cur = OB_CURSOR_SOUTHWEST;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_left)
+ cur = OB_CURSOR_WEST;
+ else if (cnr == prop_atoms.net_wm_moveresize_size_keyboard)
+ cur = OB_CURSOR_SOUTHEAST;
+ else if (cnr == prop_atoms.net_wm_moveresize_move)
+ cur = OB_CURSOR_MOVE;
+ else if (cnr == prop_atoms.net_wm_moveresize_move_keyboard)
+ cur = OB_CURSOR_MOVE;
+ else
+ g_assert_not_reached();
- g_assert(!moveresize_in_progress);
+ /* keep the pointer bounded to the screen for move/resize */
+ if (!grab_pointer(FALSE, TRUE, cur))
+ return;
+ if (!grab_keyboard()) {
+ ungrab_pointer();
+ return;
+ }
+
+ frame_end_iconify_animation(c->frame);
+
+ moving = mv;
+ moveresize_client = c;
+ start_cx = c->area.x;
+ start_cy = c->area.y;
+ /* 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;
+ corner = cnr;
+ button = b;
- client = c;
- start_cx = c->frame->area.x;
- start_cy = c->frame->area.y;
- start_cw = c->area.width;
- start_ch = c->area.height;
+ /*
+ have to change start_cx and start_cy if going to do this..
if (corner == prop_atoms.net_wm_moveresize_move_keyboard ||
corner == prop_atoms.net_wm_moveresize_size_keyboard)
- button = 0; /* mouse can't end it without being pressed first */
- else
- button = b;
- corner = cnr;
+ XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
+ c->area.width / 2, c->area.height / 2);
+ */
- if (corner == prop_atoms.net_wm_moveresize_move ||
- corner == prop_atoms.net_wm_moveresize_move_keyboard) {
+ if (moving) {
cur_x = start_cx;
cur_y = start_cy;
- moving = TRUE;
} else {
cur_x = start_cw;
cur_y = start_ch;
- moving = FALSE;
}
moveresize_in_progress = TRUE;
- if (corner == prop_atoms.net_wm_moveresize_size_topleft)
- cur = ob_cursors.tl;
- else if (corner == prop_atoms.net_wm_moveresize_size_top)
- cur = ob_cursors.tl;
- else if (corner == prop_atoms.net_wm_moveresize_size_topright)
- cur = ob_cursors.tr;
- else if (corner == prop_atoms.net_wm_moveresize_size_right)
- cur = ob_cursors.tr;
- else if (corner == prop_atoms.net_wm_moveresize_size_bottomright)
- cur = ob_cursors.br;
- else if (corner == prop_atoms.net_wm_moveresize_size_bottom)
- cur = ob_cursors.br;
- else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft)
- cur = ob_cursors.bl;
- else if (corner == prop_atoms.net_wm_moveresize_size_left)
- cur = ob_cursors.bl;
- else if (corner == prop_atoms.net_wm_moveresize_size_keyboard)
- cur = ob_cursors.br;
- else if (corner == prop_atoms.net_wm_moveresize_move)
- cur = ob_cursors.move;
- else if (corner == prop_atoms.net_wm_moveresize_move_keyboard)
- cur = ob_cursors.move;
- else
- g_assert_not_reached();
-
- grab_keyboard(TRUE);
- grab_pointer(TRUE, cur);
+#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
}
-static void end_moveresize(gboolean cancel)
+void moveresize_end(gboolean cancel)
{
- grab_keyboard(FALSE);
- grab_pointer(FALSE, None);
+ gint x, y;
- XDestroyWindow(ob_display, coords);
- coords = None;
+ ungrab_keyboard();
+ ungrab_pointer();
- moveresize_in_progress = FALSE;
+ popup_hide(popup);
if (moving) {
- client_configure(client, Corner_TopLeft, (cancel ? start_cx : cur_x),
- (cancel ? start_cy : cur_y),
- start_cw, start_ch, TRUE, TRUE);
+ client_move(moveresize_client,
+ (cancel ? start_cx : cur_x),
+ (cancel ? start_cy : cur_y));
} else {
- client_configure(client, lockcorner, client->area.x,
- client->area.y, (cancel ? start_cw : cur_x),
- (cancel ? start_ch : cur_y), TRUE, TRUE);
+#ifdef SYNC
+ /* turn off the alarm */
+ if (moveresize_alarm != None) {
+ XSyncDestroyAlarm(ob_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);
}
+
+ moveresize_in_progress = FALSE;
+ moveresize_client = NULL;
}
-static void do_move()
+static void do_move(gboolean keyboard)
{
- dispatch_move(client, &cur_x, &cur_y);
-
- popup_coords("X: %d Y: %d", cur_x, cur_y);
-
- /* get where the client should be */
- frame_frame_gravity(client->frame, &cur_x, &cur_y);
- client_configure(client, Corner_TopLeft, cur_x, cur_y,
- start_cw, start_ch, TRUE, FALSE);
+ gint resist;
+
+ if (keyboard) resist = KEY_DIST - 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,
+ TRUE, FALSE);
+ if (config_resize_popup_show == 2) /* == "Always" */
+ popup_coords(moveresize_client, "%d x %d",
+ moveresize_client->frame->area.x,
+ moveresize_client->frame->area.y);
}
static void do_resize()
{
- /* dispatch_resize needs the frame size */
- cur_x += client->frame->size.left + client->frame->size.right;
- cur_y += client->frame->size.top + client->frame->size.bottom;
-
- dispatch_resize(client, &cur_x, &cur_y, lockcorner);
+ 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;
+ }
- cur_x -= client->frame->size.left + client->frame->size.right;
- cur_y -= client->frame->size.top + client->frame->size.bottom;
-
- client_configure(client, lockcorner, client->area.x,
- client->area.y, cur_x, cur_y, TRUE, FALSE);
+#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;
+ }
+#endif
+
+ get_resize_position(&x, &y, FALSE);
+ client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE);
+
+ /* this would be better with a fixed width font ... XXX can do it better
+ if there are 2 text boxes */
+ if (config_resize_popup_show == 2 || /* == "Always" */
+ (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("W: %d H: %d", client->logical_size.width,
- client->logical_size.height);
+static void calc_resize(gboolean keyboard)
+{
+ gint 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 (keyboard) resist = KEY_DIST - 1; /* resist for one key press */
+ else resist = config_resist_win;
+ resist_size_windows(moveresize_client, resist, &cur_x, &cur_y, lockcorner);
+ if (!keyboard) resist = config_resist_edge;
+ resist_size_monitors(moveresize_client, resist, &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)
+gboolean moveresize_event(XEvent *e)
{
+ gboolean used = FALSE;
+
g_assert(moveresize_in_progress);
if (e->type == ButtonPress) {
start_y = e->xbutton.y_root;
button = e->xbutton.button; /* this will end it now */
}
+ used = e->xbutton.button == button;
} else if (e->type == ButtonRelease) {
- if (e->xbutton.button == button) {
- end_moveresize(FALSE);
+ if (!button || e->xbutton.button == button) {
+ moveresize_end(FALSE);
+ used = TRUE;
}
} else if (e->type == MotionNotify) {
if (moving) {
cur_x = start_cx + e->xmotion.x_root - start_x;
cur_y = start_cy + e->xmotion.y_root - start_y;
-
- do_move();
+ do_move(FALSE);
} 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 = Corner_BottomRight;
+ 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 = Corner_BottomRight;
+ 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 = Corner_BottomLeft;
+ 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 = Corner_BottomLeft;
+ lockcorner = OB_CORNER_BOTTOMLEFT;
} 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 = Corner_TopLeft;
+ 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 = Corner_TopLeft;
+ lockcorner = OB_CORNER_TOPLEFT;
} 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 = Corner_TopRight;
+ 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 = Corner_TopRight;
+ 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 = Corner_TopLeft;
+ lockcorner = OB_CORNER_TOPLEFT;
} else
g_assert_not_reached();
+ calc_resize(FALSE);
do_resize();
}
+ used = TRUE;
} else if (e->type == KeyPress) {
- if (e->xkey.keycode == button_escape)
- end_moveresize(TRUE);
- else if (e->xkey.keycode == button_return)
- end_moveresize(FALSE);
- else {
+ if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+ moveresize_end(TRUE);
+ used = TRUE;
+ } else if (e->xkey.keycode == ob_keycode(OB_KEY_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))
+ {
if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
- if (e->xkey.keycode == button_right)
- cur_x += MAX(4, client->size_inc.width);
- else if (e->xkey.keycode == button_left)
- cur_x -= MAX(4, client->size_inc.width);
- else if (e->xkey.keycode == button_down)
- cur_y += MAX(4, client->size_inc.height);
- else if (e->xkey.keycode == button_up)
- cur_y -= MAX(4, client->size_inc.height);
- else
- return;
+ 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);
+
+ used = TRUE;
} else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
- if (e->xkey.keycode == button_right)
- cur_x += 4;
- else if (e->xkey.keycode == button_left)
- cur_x -= 4;
- else if (e->xkey.keycode == button_down)
- cur_y += 4;
- else if (e->xkey.keycode == button_up)
- cur_y -= 4;
- else
- return;
- do_move();
+ gint dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+ gint opx, px, opy, py;
+
+ if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
+ dx = KEY_DIST;
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
+ dx = -KEY_DIST;
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
+ dy = KEY_DIST;
+ else /* if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) */
+ dy = -KEY_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);
+
+ used = TRUE;
}
}
}
+#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 */
+ used = TRUE;
+ }
+#endif
+ return used;
}
projects / chaz / openbox / blobdiff