seems to be better text placement than ever

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index c44fe3436de456a527cf340f771e7c76b95b70f8..af1e3ba8b6d1a1b39611e3c1e66f49ae538c0d1b 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -130,7 +130,7 @@ void client_manage(Window window)
     if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) ||
        XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e)) {
        XPutBackEvent(ob_display, &e);
-    
+
         grab_server(FALSE);
        return; /* don't manage it */
     }
@@ -186,6 +186,7 @@ void client_manage(Window window)
      
     client_list = g_slist_append(client_list, client);
     stacking_list = g_list_append(stacking_list, client);
+    g_assert(!g_hash_table_lookup(client_map, (gpointer)client->window));
     g_hash_table_insert(client_map, (gpointer)window, client);
 
     /* update the focus lists */
@@ -228,6 +229,7 @@ void client_unmanage(Client *client)
     g_message("Unmanaging window: %lx", client->window);
 
     dispatch_client(Event_Client_Destroy, client, 0, 0);
+    g_assert(client != NULL);
 
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, client->window, SetModeDelete);
@@ -239,6 +241,7 @@ void client_unmanage(Client *client)
 
     /* dispatch the unmapped event */
     dispatch_client(Event_Client_Unmapped, client, 0, 0);
+    g_assert(client != NULL);
 
     /* give the client its border back */
     client_toggle_border(client, TRUE);
@@ -300,8 +303,8 @@ void client_unmanage(Client *client)
        g_free(client->icons);
     g_free(client->title);
     g_free(client->icon_title);
-    g_free(client->res_name);
-    g_free(client->res_class);
+    g_free(client->name);
+    g_free(client->class);
     g_free(client->role);
     g_free(client);
      
@@ -384,7 +387,7 @@ static void client_get_all(Client *self)
     /* defaults */
     self->frame = NULL;
     self->title = self->icon_title = NULL;
-    self->res_name = self->res_class = self->role = NULL;
+    self->name = self->class = self->role = NULL;
     self->wmstate = NormalState;
     self->transient = FALSE;
     self->transients = NULL;
@@ -546,11 +549,13 @@ void client_update_transient_for(Client *self)
     if (c != self->transient_for) {
        if (self->transient_for)
            /* remove from old parent */
-           g_slist_remove(self->transient_for->transients, self);
+           self->transient_for->transients =
+                g_slist_remove(self->transient_for->transients, self);
        self->transient_for = c;
        if (self->transient_for)
            /* add to new parent */
-           g_slist_append(self->transient_for->transients, self);
+           self->transient_for->transients =
+                g_slist_append(self->transient_for->transients, self);
     }
 }
 
@@ -815,10 +820,9 @@ void client_setup_decor_and_functions(Client *self)
     client_change_allowed_actions(self);
 
     if (self->frame) {
-       /* change the decors on the frame */
-       engine_frame_adjust_size(self->frame);
-       /* with more/less decorations, we may need to be repositioned */
-       engine_frame_adjust_position(self->frame);
+       /* change the decors on the frame, and with more/less decorations,
+           we may also need to be repositioned */
+       engine_frame_adjust_area(self->frame);
        /* with new decor, the window's maximized size may change */
        client_remaximize(self);
     }
@@ -947,8 +951,7 @@ void client_update_title(Client *self)
 {
     gchar *data = NULL;
 
-    if (self->title != NULL)
-       g_free(self->title);
+    g_free(self->title);
      
     /* try netwm */
     if (!PROP_GETS(self->window, net_wm_name, utf8, data)) {
@@ -982,8 +985,7 @@ void client_update_icon_title(Client *self)
 {
     gchar *data = NULL;
 
-    if (self->icon_title != NULL)
-       g_free(self->icon_title);
+    g_free(self->icon_title);
      
     /* try netwm */
     if (!PROP_GETS(self->window, net_wm_icon_name, utf8, data)) {
@@ -1016,19 +1018,19 @@ void client_update_class(Client *self)
     gchar *s;
     guint i;
 
-    if (self->res_name) g_free(self->res_name);
-    if (self->res_class) g_free(self->res_class);
+    if (self->name) g_free(self->name);
+    if (self->class) g_free(self->class);
     if (self->role) g_free(self->role);
 
-    self->res_name = self->res_class = self->role = NULL;
+    self->name = self->class = self->role = NULL;
 
     data = g_ptr_array_new();
      
     if (PROP_GETSA(self->window, wm_class, string, data)) {
        if (data->len > 0)
-           self->res_name = g_strdup(g_ptr_array_index(data, 0));
+           self->name = g_strdup(g_ptr_array_index(data, 0));
        if (data->len > 1)
-           self->res_class = g_strdup(g_ptr_array_index(data, 1));
+           self->class = g_strdup(g_ptr_array_index(data, 1));
     }
      
     for (i = 0; i < data->len; ++i)
@@ -1038,8 +1040,8 @@ void client_update_class(Client *self)
     if (PROP_GETS(self->window, wm_window_role, string, s))
        self->role = g_strdup(s);
 
-    if (self->res_name == NULL) self->res_name = g_strdup("");
-    if (self->res_class == NULL) self->res_class = g_strdup("");
+    if (self->name == NULL) self->name = g_strdup("");
+    if (self->class == NULL) self->class = g_strdup("");
     if (self->role == NULL) self->role = g_strdup("");
 }
 
@@ -1167,7 +1169,7 @@ static Client *search_focus_tree(Client *node, Client *skip)
     GSList *it;
     Client *ret;
 
-    for (it = node->transients; it != NULL; it = g_slist_next(it)) {
+    for (it = node->transients; it != NULL; it = it->next) {
        Client *c = it->data;
        if (c == skip) continue; /* circular? */
        if ((ret = search_focus_tree(c, skip))) return ret;
@@ -1388,12 +1390,9 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h,
 
     /* move/resize the frame to match the request */
     if (self->frame) {
-       /* Adjust the size and then the position, as required by the EWMH */
-       if (resized)
-           engine_frame_adjust_size(self->frame);
-       if (moved) {
-           engine_frame_adjust_position(self->frame);
+        engine_frame_adjust_area(self->frame);
 
+       if (moved) {
            if (!user || final) {
                XEvent event;
                event.type = ConfigureNotify;
@@ -1627,7 +1626,8 @@ void client_shade(Client *self, gboolean shade)
        self->wmstate = shade ? IconicState : NormalState;
     self->shaded = shade;
     client_change_state(self);
-    engine_frame_adjust_size(self->frame);
+    /* resize the frame to just the titlebar */
+    engine_frame_adjust_area(self->frame);
 }
 
 void client_close(Client *self)
@@ -1657,6 +1657,11 @@ void client_close(Client *self)
     XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
 }
 
+void client_kill(Client *self)
+{
+    XKillClient(ob_display, self->window);
+}
+
 void client_set_desktop(Client *self, guint target)
 {
     guint old, i;
@@ -1680,14 +1685,12 @@ void client_set_desktop(Client *self, guint target)
     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 {
         focus_order[old] = g_list_remove(focus_order[old], self);
-    }
-    if (target == DESKTOP_ALL) {
-        for (i = 0; i < screen_num_desktops; ++i)
-            focus_order[i] = g_list_prepend(focus_order[i], self);
-    } else {
-        focus_order[target] = g_list_prepend(focus_order[target], self);
+        if (target == DESKTOP_ALL)
+            for (i = 0; i < screen_num_desktops; ++i)
+                focus_order[i] = g_list_prepend(focus_order[i], self);
     }
 
     dispatch_client(Event_Client_Desktop, self, target, old);