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

[Jérôme Guelfucci]

Updating branch refs/heads/libxfce4ui
         to c400026f2ebe95afaad5c8254cdefc576421dfc0 (commit)
       from 366f4529971a360e6b4da0fc171c40b3e5399672 (commit)

commit c400026f2ebe95afaad5c8254cdefc576421dfc0
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 ea26f70..c603d96 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3087,7 +3087,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);
@@ -3101,7 +3102,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 fdb59fa..acba0c4 100644
--- a/src/client.h
+++ b/src/client.h
@@ -193,8 +193,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)