X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Fwindow.c;h=f4ef6a04ac306277e46d6561a7cda780c150ef02;hb=f8f6e7f277a6e09fb4a9fa7db532867d51d229be;hp=caa293438e8cab0ab11a704048beaad5745b8dab;hpb=bab0811f845cedb817a3c3a29dd91ade07d5a886;p=chaz%2Ftint2

diff --git a/src/util/window.c b/src/util/window.c
index caa2934..f4ef6a0 100644
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -86,12 +86,10 @@ int window_is_hidden (Window win)
 			XFree(at);
 			return 1;
 		}
-		if (at[i] == server.atom._NET_WM_STATE_MODAL) {
-			// do not add modal windows if the transient window is already in the taskbar
-			if ( XGetTransientForHint(server.dsp, win, &window) && task_get_task(window) ) {
-				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);
@@ -146,20 +144,18 @@ int window_get_monitor (Window win)
 
 int window_is_iconified (Window win)
 {
-	if (IconicState == get_property32(win, server.atom.WM_STATE, server.atom.WM_STATE)) {
-		// openbox sets on shaded windows the IconicState, however we do not consider these windows iconified
-		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_SHADED) {
-				XFree(at);
-				return 0;
-			}
+	// 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 1;
 	}
+	XFree(at);
 	return 0;
 }