Don't change the client's layer in set_fullscreen

Fixes #897.

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index af8b41f3031d357d8127e74744c1e71d0b319d0d..068fba5ce97f008598ee151ee55ff87908fd7e3e 100644 (file)
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -2,12 +2,12 @@
 .\"     Title: bspwm
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/14/2018
+.\"      Date: 01/06/2019
 .\"    Manual: Bspwm Manual
-.\"    Source: Bspwm 0.9.5-25-g93c6de1
+.\"    Source: Bspwm 0.9.5-27-g2c2faeb
 .\"  Language: English
 .\"
-.TH "BSPWM" "1" "12/14/2018" "Bspwm 0\&.9\&.5\-25\-g93c6de1" "Bspwm Manual"
+.TH "BSPWM" "1" "01/06/2019" "Bspwm 0\&.9\&.5\-27\-g2c2faeb" "Bspwm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -581,7 +581,7 @@ Has its urgency hint set\&. This flag is set externally\&.
 .sp
 There\(cqs three stacking layers: BELOW, NORMAL and ABOVE\&.
 .sp
-In each layer, the window are orderered as follow: tiled & pseudo\-tiled < fullscreen < floating\&.
+In each layer, the window are orderered as follow: tiled & pseudo\-tiled < floating < fullscreen\&.
 .SH "RECEPTACLES"
 .sp
 A leaf node that doesn\(cqt hold any window is called a receptacle\&. When a node is inserted on a receptacle in automatic mode, it will replace the receptacle\&. A receptacle can be inserted on a node, preselected and killed\&. Receptacles can therefore be used to build a tree whose leaves are receptacles\&. Using the appropriate rules, one can then send windows on the leaves of this tree\&. This feature is used in \fIexamples/receptacles\fR to store and recreate layouts\&.

diff --git a/doc/bspwm.1.asciidoc b/doc/bspwm.1.asciidoc
index 86cf98ff9a31e3b8ba86f9344cca8498378c64e1..50c8adb27764fad569afda3a66a72b91732d6ba7 100644 (file)
--- a/doc/bspwm.1.asciidoc
+++ b/doc/bspwm.1.asciidoc
@@ -365,7 +365,7 @@ Stacking Layers
 
 There's three stacking layers: BELOW, NORMAL and ABOVE.
 
-In each layer, the window are orderered as follow: tiled & pseudo-tiled < fullscreen < floating.
+In each layer, the window are orderered as follow: tiled & pseudo-tiled < floating < fullscreen.
 
 Receptacles
 -----------

diff --git a/src/stack.c b/src/stack.c
index 4ec730da59b9db6cda0d19fab3428fe58a7eca2d..7d480eb457b8cce7d19487b5036dff85cf5d9d90 100644 (file)
--- a/src/stack.c
+++ b/src/stack.c
@@ -123,7 +123,7 @@ void remove_stack_node(node_t *n)
 int stack_level(client_t *c)
 {
        int layer_level = (c->layer == LAYER_NORMAL ? 1 : (c->layer == LAYER_BELOW ? 0 : 2));
-       int state_level = (IS_TILED(c) ? 0 : (IS_FLOATING(c) ? 2 : 1));
+       int state_level = (IS_TILED(c) ? 0 : (IS_FLOATING(c) ? 1 : 2));
        return 3 * layer_level + state_level;
 }
 

diff --git a/src/tree.c b/src/tree.c
index bf5d3965f8e6ebe49f447d2dd496e769c10d79dc..1a16d05413819cb5ad35a9adb40ce9f5b2d48ca9 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -1756,11 +1756,8 @@ void set_fullscreen(monitor_t *m, desktop_t *d, node_t *n, bool value)
 
        if (value) {
                c->wm_flags |= WM_FLAG_FULLSCREEN;
-               c->last_layer = c->layer;
-               c->layer = LAYER_ABOVE;
        } else {
                c->wm_flags &= ~WM_FLAG_FULLSCREEN;
-               c->layer = c->last_layer;
                if (d->focus == n) {
                        neutralize_occluding_windows(m, d, n);
                }