X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fframe.c;h=8ce2a16d9bbaa4e194e637704c68b4629304ca7a;hb=8772b46b56172e35506f21d626aa89bd649615c6;hp=aef445aec46012261a998356b5bca777311bcfad;hpb=ac72dafab4e3223fb522c0c17fd80f950d91a0c9;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index aef445ae..8ce2a16d 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -41,7 +41,7 @@
 #define FRAME_ANIMATE_ICONIFY_TIME 150000 /* .15 seconds */
 #define FRAME_ANIMATE_ICONIFY_STEP_TIME (G_USEC_PER_SEC / 60) /* 60 Hz */
 
-#define FRAME_HANDLE_Y(f) (f->size.top + f->client->area.height + f->cbwidth_y)
+#define FRAME_HANDLE_Y(f) (f->size.top + f->client->area.height + f->cbwidth_b)
 
 static void flash_done(gpointer data);
 static gboolean flash_timeout(gpointer data);
@@ -297,8 +297,7 @@ void frame_adjust_shape(ObFrame *self)
             xrect[0].x = 0;
             xrect[0].y = 0;
             xrect[0].width = self->area.width;
-            xrect[0].height = ob_rr_theme->title_height +
-                self->bwidth + self->rbwidth;
+            xrect[0].height = self->size.top;
             ++num;
         }
 
@@ -338,18 +337,21 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
         if (self->decorations & OB_FRAME_DECOR_BORDER) {
             self->bwidth = ob_rr_theme->fbwidth;
-            self->cbwidth_x = ob_rr_theme->cbwidthx;
-            self->cbwidth_y = ob_rr_theme->cbwidthy;
+            self->cbwidth_l = self->cbwidth_r = ob_rr_theme->cbwidthx;
+            self->cbwidth_t = self->cbwidth_b = ob_rr_theme->cbwidthy;
         } else {
-            self->bwidth = self->cbwidth_x = self->cbwidth_y = 0;
+            self->bwidth = self->cbwidth_l = self->cbwidth_t =
+                self->cbwidth_r = self->cbwidth_b = 0;
         }
-        self->rbwidth = self->bwidth;
 
         if (self->max_horz) {
-            self->cbwidth_x = 0;
+            self->cbwidth_l = self->cbwidth_r = 0;
             self->width = self->client->area.width - self->bwidth * 2;
+            if (self->max_vert)
+                self->cbwidth_b = 0;
         } else
-            self->width = self->client->area.width + self->cbwidth_x * 2;
+            self->width = self->client->area.width +
+                self->cbwidth_l + self->cbwidth_r;
 
         /* some elements are sized based of the width, so don't let them have
            negative values */
@@ -357,13 +359,13 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                           (ob_rr_theme->grip_width + self->bwidth) * 2 + 1);
 
         STRUT_SET(self->size,
-                  self->cbwidth_x + (!self->max_horz ? self->bwidth : 0),
-                  self->cbwidth_y + self->bwidth,
-                  self->cbwidth_x + (!self->max_horz ? self->bwidth : 0),
-                  self->cbwidth_y + self->bwidth);
+                  self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
+                  self->cbwidth_t + self->bwidth,
+                  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->rbwidth;
+            self->size.top += ob_rr_theme->title_height + self->bwidth;
         if (self->decorations & OB_FRAME_DECOR_HANDLE &&
             ob_rr_theme->handle_height > 0)
         {
@@ -373,41 +375,49 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         /* position/size and map/unmap all the windows */
 
         if (!fake) {
-            if (self->cbwidth_x) {
+            if (self->cbwidth_l) {
                 XMoveResizeWindow(ob_display, self->innerleft,
-                                  self->size.left - self->cbwidth_x,
+                                  self->size.left - self->cbwidth_l,
                                   self->size.top,
-                                  self->cbwidth_x, self->client->area.height);
+                                  self->cbwidth_l, self->client->area.height);
+
+                XMapWindow(ob_display, self->innerleft);
+            } else
+                XUnmapWindow(ob_display, self->innerleft);
+
+            if (self->cbwidth_r) {
                 XMoveResizeWindow(ob_display, self->innerright,
                                   self->size.left + self->client->area.width,
                                   self->size.top,
-                                  self->cbwidth_x, self->client->area.height);
+                                  self->cbwidth_r, self->client->area.height);
 
-                XMapWindow(ob_display, self->innerleft);
                 XMapWindow(ob_display, self->innerright);
-            } else {
-                XUnmapWindow(ob_display, self->innerleft);
+            } else
                 XUnmapWindow(ob_display, self->innerright);
-            }
 
