add some current states

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 6830ab73e25c74f813fa58a1271887678eb8ce22..8f219193ef6fe008fc76683f6029f7b78b78b046 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1613,13 +1613,6 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
            PROP_SET32A(self->window, openbox_premax, cardinal,
                        dimensions, 4);
        }
-
-        /* pass the client's current position info. the client_configure
-           will move/size stuff as appropriate for a maximized window */
-        x = self->area.x;
-        y = self->area.y;
-        w = self->area.width;
-        h = self->area.height;
     } else {
        long *dimensions;
 
@@ -1666,7 +1659,7 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
 
 void client_shade(Client *self, gboolean shade)
 {
-    if (!(self->functions & Func_Shade) || /* can't */
+    if ((!(self->functions & Func_Shade) && shade) || /* can't shade */
        self->shaded == shade) return;     /* already done */
 
     /* when we're iconic, don't change the wmstate */