X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=a961c1496dd1aa80acb612835574429235fe1be6;hb=702995014a0ef567e98899bda931901d98461341;hp=2361f9379de603599af50924ea5d1859e7058818;hpb=4c1641bfc704f17df6e0acb8bdeb20e877b377ad;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 2361f937..a961c149 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "client.h"
 #include "dock.h"
 #include "xerror.h"
@@ -216,7 +217,7 @@ void client_manage(Window window)
 	XFree(wmhint);
     }
 
-    g_message("Managing window: %lx", window);
+    ob_debug("Managing window: %lx\n", window);
 
     /* choose the events we want to receive on the CLIENT window */
     attrib_set.event_mask = CLIENT_EVENTMASK;
@@ -255,6 +256,8 @@ void client_manage(Window window)
     /* update the focus lists */
     focus_order_add_new(self);
 
+    stacking_add(CLIENT_AS_WINDOW(self));
+
     /* focus the new window? */
     if (ob_state() != OB_STATE_STARTING && config_focus_new &&
         /* note the check against Type_Normal/Dialog, not client_normal(self),
@@ -263,14 +266,10 @@ void client_manage(Window window)
         (self->type == OB_CLIENT_TYPE_NORMAL ||
          self->type == OB_CLIENT_TYPE_DIALOG))
     {        
-        if (self->desktop != screen_desktop)
-        {
+        if (self->desktop != screen_desktop) {
             /* activate the window */
-            stacking_add(CLIENT_AS_WINDOW(self));
             activate = TRUE;
-        }
-        else
-        {
+        } else {
             gboolean group_foc = FALSE;
 
             if (self->group) {
@@ -293,20 +292,10 @@ void client_manage(Window window)
                 !client_normal(focus_client))
             {
                 /* activate the window */
-                stacking_add(CLIENT_AS_WINDOW(self));
                 activate = TRUE;
             }
-            else
-            {
-                /* try to not get in the way */
-                stacking_add_nonintrusive(CLIENT_AS_WINDOW(self));
-            }
         }
     }
-    else
-    {
-        stacking_add(CLIENT_AS_WINDOW(self));
-    }
 
     dispatch_client(Event_Client_New, self, 0, 0);
 
@@ -324,12 +313,17 @@ void client_manage(Window window)
        but do focus it. */
     if (activate) client_focus(self);
 
+    /* client_activate does this but we aret using it so we have to do it
+       here as well */
+    if (screen_showing_desktop)
+        screen_show_desktop(FALSE);
+
     /* update the list hints */
     client_set_list();
 
     dispatch_client(Event_Client_Mapped, self, 0, 0);
 
-    g_message("Managed window 0x%lx (%s)", window, self->class);
+    ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
 }
 
 void client_unmanage_all()
@@ -350,7 +344,7 @@ void client_unmanage(ObClient *self)
     guint j;
     GSList *it;
 
-    g_message("Unmanaging window: %lx (%s)", self->window, self->class);
+    ob_debug("Unmanaging window: %lx (%s)\n", self->window, self->class);
 
     dispatch_client(Event_Client_Destroy, self, 0, 0);
     g_assert(self != NULL);
@@ -441,7 +435,7 @@ void client_unmanage(ObClient *self)
     }
 
 
-    g_message("Unmanaged window 0x%lx", self->window);
+    ob_debug("Unmanaged window 0x%lx\n", self->window);
 
     /* free all data allocated in the client struct */
     g_slist_free(self->transients);
@@ -1105,7 +1099,6 @@ static void client_change_allowed_actions(ObClient *self)
 	else self->shaded = FALSE;
     }
     if (!(self->functions & OB_CLIENT_FUNC_ICONIFY) && self->iconic) {
-        g_message("UNSETTING ICONIC");
 	if (self->frame) client_iconify(self, FALSE, TRUE);
 	else self->iconic = FALSE;
     }
@@ -1198,8 +1191,8 @@ void client_update_wmhints(ObClient *self)
 
     if (ur != self->urgent) {
 	self->urgent = ur;
-	g_message("Urgent Hint for 0x%lx: %s", self->window,
-		  ur ? "ON" : "OFF");
+	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)
@@ -1912,8 +1905,8 @@ static void client_iconify_recursive(ObClient *self,
 
 
     if (self->iconic != iconic) {
-        g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
-                  self->window);
+        ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
+                 self->window);
 
         self->iconic = iconic;
 
@@ -2133,7 +2126,7 @@ void client_set_desktop_recursive(ObClient *self,
 
     if (target != self->desktop) {
 
-        g_message("Setting desktop %u", target+1);
+        ob_debug("Setting desktop %u\n", target+1);
 
         g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
 
@@ -2423,9 +2416,9 @@ gboolean client_focus(ObClient *self)
     }
 
 #ifdef DEBUG_FOCUS
-    g_message("%sively focusing %lx at %d", (self->can_focus ? "act" : "pass"),
-              self->window, (int)
-              event_lasttime);
+    ob_debug("%sively focusing %lx at %d\n",
+             (self->can_focus ? "act" : "pass"),
+             self->window, (int) event_lasttime);
 #endif
 
     /* Cause the FocusIn to come back to us. Important for desktop switches,
@@ -2439,7 +2432,7 @@ void client_unfocus(ObClient *self)
 {
     g_assert(focus_client == self);
 #ifdef DEBUG_FOCUS
-    g_message("client_unfocus for %lx", self->window);
+    ob_debug("client_unfocus for %lx\n", self->window);
 #endif
     focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
 }
@@ -2642,3 +2635,16 @@ ObClient *client_search_top_transient(ObClient *self)
 
     return self;
 }
+
+ObClient *client_search_transient(ObClient *self, ObClient *search)
+{
+    GSList *sit;
+
+    for (sit = self->transients; sit; sit = g_slist_next(sit)) {
+        if (sit->data == search)
+            return search;
+        if (client_search_transient(sit->data, search))
+            return search;
+    }
+    return NULL;
+}