From d62891ad10c4a27c87b4a8f354424b33769dcae9 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 30 May 2007 02:25:47 +0000 Subject: [PATCH] merge r6958-7088 from trunk (mostly obconf commits which are ignored) --- openbox/client.c | 12 ++++++++---- openbox/openbox.c | 2 +- openbox/screen.c | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index e1c814ce..8ba71172 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -2850,8 +2850,8 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, SIZE_SET(self->logical_size, logicalw, logicalh); /* figure out if we moved or resized or what */ - moved = x != self->area.x || y != self->area.y; - resized = w != self->area.width || h != self->area.height; + moved = (x != self->area.x || y != self->area.y); + resized = (w != self->area.width || h != self->area.height); oldw = self->area.width; oldh = self->area.height; @@ -2917,8 +2917,12 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, FALSE, StructureNotifyMask, &event); } - /* if the client is shrinking, then resize the frame before the client */ - if (send_resize_client && (w <= oldw && h <= oldh)) { + /* if the client is shrinking, then resize the frame before the client. + + both of these resize sections may run, because the top one only resizes + in the direction that is growing + */ + if (send_resize_client && (w <= oldw || h <= oldh)) { frame_adjust_client_area(self->frame); XResizeWindow(ob_display, self->window, w, h); } diff --git a/openbox/openbox.c b/openbox/openbox.c index 42a062be..9b81f200 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -275,7 +275,7 @@ gint main(gint argc, gchar **argv) ob_exit_with_error(_("Unable to load a theme.")); PROP_SETS(RootWindow(ob_display, ob_screen), - ob_theme, theme->name); + ob_theme, ob_rr_theme->name); } if (reconfigure) { diff --git a/openbox/screen.c b/openbox/screen.c index a265df0a..7b4ca740 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -323,7 +323,8 @@ static void screen_tell_ksplash() /* tell ksplash through the dcop server command line interface */ g_spawn_async(NULL, argv, NULL, - G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD | + G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_STDOUT_TO_DEV_NULL, NULL, NULL, NULL, NULL); g_strfreev(argv); -- 2.34.1