#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 "config.h"
+#include "render/render.h"
+#include "render/theme.h"
#include <X11/Xlib.h>
#include <glib.h>
gboolean moveresize_in_progress = FALSE;
-Client *moveresize_client = NULL;
+ObClient *moveresize_client = NULL;
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 guint button;
static guint32 corner;
-static Corner lockcorner;
+static ObCorner lockcorner;
-static guint button_return, button_escape, button_left, button_right,
- button_up, button_down;
+static Popup *popup = NULL;
#define POPUP_X (10)
#define POPUP_Y (10)
-void moveresize_startup()
+static void client_dest(ObClient *c)
{
- 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"));
+ if (moveresize_client == c)
+ moveresize_end(TRUE);
}
-static void popup_coords(char *format, int a, int b)
+void moveresize_startup()
{
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);
+ popup = popup_new(FALSE);
+ popup_size_to_string(popup, "W: 0000 W: 0000");
- XMapWindow(ob_display, coords);
- }
+ attrib.save_under = True;
+
+ client_add_destructor(client_dest);
+}
+
+void moveresize_shutdown()
+{
+ client_remove_destructor(client_dest);
+
+ popup_free(popup);
+ popup = NULL;
+}
+
+static void popup_coords(char *format, int a, int b)
+{
+ char *text;
+ Rect *area;
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);
+ area = screen_physical_area_monitor(0);
+ popup_position(popup, NorthWestGravity,
+ POPUP_X + area->x, POPUP_Y + area->y);
+ popup_show(popup, text, NULL);
g_free(text);
}
-void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr)
+void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
{
- Cursor cur;
+ ObCursor cur;
g_assert(!moveresize_in_progress);
start_ch = c->area.height;
start_x = x;
start_y = y;
+ corner = cnr;
+ button = b;
+
+ /*
+ 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) {
moveresize_in_progress = TRUE;
if (corner == prop_atoms.net_wm_moveresize_size_topleft)
- cur = ob_cursors.tl;
+ cur = OB_CURSOR_NORTHWEST;
else if (corner == prop_atoms.net_wm_moveresize_size_top)
- cur = ob_cursors.t;
+ cur = OB_CURSOR_NORTH;
else if (corner == prop_atoms.net_wm_moveresize_size_topright)
- cur = ob_cursors.tr;
+ cur = OB_CURSOR_NORTHEAST;
else if (corner == prop_atoms.net_wm_moveresize_size_right)
- cur = ob_cursors.r;
+ cur = OB_CURSOR_EAST;
else if (corner == prop_atoms.net_wm_moveresize_size_bottomright)
- cur = ob_cursors.br;
+ cur = OB_CURSOR_SOUTHEAST;
else if (corner == prop_atoms.net_wm_moveresize_size_bottom)
- cur = ob_cursors.b;
+ cur = OB_CURSOR_SOUTH;
else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft)
- cur = ob_cursors.bl;
+ cur = OB_CURSOR_SOUTHWEST;
else if (corner == prop_atoms.net_wm_moveresize_size_left)
- cur = ob_cursors.l;
+ cur = OB_CURSOR_WEST;
else if (corner == prop_atoms.net_wm_moveresize_size_keyboard)
- cur = ob_cursors.br;
+ cur = OB_CURSOR_SOUTHEAST;
else if (corner == prop_atoms.net_wm_moveresize_move)
- cur = ob_cursors.move;
+ cur = OB_CURSOR_MOVE;
else if (corner == prop_atoms.net_wm_moveresize_move_keyboard)
- cur = ob_cursors.move;
+ cur = OB_CURSOR_MOVE;
else
g_assert_not_reached();
grab_keyboard(FALSE);
grab_pointer(FALSE, None);
- XDestroyWindow(ob_display, coords);
- coords = None;
-
- moveresize_in_progress = FALSE;
- moveresize_client = NULL;
+ popup_hide(popup);
if (moving) {
- client_configure(moveresize_client, Corner_TopLeft,
+ client_configure(moveresize_client, OB_CORNER_TOPLEFT,
(cancel ? start_cx : cur_x),
(cancel ? start_cy : cur_y),
start_cw, start_ch, TRUE, TRUE);
(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 resist)
{
- dispatch_move(moveresize_client, &cur_x, &cur_y);
+ Rect *a;
- popup_coords("X: %d Y: %d", cur_x, cur_y);
+ if (resist)
+ resist_move(moveresize_client, &cur_x, &cur_y);
/* get where the client should be */
frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
- client_configure(moveresize_client, Corner_TopLeft, cur_x, cur_y,
+ client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
start_cw, start_ch, TRUE, FALSE);
+
+ /* this would be better with a fixed width font ... XXX can do it better
+ if there are 2 text boxes */
+ a = screen_area(screen_desktop);
+ popup_coords("X: %4d Y: %4d",
+ moveresize_client->frame->area.x - a->x,
+ moveresize_client->frame->area.y - a->y);
}
-static void do_resize()
+static void do_resize(gboolean resist)
{
- /* dispatch_resize 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;
-
- dispatch_resize(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;
+ if (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;
+
+ resist_size(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;
+ }
- client_configure(moveresize_client, lockcorner, moveresize_client->area.x,
- moveresize_client->area.y, cur_x, cur_y, TRUE, FALSE);
+ client_configure(moveresize_client, lockcorner,
+ moveresize_client->area.x, moveresize_client->area.y,
+ cur_x, cur_y, TRUE, FALSE);
- popup_coords("W: %d H: %d", moveresize_client->logical_size.width,
+ /* this would be better with a fixed width font ... XXX can do it better
+ if there are 2 text boxes */
+ popup_coords("W: %4d H: %4d", moveresize_client->logical_size.width,
moveresize_client->logical_size.height);
}
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(TRUE);
} 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();
- do_resize();
+ do_resize(TRUE);
}
} else if (e->type == KeyPress) {
- if (e->xkey.keycode == button_escape)
+ if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
moveresize_end(TRUE);
- else if (e->xkey.keycode == button_return)
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
moveresize_end(FALSE);
else {
if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
- if (e->xkey.keycode == button_right)
- cur_x += MAX(4, moveresize_client->size_inc.width);
- else if (e->xkey.keycode == button_left)
- cur_x -= MAX(4, moveresize_client->size_inc.width);
- else if (e->xkey.keycode == button_down)
- cur_y += MAX(4, moveresize_client->size_inc.height);
- else if (e->xkey.keycode == button_up)
- cur_y -= MAX(4, moveresize_client->size_inc.height);
+ int dx = 0, dy = 0;
+
+ if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
+ dx = MAX(4, moveresize_client->size_inc.width);
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
+ dx = -MAX(4, moveresize_client->size_inc.width);
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
+ dy = MAX(4, moveresize_client->size_inc.height);
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
+ dy = -MAX(4, moveresize_client->size_inc.height);
else
return;
- do_resize();
+
+ cur_x += dx;
+ cur_y += dy;
+ XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
+ do_resize(FALSE);
} 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;
+ int dx = 0, dy = 0;
+
+ if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
+ dx = 4;
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT))
+ dx = -4;
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
+ dy = 4;
+ else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
+ dy = -4;
else
return;
- do_move();
+
+ cur_x += dx;
+ cur_y += dy;
+ XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+
+ do_move(FALSE);
}
}
}