X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fclient.c;h=0952909c0b3e223869b165e54a122af27383d5d3;hb=710f41e622b76dd03e9f43bd76a63eeb3070e63c;hp=209e5397c8f103523ad51bf9798acf2fadeb33e7;hpb=f68066aa63edd6404dc8a598bd9e1f66d8d3844d;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 209e5397..0952909c 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -277,7 +277,8 @@ void client_manage(Window window)
     client_restore_session_stacking(self);
 
     /* focus the new window? */
-    if (ob_state() != OB_STATE_STARTING && config_focus_new &&
+    if (ob_state() != OB_STATE_STARTING &&
+        (config_focus_new || client_search_focus_tree_full(self)) &&
         /* note the check against Type_Normal/Dialog, not client_normal(self),
            which would also include other types. in this case we want more
            strict rules for focus */
@@ -2071,7 +2072,14 @@ static void client_iconify_recursive(ObClient *self,
 
         if (iconic) {
             if (self->functions & OB_CLIENT_FUNC_ICONIFY) {
+                long old;
+
+                old = self->wmstate;
                 self->wmstate = IconicState;
+                if (old != self->wmstate)
+                    PROP_MSG(self->window, kde_wm_change_state,
+                             self->wmstate, 1, 0, 0);
+
                 self->ignore_unmaps++;
                 /* we unmap the client itself so that we can get MapRequest
                    events, and because the ICCCM tells us to! */
@@ -2085,9 +2093,17 @@ static void client_iconify_recursive(ObClient *self,
                 changed = TRUE;
             }
         } else {
+            long old;
+
             if (curdesk)
                 client_set_desktop(self, screen_desktop, FALSE);
+
+            old = self->wmstate;
             self->wmstate = self->shaded ? IconicState : NormalState;
+            if (old != self->wmstate)
+                PROP_MSG(self->window, kde_wm_change_state,
+                         self->wmstate, 1, 0, 0);
+
             XMapWindow(ob_display, self->window);
 
             /* this puts it after the current focused window */
@@ -2236,8 +2252,16 @@ void client_shade(ObClient *self, gboolean shade)
 	self->shaded == shade) return;     /* already done */
 
     /* when we're iconic, don't change the wmstate */
-    if (!self->iconic)
-	self->wmstate = shade ? IconicState : NormalState;
+    if (!self->iconic) {
+        long old;
+
+        old = self->wmstate;
+        self->wmstate = shade ? IconicState : NormalState;
+        if (old != self->wmstate)
+            PROP_MSG(self->window, kde_wm_change_state,
+                     self->wmstate, 1, 0, 0);
+    }
+
     self->shaded = shade;
     client_change_state(self);
     /* resize the frame to just the titlebar */
@@ -3008,9 +3032,8 @@ int client_directional_edge_search(ObClient *c, ObDirection dir)
     case OB_DIRECTION_NORTHWEST:
     case OB_DIRECTION_SOUTHWEST:
         /* not implemented */
-        break;
     default:
-            g_assert_not_reached();
+        g_assert_not_reached();
     }
     return dest;
 }