X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=c57c66e84571ec5e4ec90813ffb6e3a150722924;hb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;hp=278547560d647b535cfc5eaa79ff84c053201406;hpb=9c1438f17b84ef096faec0b8d52dd7d39c2c50c5;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 27854756..c57c66e8 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -233,8 +233,10 @@ void client_manage(Window window)
     self = g_new(ObClient, 1);
     self->obwin.type = Window_Client;
     self->window = window;
+
     client_get_all(self);
     client_restore_session_state(self);
+
     client_change_state(self);
 
     /* remove the client's border (and adjust re gravity) */
@@ -318,15 +320,15 @@ void client_manage(Window window)
     if (screen_showing_desktop)
         screen_show_desktop(FALSE);
 
+    /* add to client list/map */
+    client_list = g_list_append(client_list, self);
+    g_hash_table_insert(window_map, &self->window, self);
+
     /* update the list hints */
     client_set_list();
 
     dispatch_client(Event_Client_Mapped, self, 0, 0);
 
-    /* add to client list/map */
-    client_list = g_list_append(client_list, self);
-    g_hash_table_insert(window_map, &self->window, self);
-
     ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
 }
 
@@ -463,21 +465,17 @@ static void client_restore_session_state(ObClient *self)
 {
     ObSessionState *s;
 
-    g_message("looking for %s", self->name);
-
     s = session_state_find(self);
-    g_message("returned %p %d", s, self->positioned);
     if (!(s)) return;
 
-    g_message("restoring state for %s", s->name);
-
-    g_message("%d %d %d %d", s->x, s->y, s->w, s->h);
     RECT_SET(self->area, s->x, s->y, s->w, s->h);
-    XResizeWindow(ob_display, self->window, s->w, s->h);
     self->positioned = TRUE;
-    g_message("desktop %d", s->desktop);
+    XResizeWindow(ob_display, self->window, s->w, s->h);
+
     self->desktop = s->desktop == DESKTOP_ALL ? s->desktop :
         MIN(screen_num_desktops - 1, s->desktop);
+    PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
+
     self->shaded = s->shaded;
     self->iconic = s->iconic;
     self->skip_pager = s->skip_pager;
@@ -705,7 +703,6 @@ static void client_get_desktop(ObClient *self)
        if (!trdesk)
            /* defaults to the current desktop */
            self->desktop = screen_desktop;
-
     }
     if (self->desktop != d) {
         /* set the desktop hint, to make sure that it always exists */
@@ -960,10 +957,7 @@ void client_update_normal_hints(ObClient *self)
 
     /* get the hints from the window */
     if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
-        /* don't let apps tell me where to put transient windows, but only if
-           they have a valid parent */
-        self->positioned = !!(size.flags & (PPosition|USPosition)) &&
-            !self->transient_for;
+        self->positioned = !!(size.flags & (PPosition|USPosition));
 
 	if (size.flags & PWinGravity) {
 	    self->gravity = size.win_gravity;
@@ -1248,9 +1242,6 @@ void client_update_wmhints(ObClient *self)
                 }
             }
 
-            /* the WM_HINTS can contain an icon */
-            client_update_icons(self);
-
             /* because the self->transient flag wont change from this call,
                we don't need to update the window's type and such, only its
                transient_for, and the transients lists of other windows in
@@ -1258,6 +1249,9 @@ void client_update_wmhints(ObClient *self)
             client_update_transient_for(self);
         }
 
+        /* the WM_HINTS can contain an icon */
+        client_update_icons(self);
+
 	XFree(hints);
     }
 
@@ -1380,17 +1374,35 @@ void client_update_strut(ObClient *self)
 {
     guint num;
     guint32 *data;
+    gboolean got = FALSE;
+
+    if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal,
+                    &data, &num)) {
+        if (num == 12) {
+            got = TRUE;
+            STRUT_PARTIAL_SET(self->strut,
+                              data[0], data[2], data[1], data[3],
+                              data[4], data[5], data[8], data[9],
+                              data[6], data[7], data[10], data[11]);
+        }
+        g_free(data);
+    }
 
-    if (!PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
-	STRUT_SET(self->strut, 0, 0, 0, 0);
-    } else {
-        if (num == 4)
-            STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
-        else
-            STRUT_SET(self->strut, 0, 0, 0, 0);
-	g_free(data);
+    if (!got &&
+        PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
+        if (num == 4) {
+            got = TRUE;
+            STRUT_PARTIAL_SET(self->strut,
+                              data[0], data[2], data[1], data[3],
+                              0, 0, 0, 0, 0, 0, 0, 0);
+        }
+        g_free(data);
     }
 
+    if (!got)
+        STRUT_PARTIAL_SET(self->strut, 0, 0, 0, 0,
+                          0, 0, 0, 0, 0, 0, 0, 0);
+
     /* updating here is pointless while we're being mapped cuz we're not in
        the client list yet */
     if (self->frame)
@@ -2721,3 +2733,12 @@ ObClient *client_search_transient(ObClient *self, ObClient *search)
     }
     return NULL;
 }
+
+gchar* client_get_sm_client_id(ObClient *self)
+{
+    gchar *id = NULL;
+
+    if (!PROP_GETS(self->window, sm_client_id, locale, &id) && self->group)
+        PROP_GETS(self->group->leader, sm_client_id, locale, &id);
+    return id;
+}