really fix focus_last?

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 11f2012f474ba09d1208d38025bc53d511417d6a..d4759bb9495d5118def64d29d899b50cfcc300f8 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -341,14 +341,14 @@ void client_manage(Window window)
         }
 
         /* 1 && -1 shouldn't be possible by the code in config.c */
-        if (settings->max_vert == 1 && self->max_horz == 1)
+        if (settings->max_vert == 1 && settings->max_horz == 1)
             client_maximize(self, TRUE, 0, TRUE);
-        else if (settings->max_vert == 0 && self->max_horz == 0)
+        else if (settings->max_vert == 0 && settings->max_horz == 0)
             client_maximize(self, FALSE, 0, TRUE);
-        else if (settings->max_vert == 1 && self->max_horz == 0) {
+        else if (settings->max_vert == 1 && settings->max_horz == 0) {
             client_maximize(self, TRUE, 2, TRUE);
             client_maximize(self, FALSE, 1, TRUE);
-        } else if (settings->max_vert == 0 && self->max_horz == 1) {
+        } else if (settings->max_vert == 0 && settings->max_horz == 1) {
             client_maximize(self, TRUE, 1, TRUE);
             client_maximize(self, FALSE, 2, TRUE);
         }
@@ -1234,7 +1234,7 @@ void client_update_normal_hints(ObClient *self)
         if (size.flags & PBaseSize)
             SIZE_SET(self->base_size, size.base_width, size.base_height);
     
-        if (size.flags & PResizeInc && size.width_inc && size_height_inc)
+        if (size.flags & PResizeInc && size.width_inc && size.height_inc)
             SIZE_SET(self->size_inc, size.width_inc, size.height_inc);
     }
 }
@@ -2833,13 +2833,15 @@ gboolean client_focus(ObClient *self)
     return TRUE;
 }
 
+/* Used when the current client is closed, focus_last will then prevent
+ * focus from going to the mouse pointer */
 void client_unfocus(ObClient *self)
 {
     if (focus_client == self) {
 #ifdef DEBUG_FOCUS
         ob_debug("client_unfocus for %lx\n", self->window);
 #endif
-        focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
+        focus_fallback(OB_FOCUS_FALLBACK_CLOSED);
     }
 }