From: Mikael Magnusson Date: Sun, 4 May 2008 09:56:57 +0000 (+0200) Subject: Revert "make windows stay on screen when they..." X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d81d54c7a977a034199f24fc8fa7433e634aaf91;p=chaz%2Fopenbox Revert "make windows stay on screen when they..." This reverts commit 73adc6480d59fc5dccf9fe19ed5234c9582b328c. I know I had a good reason for reverting this commit, I don't know what that reason was though. --- diff --git a/openbox/client.c b/openbox/client.c index b6ca93a3..0ccb343b 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -933,19 +933,6 @@ static gboolean client_restore_session_stacking(ObClient *self) return FALSE; } -void client_reconfigure(ObClient *self, gboolean force) -{ - int x, y, w, h, lw, lh; - - x = self->area.x; - y = self->area.y; - w = self->area.width; - h = self->area.height; - client_try_configure(self, &x, &y, &w, &h, &lw, &lh, FALSE); - client_find_onscreen(self, &x, &y, w, h, FALSE); - client_configure(self, x, y, w, h, FALSE, TRUE, force); -} - void client_move_onscreen(ObClient *self, gboolean rude) { gint x = self->area.x; diff --git a/openbox/client.h b/openbox/client.h index 09c93e63..5e26ef30 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -396,13 +396,10 @@ void client_convert_gravity_resize(ObClient *self, gint gravity, client_configure(self, self->area.x, self->area.y, w, h, TRUE, TRUE, FALSE) #define client_move_resize(self, x, y, w, h) \ client_configure(self, x, y, w, h, TRUE, TRUE, FALSE) - -/*! Make a client reconfigure so that it will honour its current max/min sizes - and other bounds. - @param force If TRUE, then a ConfigureNotify event will be sent to the client - even if nothing has changed. -*/ -void client_reconfigure(ObClient *self, gboolean force); +#define client_reconfigure(self, force) \ + client_configure(self, ((ObClient*)self)->area.x, ((ObClient*)self)->area.y, \ + ((ObClient*)self)->area.width, \ + ((ObClient*)self)->area.height, FALSE, TRUE, force) /*! Figure out where a window will end up and what size it will be if you told it to move/resize to these coordinates.