some more sway changes

This commit is contained in:
chayleaf 2024-08-15 04:59:18 +07:00
parent ab682c1135
commit 5b7e3df230
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
5 changed files with 53 additions and 33 deletions

View file

@ -376,16 +376,16 @@
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723661113, "lastModified": 1723672395,
"narHash": "sha256-8e39LDaSCuzF3KbFzrt4P4gDimgttvwpJ7W5SZjzewM=", "narHash": "sha256-QQz3FQcVQggqOkOFKAfDNJKFjcyVfiQzCiB9KAjG7dM=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "mobile-nixos", "repo": "mobile-nixos",
"rev": "59d33e5fcf679b51a67414b350a1d834cb4a96fc", "rev": "d7567082df75b11a47f384ec71b0a80c508d7ceb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "chayleaf", "owner": "chayleaf",
"ref": "update", "ref": "sdm845",
"repo": "mobile-nixos", "repo": "mobile-nixos",
"type": "github" "type": "github"
} }

View file

@ -12,7 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
mobile-nixos = { mobile-nixos = {
url = "github:chayleaf/mobile-nixos/update"; url = "github:chayleaf/mobile-nixos/sdm845";
flake = false; flake = false;
}; };
osu-wine = { osu-wine = {

View file

@ -1,7 +1,7 @@
From 466d750b96184b793d276d9d0e30d37af4477fea Mon Sep 17 00:00:00 2001 From c4690b1496ca34c416869d2932abfa112a93f188 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org> From: chayleaf <chayleaf-git@pavluk.org>
Date: Wed, 14 Aug 2024 08:17:44 +0700 Date: Wed, 14 Aug 2024 08:17:44 +0700
Subject: [PATCH 2/2] mobile: don't idle_notify for volume keys Subject: [PATCH 1/2] mobile: don't idle_notify for volume keys
--- ---
sway/input/keyboard.c | 4 +++- sway/input/keyboard.c | 4 +++-

View file

@ -1,26 +0,0 @@
From 7fead3cd2158fe913775ede5651291cf5f4ccf4d Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Wed, 14 Aug 2024 07:32:11 +0700
Subject: [PATCH 1/2] mobile: reverse layer order
This makes exclusive anchored layers that were added first be first
---
sway/desktop/layer_shell.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 8c6cedfe..41a638ee 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
struct wlr_box full_area = { 0 };
wlr_output_effective_resolution(output->wlr_output,
&full_area.width, &full_area.height);
- wl_list_for_each(sway_layer, list, link) {
+ wl_list_for_each_reverse(sway_layer, list, link) {
struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
struct wlr_layer_surface_v1_state *state = &layer->current;
if (exclusive != (state->exclusive_zone > 0)) {
--
2.44.1

View file

@ -0,0 +1,46 @@
From 0d352dff09bab4536d2e182538641af1c6d2a1ef Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Wed, 14 Aug 2024 07:32:11 +0700
Subject: [PATCH 2/2] mobile: reverse layer order
This makes exclusive anchored layers that were added first be first
---
sway/desktop/layer_shell.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 8c6cedfe..4afca0b7 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -129,7 +129,7 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
struct wlr_box full_area = { 0 };
wlr_output_effective_resolution(output->wlr_output,
&full_area.width, &full_area.height);
- wl_list_for_each(sway_layer, list, link) {
+ wl_list_for_each_reverse(sway_layer, list, link) {
struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
struct wlr_layer_surface_v1_state *state = &layer->current;
if (exclusive != (state->exclusive_zone > 0)) {
@@ -214,14 +214,14 @@ void arrange_layers(struct sway_output *output) {
wlr_output_effective_resolution(output->wlr_output,
&usable_area.width, &usable_area.height);
- // Arrange exclusive surfaces from top->bottom
- arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
- &usable_area, true);
- arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
+ // Arrange exclusive surfaces from bottom->top
+ arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
&usable_area, true);
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
&usable_area, true);
- arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
+ arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
+ &usable_area, true);
+ arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
&usable_area, true);
if (memcmp(&usable_area, &output->usable_area,
--
2.44.1