Fix negative ResizeRelative values with terminal windows (Fix bug 5228)

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index db4b976d360c5ff0aafb8c8b19a5402b94032897..48dda24eaa9880380d05b1ecc9bcc875cdb1a456 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -348,7 +348,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         self->shaded = self->client->shaded;
 
         if (self->decorations & OB_FRAME_DECOR_BORDER)
-            self->bwidth = ob_rr_theme->fbwidth;
+            self->bwidth = self->client->undecorated ?
+                ob_rr_theme->ubwidth : ob_rr_theme->fbwidth;
         else
             self->bwidth = 0;
 
@@ -960,7 +961,7 @@ void frame_adjust_state(ObFrame *self)
 void frame_adjust_focus(ObFrame *self, gboolean hilite)
 {
     ob_debug_type(OB_DEBUG_FOCUS,
-                  "Frame for 0x%x has focus: %d\n",
+                  "Frame for 0x%x has focus: %d",
                   self->client->window, hilite);
     self->focused = hilite;
     self->need_render = TRUE;