X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Futil%2Fwindow.c;h=f4ef6a04ac306277e46d6561a7cda780c150ef02;hb=a5e1fb6d51a4eac007571b88f0421022e21c3500;hp=1cc91a81f124b7bf9ad0c4f08e5d2ed0fd91e22a;hpb=9cb781048d0a1cf55f0044e2f9f65ac9a5a241e9;p=chaz%2Ftint2

diff --git a/src/util/window.c b/src/util/window.c
index 1cc91a8..f4ef6a0 100644
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -33,6 +33,7 @@
 #include "window.h"
 #include "server.h"
 #include "panel.h"
+#include "taskbar.h"
 
 
 
@@ -79,18 +80,17 @@ int window_is_hidden (Window win)
 	Atom *at;
 	int count, i;
 
-	if (XGetTransientForHint(server.dsp, win, &window) != 0) {
-		if (window) {
-			return 1;
-		}
-	}
-
 	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
 	for (i = 0; i < count; i++) {
 		if (at[i] == server.atom._NET_WM_STATE_SKIP_TASKBAR) {
 			XFree(at);
 			return 1;
 		}
+		// do not add transient_for windows if the transient window is already in the taskbar
+		if ( XGetTransientForHint(server.dsp, win, &window) && task_get_tasks(window) ) {
+			XFree(at);
+			return 1;
+		}
 	}
 	XFree(at);
 
@@ -144,7 +144,19 @@ int window_get_monitor (Window win)
 
 int window_is_iconified (Window win)
 {
-	return (IconicState == get_property32(win, server.atom.WM_STATE, server.atom.WM_STATE));
+	// EWMH specification : minimization of windows use _NET_WM_STATE_HIDDEN.
+	// WM_STATE is not accurate for shaded window and in multi_desktop mode.
+	Atom *at;
+	int count, i;
+	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	for (i = 0; i < count; i++) {
+		if (at[i] == server.atom._NET_WM_STATE_HIDDEN) {
+			XFree(at);
+			return 1;
+		}
+	}
+	XFree(at);
+	return 0;
 }