Skip to content

core/layers: top layers go below fullscreen windows, fix DS solitary #15937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erstarr wants to merge 20 commits into
base: main
Choose a base branch
from
+487 −87
Open

core/layers: top layers go below fullscreen windows, fix DS solitary #15937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
36053fe
why do we suffer?
erstarr Aug 22, 2026
be4f861
begone
erstarr Aug 22, 2026
b5cd1ae
format
erstarr Aug 22, 2026
72c87ac
TEST - Top and Overlay - spawn before and after FS - test both maximi…
erstarr Aug 22, 2026
dc273b4
add config opt
erstarr Aug 23, 2026
d8b05b3
meow
erstarr Aug 23, 2026
1e6158c
add TEST for allow_new_top_layers_over_existing_fullscreen = true -- …
erstarr Aug 23, 2026
4ce6b7d
fix default handled test, clone the def test into scrolling's layout …
erstarr Aug 23, 2026
e605ff4
The whole thing is quite hopeless, so it's no good worrying about tom…
erstarr Aug 23, 2026
4c6aaee
whatDidIDoToDeserveThis
erstarr Aug 23, 2026
e767ebe
monitor: only non-transparent `overlay` layers can block solitary
LRitzdorf Sep 5, 2026
f799fc1
testFixAttempt
erstarr Oct 4, 2026
8869c46
fix oopsie
erstarr Oct 4, 2026
ab590f4
testFixAttempt2
erstarr Oct 4, 2026
ec42e17
whole lot of fixes and cleanups
erstarr Oct 4, 2026
c806281
fix scrolling's test
erstarr Oct 4, 2026
e8ebebd
format
erstarr Oct 4, 2026
3f76698
redundant includes
erstarr Oct 4, 2026
39b414b
do not show a layer in hyprctl layers before it is mapped
erstarr Oct 9, 2026
00485cc
review fix: value -> goal
erstarr Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 190 additions & 6 deletions hyprtester/src/tests/main/layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,29 @@ TEST_CASE(ruleConfinementRuntimeToggle) {

TEST_CASE(layerVisibilityOnFs) {

// For default handled fullscreen
const auto doMassacre = [&]() -> void {
Tests::killAllLayers();
Tests::waitUntilLayersN(0);
Tests::killAllWindows();
Tests::waitUntilWindowsN(0);
};

static constexpr const char* LAYER_NAMESPACE = "bar-like-layer";

ASSERT(spawnLayer(LAYER_NAMESPACE, {"--edge=top", "--layer=top", "--lines=48px", "--focus-policy=not-allowed"}), true);
const auto spawnLayerAndWaitTillSuccess_TOP = [&]() {
ASSERT(spawnLayer(LAYER_NAMESPACE, {"--edge=top", "--layer=top", "--lines=48px", "--focus-policy=not-allowed"}), true);
Tests::waitUntilLayersN(1);
};

const auto spawnLayerAndWaitTillSuccess_OVERLAY = [&]() {
ASSERT(spawnLayer(LAYER_NAMESPACE, {"--edge=top", "--layer=overlay", "--lines=48px", "--focus-policy=not-allowed"}), true);
Tests::waitUntilLayersN(1);
};

// For default handled fullscreen

// FS after a layer has been created
spawnLayerAndWaitTillSuccess_TOP();

SPAWN_KITTY("cat");

Expand All @@ -318,35 +336,201 @@ TEST_CASE(layerVisibilityOnFs) {
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'set', window = 'class:cat' })"));
{

auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);

EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 1");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'set', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 0");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 2");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1")
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

// TOP Layer spawn after FS

doMassacre();

// allow_new_top_layers_over_existing_fullscreen = true
OK(getFromSocket("/eval hl.config({ misc = { allow_new_top_layers_over_existing_fullscreen = true } })"));

SPAWN_KITTY("cat");

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'set', window = 'class:cat' })"));
spawnLayerAndWaitTillSuccess_TOP();
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 1");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

doMassacre();
SPAWN_KITTY("cat");

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'set', window = 'class:cat' })"));
spawnLayerAndWaitTillSuccess_TOP();
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1")
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 2");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

// allow_new_top_layers_over_existing_fullscreen = false

doMassacre();

OK(getFromSocket("/eval hl.config({ misc = { allow_new_top_layers_over_existing_fullscreen = false },})"));

SPAWN_KITTY("cat");

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'set', window = 'class:cat' })"));
spawnLayerAndWaitTillSuccess_TOP();
{

auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 1");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

doMassacre();
SPAWN_KITTY("cat");

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'set', window = 'class:cat' })"));
spawnLayerAndWaitTillSuccess_TOP();
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 0");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 2");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

doMassacre();

// Overlay is always ontop, spawn later or before FS

// we need not test with the allow_new_top_layers_over_existing_fullscreen config opt as it's only relevant to TOP layer.

// FS after a layer has been created
spawnLayerAndWaitTillSuccess_OVERLAY();

SPAWN_KITTY("cat");

{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 0")
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'set', window = 'class:cat' })"));
{

auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 1");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'set', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 2");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

// overlay Layer spawn after FS

doMassacre();
SPAWN_KITTY("cat");

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'set', window = 'class:cat' })"));
spawnLayerAndWaitTillSuccess_OVERLAY();
{

auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1")
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 1");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'maximized', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}

doMassacre();
SPAWN_KITTY("cat");

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'set', window = 'class:cat' })"));
spawnLayerAndWaitTillSuccess_OVERLAY();
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 2");
}

OK(getFromSocket("/dispatch hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'unset', window = 'class:cat' })"));
{
auto str = getLayerLine(getFromSocket("/layers"), LAYER_NAMESPACE);
EXPECT_CONTAINS(str, "a: 1");
EXPECT_CONTAINS(getFromSocket("/activewindow"), "fullscreen: 0");
}
}
Expand Down
Loading
Loading