#include "client.h"
#include "dispatch.h"
#include "openbox.h"
+#include "popup.h"
#include <X11/Xlib.h>
#include <glib.h>
gboolean moveresize_in_progress = FALSE;
+Client *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 Client *client;
static guint button;
static guint32 corner;
static Corner 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)
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_size_to_string(popup, "W: 0000 W: 0000");
+ popup_position(popup, NorthWestGravity, POPUP_X, POPUP_Y);
+}
+
+void moveresize_shutdown()
+{
+ popup_free(popup);
+ popup = NULL;
}
static void popup_coords(char *format, int a, int b)
{
- 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);
- }
-
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);
+ popup_show(popup, text, NULL);
g_free(text);
}
g_assert(!moveresize_in_progress);
- client = c;
+ moveresize_client = c;
start_cx = c->frame->area.x;
start_cy = c->frame->area.y;
start_cw = c->area.width;
grab_keyboard(TRUE);
}
-static void end_moveresize(gboolean cancel)
+void moveresize_end(gboolean cancel)
{
grab_keyboard(FALSE);
grab_pointer(FALSE, None);
- XDestroyWindow(ob_display, coords);
- coords = None;
-
- moveresize_in_progress = FALSE;
+ popup_hide(popup);
if (moving) {
- client_configure(client, Corner_TopLeft, (cancel ? start_cx : cur_x),
+ client_configure(moveresize_client, Corner_TopLeft,
+ (cancel ? start_cx : cur_x),
(cancel ? start_cy : cur_y),
start_cw, start_ch, TRUE, TRUE);
} else {
- client_configure(client, lockcorner, client->area.x,
- client->area.y, (cancel ? start_cw : cur_x),
+ client_configure(moveresize_client, lockcorner,
+ moveresize_client->area.x,
+ moveresize_client->area.y,
+ (cancel ? start_cw : cur_x),
(cancel ? start_ch : cur_y), TRUE, TRUE);
}
+
+ moveresize_in_progress = FALSE;
+ moveresize_client = NULL;
}
static void do_move()
{
- dispatch_move(client, &cur_x, &cur_y);
-
- popup_coords("X: %d Y: %d", cur_x, cur_y);
+ dispatch_move(moveresize_client, &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,
+ frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
+ client_configure(moveresize_client, 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 */
+ popup_coords("X: %4d Y: %4d", 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;
+ 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(client, &cur_x, &cur_y, lockcorner);
+ dispatch_resize(moveresize_client, &cur_x, &cur_y, lockcorner);
- cur_x -= client->frame->size.left + client->frame->size.right;
- cur_y -= client->frame->size.top + client->frame->size.bottom;
+ 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(client, lockcorner, client->area.x,
- 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", client->logical_size.width,
- client->logical_size.height);
+ /* 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);
}
void moveresize_event(XEvent *e)
}
} else if (e->type == ButtonRelease) {
if (!button || e->xbutton.button == button) {
- end_moveresize(FALSE);
+ moveresize_end(FALSE);
}
} else if (e->type == MotionNotify) {
if (moving) {
}
} else if (e->type == KeyPress) {
if (e->xkey.keycode == button_escape)
- end_moveresize(TRUE);
+ moveresize_end(TRUE);
else if (e->xkey.keycode == button_return)
- end_moveresize(FALSE);
+ moveresize_end(FALSE);
else {
if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
if (e->xkey.keycode == button_right)
- cur_x += MAX(4, client->size_inc.width);
+ cur_x += MAX(4, moveresize_client->size_inc.width);
else if (e->xkey.keycode == button_left)
- cur_x -= MAX(4, client->size_inc.width);
+ cur_x -= MAX(4, moveresize_client->size_inc.width);
else if (e->xkey.keycode == button_down)
- cur_y += MAX(4, client->size_inc.height);
+ cur_y += MAX(4, moveresize_client->size_inc.height);
else if (e->xkey.keycode == button_up)
- cur_y -= MAX(4, client->size_inc.height);
+ cur_y -= MAX(4, moveresize_client->size_inc.height);
else
return;
do_resize();
projects / chaz / openbox / blobdiff