use actions to focus and raise the wnidow ni client_activate. this means the focus...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 80773f6c45ed8af890dc9b003cee215dccbab291..725416bb922d4a59e14e576f2b4a49375d245199 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -277,9 +277,7 @@ void client_manage(Window window)
 
     /* focus the new window? */
     if (ob_state() != OB_STATE_STARTING &&
-        (config_focus_new || (self->transient_for &&
-                              self->transient_for != OB_TRAN_GROUP &&
-                              client_focused(self->transient_for))) &&
+        (config_focus_new || client_search_focus_parent(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 */
@@ -1310,16 +1308,14 @@ void client_update_wmhints(ObClient *self)
         /* the WM_HINTS can contain an icon */
         client_update_icons(self);
 
-       XFree(hints);
+        XFree(hints);
     }
 
     if (ur != self->urgent) {
-       self->urgent = ur;
-       ob_debug("Urgent Hint for 0x%lx: %s\n", self->window,
-                 ur ? "ON" : "OFF");
-       /* fire the urgent callback if we're mapped, otherwise, wait until
-          after we're mapped */
-       if (self->frame)
+        self->urgent = ur;
+        /* fire the urgent callback if we're mapped, otherwise, wait until
+           after we're mapped */
+        if (self->frame)
             client_urgent_notify(self);
     }
 }
@@ -1668,7 +1664,9 @@ static ObStackingLayer calc_layer(ObClient *self)
 {
     ObStackingLayer l;
 
-    if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN;
+    if (self->fullscreen &&
+        (client_focused(self) || client_search_focus_tree(self)))
+        l = OB_STACKING_LAYER_FULLSCREEN;
     else if (self->type == OB_CLIENT_TYPE_DESKTOP)
         l = OB_STACKING_LAYER_DESKTOP;
     else if (self->type == OB_CLIENT_TYPE_DOCK) {
@@ -2185,7 +2183,7 @@ void client_maximize(ObClient *self, gboolean max, int dir, gboolean savearea)
             }
         }
         if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */
-            if (self->pre_max_area.width > 0) {
+            if (self->pre_max_area.height > 0) {
                 y = self->pre_max_area.y;
                 h = self->pre_max_area.height;
 
@@ -2617,8 +2615,8 @@ void client_activate(ObClient *self, gboolean here)
         return;
     if (self->shaded)
         client_shade(self, FALSE);
-    client_focus(self);
-    stacking_raise(CLIENT_AS_WINDOW(self));
+    action_run_string("Focus", self);
+    action_run_string("Raise", self);
 }
 
 gboolean client_focused(ObClient *self)
@@ -2809,6 +2807,52 @@ ObClient *client_search_top_transient(ObClient *self)
     return self;
 }
 
+ObClient *client_search_focus_parent(ObClient *self)
+{
+    if (self->transient_for) {
+        if (self->transient_for != OB_TRAN_GROUP) {
+            if (client_focused(self->transient_for))
+                return self->transient_for;
+        } else {
+            GSList *it;
+
+            for (it = self->group->members; it; it = it->next) {
+                ObClient *c = it->data;
+
+                /* checking transient_for prevents infinate loops! */
+                if (c != self && !c->transient_for)
+                    if (client_focused(c))
+                        return c;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+ObClient *client_search_parent(ObClient *self, ObClient *search)
+{
+    if (self->transient_for) {
+        if (self->transient_for != OB_TRAN_GROUP) {
+            if (self->transient_for == search)
+                return search;
+        } else {
+            GSList *it;
+
+            for (it = self->group->members; it; it = it->next) {
+                ObClient *c = it->data;
+
+                /* checking transient_for prevents infinate loops! */
+                if (c != self && !c->transient_for)
+                    if (c == search)
+                        return search;
+            }
+        }
+    }
+
+    return NULL;
+}
+
 ObClient *client_search_transient(ObClient *self, ObClient *search)
 {
     GSList *sit;