defn vars at the top of funcs

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 479dc8602d9bd6a1896100753b00987d763f1aa2..c44fe3436de456a527cf340f771e7c76b95b70f8 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -245,6 +245,7 @@ void client_unmanage(Client *client)
 
     /* reparent the window out of the frame, and free the frame */
     engine_frame_release_client(client->frame, client);
+    client->frame = NULL;
      
     client_list = g_slist_remove(client_list, client);
     stacking_list = g_list_remove(stacking_list, client);
@@ -276,7 +277,7 @@ void client_unmanage(Client *client)
 
     /* unfocus the client (dispatchs the focus event) (we're out of the
      transient lists already, so being modal doesn't matter) */
-    if (client->focused)
+    if (client_focused(client))
        client_unfocus(client);
 
     if (ob_state != State_Exiting) {
@@ -385,7 +386,6 @@ static void client_get_all(Client *self)
     self->title = self->icon_title = NULL;
     self->res_name = self->res_class = self->role = NULL;
     self->wmstate = NormalState;
-    self->focused = FALSE;
     self->transient = FALSE;
     self->transients = NULL;
     self->transient_for = NULL;
@@ -1171,7 +1171,7 @@ static Client *search_focus_tree(Client *node, Client *skip)
        Client *c = it->data;
        if (c == skip) continue; /* circular? */
        if ((ret = search_focus_tree(c, skip))) return ret;
-       if (c->focused) return c;
+       if (client_focused(c)) return c;
     }
     return NULL;
 }
@@ -1421,7 +1421,6 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
 
 void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 {
-    static int saved_func, saved_decor;
     int x, y, w, h;
 
     if (!(self->functions & Func_Fullscreen) || /* can't */
@@ -1432,11 +1431,11 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 
     if (fs) {
        /* save the functions and remove them */
-       saved_func = self->functions;
+       self->pre_fs_func = self->functions;
        self->functions &= (Func_Close | Func_Fullscreen |
                            Func_Iconify);
        /* save the decorations and remove them */
-       saved_decor = self->decorations;
+       self->pre_fs_decor = self->decorations;
        self->decorations = 0;
        if (savearea) {
            long dimensions[4];
@@ -1455,8 +1454,8 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
     } else {
        long *dimensions;
 
-       self->functions = saved_func;
-       self->decorations = saved_decor;
+       self->functions = self->pre_fs_func;
+       self->decorations = self->pre_fs_decor;
          
        if (PROP_GET32A(self->window, openbox_premax, cardinal,
                        dimensions, 4)) {
@@ -1899,7 +1898,10 @@ gboolean client_focus(Client *self)
            return FALSE;
        }
     }
-     
+
+    if (client_focused(self))
+        return TRUE;
+
     if (self->can_focus)
        XSetInputFocus(ob_display, self->window, RevertToNone, CurrentTime);
 
@@ -1918,12 +1920,42 @@ gboolean client_focus(Client *self)
        XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
     }
 
-    /*XSync(ob_display, FALSE); XXX Why sync? */
+    client_set_focused(self, TRUE);
+
+    /* XSync(ob_display, FALSE); XXX Why sync? */
     return TRUE;
 }
 
 void client_unfocus(Client *self)
 {
     g_assert(focus_client == self);
-    focus_set_client(NULL);
+    client_set_focused(self, FALSE);
+}
+
+void client_set_focused(Client *self, gboolean focused)
+{
+    if (focused) {
+        if (focus_client != self) {
+            focus_set_client(self);
+
+            /* focus state can affect the stacking layer */
+            client_calc_layer(self);
+
+            engine_frame_adjust_focus(self->frame);
+        }
+    } else {
+       if (focus_client == self)
+           focus_set_client(NULL);
+
+        /* focus state can affect the stacking layer */
+        client_calc_layer(self);
+
+        if (self->frame != NULL) /* unfocus can happen while being unmanaged */
+            engine_frame_adjust_focus(self->frame);
+    }
+}
+
+gboolean client_focused(Client *self)
+{
+    return self == focus_client;
 }