X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=d86e42532bf627e7941d735adbc0fcbee5c5afb2;hb=712475a9b597a5fa0877b4d3cf3c99aa586641ff;hp=4b65b0d02a439b78f52fe509d43588c592823c04;hpb=e75ead70a6d98bd7e368c5844c05d2f85f275f65;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 4b65b0d0..d86e4253 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -8,6 +8,7 @@
 #include "focus.h"
 #include "stacking.h"
 #include "dispatch.h"
+#include "openbox.h"
 #include "group.h"
 #include "config.h"
 
@@ -25,7 +26,7 @@ GList      *client_list      = NULL;
 GHashTable *client_map       = NULL;
 
 static Window *client_startup_stack_order = NULL;
-static gulong  client_startup_stack_size = 0;
+static guint  client_startup_stack_size = 0;
 
 static void client_get_all(Client *self);
 static void client_toggle_border(Client *self, gboolean show);
@@ -52,8 +53,9 @@ void client_startup()
 				  (GEqualFunc)map_key_comp);
 
     /* save the stacking order on startup! */
-    PROP_GET32U(ob_root, net_client_list_stacking, window,
-                client_startup_stack_order, client_startup_stack_size);
+    PROP_GETA32(ob_root, net_client_list_stacking, window,
+                (guint32**)&client_startup_stack_order,
+                &client_startup_stack_size);
 
     client_set_list();
 }
@@ -78,7 +80,7 @@ void client_set_list()
     } else
 	windows = NULL;
 
-    PROP_SET32A(ob_root, net_client_list, window, windows, size);
+    PROP_SETA32(ob_root, net_client_list, window, (guint32*)windows, size);
 
     if (windows)
 	g_free(windows);
