Merge branch 'master' into chaz

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 8a9a5a6462800b7aad364ab6a39a05b1163279f2..0f2d56ebaf7ce37c6e55c445444f7328afe94ced 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -276,9 +276,14 @@ void frame_adjust_shape_kind(ObFrame *self, int kind)
 {
     gint num;
     XRectangle xrect[2];
+    gboolean shaped;
 
-    if (!((kind == ShapeBounding && self->client->shaped) ||
-          (kind == ShapeInput && self->client->shaped_input))) {
+    shaped = (kind == ShapeBounding && self->client->shaped);
+#ifdef ShapeInput
+    shaped |= (kind == ShapeInput && self->client->shaped_input);
+#endif
+
+    if (!shaped) {
         /* clear the shape on the frame window */
         XShapeCombineMask(obt_display, self->window, kind,
                           self->size.left,
@@ -323,8 +328,10 @@ void frame_adjust_shape(ObFrame *self)
 {
 #ifdef SHAPE
   frame_adjust_shape_kind(self, ShapeBounding);
+#ifdef ShapeInput
   frame_adjust_shape_kind(self, ShapeInput);
 #endif
+#endif
 }
 
 void frame_adjust_area(ObFrame *self, gboolean moved,
@@ -341,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;
 
@@ -370,13 +378,22 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
         STRUT_SET(self->size,
                   self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
-                  self->cbwidth_t + self->bwidth,
+                  self->cbwidth_t +
+                  (!self->max_horz || !self->max_vert ? self->bwidth : 0),
                   self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_b +
                   (!self->max_horz || !self->max_vert ? self->bwidth : 0));
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->size.top += ob_rr_theme->title_height + self->bwidth;
+        else if (self->max_horz && self->max_vert) {
+            /* A maximized and undecorated window needs a small border on the
+               top of the window to let the user still undecorate/unmaximize the
+               window via the client menu. */
+            /* XXX This size should probably be a theme option. */
+            self->size.top += 1;
+        }
+
         if (self->decorations & OB_FRAME_DECOR_HANDLE &&
             ob_rr_theme->handle_height > 0)
         {
@@ -953,7 +970,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;
@@ -1657,11 +1674,13 @@ static gboolean flash_timeout(gpointer data)
     ObFrame *self = data;
     GTimeVal now;
 
-    g_get_current_time(&now);
-    if (now.tv_sec > self->flash_end.tv_sec ||
-        (now.tv_sec == self->flash_end.tv_sec &&
-         now.tv_usec >= self->flash_end.tv_usec))
-        self->flashing = FALSE;
+    if (config_frame_flash_duration != 0) {
+        g_get_current_time(&now);
+        if (now.tv_sec > self->flash_end.tv_sec ||
+            (now.tv_sec == self->flash_end.tv_sec &&
+             now.tv_usec >= self->flash_end.tv_usec))
+            self->flashing = FALSE;
+    }
 
     if (!self->flashing)
         return FALSE; /* we are done */
@@ -1677,14 +1696,19 @@ static gboolean flash_timeout(gpointer data)
 
 void frame_flash_start(ObFrame *self)
 {
+    if (config_frame_flash_delay == 0) return;
+
     self->flash_on = self->focused;
 
     if (!self->flashing)
         self->flash_timer = g_timeout_add_full(G_PRIORITY_DEFAULT,
-                                               600, flash_timeout, self,
+                                               config_frame_flash_delay, flash_timeout, self,
                                                flash_done);
-    g_get_current_time(&self->flash_end);
-    g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
+
+    if (config_frame_flash_duration != 0) {
+        g_get_current_time(&self->flash_end);
+        g_time_val_add(&self->flash_end, 1000 * config_frame_flash_duration);
+    }
 
     self->flashing = TRUE;
 }