X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=de1b2c9c253bf19c146c881893aa17e1fd3cb3c4;hb=3443454f33f88e10f187b78594ecfb5c09e1448d;hp=bebd8949dc6756167dfee2d88d9a3c1a122b620f;hpb=0d84c43d2a02acf5d2f0159e8cf54fe85f3755cc;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index bebd8949..de1b2c9c 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -794,7 +794,7 @@ void client_setup_decor_and_functions(Client *self)
 
     /* can't maximize without moving/resizing */
     if (!((self->functions & Func_Move) && (self->functions & Func_Resize)))
-	self->functions &= ~Func_Maximize;
+	self->functions &= ~(Func_Maximize | Func_Fullscreen);
 
     /* finally, user specified disabled decorations are applied to subtract
        decorations */
@@ -1307,63 +1307,73 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
         }
     }
 
-    if (x == self->area.x && y == self->area.y && w == self->area.width &&
-        h == self->area.height)
-        return; /* no change */
-
-    w -= self->base_size.width;
-    h -= self->base_size.height;
-
+    /* these override the above states! if you cant move you can't move! */
     if (user) {
-	/* for interactive resizing. have to move half an increment in each
-	   direction. */
-
-	/* how far we are towards the next size inc */
-	int mw = w % self->size_inc.width; 
-	int mh = h % self->size_inc.height;
-	/* amount to add */
-	int aw = self->size_inc.width / 2;
-	int ah = self->size_inc.height / 2;
-	/* don't let us move into a new size increment */
-	if (mw + aw >= self->size_inc.width)
-	    aw = self->size_inc.width - mw - 1;
-	if (mh + ah >= self->size_inc.height)
-	    ah = self->size_inc.height - mh - 1;
-	w += aw;
-	h += ah;
-    
-	/* if this is a user-requested resize, then check against min/max
-	   sizes and aspect ratios */
-
-	/* smaller than min size or bigger than max size? */
-	if (w > self->max_size.width) w = self->max_size.width;
-	if (w < self->min_size.width) w = self->min_size.width;
-	if (h > self->max_size.height) h = self->max_size.height;
-	if (h < self->min_size.height) h = self->min_size.height;
-
-	/* adjust the height ot match the width for the aspect ratios */
-	if (self->min_ratio)
-	    if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
-	if (self->max_ratio)
-	    if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
+        if (!(self->functions & Func_Move)) {
+            x = self->area.x;
+            y = self->area.y;
+        }
+        if (!(self->functions & Func_Resize)) {
+            w = self->area.width;
+            h = self->area.height;
+        }
     }
 
-    /* keep to the increments */
-    w /= self->size_inc.width;
-    h /= self->size_inc.height;
+    if (!(w == self->area.width && h == self->area.height)) {
+        w -= self->base_size.width;
+        h -= self->base_size.height;
+
+        if (user) {
+            /* for interactive resizing. have to move half an increment in each
+               direction. */
+
+            /* how far we are towards the next size inc */
+            int mw = w % self->size_inc.width; 
+            int mh = h % self->size_inc.height;
+            /* amount to add */
+            int aw = self->size_inc.width / 2;
+            int ah = self->size_inc.height / 2;
+            /* don't let us move into a new size increment */
+            if (mw + aw >= self->size_inc.width)
+                aw = self->size_inc.width - mw - 1;
+            if (mh + ah >= self->size_inc.height)
+                ah = self->size_inc.height - mh - 1;
+            w += aw;
+            h += ah;
+    
+            /* if this is a user-requested resize, then check against min/max
+               sizes and aspect ratios */
+
+            /* smaller than min size or bigger than max size? */
+            if (w > self->max_size.width) w = self->max_size.width;
+            if (w < self->min_size.width) w = self->min_size.width;
+            if (h > self->max_size.height) h = self->max_size.height;
+            if (h < self->min_size.height) h = self->min_size.height;
+
+            /* adjust the height ot match the width for the aspect ratios */
+            if (self->min_ratio)
+                if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
+            if (self->max_ratio)
+                if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
+        }
+
+        /* keep to the increments */
+        w /= self->size_inc.width;
+        h /= self->size_inc.height;
 
-    /* you cannot resize to nothing */
-    if (w < 1) w = 1;
-    if (h < 1) h = 1;
+        /* you cannot resize to nothing */
+        if (w < 1) w = 1;
+        if (h < 1) h = 1;
   
-    /* store the logical size */
-    SIZE_SET(self->logical_size, w, h);
+        /* store the logical size */
+        SIZE_SET(self->logical_size, w, h);
 
-    w *= self->size_inc.width;
-    h *= self->size_inc.height;
+        w *= self->size_inc.width;
+        h *= self->size_inc.height;
 
-    w += self->base_size.width;
-    h += self->base_size.height;
+        w += self->base_size.width;
+        h += self->base_size.height;
+    }
 
     switch (anchor) {
     case Corner_TopLeft:
@@ -1393,28 +1403,26 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
         if (moved || resized)
             engine_frame_adjust_area(self->frame, moved, resized);
 
-	if (moved) {
-	    if (!user || final) {
-		XEvent event;
-		event.type = ConfigureNotify;
-		event.xconfigure.display = ob_display;
-		event.xconfigure.event = self->window;
-		event.xconfigure.window = self->window;
+        if (!user || final) {
+            XEvent event;
+            event.type = ConfigureNotify;
+            event.xconfigure.display = ob_display;
+            event.xconfigure.event = self->window;
+            event.xconfigure.window = self->window;
     
-		/* root window coords with border in mind */
-		event.xconfigure.x = x - self->border_width +
-		    self->frame->size.left;
-		event.xconfigure.y = y - self->border_width +
-		    self->frame->size.top;
+            /* root window coords with border in mind */
+            event.xconfigure.x = x - self->border_width +
+                self->frame->size.left;
+            event.xconfigure.y = y - self->border_width +
+                self->frame->size.top;
     
-		event.xconfigure.width = self->area.width;
-		event.xconfigure.height = self->area.height;
-		event.xconfigure.border_width = self->border_width;
-		event.xconfigure.above = self->frame->plate;
-		event.xconfigure.override_redirect = FALSE;
-		XSendEvent(event.xconfigure.display, event.xconfigure.window,
-			   FALSE, StructureNotifyMask, &event);
-	    }
+            event.xconfigure.width = self->area.width;
+            event.xconfigure.height = self->area.height;
+            event.xconfigure.border_width = self->border_width;
+            event.xconfigure.above = self->frame->plate;
+            event.xconfigure.override_redirect = FALSE;
+            XSendEvent(event.xconfigure.display, event.xconfigure.window,
+                       FALSE, StructureNotifyMask, &event);
 	}
     }
 }