make the combined client list menu not suck quite as bad

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 5408b18fa9a20a64b8dc6c8c24b4dedcdd416092..c59baf96905d7d04036ed6b632b7b98b91ba0b7f 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2,7 +2,7 @@
    
    client.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -468,11 +468,8 @@ void client_manage(Window window)
         /* If a nothing at all, or a parent was focused, then focus this
            always
         */
-        if (client_search_focus_parent(self) != NULL ||
-            !focus_client)
-        {
+        if (!focus_client || client_search_focus_parent(self) != NULL)
             activate = TRUE;
-        }
         else
         {
             /* If time stamp is old, don't steal focus */
@@ -481,11 +478,8 @@ void client_manage(Window window)
             /* Don't steal focus from globally active clients.
                I stole this idea from KWin. It seems nice.
              */
-            if (focus_client && !focus_client->can_focus &&
-                focus_client->focus_notify)
-            {
+            if (!focus_client->can_focus && focus_client->focus_notify)
                 activate = FALSE;
-            }
         }
 
         if (activate)
@@ -2010,8 +2004,6 @@ static void client_calc_layer_recursive(ObClient *self, ObClient *orig,
     own = calc_layer(self);
     self->layer = MAX(own, min);
 
-    ob_debug("layer for %s: %d\n", self->title, self->layer);
-
     for (it = self->transients; it; it = g_slist_next(it))
         client_calc_layer_recursive(it->data, orig,
                                     self->layer,