nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

watch out when unmanaging a window, that it is not being move/resized

Browse source
This commit is contained in:
Dana Jansens 2003-04-18 01:51:41 +00:00
parent cfe3dc9ec4
commit 077cd7f944
3 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/client.c
View file

@ -1,5 +1,6 @@
#include "client.h" #include "client.h"
#include "screen.h" #include "screen.h"
#include "moveresize.h"
#include "prop.h" #include "prop.h"
#include "extensions.h" #include "extensions.h"
#include "frame.h" #include "frame.h"
@ -237,8 +238,6 @@ void client_manage(Window window)
client_showhide(self); client_showhide(self);
dispatch_client(Event_Client_Mapped, self, 0, 0);
/* focus the new window? */ /* focus the new window? */
if (ob_state != State_Starting && client_normal(self)) { if (ob_state != State_Starting && client_normal(self)) {
if (config_focus_new) if (config_focus_new)
@ -265,6 +264,8 @@ void client_manage(Window window)
/* make sure the window is visible */ /* make sure the window is visible */
client_move_onscreen(self); client_move_onscreen(self);
dispatch_client(Event_Client_Mapped, self, 0, 0);
g_message("Managed window 0x%lx", window); g_message("Managed window 0x%lx", window);
} }
@ -331,6 +332,9 @@ void client_unmanage(Client *self)
} }
} }
if (moveresize_client == self)
moveresize_end(TRUE);
if (focus_client == self) if (focus_client == self)
client_unfocus(self); client_unfocus(self);

58
openbox/moveresize.c
View file

@ -9,12 +9,13 @@
#include <glib.h> #include <glib.h>
gboolean moveresize_in_progress = FALSE; gboolean moveresize_in_progress = FALSE;
Client *moveresize_client = NULL;
static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */ static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */
static Window coords = None; static Window coords = None;
static int start_x, start_y, start_cx, start_cy, start_cw, start_ch; static int start_x, start_y, start_cx, start_cy, start_cw, start_ch;
static int cur_x, cur_y; static int cur_x, cur_y;
static Client *client;
static guint button; static guint button;
static guint32 corner; static guint32 corner;
static Corner lockcorner; static Corner lockcorner;
@ -65,7 +66,7 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr)
g_assert(!moveresize_in_progress); g_assert(!moveresize_in_progress);
client = c; moveresize_client = c;
start_cx = c->frame->area.x; start_cx = c->frame->area.x;
start_cy = c->frame->area.y; start_cy = c->frame->area.y;
start_cw = c->area.width; start_cw = c->area.width;
@ -121,7 +122,7 @@ void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr)
grab_keyboard(TRUE); grab_keyboard(TRUE);
} }
static void end_moveresize(gboolean cancel) void moveresize_end(gboolean cancel)
{ {
grab_keyboard(FALSE); grab_keyboard(FALSE);
grab_pointer(FALSE, None); grab_pointer(FALSE, None);
@ -132,44 +133,51 @@ static void end_moveresize(gboolean cancel)
moveresize_in_progress = FALSE; moveresize_in_progress = FALSE;
if (moving) { 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), (cancel ? start_cy : cur_y),
start_cw, start_ch, TRUE, TRUE); start_cw, start_ch, TRUE, TRUE);
} else { } else {
client_configure(client, lockcorner, client->area.x, client_configure(moveresize_client, lockcorner,
client->area.y, (cancel ? start_cw : cur_x), moveresize_client->area.x,
moveresize_client->area.y,
(cancel ? start_cw : cur_x),
(cancel ? start_ch : cur_y), TRUE, TRUE); (cancel ? start_ch : cur_y), TRUE, TRUE);
} }
} }
static void do_move() static void do_move()
{ {
dispatch_move(client, &cur_x, &cur_y); dispatch_move(moveresize_client, &cur_x, &cur_y);
popup_coords("X: %d Y: %d", cur_x, cur_y); popup_coords("X: %d Y: %d", cur_x, cur_y);
/* get where the client should be */ /* get where the client should be */
frame_frame_gravity(client->frame, &cur_x, &cur_y); frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
client_configure(client, Corner_TopLeft, cur_x, cur_y, client_configure(moveresize_client, Corner_TopLeft, cur_x, cur_y,
start_cw, start_ch, TRUE, FALSE); start_cw, start_ch, TRUE, FALSE);
} }
static void do_resize() static void do_resize()
{ {
/* dispatch_resize needs the frame size */ /* dispatch_resize needs the frame size */
cur_x += client->frame->size.left + client->frame->size.right; cur_x += moveresize_client->frame->size.left +
cur_y += client->frame->size.top + client->frame->size.bottom; 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_x -= moveresize_client->frame->size.left +
cur_y -= client->frame->size.top + client->frame->size.bottom; 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_configure(moveresize_client, lockcorner, moveresize_client->area.x,
client->area.y, cur_x, cur_y, TRUE, FALSE); moveresize_client->area.y, cur_x, cur_y, TRUE, FALSE);
popup_coords("W: %d H: %d", client->logical_size.width, popup_coords("W: %d H: %d", moveresize_client->logical_size.width,
client->logical_size.height); moveresize_client->logical_size.height);
} }
void moveresize_event(XEvent *e) void moveresize_event(XEvent *e)
@ -184,7 +192,7 @@ void moveresize_event(XEvent *e)
} }
} else if (e->type == ButtonRelease) { } else if (e->type == ButtonRelease) {
if (!button || e->xbutton.button == button) { if (!button || e->xbutton.button == button) {
end_moveresize(FALSE); moveresize_end(FALSE);
} }
} else if (e->type == MotionNotify) { } else if (e->type == MotionNotify) {
if (moving) { if (moving) {
@ -237,19 +245,19 @@ void moveresize_event(XEvent *e)
} }
} else if (e->type == KeyPress) { } else if (e->type == KeyPress) {
if (e->xkey.keycode == button_escape) if (e->xkey.keycode == button_escape)
end_moveresize(TRUE); moveresize_end(TRUE);
else if (e->xkey.keycode == button_return) else if (e->xkey.keycode == button_return)
end_moveresize(FALSE); moveresize_end(FALSE);
else { else {
if (corner == prop_atoms.net_wm_moveresize_size_keyboard) { if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
if (e->xkey.keycode == button_right) 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) 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) 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) 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 else
return; return;
do_resize(); do_resize();

2
openbox/moveresize.h
View file

@ -6,10 +6,12 @@
#include <glib.h> #include <glib.h>
extern gboolean moveresize_in_progress; extern gboolean moveresize_in_progress;
extern Client *moveresize_client;
void moveresize_startup(); void moveresize_startup();
void moveresize_start(Client *c, int x, int y, guint button, guint32 corner); void moveresize_start(Client *c, int x, int y, guint button, guint32 corner);
void moveresize_end(gboolean cancel);
void moveresize_event(XEvent *e); void moveresize_event(XEvent *e);