-            if (self->cbwidth_y) {
+            if (self->cbwidth_t) {
                 XMoveResizeWindow(ob_display, self->innertop,
-                                  self->size.left - self->cbwidth_x,
-                                  self->size.top - self->cbwidth_y,
+                                  self->size.left - self->cbwidth_l,
+                                  self->size.top - self->cbwidth_t,
                                   self->client->area.width +
-                                  self->cbwidth_x * 2, self->cbwidth_y);
+                                  self->cbwidth_l + self->cbwidth_r,
+                                  self->cbwidth_t);
+
+                XMapWindow(ob_display, self->innertop);
+            } else
+                XUnmapWindow(ob_display, self->innertop);
+
+            if (self->cbwidth_b) {
                 XMoveResizeWindow(ob_display, self->innerbottom,
-                                  self->size.left - self->cbwidth_x,
+                                  self->size.left - self->cbwidth_l,
                                   self->size.top + self->client->area.height,
                                   self->client->area.width +
-                                  self->cbwidth_x * 2, self->cbwidth_y);
+                                  self->cbwidth_l + self->cbwidth_r,
+                                  self->cbwidth_b);
 
-                XMapWindow(ob_display, self->innertop);
                 XMapWindow(ob_display, self->innerbottom);
-            } else {
-                XUnmapWindow(ob_display, self->innertop);
+            } else
                 XUnmapWindow(ob_display, self->innerbottom);
-            }
 
             if (self->bwidth) {
                 gint titlesides;
@@ -458,14 +468,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                 XMapWindow(ob_display, self->titletopleft);
                 XMapWindow(ob_display, self->titletopright);
 
-                if (self->decorations & OB_FRAME_DECOR_TITLEBAR &&
-                    self->rbwidth)
-                {
+                if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
                     XMoveResizeWindow(ob_display, self->titlebottom,
                                       self->bwidth,
                                       ob_rr_theme->title_height + self->bwidth,
                                       self->width,
-                                      self->rbwidth);
+                                      self->bwidth);
 
                     XMapWindow(ob_display, self->titlebottom);
                 } else
@@ -522,7 +530,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             layout_title(self);
 
         if (!fake) {
-            if (self->bwidth) {
+            if (self->bwidth && self->size.bottom) {
                 XMoveResizeWindow(ob_display, self->handlebottom,
                                   ob_rr_theme->grip_width +
                                   self->bwidth * 2,
@@ -538,11 +546,11 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                   self->size.bottom -
                                   (!self->max_horz ?
                                    ob_rr_theme->grip_width :
-                                   self->size.bottom),
+                                   self->size.bottom - self->cbwidth_b),
                                   self->bwidth,
                                   (!self->max_horz ?
                                    ob_rr_theme->grip_width :
-                                   self->size.bottom));
+                                   self->size.bottom - self->cbwidth_b));
                 XMoveResizeWindow(ob_display, self->rgripright,
                                   self->size.left + self->client->area.width +
                                   self->size.right - self->bwidth,
@@ -550,11 +558,11 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                   self->size.bottom -
                                   (!self->max_horz ?
                                    ob_rr_theme->grip_width :
-                                   self->size.bottom),
+                                   self->size.bottom - self->cbwidth_b),
                                   self->bwidth,
                                   (!self->max_horz ?
                                    ob_rr_theme->grip_width :
-                                   self->size.bottom));
+                                   self->size.bottom - self->cbwidth_b));
 
                 XMoveResizeWindow(ob_display, self->lgripbottom,
                                   self->bwidth,
@@ -701,7 +709,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             if (self->bwidth && !self->max_horz) {
                 XMoveResizeWindow(ob_display, self->right,
                                   self->client->area.width +
-                                  self->cbwidth_x * 2 + self->bwidth,
+                                  self->cbwidth_l + self->cbwidth_r + self->bwidth,
                                   self->bwidth + ob_rr_theme->grip_width,
                                   self->bwidth,
                                   self->client->area.height +
@@ -729,10 +737,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                    self->size.top + self->size.bottom));
 
     if ((moved || resized) && !fake) {
-        /* when the client has StaticGravity, it likes to move around. */
-        XMoveWindow(ob_display, self->client->window,
-                    self->size.left, self->size.top);
-
         /* find the new coordinates, done after setting the frame.size, for
            frame_client_gravity. */
         self->area.x = self->client->area.x;
@@ -756,6 +760,13 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                               self->area.width,
                               self->area.height);
 
+        /* when the client has StaticGravity, it likes to move around.
+           also this correctly positions the client when it maps.
+           this also needs to be run when the frame's decorations sizes change!
+        */
+        XMoveWindow(ob_display, self->client->window,
+                    self->size.left, self->size.top);
+
         if (resized) {
             framerender_frame(self);
             frame_adjust_shape(self);