*fix* minor bugfixes

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

diff --git a/src/util/window.c b/src/util/window.c
index 1cc91a81f124b7bf9ad0c4f08e5d2ed0fd91e22a..285d525d8e15edbddf23964978ddbd724cafd4a7 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"
 
 
 
@@ -79,18 +80,19 @@ 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;
                }
+               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_tasks(window) ) {
+                               XFree(at);
+                               return 1;
+                       }
+               }
        }
        XFree(at);
 
@@ -144,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;
 }