Some fixes and new bugs. Someone else can do the menus because it is

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index c57c66e84571ec5e4ec90813ffb6e3a150722924..191fa9943331ac148f61659861e090f9272f77d1 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -494,7 +494,8 @@ void client_move_onscreen(ObClient *self, gboolean rude)
     int x = self->area.x;
     int y = self->area.y;
     if (client_find_onscreen(self, &x, &y,
-                             self->area.width, self->area.height, rude)) {
+                             self->frame->area.width,
+                             self->frame->area.height, rude)) {
         client_configure(self, OB_CORNER_TOPLEFT, x, y,
                          self->area.width, self->area.height,
                          TRUE, TRUE);
@@ -1113,13 +1114,8 @@ void client_setup_decor_and_functions(ObClient *self)
     client_change_allowed_actions(self);
 
     if (self->frame) {
-        /* this makes sure that these windows appear on all desktops */
-        if (self->type == OB_CLIENT_TYPE_DESKTOP &&
-            self->desktop != DESKTOP_ALL)
-            client_set_desktop(self, DESKTOP_ALL, FALSE);
-
-       /* adjust the client's decorations, etc. */
-       client_reconfigure(self);
+        /* adjust the client's decorations, etc. */
+        client_reconfigure(self);
     } else {
         /* this makes sure that these windows appear on all desktops */
         if (self->type == OB_CLIENT_TYPE_DESKTOP &&
@@ -1709,6 +1705,12 @@ void client_configure_full(ObClient *self, ObCorner anchor,
                            gboolean force_reply)
 {
     gboolean moved = FALSE, resized = FALSE;
+    gint fdecor = self->frame->decorations;
+
+    /* make the frame recalculate its dimentions n shit without changing
+       anything visible for real, this way the constraints below can work with
+       the updated frame dimensions. */
+    frame_adjust_area(self->frame, TRUE, TRUE, TRUE);
 
     /* gets the frame's position */
     frame_client_gravity(self->frame, &x, &y);
@@ -1755,8 +1757,8 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
         /* set the size and position if maximized */
         if (self->max_horz) {
-            x = a->x - self->frame->size.left;
-            w = a->width;
+            x = a->x;
+            w = a->width - self->frame->size.left - self->frame->size.right;
         }
         if (self->max_vert) {
             y = a->y;
@@ -1887,18 +1889,18 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
     /* for app-requested resizes, always resize if 'resized' is true.
        for user-requested ones, only resize if final is true, or when
-       resizing in opaque mode */
+       resizing in redraw mode */
     if ((!user && resized) ||
-        (user && (final || (resized && config_opaque_resize))))
+        (user && (final || (resized && config_redraw_resize))))
        XResizeWindow(ob_display, self->window, w, h);
 
     /* move/resize the frame to match the request */
     if (self->frame) {
-        if (self->decorations != self->frame->decorations)
+        if (self->decorations != fdecor)
             moved = resized = TRUE;
 
         if (moved || resized)
-            frame_adjust_area(self->frame, moved, resized);
+            frame_adjust_area(self->frame, moved, resized, FALSE);
 
         if (!resized && (force_reply || ((!user && moved) || (user && final))))
         {
@@ -2168,7 +2170,7 @@ void client_shade(ObClient *self, gboolean shade)
     self->shaded = shade;
     client_change_state(self);
     /* resize the frame to just the titlebar */
-    frame_adjust_area(self->frame, FALSE, FALSE);
+    frame_adjust_area(self->frame, FALSE, FALSE, FALSE);
 }
 
 void client_close(ObClient *self)