was not moving the window between desktop focus lists sometimes. bad news. now i...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 783678b83dfeae7c14e8dd0de2ed0e1aff12741c..209f5f9657e2b826fa0f4679047b0066e6e6093a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -893,6 +893,7 @@ static void client_change_allowed_actions(Client *self)
        else self->shaded = FALSE;
     }
     if (!(self->functions & Func_Iconify) && self->iconic) {
+        g_message("UNSETTING ICONIC");
        if (self->frame) client_iconify(self, FALSE, TRUE);
        else self->iconic = FALSE;
     }
@@ -934,9 +935,11 @@ void client_update_wmhints(Client *self)
        if (hints->flags & InputHint)
            self->can_focus = hints->input;
 
-       /* only do this when starting! */
-       if (ob_state == State_Starting && (hints->flags & StateHint))
-           self->iconic = hints->initial_state == IconicState;
+       /* only do this when first managing the window *AND* when we aren't
+           starting up! */
+       if (ob_state != State_Starting && self->frame == NULL)
+            if (hints->flags & StateHint)
+                self->iconic = hints->initial_state == IconicState;
 
        if (hints->flags & XUrgencyHint)
            ur = TRUE;
@@ -1082,7 +1085,7 @@ void client_update_strut(Client *self)
     gulong *data;
 
     if (PROP_GET32A(self->window, net_wm_strut, cardinal, data, 4)) {
-       STRUT_SET(self->strut, data[0], data[1], data[2], data[3]);
+       STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
        g_free(data);
     } else
        STRUT_SET(self->strut, 0, 0, 0, 0);
@@ -1323,13 +1326,11 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
         /* set the size and position if maximized */
         if (self->max_horz) {
             x = screen_area(self->desktop)->x - self->frame->size.left;
-            w = screen_area(self->desktop)->x +
-                screen_area(self->desktop)->width;
+            w = screen_area(self->desktop)->width;
         }
         if (self->max_vert) {
             y = screen_area(self->desktop)->y;
-            h = screen_area(self->desktop)->y +
-                screen_area(self->desktop)->height -
+            h = screen_area(self->desktop)->height -
                 self->frame->size.top - self->frame->size.bottom;
         }
     }
@@ -1540,7 +1541,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
        XUnmapWindow(ob_display, self->window);
     } else {
        if (curdesk)
-           client_set_desktop(self, screen_desktop);
+           client_set_desktop(self, screen_desktop, FALSE);
        self->wmstate = self->shaded ? IconicState : NormalState;
        XMapWindow(ob_display, self->window);
     }
@@ -1701,13 +1702,14 @@ void client_kill(Client *self)
     XKillClient(ob_display, self->window);
 }
 
-void client_set_desktop(Client *self, guint target)
+void client_set_desktop(Client *self, guint target, gboolean donthide)
 {
     guint old, i;
+    ConfigValue focus_new;
 
     if (target == self->desktop) return;
   
-    g_message("Setting desktop %u\n", target);
+    g_message("Setting desktop %u", target);
 
     g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
 
@@ -1717,19 +1719,31 @@ void client_set_desktop(Client *self, guint target)
     /* the frame can display the current desktop state */
     engine_frame_adjust_state(self->frame);
     /* 'move' the window to the new desktop */
-    client_showhide(self);
+    if (!donthide)
+        client_showhide(self);
+    stacking_raise(self);
     screen_update_struts();
 
     /* update the focus lists */
+    if (!config_get("focusNew", Config_Bool, &focus_new))
+        g_assert_not_reached();
     if (old == DESKTOP_ALL) {
         for (i = 0; i < screen_num_desktops; ++i)
             focus_order[i] = g_list_remove(focus_order[i], self);
-        focus_order[target] = g_list_prepend(focus_order[target], self);
-    } else {
+    } else
         focus_order[old] = g_list_remove(focus_order[old], self);
-        if (target == DESKTOP_ALL)
-            for (i = 0; i < screen_num_desktops; ++i)
+    if (target == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i) {
+            if (focus_new.bool)
                 focus_order[i] = g_list_prepend(focus_order[i], self);
+            else
+                focus_order[i] = g_list_append(focus_order[i], self);
+        }
+    } else {
+        if (focus_new.bool)
+            focus_order[target] = g_list_prepend(focus_order[target], self);
+        else
+            focus_order[target] = g_list_append(focus_order[target], self);
     }
 
     dispatch_client(Event_Client_Desktop, self, target, old);