*fix* issue 272

[chaz/tint2] / src / util / window.c

diff --git a/src/util/window.c b/src/util/window.c
index eaab1b7980ed6673bffabc43b554a4cccf5f2598..dc38d24f3ef84c0e46f59070243c78cfbf3dd2f5 100644 (file)
--- 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"
 
 
 
@@ -85,9 +86,13 @@ int window_is_hidden (Window win)
                        XFree(at);
                        return 1;
                }
-               if (at[i] == server.atom._NET_WM_STATE_MODAL) {
-                       XFree(at);
-                       return 1;
+               // do not add transient_for windows if the transient window is already in the taskbar
+               window=win;
+               while ( XGetTransientForHint(server.dsp, window, &window) ) {
+                       if ( task_get_tasks(window) ) {
+                               XFree(at);
+                               return 1;
+                       }
                }
        }
        XFree(at);
@@ -142,7 +147,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;
 }