X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=361d57cd8a01a9fbb034a3e798bebcc9fb180750;hb=4398c7c168fdcba1e31afc465d9783a57e7e674a;hp=209f5f9657e2b826fa0f4679047b0066e6e6093a;hpb=b749cd5ec47040c4568beac5ad5121c05b4bcf61;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 209f5f96..361d57cd 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -706,7 +706,7 @@ void client_update_normal_hints(Client *self)
 
     /* get the hints from the window */
     if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
-	self->positioned = (size.flags & (PPosition|USPosition));
+	self->positioned = !!(size.flags & (PPosition|USPosition));
 
 	if (size.flags & PWinGravity) {
 	    self->gravity = size.win_gravity;
@@ -747,7 +747,8 @@ void client_setup_decor_and_functions(Client *self)
 {
     /* start with everything (cept fullscreen) */
     self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
-	Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize;
+	Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize |
+        Decor_Shade;
     self->functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize |
 	Func_Shade;
     if (self->delete_window) {
@@ -842,6 +843,8 @@ void client_setup_decor_and_functions(Client *self)
 	self->decorations &= ~Decor_Maximize;
     if (self->disabled_decorations & Decor_AllDesktops)
 	self->decorations &= ~Decor_AllDesktops;
+    if (self->disabled_decorations & Decor_Shade)
+	self->decorations &= ~Decor_Shade;
     if (self->disabled_decorations & Decor_Close)
 	self->decorations &= ~Decor_Close;
 
@@ -1316,6 +1319,11 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
 {
     gboolean moved = FALSE, resized = FALSE;
 
+    /* gets the frame's position */
+    frame_client_gravity(self->frame, &x, &y);
+
+    /* these positions are frame positions, not client positions */
+
     /* set the size and position if fullscreen */
     if (self->fullscreen) {
 	x = 0;
@@ -1335,6 +1343,9 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
         }
     }
 
+    /* gets the client's position */
+    frame_frame_gravity(self->frame, &x, &y);
+
     /* these override the above states! if you cant move you can't move! */
     if (user) {
         if (!(self->functions & Func_Move)) {
@@ -1605,13 +1616,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;
 
@@ -1658,7 +1662,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 */
@@ -1721,7 +1725,9 @@ void client_set_desktop(Client *self, guint target, gboolean donthide)
     /* 'move' the window to the new desktop */
     if (!donthide)
         client_showhide(self);
-    stacking_raise(self);
+    /* raise if it was not already on the desktop */
+    if (old != DESKTOP_ALL)
+        stacking_raise(self);
     screen_update_struts();
 
     /* update the focus lists */
@@ -1956,9 +1962,10 @@ gboolean client_focus(Client *self)
     }
 
     if (self->can_focus)
-        /* RevertToNone is used so that windows dont get focused inadvertantly
-           by having the pointer in them, and then FocusIn events go missing */
-	XSetInputFocus(ob_display, self->window, RevertToNone,
+        /* RevertToPointerRoot causes much more headache than TevertToNone, so
+           I choose to use it always, hopefully to find errors quicker, if any
+           are left. (I hate X. I hate focus events.) */
+	XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
                        event_lasttime);
 
     if (self->focus_notify) {