[Xfce4-commits] <xfwm4:xfce-4.6> Allow only regular windows to be placed either above or below.

[Olivier Fourdan]

Updating branch refs/heads/xfce-4.6
         to 06046f1723eba7a90e53bdba8a2af4a51fd03db6 (commit)
       from bc9e8203b9438dc0066e622d79526e7e854b95cf (commit)

commit 06046f1723eba7a90e53bdba8a2af4a51fd03db6
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Feb 24 20:26:52 2010 +0100

    Allow only regular windows to be placed either above or below.

 src/client.c |    6 ++++--
 src/client.h |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client.c b/src/client.c
index 2e6342a..8986384 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3078,7 +3078,8 @@ void clientToggleLayerAbove (Client * c)
     g_return_if_fail (c != NULL);
     TRACE ("entering clientToggleAbove");
 
-    if (!clientIsTransientOrModal (c) &&
+    if ((c->type & WINDOW_REGULAR_FOCUSABLE) &&
+        !clientIsTransientOrModal (c) &&
         !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
     {
         FLAG_UNSET (c->flags, CLIENT_FLAG_BELOW);
@@ -3092,7 +3093,8 @@ void clientToggleLayerBelow (Client * c)
     g_return_if_fail (c != NULL);
     TRACE ("entering clientToggleBelow");
 
-    if (!clientIsTransientOrModal (c) &&
+    if ((c->type & WINDOW_REGULAR_FOCUSABLE) &&
+        !clientIsTransientOrModal (c) &&
         !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
     {
         FLAG_UNSET (c->flags, CLIENT_FLAG_ABOVE);
diff --git a/src/client.h b/src/client.h
index 1c6c032..7ad3f29 100644
--- a/src/client.h
+++ b/src/client.h
@@ -191,8 +191,8 @@
                                          WINDOW_UTILITY | \
                                          WINDOW_SPLASHSCREEN)
 #define WINDOW_REGULAR_FOCUSABLE        (WINDOW_NORMAL | \
-                                         WINDOW_DIALOG | \
-                                         WINDOW_MODAL_DIALOG)
+                                         WINDOW_TYPE_DIALOG | \
+                                         WINDOW_UTILITY)
 #define WINDOW_TYPE_DONT_FOCUS          (WINDOW_SPLASHSCREEN | \
                                          WINDOW_DOCK)