@@ -541,9 +543,9 @@ static void client_get_area(Client *self)
 
 static void client_get_desktop(Client *self)
 {
-    unsigned int d;
+    guint32 d;
 
-    if (PROP_GET32(self->window, net_wm_desktop, cardinal, d)) {
+    if (PROP_GET32(self->window, net_wm_desktop, cardinal, &d)) {
 	if (d >= screen_num_desktops && d != DESKTOP_ALL)
 	    d = screen_num_desktops - 1;
 	self->desktop = d;
@@ -555,14 +557,14 @@ static void client_get_desktop(Client *self)
 
 static void client_get_state(Client *self)
 {
-    gulong *state;
-    gulong num;
+    guint32 *state;
+    guint num;
   
     self->modal = self->shaded = self->max_horz = self->max_vert =
 	self->fullscreen = self->above = self->below = self->iconic =
 	self->skip_taskbar = self->skip_pager = FALSE;
 
-    if (PROP_GET32U(self->window, net_wm_state, atom, state, num)) {
+    if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) {
 	gulong i;
 	for (i = 0; i < num; ++i) {
 	    if (state[i] == prop_atoms.net_wm_state_modal)
@@ -668,12 +670,13 @@ void client_update_transient_for(Client *self)
 
 static void client_get_mwm_hints(Client *self)
 {
-    unsigned long num;
-    unsigned long *hints;
+    guint num;
+    guint32 *hints;
 
     self->mwmhints.flags = 0; /* default to none */
 
-    if (PROP_GET32U(self->window, motif_wm_hints, motif_wm_hints, hints, num)) {
+    if (PROP_GETA32(self->window, motif_wm_hints, motif_wm_hints,
+                    &hints, &num)) {
 	if (num >= MWM_ELEMENTS) {
 	    self->mwmhints.flags = hints[0];
 	    self->mwmhints.functions = hints[1];
@@ -685,11 +688,12 @@ static void client_get_mwm_hints(Client *self)
 
 void client_get_type(Client *self)
 {
-    gulong *val, num, i;
+    guint num, i;
+    guint32 *val;
 
     self->type = -1;
   
-    if (PROP_GET32U(self->window, net_wm_window_type, atom, val, num)) {
+    if (PROP_GETA32(self->window, net_wm_window_type, atom, &val, &num)) {
 	/* use the first value that we know about in the array */
 	for (i = 0; i < num; ++i) {
 	    if (val[i] == prop_atoms.net_wm_window_type_desktop)
@@ -735,13 +739,13 @@ void client_get_type(Client *self)
 
 void client_update_protocols(Client *self)
 {
-    Atom *proto;
-    gulong num_return, i;
+    guint32 *proto;
+    guint num_return, i;
 
     self->focus_notify = FALSE;
     self->delete_window = FALSE;
 
-    if (PROP_GET32U(self->window, wm_protocols, atom, proto, num_return)) {
+    if (PROP_GETA32(self->window, wm_protocols, atom, &proto, &num_return)) {
 	for (i = 0; i < num_return; ++i) {
 	    if (proto[i] == prop_atoms.wm_delete_window) {
 		/* this means we can request the window to close */
@@ -946,7 +950,7 @@ void client_setup_decor_and_functions(Client *self)
 
 static void client_change_allowed_actions(Client *self)
 {
-    Atom actions[9];
+    guint32 actions[9];
     int num = 0;
 
     actions[num++] = prop_atoms.net_wm_action_change_desktop;
@@ -968,7 +972,7 @@ static void client_change_allowed_actions(Client *self)
 	actions[num++] = prop_atoms.net_wm_action_maximize_vert;
     }
 
-    PROP_SET32A(self->window, net_wm_allowed_actions, atom, actions, num);
+    PROP_SETA32(self->window, net_wm_allowed_actions, atom, actions, num);
 
     /* make sure the window isn't breaking any rules now */
 
@@ -1011,6 +1015,7 @@ void client_update_wmhints(Client *self)
 {
     XWMHints *hints;
     gboolean ur = FALSE;
+    GSList *it;
 
     /* assume a window takes input if it doesnt specify */
     self->can_focus = TRUE;
@@ -1033,11 +1038,27 @@ void client_update_wmhints(Client *self)
         /* did the group state change? */
         if (hints->window_group != (self->group ? self->group->leader : None)){
             /* remove from the old group if there was one */
-            if (self->group != NULL)
+            if (self->group != NULL) {
+                /* remove transients of the group */
+                for (it = self->group->members; it; it = it->next)
+                    if (it->data != self &&
+                        ((Client*)it->data)->transient_for == TRAN_GROUP) {
+                        self->transients = g_slist_remove(self->transients,
+                                                          it->data);
+                    }
                 group_remove(self->group, self);
+                self->group = NULL;
+            }
             if (hints->window_group != None)
                 self->group = group_add(hints->window_group, self);
 
+            /* add other transients of the group that are already set up */
+            for (it = self->group->members; it; it = it->next)
+                if (it->data != self &&
+                    ((Client*)it->data)->transient_for == TRAN_GROUP)
+                    self->transients = g_slist_append(self->transients,
+                                                      it->data);
+
             /* 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 the
@@ -1076,31 +1097,19 @@ void client_update_wmhints(Client *self)
 
 void client_update_title(Client *self)
 {
-    gchar *data = NULL;
+    char *data = NULL;
 
     g_free(self->title);
      
     /* try netwm */
-    if (!PROP_GETS(self->window, net_wm_name, utf8, data)) {
+    if (!PROP_GETS(self->window, net_wm_name, utf8, &data))
 	/* try old x stuff */
-	if (PROP_GETS(self->window, wm_name, string, data)) {
-	    /* convert it to UTF-8 */
-	    gsize r, w;
-	    gchar *u;
-
-	    u = g_locale_to_utf8(data, -1, &r, &w, NULL);
-	    if (u == NULL) {
-		g_warning("Unable to convert string to UTF-8");
-	    } else {
-		g_free(data);
-		data = u;
-	    }
-	}
-	if (data == NULL)
+	if (!PROP_GETS(self->window, wm_name, locale, &data))
 	    data = g_strdup("Unnamed Window");
 
-	PROP_SETS(self->window, net_wm_visible_name, utf8, data);
-    }
+    /* look for duplicates and append a number */
+
+    PROP_SETS(self->window, net_wm_visible_name, data);
 
     self->title = data;
 
@@ -1110,40 +1119,25 @@ void client_update_title(Client *self)
 
 void client_update_icon_title(Client *self)
 {
-    gchar *data = NULL;
+    char *data = NULL;
 
     g_free(self->icon_title);
      
     /* try netwm */
-    if (!PROP_GETS(self->window, net_wm_icon_name, utf8, data)) {
+    if (!PROP_GETS(self->window, net_wm_icon_name, utf8, &data))
 	/* try old x stuff */
-	if (PROP_GETS(self->window, wm_icon_name, string, data)) {
-	    /* convert it to UTF-8 */
-	    gsize r, w;
-	    gchar *u;
-
-	    u = g_locale_to_utf8(data, -1, &r, &w, NULL);
-	    if (u == NULL) {
-		g_warning("Unable to convert string to UTF-8");
-	    } else {
-		g_free(data);
-		data = u;
-	    }
-	}
-	if (data == NULL)
-	    data = g_strdup("Unnamed Window");
+	if (!PROP_GETS(self->window, wm_icon_name, locale, &data))
+            data = g_strdup("Unnamed Window");
 
-	PROP_SETS(self->window, net_wm_visible_icon_name, utf8, data);
-    }
+    PROP_SETS(self->window, net_wm_visible_icon_name, data);
 
     self->icon_title = data;
 }
 
 void client_update_class(Client *self)
 {
-    GPtrArray *data;
-    gchar *s;
-    guint i;
+    char **data;
+    char *s;
 
     if (self->name) g_free(self->name);
     if (self->class) g_free(self->class);
@@ -1151,20 +1145,16 @@ void client_update_class(Client *self)
 
     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->name = g_strdup(g_ptr_array_index(data, 0));
-	if (data->len > 1)
-	    self->class = g_strdup(g_ptr_array_index(data, 1));
+    if (PROP_GETSS(self->window, wm_class, locale, &data)) {
+        if (data[0]) {
+	    self->name = g_strdup(data[0]);
+            if (data[1])
+                self->class = g_strdup(data[1]);
+        }
+        g_strfreev(data);     
     }
-     
-    for (i = 0; i < data->len; ++i)
-	g_free(g_ptr_array_index(data, i));
-    g_ptr_array_free(data, TRUE);
 
-    if (PROP_GETS(self->window, wm_window_role, string, s))
+    if (PROP_GETS(self->window, wm_window_role, locale, &s))
 	self->role = g_strdup(s);
 
     if (self->name == NULL) self->name = g_strdup("");
@@ -1174,13 +1164,18 @@ void client_update_class(Client *self)
 
 void client_update_strut(Client *self)
 {
-    gulong *data;
+    guint num;
+    guint32 *data;
 
-    if (PROP_GET32A(self->window, net_wm_strut, cardinal, data, 4)) {
-	STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
-	g_free(data);
-    } else
+    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);
+    }
 
     /* updating here is pointless while we're being mapped cuz we're not in
        the client list yet */
@@ -1190,9 +1185,9 @@ void client_update_strut(Client *self)
 
 void client_update_icons(Client *self)
 {
-    unsigned long num;
-    unsigned long *data;
-    unsigned long w, h, i;
+    guint num;
+    guint32 *data;
+    guint w, h, i;
     int j;
 
     for (j = 0; j < self->nicons; ++j)
@@ -1201,7 +1196,7 @@ void client_update_icons(Client *self)
 	g_free(self->icons);
     self->nicons = 0;
 
-    if (PROP_GET32U(self->window, net_wm_icon, cardinal, data, num)) {
+    if (PROP_GETA32(self->window, net_wm_icon, cardinal, &data, &num)) {
 	/* figure out how many valid icons are in here */
 	i = 0;
 	while (num - i > 2) {
@@ -1234,14 +1229,18 @@ void client_update_icons(Client *self)
 
 void client_update_kwm_icon(Client *self)
 {
-    Pixmap *data;
+    guint num;
+    guint32 *data;
 
-    if (PROP_GET32A(self->window, kwm_win_icon, kwm_win_icon, data, 2)) {
-	self->pixmap_icon = data[0];
-	self->pixmap_icon_mask = data[1];
-	g_free(data);
-    } else {
+    if (!PROP_GETA32(self->window, kwm_win_icon, kwm_win_icon, &data, &num)) {
 	self->pixmap_icon = self->pixmap_icon_mask = None;
+    } else {
+        if (num == 2) {
+            self->pixmap_icon = data[0];
+            self->pixmap_icon_mask = data[1];
+        } else
+            self->pixmap_icon = self->pixmap_icon_mask = None;
+	g_free(data);
     }
     if (self->frame)
 	frame_adjust_icon(self->frame);
@@ -1249,13 +1248,13 @@ void client_update_kwm_icon(Client *self)
 
 static void client_change_state(Client *self)
 {
-    unsigned long state[2];
-    Atom netstate[10];
-    int num;
+    guint32 state[2];
+    guint32 netstate[10];
+    guint num;
 
     state[0] = self->wmstate;
     state[1] = None;
-    PROP_SET32A(self->window, wm_state, wm_state, state, 2);
+    PROP_SETA32(self->window, wm_state, wm_state, state, 2);
 
     num = 0;
     if (self->modal)
@@ -1278,7 +1277,7 @@ static void client_change_state(Client *self)
 	netstate[num++] = prop_atoms.net_wm_state_above;
     if (self->below)
 	netstate[num++] = prop_atoms.net_wm_state_below;
-    PROP_SET32A(self->window, net_wm_state, atom, netstate, num);
+    PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
 
     client_calc_layer(self);
 
@@ -1300,27 +1299,64 @@ static Client *search_focus_tree(Client *node, Client *skip)
     return NULL;
 }
 
+static void calc_recursive(Client *self, StackLayer l, gboolean raised)
+{
+    StackLayer old;
+    GSList *it;
+
+    old = self->layer;
+    self->layer = l;
+
+    for (it = self->transients; it; it = it->next)
+        calc_recursive(it->data, l, raised ? raised : l != old);
+
+    if (!raised && l != old)
+	if (self->frame)
+	    stacking_raise(self);
+}
+
 void client_calc_layer(Client *self)
 {
     StackLayer l;
+    gboolean f;
+
+    /* transients take on the layer of their parents */
+    if (self->transient_for) {
+        if (self->transient_for != TRAN_GROUP) {
+            self = self->transient_for;
+        } else {
+            GSList *it;
+
+            for (it = self->group->members; it; it = it->next)
+                if (it->data != self &&
+                    ((Client*)it->data)->transient_for != TRAN_GROUP) {
+                    self = it->data;
+                    break;
+                }
+        }
+    }
+
+    /* is us or one of our transients focused? */
+    if (client_focused(self))
+        f = TRUE;
+    else if (search_focus_tree(self, self))
+        f = TRUE;
+    else
+        f = FALSE;
 
     if (self->iconic) l = Layer_Icon;
     /* fullscreen windows are only in the fullscreen layer while focused */
-    else if (self->fullscreen && focus_client == self) l = Layer_Fullscreen;
+    else if (self->fullscreen && f) l = Layer_Fullscreen;
     else if (self->type == Type_Desktop) l = Layer_Desktop;
     else if (self->type == Type_Dock) {
-	if (!self->below) l = Layer_Top;
-	else l = Layer_Normal;
+        if (!self->below) l = Layer_Top;
+        else l = Layer_Normal;
     }
     else if (self->above) l = Layer_Above;
     else if (self->below) l = Layer_Below;
     else l = Layer_Normal;
-     
-    if (l != self->layer) {
-	self->layer = l;
-	if (self->frame)
-	    stacking_raise(self);
-    }
+
+    calc_recursive(self, l, FALSE);
 }
 
 gboolean client_should_show(Client *self)
@@ -1547,17 +1583,18 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 	self->fullscreen == fs) return;         /* already done */
 
     self->fullscreen = fs;
-    client_change_state(self); /* change the state hints on the client */
+    client_change_state(self); /* change the state hints on the client,
+                                  and adjust out layer/stacking */
 
     if (fs) {
 	if (savearea) {
-	    long dimensions[4];
+	    guint32 dimensions[4];
 	    dimensions[0] = self->area.x;
 	    dimensions[1] = self->area.y;
 	    dimensions[2] = self->area.width;
 	    dimensions[3] = self->area.height;
   
-	    PROP_SET32A(self->window, openbox_premax, cardinal,
+	    PROP_SETA32(self->window, openbox_premax, cardinal,
 			dimensions, 4);
 	}
 
@@ -1565,23 +1602,26 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
            as appropriate when the window is fullscreened */
         x = y = w = h = 0;
     } else {
-	long *dimensions;
-
-	if (PROP_GET32A(self->window, openbox_premax, cardinal,
-			dimensions, 4)) {
-	    x = dimensions[0];
-	    y = dimensions[1];
-	    w = dimensions[2];
-	    h = dimensions[3];
+        guint num;
+	gint32 *dimensions;
+
+        /* pick some fallbacks... */
+        x = screen_area(self->desktop)->x +
+            screen_area(self->desktop)->width / 4;
+        y = screen_area(self->desktop)->y +
+            screen_area(self->desktop)->height / 4;
+        w = screen_area(self->desktop)->width / 2;
+        h = screen_area(self->desktop)->height / 2;
+
+	if (PROP_GETA32(self->window, openbox_premax, cardinal,
+                        (guint32**)&dimensions, &num)) {
+            if (num == 4) {
+                x = dimensions[0];
+                y = dimensions[1];
+                w = dimensions[2];
+                h = dimensions[3];
+            }
 	    g_free(dimensions);
-	} else {
-	    /* pick some fallbacks... */
-	    x = screen_area(self->desktop)->x +
-		screen_area(self->desktop)->width / 4;
-	    y = screen_area(self->desktop)->y +
-		screen_area(self->desktop)->height / 4;
-	    w = screen_area(self->desktop)->width / 2;
-	    h = screen_area(self->desktop)->height / 2;
 	}
     }
 
@@ -1589,9 +1629,6 @@ void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 
     client_configure(self, Corner_TopLeft, x, y, w, h, TRUE, TRUE);
 
-    /* raise (back) into our stacking layer */
-    stacking_raise(self);
-
     /* try focus us when we go into fullscreen mode */
     client_focus(self);
 }
@@ -1683,8 +1720,9 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
 
     if (max) {
 	if (savearea) {
-	    long dimensions[4];
-	    long *readdim;
+	    gint32 dimensions[4];
+	    gint32 *readdim;
+            guint num;
 
 	    dimensions[0] = x;
 	    dimensions[1] = y;
@@ -1693,48 +1731,53 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea)
 
 	    /* get the property off the window and use it for the dimensions
 	       we are already maxed on */
-	    if (PROP_GET32A(self->window, openbox_premax, cardinal,
-			    readdim, 4)) {
-		if (self->max_horz) {
-		    dimensions[0] = readdim[0];
-		    dimensions[2] = readdim[2];
-		}
-		if (self->max_vert) {
-		    dimensions[1] = readdim[1];
-		    dimensions[3] = readdim[3];
-		}
+	    if (PROP_GETA32(self->window, openbox_premax, cardinal,
+			    (guint32**)&readdim, &num)) {
+                if (num == 4) {
+                    if (self->max_horz) {
+                        dimensions[0] = readdim[0];
+                        dimensions[2] = readdim[2];
+                    }
+                    if (self->max_vert) {
+                        dimensions[1] = readdim[1];
+                        dimensions[3] = readdim[3];
+                    }
+                }
 		g_free(readdim);
 	    }
 
-	    PROP_SET32A(self->window, openbox_premax, cardinal,
-			dimensions, 4);
+	    PROP_SETA32(self->window, openbox_premax, cardinal,
+			(guint32*)dimensions, 4);
 	}
     } else {
-	long *dimensions;
+        guint num;
+	gint32 *dimensions;
+
+        /* pick some fallbacks... */
+        if (dir == 0 || dir == 1) { /* horz */
+            x = screen_area(self->desktop)->x +
+                screen_area(self->desktop)->width / 4;
+            w = screen_area(self->desktop)->width / 2;
+        }
+        if (dir == 0 || dir == 2) { /* vert */
+            y = screen_area(self->desktop)->y +
+                screen_area(self->desktop)->height / 4;
+            h = screen_area(self->desktop)->height / 2;
+        }
 
-	if (PROP_GET32A(self->window, openbox_premax, cardinal,
-			dimensions, 4)) {
-	    if (dir == 0 || dir == 1) { /* horz */
-		x = dimensions[0];
-		w = dimensions[2];
-	    }
-	    if (dir == 0 || dir == 2) { /* vert */
-		y = dimensions[1];
-		h = dimensions[3];
-	    }
-	    g_free(dimensions);
-	} else {
-	    /* pick some fallbacks... */
-	    if (dir == 0 || dir == 1) { /* horz */
-		x = screen_area(self->desktop)->x +
-		    screen_area(self->desktop)->width / 4;
-		w = screen_area(self->desktop)->width / 2;
-	    }
-	    if (dir == 0 || dir == 2) { /* vert */
-		y = screen_area(self->desktop)->y +
-		    screen_area(self->desktop)->height / 4;
-		h = screen_area(self->desktop)->height / 2;
-	    }
+	if (PROP_GETA32(self->window, openbox_premax, cardinal,
+			(guint32**)&dimensions, &num)) {
+            if (num == 4) {
+                if (dir == 0 || dir == 1) { /* horz */
+                    x = dimensions[0];
+                    w = dimensions[2];
+                }
+                if (dir == 0 || dir == 2) { /* vert */
+                    y = dimensions[1];
+                    h = dimensions[3];
+                }
+            }
+            g_free(dimensions);
 	}
     }
 
@@ -2099,7 +2142,7 @@ gboolean client_focus(Client *self)
 void client_unfocus(Client *self)
 {
     g_assert(focus_client == self);
-#ifndef DEBUG_FOCUS
+#ifdef DEBUG_FOCUS
     g_message("client_unfocus");
 #endif
     focus_fallback(Fallback_Unfocusing);