From 7c1e192ea33c3b7b60b9fe2bef72a1e27cfb702d Mon Sep 17 00:00:00 2001 From: nortio Date: Sun, 14 Sep 2025 19:38:17 +0200 Subject: [PATCH 1/7] Update README.it.md for Italian Updated italian readme to follow the recent changes to the English one. I also removed "gestore di accesso" which in theory translates to display manager, but in practice is never used in this context. Other wikis such as [Debian](https://wiki.debian.org/it/DisplayManager) and [Ubuntu](https://wiki.ubuntu-it.org/AmbienteGrafico/DisplayManager) just use the term "Display Manager" as is. Another small thing that I corrected is "canale di IRC" which sounds a bit weird. --- README.it.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.it.md b/README.it.md index 82bb57837..272f61a02 100644 --- a/README.it.md +++ b/README.it.md @@ -1,7 +1,7 @@ # sway sway è un compositore di [Wayland] compatibile con [i3]. Leggi le [FAQ]. -Unisciti al [canale di IRC] \(#sway su irc.libera.chat). +Unisciti al [canale IRC] \(#sway su irc.libera.chat). ## Firma delle versioni @@ -52,13 +52,12 @@ configurazione. ## Esecuzione -Lancia `sway` da un TTY. Alcuni gestori d'accesso potrebbero funzionare ma non -sono supportati da sway (gdm funziona abbastanza bene). +Lancia `sway` da un TTY o da un display manager. [i3]: https://i3wm.org/ [Wayland]: http://wayland.freedesktop.org/ [FAQ]: https://github.com/swaywm/sway/wiki -[canale di IRC]: https://web.libera.chat/gamja/?channels=#sway +[canale IRC]: https://web.libera.chat/gamja/?channels=#sway [E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 [GitHub releases]: https://github.com/swaywm/sway/releases [Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup From a7d9535eb3b2056cea6a88e174fb1e75c33469f2 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 11 Sep 2025 11:21:01 +0200 Subject: [PATCH 2/7] input/text_input: stop using listener data These are now NULL. Fixes: aaab7f961e0b ("input/text_input: chase wlroots update") Closes: https://github.com/swaywm/sway/issues/8864 References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5107 --- sway/input/text_input.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/sway/input/text_input.c b/sway/input/text_input.c index 8dc64f019..e496bff1b 100644 --- a/sway/input/text_input.c +++ b/sway/input/text_input.c @@ -42,23 +42,21 @@ static void handle_im_commit(struct wl_listener *listener, void *data) { if (!text_input) { return; } - struct wlr_input_method_v2 *context = data; - assert(context == relay->input_method); - if (context->current.preedit.text) { + if (relay->input_method->current.preedit.text) { wlr_text_input_v3_send_preedit_string(text_input->input, - context->current.preedit.text, - context->current.preedit.cursor_begin, - context->current.preedit.cursor_end); + relay->input_method->current.preedit.text, + relay->input_method->current.preedit.cursor_begin, + relay->input_method->current.preedit.cursor_end); } - if (context->current.commit_text) { + if (relay->input_method->current.commit_text) { wlr_text_input_v3_send_commit_string(text_input->input, - context->current.commit_text); + relay->input_method->current.commit_text); } - if (context->current.delete.before_length - || context->current.delete.after_length) { + if (relay->input_method->current.delete.before_length + || relay->input_method->current.delete.after_length) { wlr_text_input_v3_send_delete_surrounding_text(text_input->input, - context->current.delete.before_length, - context->current.delete.after_length); + relay->input_method->current.delete.before_length, + relay->input_method->current.delete.after_length); } wlr_text_input_v3_send_done(text_input->input); } @@ -66,7 +64,7 @@ static void handle_im_commit(struct wl_listener *listener, void *data) { static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *data) { struct sway_input_method_relay *relay = wl_container_of(listener, relay, input_method_keyboard_grab_destroy); - struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data; + struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = relay->input_method->keyboard_grab; struct wlr_seat *wlr_seat = keyboard_grab->input_method->seat; wl_list_remove(&relay->input_method_keyboard_grab_destroy.link); @@ -110,8 +108,6 @@ static void text_input_set_pending_focused_surface( static void handle_im_destroy(struct wl_listener *listener, void *data) { struct sway_input_method_relay *relay = wl_container_of(listener, relay, input_method_destroy); - struct wlr_input_method_v2 *context = data; - assert(context == relay->input_method); wl_list_remove(&relay->input_method_commit.link); wl_list_remove(&relay->input_method_grab_keyboard.link); wl_list_remove(&relay->input_method_destroy.link); @@ -322,8 +318,6 @@ static void handle_pending_focused_surface_destroy(struct wl_listener *listener, void *data) { struct sway_text_input *text_input = wl_container_of(listener, text_input, pending_focused_surface_destroy); - struct wlr_surface *surface = data; - assert(text_input->pending_focused_surface == surface); text_input->pending_focused_surface = NULL; wl_list_remove(&text_input->pending_focused_surface_destroy.link); wl_list_init(&text_input->pending_focused_surface_destroy.link); From bc96d0acdf8544d81df669566b50032333ce16d9 Mon Sep 17 00:00:00 2001 From: Felix Pehla <29adc1fd92@gmail.com> Date: Mon, 15 Sep 2025 12:47:58 +0200 Subject: [PATCH 3/7] README: update German translation Update the information about display manager support (see #8861), as well as markdown formatting of links and change some wording in the German README. --- README.de.md | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/README.de.md b/README.de.md index 68b411d95..d20cb4c99 100644 --- a/README.de.md +++ b/README.de.md @@ -1,21 +1,21 @@ # Sway -Sway ist ein [i3](https://i3wm.org/)-kompatibler [Wayland](http://wayland.freedesktop.org/)-Compositor. Lies die [FAQ](https://github.com/swaywm/sway/wiki). Tritt dem [IRC Channel](https://web.libera.chat/gamja/?channels=#sway) bei (#sway on irc.libera.chat; Englisch). +Sway ist ein [i3]-kompatibler [Wayland]-Compositor. Lies die [FAQ]. Tritt dem [IRC Channel] bei (#sway on irc.libera.chat; Englisch). ## Signaturen -Jedes Release wird mit dem PGP-Schlüssel [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) signiert und [auf GitHub](https://github.com/swaywm/sway/releases) veröffentlicht. +Jeder Release wird mit dem PGP-Schlüssel [E88F5E48] signiert und [auf GitHub][GitHub releases] veröffentlicht. ## Installation ### Über die Paketverwaltung -Sway kann in vielen Distributionen direkt durch die Paketverwaltung installiert werden. Versuche einfach das Packet "sway" zu installieren. +Sway kann in vielen Distributionen direkt durch die Paketverwaltung installiert werden. Versuche einfach das Paket "sway" zu installieren. ### Quellcode selbst kompilieren sway benötigt die folgenden Pakete: -* meson\* -* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) +* meson \* +* [wlroots] * wayland * wayland-protocols\* * pcre2 @@ -23,21 +23,34 @@ sway benötigt die folgenden Pakete: * pango * cairo * gdk-pixbuf2 (Optional, wird für das Benachrichtigungsfeld (System Tray) benötigt) -* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (Optional, wird für die Dokumentation (Man Pages) benötigt)\* +* [swaybg] (Optional, wird für das Setzen von Desktophintergrundbildern benötigt) +* [scdoc] (Optional, wird für die Dokumentation (Man Pages) benötigt)\* * git (Optional: Versionsinfo)\* -_\*Werden nur während des Kompilierens benötigt_ +_\*Werden nur für das Kompilieren benötigt_ Führe die folgenden Befehle aus: - meson build - ninja -C build - sudo ninja -C build install + meson build/ + ninja -C build/ + sudo ninja -C build/ install + +Schaue in das [Wiki][Development setup] (Englisch) für Informationen, falls du zum Testen oder Entwickeln den neuesten Stand (HEAD) von sway und wlroots kompilieren willst. ## Konfiguration Falls du von i3 migrierst, kannst du deine Konfigurationsdatei nach `~/.config/sway/config` kopieren und die Einstellungen sollten ohne Weiteres funktionieren. Ansonsten kannst du die Beispielkonfiguration, die normalerweise in `/etc/sway/config` liegt, nach `~/.config/sway/config` kopieren. Die Dokumentation zur Konfigurationsdatei findest du in `man 5 sway`. ## Sway starten -Sway kann einfach mit dem Befehl `sway` vom TTY gestartet werden. -Display-Manager werden nicht offiziell unterstützt. Es gibt aber durchaus einige, die mit Sway funktionieren (z.B. gdm). +Sway kann einfach mit dem Befehl `sway` vom TTY oder mithilfe eines Displaymanagers gestartet werden. + +[i3]: https://i3wm.org/ +[Wayland]: http://wayland.freedesktop.org/ +[FAQ]: https://github.com/swaywm/sway/wiki +[IRC channel]: https://web.libera.chat/gamja/?channels=#sway +[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 +[GitHub releases]: https://github.com/swaywm/sway/releases +[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup +[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots +[swaybg]: https://github.com/swaywm/swaybg +[scdoc]: https://git.sr.ht/~sircmpwn/scdoc From d9e615c507c1d669171e8222ef8b32bf8de07ed5 Mon Sep 17 00:00:00 2001 From: llyyr Date: Sun, 21 Sep 2025 06:44:24 +0530 Subject: [PATCH 4/7] sway/server: set color_manager for root scene Chase https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5122/ --- sway/server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sway/server.c b/sway/server.c index 8ad62c719..4e606a391 100644 --- a/sway/server.c +++ b/sway/server.c @@ -467,7 +467,8 @@ bool server_init(struct sway_server *server) { WP_COLOR_MANAGER_V1_PRIMARIES_SRGB, WP_COLOR_MANAGER_V1_PRIMARIES_BT2020, }; - wlr_color_manager_v1_create(server->wl_display, 1, &(struct wlr_color_manager_v1_options){ + struct wlr_color_manager_v1 *cm = wlr_color_manager_v1_create( + server->wl_display, 1, &(struct wlr_color_manager_v1_options){ .features = { .parametric = true, .set_mastering_display_primaries = true, @@ -479,6 +480,7 @@ bool server_init(struct sway_server *server) { .primaries = primaries, .primaries_len = sizeof(primaries) / sizeof(primaries[0]), }); + wlr_scene_set_color_manager_v1(root->root_scene, cm); } wl_list_init(&server->pending_launcher_ctxs); From b4a9a1716f70f080edf146f82698aa2c1bb99bcc Mon Sep 17 00:00:00 2001 From: nyxed Date: Thu, 2 Oct 2025 17:33:59 +0200 Subject: [PATCH 5/7] build: switch to explicit 'meson setup' syntax --- .builds/alpine.yml | 6 +++--- .builds/archlinux.yml | 4 ++-- .builds/freebsd.yml | 2 +- README.ar.md | 2 +- README.az.md | 2 +- README.cs.md | 2 +- README.de.md | 2 +- README.dk.md | 2 +- README.es.md | 2 +- README.fr.md | 2 +- README.ge.md | 2 +- README.gr.md | 2 +- README.hi.md | 2 +- README.hu.md | 2 +- README.ir.md | 2 +- README.it.md | 2 +- README.ja.md | 2 +- README.ko.md | 2 +- README.md | 2 +- README.nl.md | 2 +- README.no.md | 2 +- README.pl.md | 2 +- README.pt.md | 2 +- README.ro.md | 2 +- README.ru.md | 2 +- README.sr.md | 2 +- README.sv.md | 2 +- README.tr.md | 2 +- README.uk.md | 2 +- README.zh-CN.md | 2 +- README.zh-TW.md | 2 +- 31 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index 7a1fa58e0..fa693906d 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -29,12 +29,12 @@ sources: tasks: - wlroots: | cd wlroots - meson --prefix=/usr build -Dexamples=false + meson setup --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install - setup: | cd sway - meson build --fatal-meson-warnings -Dauto_features=enabled -Dtray=disabled + meson setup build --fatal-meson-warnings -Dauto_features=enabled -Dtray=disabled - build: | cd sway ninja -C build @@ -52,5 +52,5 @@ tasks: mkdir subprojects ln -s ../../wlroots subprojects/wlroots rm -rf build - meson build --fatal-meson-warnings --default-library=static --force-fallback-for=wlroots + meson setup build --fatal-meson-warnings --default-library=static --force-fallback-for=wlroots ninja -C build diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index e249571ee..2c8ffcf45 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -26,12 +26,12 @@ sources: tasks: - wlroots: | cd wlroots - meson --prefix=/usr build -Dexamples=false + meson setup --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install - setup: | cd sway - meson build --fatal-meson-warnings -Dauto_features=enabled -Dsd-bus-provider=libsystemd + meson setup build --fatal-meson-warnings -Dauto_features=enabled -Dsd-bus-provider=libsystemd - build: | cd sway ninja -C build diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 977fe467e..a3df06e6d 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -39,7 +39,7 @@ tasks: cd subprojects ln -s ../../wlroots wlroots cd .. - meson build --fatal-meson-warnings -Dtray=enabled -Dsd-bus-provider=basu + meson setup build --fatal-meson-warnings -Dtray=enabled -Dsd-bus-provider=basu - build: | cd sway ninja -C build diff --git a/README.ar.md b/README.ar.md index 4f9bf828a..2f64f2b53 100644 --- a/README.ar.md +++ b/README.ar.md @@ -37,7 +37,7 @@ _\* Compile-time dep_ نفذ هذه الأوامر: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.az.md b/README.az.md index 3c5e0e413..50c8b0dec 100644 --- a/README.az.md +++ b/README.az.md @@ -38,7 +38,7 @@ _\* Kompilyasiya asılılıqları_ Bu əmrləri icra edin: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.cs.md b/README.cs.md index 6cdc04a69..0b4085e7f 100644 --- a/README.cs.md +++ b/README.cs.md @@ -39,7 +39,7 @@ _\* Závislost pouze pro kompilaci_ Spusťte tyto příkazy: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.de.md b/README.de.md index d20cb4c99..0c0b18637 100644 --- a/README.de.md +++ b/README.de.md @@ -31,7 +31,7 @@ _\*Werden nur für das Kompilieren benötigt_ Führe die folgenden Befehle aus: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.dk.md b/README.dk.md index 4ae029492..8e4cc3724 100644 --- a/README.dk.md +++ b/README.dk.md @@ -41,7 +41,7 @@ _\*Kompileringsafhængighed_ Kør følgende kommandoer: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.es.md b/README.es.md index 1f1657dfa..3ad8e29e3 100644 --- a/README.es.md +++ b/README.es.md @@ -40,7 +40,7 @@ _\*Compile-time dep_ Desde su consola, ejecute las órdenes: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.fr.md b/README.fr.md index 668bd4768..c4ef699a4 100644 --- a/README.fr.md +++ b/README.fr.md @@ -47,7 +47,7 @@ _\* Requis uniquement pour la compilation_ Exécutez ces commandes : - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.ge.md b/README.ge.md index bb8b9a34c..de75be837 100644 --- a/README.ge.md +++ b/README.ge.md @@ -35,7 +35,7 @@ _\* Compile-time dep_ გაუშვით ეს ბრძანებები: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.gr.md b/README.gr.md index d697f78e3..629465846 100644 --- a/README.gr.md +++ b/README.gr.md @@ -40,7 +40,7 @@ _\*Compile-time dep_ Τρέξτε αυτά τα commands: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.hi.md b/README.hi.md index eae5e90a5..eb792b790 100644 --- a/README.hi.md +++ b/README.hi.md @@ -44,7 +44,7 @@ _\* Compilation के समय आवश्यक_ ये commands चलाएं: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.hu.md b/README.hu.md index 2fcc36dd5..b66a24b23 100644 --- a/README.hu.md +++ b/README.hu.md @@ -40,7 +40,7 @@ _\*Fordításidejű függőség_ Futtasd ezeket a parancsokat: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.ir.md b/README.ir.md index a485a4059..f7d00e803 100644 --- a/README.ir.md +++ b/README.ir.md @@ -41,7 +41,7 @@ _\*نیازمندی‌های زمان کامپایل برنامه_ این فرمان‌ها را اجرا کنید: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.it.md b/README.it.md index 272f61a02..30cdc21e0 100644 --- a/README.it.md +++ b/README.it.md @@ -38,7 +38,7 @@ _\* Dipendenza necessaria per la compilazione_ Esegui questi comandi: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.ja.md b/README.ja.md index 3941fbc7d..d6a8202e3 100644 --- a/README.ja.md +++ b/README.ja.md @@ -42,7 +42,7 @@ _\*コンパイル時の依存_ 次のコマンドを実行してください: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.ko.md b/README.ko.md index 0d9c8c37e..c9f31beff 100644 --- a/README.ko.md +++ b/README.ko.md @@ -39,7 +39,7 @@ _\*컴파일 떄 필요_ 다음 명령을 실행하세요: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.md b/README.md index f8f4b8f8b..882db57ee 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ _\* Compile-time dep_ Run these commands: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.nl.md b/README.nl.md index bf1ea9750..f2f7bb497 100644 --- a/README.nl.md +++ b/README.nl.md @@ -40,7 +40,7 @@ _\* Compileerafhankelijkheden_ Voer deze opdrachten uit: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.no.md b/README.no.md index c37d3f9b4..77676062d 100644 --- a/README.no.md +++ b/README.no.md @@ -38,7 +38,7 @@ _\* Kompileringsavhengigheter_ Kjør følgende kommandoer: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.pl.md b/README.pl.md index f7802d786..0c12a2b86 100644 --- a/README.pl.md +++ b/README.pl.md @@ -40,7 +40,7 @@ _\*zależności kompilacji_ Wykonaj następujące polecenia: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.pt.md b/README.pt.md index c1611a31c..4660e0bed 100644 --- a/README.pt.md +++ b/README.pt.md @@ -42,7 +42,7 @@ _\*Dependência de tempo de compilação_ Execute esses comandos: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.ro.md b/README.ro.md index a3559a8bb..1f63b5955 100644 --- a/README.ro.md +++ b/README.ro.md @@ -38,7 +38,7 @@ Dependențe pentru instalare: Rulați aceste comenzi: ``` - meson build + meson setup build ninja -C build sudo ninja -C build install ``` diff --git a/README.ru.md b/README.ru.md index ff4e6560b..5eee59efa 100644 --- a/README.ru.md +++ b/README.ru.md @@ -41,7 +41,7 @@ _\*Зависимости для сборки_ Выполните эти команды: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.sr.md b/README.sr.md index 011b99831..bd573566a 100644 --- a/README.sr.md +++ b/README.sr.md @@ -38,7 +38,7 @@ _\* Потребно само за компајлирање_ Покрените следеће команде: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.sv.md b/README.sv.md index 49caf9285..bff9d4a85 100644 --- a/README.sv.md +++ b/README.sv.md @@ -35,7 +35,7 @@ _\* Krav för kompilering_ Kör dessa kommandon: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.tr.md b/README.tr.md index 40de14748..3769ee755 100644 --- a/README.tr.md +++ b/README.tr.md @@ -38,7 +38,7 @@ _\*Derleme-anı bağımlılıkları_ Şu komutları çalıştırın: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.uk.md b/README.uk.md index 33359cffc..01c43afee 100644 --- a/README.uk.md +++ b/README.uk.md @@ -51,7 +51,7 @@ _\*Лише для компіляції_ Виконайте ці команди: - meson build + meson setup build ninja -C build sudo ninja -C build install diff --git a/README.zh-CN.md b/README.zh-CN.md index a6f4518ae..b733c71ab 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -35,7 +35,7 @@ _\*编译时依赖_ 运行如下命令: - meson build/ + meson setup build/ ninja -C build/ sudo ninja -C build/ install diff --git a/README.zh-TW.md b/README.zh-TW.md index 2de2f63fc..7cf848ea3 100644 --- a/README.zh-TW.md +++ b/README.zh-TW.md @@ -40,7 +40,7 @@ _\*編譯時相依_ 執行這些指令: - meson build + meson setup build ninja -C build sudo ninja -C build install From ecfea6b8aebcc6a7f663e2f23144e146dbe726d3 Mon Sep 17 00:00:00 2001 From: Louis POIROT--HATTERMANN Date: Thu, 2 Oct 2025 15:54:24 +0200 Subject: [PATCH 6/7] commands/scratchpad: don't hide scratchpad if no pending workspace Fixes: https://github.com/swaywm/sway/issues/8909 --- sway/tree/root.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sway/tree/root.c b/sway/tree/root.c index 33c29d381..cf7170a48 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -214,9 +214,7 @@ void root_scratchpad_hide(struct sway_container *con) { struct sway_node *focus = seat_get_focus_inactive(seat, &root->node); struct sway_workspace *ws = con->pending.workspace; - if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL && !con->pending.workspace) { - // If the container was made fullscreen global while in the scratchpad, - // it should be shown until fullscreen has been disabled + if (!con->pending.workspace) { return; } From 90d3270970cc963454455b572883a051d3f376a1 Mon Sep 17 00:00:00 2001 From: llyyr Date: Mon, 29 Sep 2025 16:27:30 +0530 Subject: [PATCH 7/7] sway/input/cursor: send frame event when simulating pointer from tablet --- sway/input/cursor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sway/input/cursor.c b/sway/input/cursor.c index aeab558cb..df62ef41b 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -578,6 +578,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor, } else { wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool); pointer_motion(cursor, time_msec, input_device->wlr_device, dx, dy, dx, dy); + wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat); } }