*fix* minor bugfixes

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

diff --git a/src/util/window.c b/src/util/window.c
index 1aa08774e28f9f93369f5a49b3bdd87f53d4c0f7..285d525d8e15edbddf23964978ddbd724cafd4a7 100644 (file)
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -88,7 +88,7 @@ int window_is_hidden (Window win)
                }
                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) ) {
+                       if ( XGetTransientForHint(server.dsp, win, &window) && task_get_tasks(window) ) {
                                XFree(at);
                                return 1;
                        }
@@ -146,7 +146,21 @@ 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));
+       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;
+                       }
+               }
+               XFree(at);
+               return 1;
+       }
+       return 0;
 }