X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=7878b9f2714bd4cc01c4a5516d9f6085fd578823;hb=03d42b5d8253ad2de94df20b12b9fb22ce51eb3d;hp=7731180470aaf48aac03c288397adfe384efc03e;hpb=c4af950903820221bc8617de81231de32eef4f07;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 77311804..7878b9f2 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -4,17 +4,18 @@ #include "client.h" #include "dispatch.h" #include "openbox.h" +#include "popup.h" #include #include 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; @@ -22,6 +23,8 @@ 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) @@ -33,29 +36,24 @@ void moveresize_startup() 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); } @@ -65,7 +63,7 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr) 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; @@ -95,19 +93,19 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr) 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; + cur = ob_cursors.t; 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; + cur = ob_cursors.r; 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; + cur = ob_cursors.b; 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; + cur = ob_cursors.l; else if (corner == prop_atoms.net_wm_moveresize_size_keyboard) cur = ob_cursors.br; else if (corner == prop_atoms.net_wm_moveresize_move) @@ -121,55 +119,67 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr) 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) @@ -183,8 +193,8 @@ void moveresize_event(XEvent *e) button = e->xbutton.button; /* this will end it now */ } } else if (e->type == ButtonRelease) { - if (e->xbutton.button == button) { - end_moveresize(FALSE); + if (!button || e->xbutton.button == button) { + moveresize_end(FALSE); } } else if (e->type == MotionNotify) { if (moving) { @@ -237,19 +247,19 @@ void moveresize_event(XEvent *e) } } 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();