add spirv-headers to ci

bump whisper-rs
wvr_server: process matching tweaks
2026-10-28 18:08:40 +01:00 · 2026-10-28 06:00:02 +09:00 · 2026-10-28 05:53:43 +09:00 · 2026-10-28 05:26:14 +09:00 · 2026-10-27 12:13:34 +09:00 · 2026-10-24 23:31:49 +02:00
42 changed files with 1320 additions and 482 deletions
@@ -22,7 +22,7 @@ sudo apt-get update
 sudo apt-get install -y fuse cmake pkg-config fontconfig libasound2-dev libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev \
  libopenxr-dev libfontconfig-dev libdbus-1-dev libpipewire-0.3-0 libpipewire-0.3-dev libspa-0.2-dev libx11-6 libxext6 libxrandr2 \
  libx11-dev libxext-dev libxrandr-dev libopenvr-dev libopenvr-api1t64 libwayland-dev libegl-dev libxcb-glx0 libxcb-glx0-dev \
-  dav1d libdav1d-dev libvulkan-dev glslc vulkan-tools libudev-dev libudev1 libinput-dev libinput10
+  dav1d libdav1d-dev libvulkan-dev glslc vulkan-tools libudev-dev libudev1 libinput-dev libinput10 spirv-headers

 rustup update

@@ -0,0 +1,46 @@
+# Contributing
+
+Contributions are warmly welcome. Before you start, please read the entire document carefully.
+
+## AI Policy
+
+Do not use LLMs to generate substantial pieces of code. You need to fully understand every line of code you change. No exceptions.
+
+Commits, issues and pull requests must be made by humans. Co-authoring by AI is not allowed.
+Looking to create an issue on the project, such as a feature request or bug report? Focus on writing what you know for sure in simple terms. We'll figure it out from there.
+
+Usage of Gen-AI for visuals and audio is prohibited.
+
+The only exception is LLM-translated strings generated by the scripts/translator tool.
+
+## Basics
+
+Before committing, make sure to format your Rust code by running:
+
+```
+cargo fmt
+```
+
+You should also check for any compiler warnings too:
+
+```
+cargo check
+```
+
+or even better:
+
+```
+cargo clippy
+```
+
+## Large contributions
+
+If you want to submit a relatively big pull requests, it's highly advisable to create a separate issue request for it. That way we can discuss the approach and sort out the details first.
+
+## Adding translations
+
+Look at `scripts/translator/run.sh` for more information.
+
+## Licensing
+
+WayVR is developed and published under [GPL-3 License](https://www.gnu.org/licenses/gpl-3.0.en.html).
@@ -689,6 +689,12 @@ dependencies = [
 "wyz",
 ]

+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -729,6 +735,17 @@ dependencies = [
 "piper",
 ]

+[[package]]
+name = "bstr"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f"
+dependencies = [
+ "memchr",
+ "regex-automata",
+ "serde_core",
+]
+
 [[package]]
 name = "built"
 version = "0.8.1"
@@ -1401,6 +1418,7 @@ dependencies = [
 "rust-embed",
 "serde",
 "serde_json",
+ "shell-words",
 "smol",
 "strum",
 "ureq",
@@ -1921,6 +1939,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"

+[[package]]
+name = "freedesktop-desktop-entry"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a69ad6111a2b572cb41e0f3542d546386e841013cee7c45d705b61a15a87dd"
+dependencies = [
+ "bstr",
+ "gettext-rs",
+ "log",
+ "memchr",
+ "thiserror 2.0.18",
+ "unicase",
+ "xdg 3.0.0",
+]
+
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -2100,6 +2133,26 @@ dependencies = [
 "rand_core 0.10.1",
 ]

+[[package]]
+name = "gettext-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df5e3fa8c077b15fdfa8ce130e2bc73d663b8aaa6d51b71421b8659980b1d80"
+dependencies = [
+ "gettext-sys",
+ "locale_config",
+]
+
+[[package]]
+name = "gettext-sys"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4caa7e4460b196107cc1bb2629488e8b6dbb7f34f6683ea6753c4ac22f590785"
+dependencies = [
+ "cc",
+ "temp-dir",
+]
+
 [[package]]
 name = "gif"
 version = "0.14.2"
@@ -2869,6 +2922,19 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"

+[[package]]
+name = "locale_config"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
+dependencies = [
+ "lazy_static",
+ "objc",
+ "objc-foundation",
+ "regex",
+ "winapi",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.14"
@@ -2930,6 +2996,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "matchers"
 version = "0.2.0"
@@ -3221,6 +3296,26 @@ dependencies = [
 "syn 2.0.118",
 ]

+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -3528,6 +3623,15 @@ dependencies = [
 "objc2-foundation 0.2.2",
 ]

+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
 [[package]]
 name = "object"
 version = "0.37.3"
@@ -4669,8 +4773,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rxscreen"
 version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbab13f83503a8272b7150d487494992cf6c59c299dcaf5d8ffac75bad9fc96"
+source = "git+https://github.com/galister/rxscreen.git?rev=7197e1de6622b65859e6f2060b5750185e0dad2a#7197e1de6622b65859e6f2060b5750185e0dad2a"
 dependencies = [
 "libc",
 ]
@@ -5343,6 +5446,12 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"

+[[package]]
+name = "temp-dir"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
+
 [[package]]
 name = "tempfile"
 version = "3.27.0"
@@ -5693,6 +5802,12 @@ dependencies = [
 "wlx-common",
 ]

+[[package]]
+name = "unicase"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
@@ -6259,8 +6374,7 @@ dependencies = [
 [[package]]
 name = "whisper-rs"
 version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2088172d00f936c348d6a72f488dc2660ab3f507263a195df308a3c2383229f6"
+source = "git+https://github.com/wayvr-org/whisper-rs.git?rev=2d908ec36cd41521a28f7f5fb5dc95499fd40051#2d908ec36cd41521a28f7f5fb5dc95499fd40051"
 dependencies = [
 "libc",
 "whisper-rs-sys",
@@ -6269,8 +6383,7 @@ dependencies = [
 [[package]]
 name = "whisper-rs-sys"
 version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6986c0fe081241d391f09b9a071fbcbb59720c3563628c3c829057cf69f2a56f"
+source = "git+https://github.com/wayvr-org/whisper-rs.git?rev=2d908ec36cd41521a28f7f5fb5dc95499fd40051#2d908ec36cd41521a28f7f5fb5dc95499fd40051"
 dependencies = [
 "bindgen",
 "cfg-if",
@@ -6739,6 +6852,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "chrono",
+ "freedesktop-desktop-entry",
 "glam",
 "glob",
 "identicons-svg",
@@ -6746,7 +6860,6 @@ dependencies = [
 "idmap-derive",
 "log",
 "rodio",
- "rust-ini",
 "serde",
 "serde_json",
 "serde_json5",
@@ -32,6 +32,7 @@ rust-embed = "8.9.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.145"
 serde_json5 = "0.2.1"
+shell-words = "1.1.1"
 slotmap = "1.1.1"
 smallvec = "1.15.2"
 smol = "2.0.2"
@@ -44,7 +45,6 @@ wayland-protocols-misc = { version = "0.3.12" }
 winit = "0.30.12"
 xdg = "3.0.0"

-
 [profile.dev]
 opt-level = 1
 debug = true
@@ -19,6 +19,7 @@ log.workspace = true
 rust-embed.workspace = true
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
+shell-words.workspace = true
 smol = { workspace = true }
 strum.workspace = true
 uuid.workspace = true
@@ -0,0 +1,384 @@
+{
+	"DEFINITIONS": {
+		"ANCHORED": "Förankrad",
+		"FLOATING": "Flytande",
+		"STATIC": "Stationär",
+		"SET": "Set",
+		"WATCH": "Klocka",
+		"DASHBOARD": "Kontrollpanel",
+		"EDIT_MODE": "Redigeringsläge",
+		"SETTINGS": "Inställningar",
+		"KEYBOARD": "Tangentbord",
+		"TASKBAR": "Uppgiftsfält",
+		"FEATURES": "Funktioner",
+		"OVERLAY": "Overlay",
+		"SKYMAP": "Skymap",
+		"PLAYSPACE": "Playspace",
+		"D_PAD": "D-pad"
+	},
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "Centrera om playspace"
+	},
+	"APP_LAUNCHER": {
+		"ASPECT": {
+			"SEMI_TALL": "Halvhög",
+			"SEMI_WIDE": "Halvbredd",
+			"SQUARE": "Kvadratisk",
+			"TALL": "Hög",
+			"WIDE": "Bredbild"
+		},
+		"ASPECT_TITLE": "Bildförhållande",
+		"AUTOSTART": "Kör automatiskt vid start",
+		"LAUNCH": "Starta",
+		"MODE": {
+			"CAGE": "Kompatibilitetsläge (Cage)",
+			"NATIVE": "Nativt läge"
+		},
+		"RES_TITLE": "Upplösning"
+	},
+	"APP_SETTINGS": {
+		"ALLOW_SLIDING": "Stick-interaktion vid grepp",
+		"ANIMATION_SPEED": "Hastighet för UI-animationer",
+		"AUTOSTART_APPS": "Appar som ska köras vid start",
+		"BLOCK_GAME_INPUT": "Blockera spelindata",
+		"BLOCK_GAME_INPUT_HELP": "Blockerar all input när en overlay hovras över",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignorera klockan vid blockering av input",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Blockera inte inmatning när klockan är markerad",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "Blockera poser vid interaktion med tangentbord",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Blockerar spelets mottagning av poser när tangentbordet hovras över och 'Blockera spel-input' är aktiverat",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "Klick",
+				"FORCE": "Tryckkraft",
+				"TOUCH": "Beröring",
+				"VALUE": "Värde",
+				"PROXIMITY": "Närhet",
+				"X_AXIS": "X-axel",
+				"Y_AXIS": "Y-axel"
+			},
+			"TYPE": {
+				"BUMPER": "Bumper",
+				"DPAD_UP": "D-pad upp",
+				"DPAD_DOWN": "D-pad ned",
+				"DPAD_LEFT": "D-pad vänster",
+				"DPAD_RIGHT": "D-pad höger",
+				"JOYSTICK": "Joystick",
+				"MENU": "Meny",
+				"SHOULDER": "Axel",
+				"SQUEEZE": "Grepp",
+				"SYSTEM": "System",
+				"THUMBREST": "Tumstöd",
+				"THUMBSTICK": "Thumbstick",
+				"TRACKPAD": "Trackpad",
+				"TRIGGER": "Trigger",
+				"VIEW": "Visa"
+			},
+			"CLICK": {
+				"ANY": "Vilken som helst",
+				"DOUBLE": "Dubbelklicka",
+				"TRIPLE": "Trippelklick",
+				"TYPE": "Antal tryck"
+			},
+			"ACTION": {
+				"CLICK": "Klicka*",
+				"GRAB": "Greppa*",
+				"ALT_CLICK": "Anpassat shell-kommando (ställ in alt_click i config)",
+				"SHOW_HIDE": "Visa, dölj, centrera om*",
+				"TOGGLE_DASHBOARD": "Växla instrumentpanel",
+				"SPACE_DRAG": "Dra playspace",
+				"SPACE_ROTATE": "Rotera playspace",
+				"SPACE_RESET": "Återställ Playspace",
+				"CLICK_MODIFIER_RIGHT": "Högerklick-modifierare",
+				"CLICK_MODIFIER_MIDDLE": "Modifierare för mittklick",
+				"MOVE_MOUSE": "Flytta mus (om avstängd som standard)",
+				"SCROLL": "Scrolla*"
+			},
+			"LEFT": "Vänster",
+			"RIGHT": "Höger",
+			"CHORD": "Kombination",
+			"CHORD_ADD_INPUT": "Lägg till inmatning för kombination",
+			"CHORD_INPUT_HAND": "Inmatningshand",
+			"COMPONENT": "Aktiveringstyp",
+			"SUBPATH": "Aktiverande kontroll",
+			"THRESHOLD": "Aktivera vid övre värdet\nAvaktivera vid nedre värdet"
+		},
+		"BROWSE_ONLINE_CATALOG": "Bläddra i onlinekatalogen...",
+		"BROWSE_SKYMAPS": "Bläddra bland skymaps",
+		"CAPTURE_METHOD": "Metod för skärmavbildning",
+		"CAPTURE_METHOD_HELP": "Prova att ändra detta om du\nupplever svarta eller glitchiga skärmar",
+		"COLOR_KEYING": "Färgnyckelning",
+		"COLOR_PALETTE": "Färgpalett",
+		"COLOR_PALETTE_HELP": "Klicka för att bläddra bland färgpaletter.\nSe webbplatsen för att skapa egna!",
+		"COLOR_PALETTES": "Färgpaletter",
+		"COLOR_PALETTE_CURRENT": "Nuvarande aktivt tema.",
+		"COLOR_PALETTE_CUSTOM_URL": "Lägg till ett eget anpassat tema!",
+		"COLOR_PALETTE_CUSTOM_URL2": "Klicka för att öppna webbmanualen.",
+		"COLOR_PALETTE_ACTIVATE": "Klicka för att använda detta tema.",
+		"CLEAR_PIPEWIRE_TOKENS": "Rensa PipeWire-tokens",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "Fråga om skärmval vid nästa start",
+		"CLEAR_SAVED_STATE": "Återställ sparade inställningar",
+		"CLEAR_SAVED_STATE_HELP": "Återställ sets och overlay-positioner",
+		"CLICK_FREEZE_TIME_MS": "Klickfrysningstid (ms)",
+		"CLICK_FREEZE_TIME_MS_HELP": "Hjälper till med precision vid dubbelklick",
+		"CLOCK_12H": "12-timmarsklocka",
+		"CONTROLS": "Kontroller",
+		"DELETE_ALL_CONFIGS": "Rensa konfiguration",
+		"DELETE_ALL_CONFIGS_HELP": "Ta bort alla konfigurationsfiler från conf.d",
+		"DOUBLE_CURSOR_FIX": "Fix för dubbla markörer",
+		"DOUBLE_CURSOR_FIX_HELP": "Aktivera om du ser två markörer",
+		"DEFAULT_OVERLAY_SCALE": "Standardstorlek för overlay",
+		"DEFAULT_OVERLAY_SCALE_HELP": "Skapa nya overlays i den här skalan.",
+		"DEFAULT_CURVATURE": "Standardkurvatur för overlay",
+		"DEFAULT_OPACITY": "Standardopacitet för overlay",
+		"DEFAULT_POSITIONING": "Standardposition för overlay",
+		"OVERLAY_DEFAULTS_HELP": "Gäller endast nya overlays",
+		"ENABLED": "Aktiverad",
+		"FEATURES": "Funktioner",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "Musrörelse vid trigger-tryck",
+		"HANDSFREE_POINTER": "Handsfree-läge",
+		"HANDSFREE_POINTER_HELP": "Inmatning som används när rörelsekontroller saknas.\nVänster nyp är greppa, höger är klicka.",
+		"HANDSFREE_ALT_TAB": "Sikte för app-växlare",
+		"HANDSFREE_ALT_TAB_HELP": "Håll in Super+X, sikta på önskat fönster och släpp sedan för att byta fokus.",
+		"DIAGNOSTICS": {
+			"CPU_ACCESSIBLE_VRAM": "CPU-tillgängligt VRAM: {NUM} MiB",
+			"TITLE": "Diagnostik",
+			"ENABLE_REBAR": "Aktivera [resizable bar] i BIOS-inställningarna för optimal VR-prestanda"
+		},
+		"DIAGNOSTICS_REASON": {
+			"PACTL": "Krävs för kontroll av högtalare/mikrofon och byte av ljudkort",
+			"CAGE": "Rekommenderas vid inkompatibilitet med vissa X11-applikationer (kompatibilitetsläge)",
+			"XWAYLAND_SATELLITE": "Rekommenderas om du vill köra X11 (Xwayland)-applikationer i nativt läge",
+			"XDG_OPEN": "Krävs för att öppna URL:er eller Steam-spel"
+		},
+		"HIDE_GRAB_HELP": "Dölj grepphjälp",
+		"HIDE_USERNAME": "Dölj användarnamn",
+		"INPUT_EMULATION_METHOD": "Metod för inmatningssimulering",
+		"INPUT_EMULATION_METHOD_HELP": "Prova att ändra detta om mus- eller\ntangentbordindata inte registreras.",
+		"INPUT_CAPTURE_METHOD": "Metod för inmatningsfångst",
+		"INPUT_CAPTURE_METHOD_HELP": "Möjliggör användning av fysisk kringutrustning i WayVR.\n Super+Z: Växla input mellan WayVR och skrivbordet\n Super+X: Växla mellan WayVR-appar",
+		"INPUT_PROFILES": "Ändra styrinställningar",
+		"INPUT_PROFILES_HELP": "OpenXR-kontrollbindningar",
+		"INVERT_SCROLL_DIRECTION_X": "Invertera horisontell scrollriktning",
+		"INVERT_SCROLL_DIRECTION_Y": "Invertera vertikal rullningsriktning",
+		"LENS_SEPARATION_MM": "Linsavstånd (mm)",
+		"KEYBOARD_MIDDLE_CLICK": "Tangentbordets mittklick",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "Modifier som används vid skrivning\nmed lila laser",
+		"KEYBOARD_SOUND_ENABLED": "Tangentbordsljud",
+		"LANGUAGE": "Språk",
+		"LEFT_HANDED_MOUSE": "Vänstermus",
+		"LEFT_HANDED_MOUSE_HELP": "Används om musknapparna är ombytta",
+		"LONG_PRESS_DURATION": "Långtryckstid",
+		"LOOK_AND_FEEL": "Utseende och känsla",
+		"MISC": "Övrigt",
+		"MIDDLE_GRABS_SINGLE": "Modifierare för mittklick greppar enskilda objekt",
+		"MIDDLE_GRABS_SINGLE_HELP": "Att greppa med modifieraren för mittklick (lila laser)\ngreppar enskilda overlays istället för hela setet",
+		"NOTIFICATIONS_ENABLED": "Aktivera aviseringar",
+		"NOTIFICATIONS_SOUND_ENABLED": "Ljud för aviseringar",
+		"NOT_SUPPORTED": "Ej stöds",
+		"NO_SKYMAPS_FOUND": "Inga skymaps hittades",
+		"OPAQUE_BACKGROUND": "Opak bakgrund",
+		"OPTION": {
+			"ANCHORED_HELP": "Följer centermarkören. Rekommenderas.",
+			"FLOATING_HELP": "Flyttas oberoende, centreras om.\nLätt att tappa bort; rekommenderas ej.",
+			"STATIC_HELP": "Håller sig på plats i förhållande till världen.",
+			"AUTO": "Automatisk",
+			"AUTO_HELP": "ScreenCopy GPU om det stöds,\nannars PipeWire GPU.",
+			"EYE_ONLY": "Ögonlaser",
+			"EYE_PINCH": "Öga + pinch",
+			"HMD_ONLY": "HMD-laser",
+			"HMD_PINCH": "HMD + pinch",
+			"NONE": "Ingen",
+			"NONE_INPUT_HELP": "Emulera inte mus och tangentbord.\nInteraktion med skärmar blir inte möjlig.",
+			"NONE_INPUT_CAPTURE_HELP": "Fånga inte mus och tangentbord.\nDu kommer inte att kunna använda fysisk mus\neller tangentbord i appar som startas i WayVR.",
+			"PIPEWIRE_HELP": "Snabb GPU-avbildning,\nstandard för alla skrivbord.",
+			"PW_FALLBACK_HELP": "Långsam metod med hög CPU-belastning.\nProva om PipeWire GPU inte fungerar",
+			"SCREENCOPY_GPU_HELP": "Snabb, inga popup-fönster för skärmdelning.\nFungerar på: Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "Långsam, inga popup-fönster för skärmdelning.\nFungerar på: Hyprland, Niri, River, Sway",
+			"UINPUT": "Enhetsemulering",
+			"UINPUT_HELP": "Använder modulen uinput för att emulera en enhet.\nFungerar generellt bra på de flesta skrivbord.",
+			"EVDEV_HELP": "Ta kontroll över inmatningsenheter för exklusiv användning.\nAnvändaren måste tillhöra gruppen 'input'.",
+			"WL_VIRTUAL": "Wayland virtuell inmatning",
+			"WL_VIRTUAL_HELP": "Skickar händelser till Wayland-kompositorn via\nzwlr_virtual_pointer och zwp_virtual_keyboard.\nFungerar endast på vissa skrivbord.\nFungerar INTE på KDE, GNOME eller COSMIC."
+		},
+		"POINTER_ACCELERATION": "Musacceleration",
+		"POINTER_ACCELERATION_HELP": "På: Adaptiv musacceleration\nAv: Konstant hastighet",
+		"POINTER_LERP_FACTOR": "Utjämning av pekare",
+		"POINTER_SPEED": "Mushastighet",
+		"REQUIRES_RESTART": "Kräver omstart",
+		"RESET_PLAYSPACE": "Återställ playspace",
+		"RESET_PLAYSPACE_HELP": "Nollställ offset för playspace.",
+		"SAVE_PLAYSPACE_CENTER": "Spara playspace-center",
+		"SAVE_PLAYSPACE_CENTER_HELP": "Använd nuvarande playspace för bindningen \"återställ playspace\".",
+		"RESET_PLAYSPACE_CENTER": "Återställ playspace-center",
+		"RESET_PLAYSPACE_CENTER_HELP": "Rensa tidigare inställd mittpunkt för playspace.",
+		"RESTART_WAYVR": "Starta om WayVR",
+		"CLOSE_WAYVR": "Stäng WayVR",
+		"ROUND_MULTIPLIER": "UI-kanternas rundning",
+		"SCREEN_RENDER_DOWN": "Rendera skärm i lägre upplösning",
+		"SCREEN_RENDER_DOWN_HELP": "Hjälper mot aliasing på skärmar med hög upplösning",
+		"SCROLL_SPEED": "Scrollningshastighet",
+		"SELECT_VARIANT": "Välj variant",
+		"SNAP_ANGLE_DEG": "Snapvinkel för fönster (pitch & roll)",
+		"SNAP_ANGLE_DEG_HELP": "Greppade fönster snäpps till denna vinkel på pitch- och rollaxeln.",
+		"ENABLE_WATCH": "Aktivera klockan",
+		"SETS_ON_WATCH": "Set på klockan",
+		"SKYBOX": "Skymap",
+		"SKYMAP_ALREADY_DOWNLOADED": "Denna skymap är redan nedladdad. Välj åtgärd.",
+		"SPACE_DRAG": "Playspace",
+		"SPACE_DRAG_MULTIPLIER": "Multiplikator för space-drag",
+		"SPACE_DRAG_AFFECTS_WORLD": "Lämna overlays kvar vid flytt av playspace",
+		"SPACE_DRAG_UNLOCKED": "Tillåt space-drag på alla axlar",
+		"SPACE_GRAVITY_DAMPING": "Dämpning",
+		"SPACE_GRAVITY_DAMPING_HELP": "Artificiell dämpning för att sakta ner rörelser. 0,1 – hög dämpning, 1,0 – ingen dämpning",
+		"SPACE_GRAVITY_FLING_STRENGTH": "Kaststyrka",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Intensitetsmultiplikator för gravitationskraften efter space-drag.\n0.0 - ingen rörelse alls, 2.0 - dubbel intensitet",
+		"SPACE_GRAVITY_GRAVITY": "Gravitation",
+		"SPACE_GRAVITY_GRAVITY_HELP": "Mängd nedåtgående kraft. 0.0 - ingen gravitation",
+		"SPACE_GRAVITY_GROUND_FRICTION": "Markfriktion",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "Mängden friktion som saktar ner dig när du rör vid marken.\n0.0 - ingen friktion (som på is), 1.0 - sträv yta",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "Golvhöjd",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "Y-positionen för golvet. Gravitationen upphör när denna höjd nås.",
+		"SPACE_ROTATE_UNLOCKED": "Tillåt rotation av playspace på alla axlar",
+		"ROTATIONS": "HMD-rotationer",
+		"SESSION_TIME": "Sessionstid",
+		"STATISTICS": "Statistik",
+		"TROUBLESHOOTING": "Felsökning",
+		"UI_GRADIENT_INTENSITY": "Intensitet för UI-gradient",
+		"UPRIGHT_SCREEN_FIX": "Fix för upprätt skärm",
+		"UPRIGHT_SCREEN_FIX_HELP": "Fixar upprätt ställda skärmar på vissa skrivbord",
+		"USE_PASSTHROUGH": "Aktivera passthrough",
+		"USE_PASSTHROUGH_HELP": "Tillåt passthrough om XR-runtime stöder det",
+		"USE_SKYBOX": "Visa skymap",
+		"USE_SKYBOX_HELP": "Visa en skymap om ingen scenapp eller passthrough används",
+		"WATCH_VIEW_ANGLE": "Klockans synvinklar",
+		"WATCH_VIEW_ANGLE_HELP": "Styr hur klockan tonas ut",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "Den valda modellen måste laddas ner.\nVill du ladda ner den nu?",
+			"REMOVE_UNUSED_MODELS": "Du stänger av tal-till-text-funktionen.\nVill du ta bort nedladdade Whisper-modeller för att frigöra utrymme?"
+		},
+		"WHISPER_MODEL": "Tal-till-text-modell",
+		"WHISPER_MODEL_HELP": "Whisper-modell som ska användas.\nStörre modeller ger mer precisa\nresultat, men förbrukar mer VRAM.",
+		"SPEECH_TO_TEXT": "Tal till text",
+		"WHISPER_GPU_SELECT": "Välj GPU",
+		"TUTORIAL": "Handbok",
+		"GRID_OPACITY": "Golvgridens opacitet",
+		"GRID_OPACITY_HELP": "Opacitet för golvgridet när skymap är aktiverat",
+		"XWAYLAND_BY_DEFAULT": "Kör appar i kompatibilitetsläge som standard",
+		"SAVE": "Spara",
+		"CANCEL": "Avbryt"
+	},
+	"APPLICATION_LAUNCHER": "App-startare",
+	"APPLICATION_STARTED": "Applikationen startades",
+	"APPLICATIONS": "Applikationer",
+	"AUDIO": {
+		"SWITCH_TO_THIS_DEVICE": "Byt till den här enheten",
+		"AUTO_SWITCH_TO_VR_AUDIO": "Byt automatiskt till VR-ljud",
+		"CARDS": "Kort",
+		"FAILED_TO_SWITCH_MICROPHONE": "Kunde inte byta mikrofon",
+		"MICROPHONE_SET_SUCCESSFULLY": "Mikrofonen har ändrats",
+		"MICROPHONES": "Mikrofoner",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "Ingen VR-mikrofon hittades. Byt manuellt.",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Inga VR-högtalare hittades. Byt manuellt.",
+		"SELECT_AUDIO_CARD_PROFILE": "Välj ljudkortsprofil",
+		"SETTINGS": "Ljudinställningar",
+		"SPEAKERS": "Högtalare",
+		"SPEAKERS_SET_SUCCESSFULLY": "Högtalarna har ändrats",
+		"VOLUME": "Volym"
+	},
+	"CLOSE_WINDOW": "Stäng fönster",
+	"CREATION_DATE": "Skapad datum",
+	"DEBUG_INFO": "Debuginfo",
+	"DISPLAY_BRIGHTNESS": "Skärmljusstyrka",
+	"DONATE": {
+		"SUPPORT_US": "Stöd oss",
+		"DESCRIPTION": "Vi är ett litet team på två utvecklare som bygger WayVR på vår fritid. Om du gillar att använda programvaran, överväg att stötta oss – varje donation hjälper oss att fortsätta.",
+		"THANK_YOU_WAYVR": "Tack från WayVR-teamet!",
+		"BUTTON_TOOLTIP": "Donera via Open Collective",
+		"CURRENT_SUPPORTERS": "Nuvarande supportrar",
+		"BROUGHT_TO_YOU_VARIANTS_OFTEN": "Stöds av {USER}|Särskilt tack till {USER}|Sponsras av {USER}|Backas av {USER}|Drivs av community-medlemmar som {USER}|Möjliggjorts av {USER}|Upprätthålls av {USER}|Bidrag från {USER}|Finansierat av {USER}",
+		"BROUGHT_TO_YOU_VARIANTS_RARE": "Kaffe sponsrat av {USER}|Drivs av {USER}|Hälsningar till {USER}!|Håller oss igång: {USER}|Hjälper oss att växa: {USER}|Håller servrarna igång: {USER}|Med tacksamhet till {USER}|Drivs av {USER}|Stöds av vänner som {USER}",
+		"BROUGHT_TO_YOU_VARIANTS_VERY_RARE": "Stöttas av legender som {USER}|Koffein sponsrat av {USER}|En sann legend: {USER}|Dagens hjälte: {USER}|En total superstjärna: {USER}|Betalar elräkningen: {USER}|Räddaren av vårt förstånd: {USER}|Visar vägen: {USER}|Koffein-till-kod-omvandlare tillhandahållen av {USER}|Håller produktionen stabil: {USER}|Den ende och ende: {USER}|Skickar dmabuf-buffertar: {USER}"
+	},
+	"DOWNLOAD": "Ladda ner",
+	"DOWNLOADER": "Nedladdare",
+	"WELCOME": {
+		"ALL_SET": "Nu är du redo!",
+		"BASICS": "Dessa grunder gör att du enkelt kan börja använda WayVR.",
+		"CENTER_MARKER": "Centreringsmarkören visas framför dig vid omcentrering. Placera overlays runt den!",
+		"DOUBLE_PRESS_TO_TOGGLE": "Dubbeltryck B (på Index) eller Y (på Meta) för att visa, centrera om eller dölja ditt set. Prova nu.",
+		"FEATURES_DOCUMENTATION": "Det finns många andra funktioner värda att anpassa. För mer information, se dokumentationen på",
+		"FINISH_TUTORIAL": "Avsluta handledningen",
+		"GRAB_BOTH_HANDS": "Greppa med båda händerna om du vill flytta ett specifikt overlay i ditt set.",
+		"GRAB_ONE_HAND": "Greppa med en hand för att flytta ditt set.",
+		"GREETING": "Hej!",
+		"GUIDE_INTRO": "Låt oss guida dig genom dina första steg.",
+		"LASER_COLORS": "Laserfärger",
+		"LASER_FUNCTIONALITY": "Mycket av funktionaliteten i WayVR beror på vilken laserfärg som används för att interagera med ett UI-element. Du behöver inte trycka på knapparna, det räcker att röra vid dem!",
+		"LAST_PAGE_INFO": "Denna handledning slutar visas när du når den sista sidan.",
+		"LOOK_AT_LEFT_WRIST": "Titta på din vänstra handled. Det är din klocka.",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "Mittenklick-läge: Lila laser",
+		"MOVING_YOUR_SET": "Flytta ditt set",
+		"NEXT_BUTTON": "Tryck på nästa-knappen nedan för att komma igång.",
+		"REGULAR_MODE_BLUE_LASER": "Vanligt läge: Blå laser",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "Flytta det här fönstret med kontrollens grip-funktion.",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "Högerklicksläge: Orange laser",
+		"THANKS_FOR_INSTALLING": "Tack för att du installerade WayVR!",
+		"WATCH": "Klocka",
+		"WORKING_SET": "Aktivt Set"
+	},
+	"DOWNLOAD_AGAIN": "Ladda ner igen",
+	"DOWNLOADING_FILE": "Laddar ner fil...",
+	"FAILED_TO_LAUNCH_APPLICATION": "Kunde inte starta applikationen:",
+	"GAME_LAUNCHED": "Spelet har startats",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "Inga spel hittades",
+		"RUNNING_GAMES_LIST": "Lista över körande spel"
+	},
+	"GAMES": "Spel",
+	"GENERAL_SETTINGS": "Allmänna inställningar",
+	"GETTING_STARTED": "Kom igång",
+	"HEIGHT": "Höjd",
+	"HELLO": "Hej!",
+	"HELLO_USER": "Hej, {USER}!",
+	"HIDE": "Dölj",
+	"HOME_SCREEN": "Hem",
+	"MODIFICATION_DATE": "Ändringsdatum",
+	"MONADO_RUNTIME": "Monado runtime",
+	"LOADING": "Laddar...",
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "Upplösning"
+	},
+	"POWER_OPTIONS": {
+		"TITLE": "Strömalternativ",
+		"SHUTDOWN": "Stäng av",
+		"SUSPEND": "Viloläge",
+		"NOT_SUPPORTED": "Strömalternativ kräver systemd eller elogind.",
+		"SHUTDOWN_ARE_YOU_SURE": "Är du säker på att du vill stänga av datorn?",
+		"SUSPEND_ARE_YOU_SURE": "Är du säker på att du vill försätta datorn i viloläge?"
+	},
+	"PROCESS": {
+		"FORCE_KILL": "Tvinga avslut",
+		"STOP": "Stoppa"
+	},
+	"PROCESS_LIST": "Processlista",
+	"REFRESH": "Uppdatera",
+	"REMOVE": "Ta bort",
+	"APPLY": "Verkställ",
+	"RELOAD_FROM_DISK": "Ladda om från disk",
+	"SETTINGS": "Inställningar",
+	"SHOW": "Visa",
+	"TARGET_PATH": "Mål sökväg",
+	"TERMINATE_PROCESS": "Avsluta process",
+	"VERSION": "Version",
+	"WIDTH": "Bredd",
+	"PINNED_APPS": "Fästa applikationer",
+	"SAVED_TO_FAVOURITES": "Sparad i fästa applikationer",
+	"ADD_TO_FAVOURITES": "Lägg till i fästa applikationer",
+	"ADD_TO_FAVOURITES_HINT": "Spara förinställning och fäst den i app-menyn",
+	"REMOVE_FROM_FAVOURITES": "Ta bort från fästa applikationer",
+	"EMPTY": "Tomt",
+	"INSTALLED": "Installerad",
+	"NOT_INSTALLED": "Ej installerad",
+	"YES": "Ja",
+	"NO": "Nej"
+}
@@ -61,7 +61,7 @@ impl<T> Tab<T> for TabApps<T> {
 	}
 }

-fn find_entry_from_app_name<'a>(app_id: &str, entries: &'a [DesktopEntry]) -> Option<&'a DesktopEntry> {
+fn find_entry_from_app_name<'a>(app_id: &str, entries: &'a [Rc<DesktopEntry>]) -> Option<&'a Rc<DesktopEntry>> {
 	entries.iter().find(|&entry| *entry.app_id == *app_id)
 }

@@ -72,7 +72,7 @@ impl<T> TabApps<T> {

 		let mut stale_entries = Vec::<Rc<str>>::new();

-		let mut pinned_desktop_entries = Vec::<(PinnedApp, &DesktopEntry)>::new();
+		let mut pinned_desktop_entries = Vec::<(PinnedApp, Rc<DesktopEntry>)>::new();

 		// collect pinned desktop entries
 		{
@@ -83,7 +83,7 @@ impl<T> TabApps<T> {
 					continue;
 				};

-				pinned_desktop_entries.push((pinned_app.clone(), desktop_entry));
+				pinned_desktop_entries.push((pinned_app.clone(), desktop_entry.clone()));
 			}
 			// cleanup:
 			// remove non-existent app ids from pinned apps
@@ -119,7 +119,7 @@ impl<T> TabApps<T> {
 				&mut state.parser_state,
 				&doc_params(frontend.globals.clone()),
 				self.pinned_apps_parent,
-				desktop_entry,
+				desktop_entry.as_ref(),
 				Some(tooltip_string),
 			)?;

@@ -139,8 +139,8 @@ impl<T> TabApps<T> {

 struct AppList {
 	//data: Vec<ParserData>,
-	all_entries: Vec<DesktopEntry>,
-	entries_to_mount: VecDeque<DesktopEntry>,
+	all_entries: Vec<Rc<DesktopEntry>>,
+	entries_to_mount: VecDeque<Rc<DesktopEntry>>,
 	list_parent: WidgetPair,
 	prev_category_name: String,
 }
@@ -150,7 +150,7 @@ fn on_app_click(
 	frontend_tasks: FrontendTasks,
 	tasks: Tasks<Task>,
 	globals: WguiGlobals,
-	entry: DesktopEntry,
+	entry: Rc<DesktopEntry>,
 	state: Rc<RefCell<State>>,
 	pinned_app: Option<PinnedApp>,
 ) -> ButtonClickCallback {
@@ -307,14 +307,17 @@ fn get_category_name_score(name: &str) -> u8 {
 	Scores::Unknown as u8
 }

-fn get_best_category_name(categories: &[Rc<str>]) -> Option<&Rc<str>> {
+fn get_best_category_name<S>(categories: &[S]) -> Option<&str>
+where
+	S: AsRef<str>,
+{
 	let mut best_score: u8 = 0;
-	let mut best_category: Option<&Rc<str>> = None;
+	let mut best_category: Option<&str> = None;

 	for cat in categories {
-		let score = get_category_name_score(cat);
+		let score = get_category_name_score(cat.as_ref());
 		if score > best_score {
-			best_category = Some(cat);
+			best_category = Some(cat.as_ref());
 			best_score = score;
 		}
 	}
@@ -1,16 +1,14 @@
 use std::rc::Rc;

-use crate::tab::settings::{self, SettingType, Task, horiz_cell, mount_requires_restart};
+use crate::{
+	tab::settings::{self, SettingType, Task, horiz_cell, mount_requires_restart},
+	util::wgui_simple,
+};
 use wgui::{
-	components::{
-		button::{ButtonClickEvent, ComponentButton},
-		checkbox::ComponentCheckbox,
-		slider::ComponentSlider,
-	},
+	components::{button::ComponentButton, checkbox::ComponentCheckbox, slider::ComponentSlider},
 	layout::{Layout, WidgetID},
 	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
-	widget::label::WidgetLabel,
 	windowing::context_menu,
 };
 use wlx_common::{DesktopBackend, XrBackend, config::GeneralConfig, dash_interface::InterfaceFeats};
@@ -297,7 +295,6 @@ where
 	mp.idx += 1;

 	let mut params = TemplateParams::new();
-	params.insert("id", &id);

 	match setting.get_translation() {
 		Ok(translation) => params.insert("translation", translation),
@@ -310,69 +307,63 @@ where

 	let id_cell = horiz_cell(mp.layout, parent)?;

-	mp.parser_state
-		.instantiate_template(mp.doc_params, "DropdownButton", mp.layout, id_cell, params)?;
+	let setting_str = setting.as_ref();
+	let title = setting.get_enum_title(mp.config);
+
+	let feats = mp.feats;
+	let cells = EnumType::VARIANTS
+		.iter()
+		.filter_map(|item| {
+			if item.get_bool("Hidden").unwrap_or(false) {
+				return None;
+			}
+			if item
+				.get_str("Backend")
+				.is_some_and(|x| XrBackend::try_from(x).unwrap() != feats.xr_backend)
+			{
+				return None;
+			}
+			if item
+				.get_str("Desktop")
+				.is_some_and(|x| DesktopBackend::try_from(x).unwrap() != feats.desktop_backend)
+			{
+				return None;
+			}
+
+			let value = item.as_ref();
+			let title = SettingType::get_enum_title_inner(*item);
+			let tooltip = SettingType::get_enum_tooltip_inner(*item);
+
+			let text = &title.text;
+			let translated = if title.translated { "1" } else { "0" };
+			let action = format!("{setting_str};{id};{value};{text};{translated}");
+
+			Some(context_menu::Cell::Button(context_menu::Button {
+				action_name: Some(action.into()),
+				title,
+				tooltip,
+				..Default::default()
+			}))
+		})
+		.collect();
+
+	let tasks = mp.tasks.clone();
+	wgui_simple::mount_dropdown(wgui_simple::MountDropdownParams {
+		layout: mp.layout,
+		parser_state: mp.parser_state,
+		doc_params: mp.doc_params,
+		parent: id_cell,
+		id,
+		params,
+		current_text: title,
+		cells,
+		on_open: Box::new(move |pos, cells| tasks.push(Task::OpenContextMenu(pos, cells))),
+	})?;

 	if setting.requires_restart() {
 		mount_requires_restart(mp.layout, id_cell)?;
 	}

-	let setting_str = setting.as_ref();
-	let title = setting.get_enum_title(mp.config);
-
-	{
-		let mut label = mp
-			.parser_state
-			.fetch_widget_as::<WidgetLabel>(&mp.layout.state, &format!("{id}_value"))?;
-		label.set_text_simple(&mut mp.layout.state.globals.get(), title);
-	}
-
-	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
-	btn.on_click(Rc::new({
-		let feats = mp.feats;
-		let tasks = mp.tasks.clone();
-		move |_common, e: ButtonClickEvent| {
-			tasks.push(Task::OpenContextMenu(
-				e.mouse_pos_absolute.into(),
-				EnumType::VARIANTS
-					.iter()
-					.filter_map(|item| {
-						if item.get_bool("Hidden").unwrap_or(false) {
-							return None;
-						}
-						if item
-							.get_str("Backend")
-							.is_some_and(|x| XrBackend::try_from(x).unwrap() != feats.xr_backend)
-						{
-							return None;
-						}
-						if item
-							.get_str("Desktop")
-							.is_some_and(|x| DesktopBackend::try_from(x).unwrap() != feats.desktop_backend)
-						{
-							return None;
-						}
-
-						let value = item.as_ref();
-						let title = SettingType::get_enum_title_inner(*item);
-						let tooltip = SettingType::get_enum_tooltip_inner(*item);
-
-						let text = &title.text;
-						let translated = if title.translated { "1" } else { "0" };
-
-						Some(context_menu::Cell::Button(context_menu::Button {
-							action_name: Some(format!("{setting_str};{id};{value};{text};{translated}").into()),
-							title,
-							tooltip,
-							..Default::default()
-						}))
-					})
-					.collect(),
-			));
-			Ok(())
-		}
-	}));
-
 	Ok(())
 }

@@ -1,7 +1,6 @@
 use std::rc::Rc;

 use wgui::{
-	components::button::{ButtonClickEvent, ComponentButton},
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::WidgetID,
@@ -9,7 +8,7 @@ use wgui::{
 	parser::{Fetchable, TemplateParams},
 	task::Tasks,
 	widget::label::WidgetLabel,
-	windowing::context_menu::{self},
+	windowing::context_menu,
 };
 use wlx_common::{async_executor::AsyncExecutor, config::GeneralConfig, dash_interface::ConfigChangeKind};

@@ -21,6 +20,7 @@ use crate::{
 	},
 	util::{
 		popup_manager::PopupHolder,
+		wgui_simple,
 		whisper::{
 			WHISPER_MODELS, WhisperModel, whisper_any_models_downloaded, whisper_delete_all_models, whisper_model_from_name,
 			whisper_model_path,
@@ -319,47 +319,35 @@ fn whisper_gpu_select_dropdown(
 	let parent = horiz_cell(mp.layout, parent)?;

 	let mut params = TemplateParams::new();
-	params.insert("id", &id);
 	params.insert("translation", "APP_SETTINGS.WHISPER_GPU_SELECT");

-	mp.parser_state
-		.instantiate_template(mp.doc_params, "DropdownButton", mp.layout, parent, params)?;
+	let current_text = Translation::from_raw_text_string(mp.config.whisper_gpu.to_string());

-	{
-		let mut label = mp
-			.parser_state
-			.fetch_widget_as::<WidgetLabel>(&mp.layout.state, &format!("{id}_value"))?;
-		label.set_text_simple(
-			&mut mp.layout.state.globals.get(),
-			Translation::from_raw_text_string(mp.config.whisper_gpu.to_string()),
-		);
-	}
+	let cells = vulkan_devices
+		.iter()
+		.enumerate()
+		.filter(|(_, name)| !name.contains("llvmpipe"))
+		.map(|(idx, name)| {
+			context_menu::Cell::Button(context_menu::Button {
+				action_name: Some(format!(";whisper_gpu;{};{}", id, idx).into()),
+				title: Translation::from_raw_text_string(name.to_string()),
+				..Default::default()
+			})
+		})
+		.collect();

-	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
-	btn.on_click(Rc::new({
-		let parent_tasks = mp.tasks.clone();
-		move |_common, e: ButtonClickEvent| {
-			let mut cells = Vec::new();
-
-			for (idx, name) in vulkan_devices.iter().enumerate() {
-				if name.contains("llvmpipe") {
-					continue;
-				}
-
-				cells.push(context_menu::Cell::Button(context_menu::Button {
-					action_name: Some(format!(";whisper_gpu;{};{}", id, idx).into()),
-					title: Translation::from_raw_text_string(name.to_string()),
-					..Default::default()
-				}));
-			}
-
-			parent_tasks.push(ParentTask::OpenContextMenu(e.mouse_pos_absolute.into(), cells));
-
-			Ok(())
-		}
-	}));
-
-	Ok(())
+	let tasks = mp.tasks.clone();
+	wgui_simple::mount_dropdown(wgui_simple::MountDropdownParams {
+		layout: mp.layout,
+		parser_state: mp.parser_state,
+		doc_params: mp.doc_params,
+		parent,
+		id,
+		params,
+		current_text,
+		cells,
+		on_open: Box::new(move |pos, cells| tasks.push(ParentTask::OpenContextMenu(pos, cells))),
+	})
 }

 fn whisper_models_dropdown(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
@@ -382,57 +370,49 @@ fn whisper_models_dropdown(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Re
 		});

 	let mut params = TemplateParams::new();
-	params.insert("id", &id);
 	params.insert("translation", "APP_SETTINGS.WHISPER_MODEL");
 	params.insert("tooltip", "APP_SETTINGS.WHISPER_MODEL_HELP");

-	mp.parser_state
-		.instantiate_template(mp.doc_params, "DropdownButton", mp.layout, parent, params)?;
-
-	{
-		let mut label = mp
-			.parser_state
-			.fetch_widget_as::<WidgetLabel>(&mp.layout.state, &format!("{id}_value"))?;
-		label.set_text_simple(&mut mp.layout.state.globals.get(), current_translation);
-	}
-
-	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
-	btn.on_click(Rc::new({
-		let parent_tasks = mp.tasks.clone();
-		move |_common, e: ButtonClickEvent| {
-			let mut cells = WHISPER_MODELS
-				.iter()
-				.enumerate()
-				.map(|(idx, item)| {
-					context_menu::Cell::Button(context_menu::Button {
-						action_name: Some(format!(";whisper_model;{id};{}", item.file_name).into()),
-						title: Translation::from_raw_text(item.display_name),
-						tooltip: None,
-						attribs: vec![],
-						sprite_src_builtin: if downloaded_models.contains(&idx) {
-							Some("@/dashboard/check.svg".into())
-						} else {
-							None
-						},
-					})
-				})
-				.collect::<Vec<_>>();
-
-			cells.insert(
-				0,
+	let mut cells = WHISPER_MODELS
+		.iter()
+		.enumerate()
+		.map(|(idx, item)| {
+			if downloaded_models.contains(&idx) {
 				context_menu::Cell::Button(context_menu::Button {
-					action_name: Some(format!(";whisper_model;{id};").into()),
-					title: Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"),
-					tooltip: None,
-					attribs: vec![],
+					action_name: Some(format!(";whisper_model;{id};{}", item.file_name).into()),
+					title: Translation::from_raw_text(item.display_name),
+					sprite_src_builtin: Some("@/dashboard/check.svg".into()),
 					..Default::default()
-				}),
-			);
+				})
+			} else {
+				context_menu::Cell::Button(context_menu::Button {
+					action_name: Some(format!(";whisper_model;{id};{}", item.file_name).into()),
+					title: Translation::from_raw_text(item.display_name),
+					..Default::default()
+				})
+			}
+		})
+		.collect::<Vec<_>>();

-			parent_tasks.push(ParentTask::OpenContextMenu(e.mouse_pos_absolute.into(), cells));
-			Ok(())
-		}
-	}));
+	cells.insert(
+		0,
+		context_menu::Cell::Button(context_menu::Button {
+			action_name: Some(format!(";whisper_model;{id};").into()),
+			title: Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"),
+			..Default::default()
+		}),
+	);

-	Ok(())
+	let tasks = mp.tasks.clone();
+	wgui_simple::mount_dropdown(wgui_simple::MountDropdownParams {
+		layout: mp.layout,
+		parser_state: mp.parser_state,
+		doc_params: mp.doc_params,
+		parent,
+		id,
+		params,
+		current_text: current_translation,
+		cells,
+		on_open: Box::new(move |pos, cells| tasks.push(ParentTask::OpenContextMenu(pos, cells))),
+	})
 }
@@ -1,12 +1,16 @@
 use glam::{Mat4, Vec2};
+use std::rc::Rc;
 use wgui::{
 	animation::{Animation, AnimationDuration, AnimationEasing},
 	assets::AssetPathRef,
 	color::WguiColorName,
-	components::{self, button::ButtonClickCallback},
+	components::{
+		self,
+		button::{ButtonClickCallback, ButtonClickEvent, ComponentButton},
+	},
 	i18n::Translation,
 	layout::{Layout, LayoutTask, WidgetID},
-	parser::{Fetchable, ParseDocumentParams},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	renderer_vk::{
 		text::{FontWeight, TextStyle, custom_glyph::CustomGlyphData},
 		util::centered_matrix,
@@ -17,6 +21,7 @@ use wgui::{
 		label::{WidgetLabel, WidgetLabelParams},
 		sprite::{WidgetSprite, WidgetSpriteParams},
 	},
+	windowing::context_menu,
 };

 pub struct CreateButtonParams<'a> {
@@ -166,3 +171,39 @@ pub fn create_loading(par: CreateLoadingParams) -> anyhow::Result<WidgetID> {

 	Ok(id_root)
 }
+
+pub struct MountDropdownParams<'a> {
+	pub layout: &'a mut Layout,
+	pub parser_state: &'a mut ParserState,
+	pub doc_params: &'a ParseDocumentParams<'a>,
+	pub parent: WidgetID,
+	pub id: String,
+	pub params: TemplateParams,
+	pub current_text: Translation,
+	pub cells: Vec<context_menu::Cell>,
+	pub on_open: Box<dyn Fn(context_menu::Position, Vec<context_menu::Cell>)>,
+}
+
+pub fn mount_dropdown(par: MountDropdownParams) -> anyhow::Result<()> {
+	let mut params = par.params;
+	params.insert("id", &par.id);
+
+	par
+		.parser_state
+		.instantiate_template(par.doc_params, "DropdownButton", par.layout, par.parent, params)?;
+
+	{
+		let mut label = par
+			.parser_state
+			.fetch_widget_as::<WidgetLabel>(&par.layout.state, &format!("{}_value", par.id))?;
+		label.set_text_simple(&mut par.layout.state.globals.get(), par.current_text);
+	}
+
+	let btn = par.parser_state.fetch_component_as::<ComponentButton>(&par.id)?;
+	btn.on_click(Rc::new(move |_common, e: ButtonClickEvent| {
+		(par.on_open)(e.mouse_pos_absolute.into(), par.cells.clone());
+		Ok(())
+	}));
+
+	Ok(())
+}
@@ -53,7 +53,7 @@ struct LaunchParams<'a, T> {
 pub struct View {
 	#[allow(dead_code)]
 	state: ParserState,
-	entry: DesktopEntry,
+	entry: Rc<DesktopEntry>,
 	tasks: Tasks<Task>,
 	frontend_tasks: FrontendTasks,
 	globals: WguiGlobals,
@@ -80,7 +80,7 @@ pub struct View {

 pub struct Params<'a> {
 	pub globals: &'a WguiGlobals,
-	pub entry: DesktopEntry,
+	pub entry: Rc<DesktopEntry>,
 	pub layout: &'a mut Layout,
 	pub parent_id: WidgetID,
 	pub config: &'a GeneralConfig,
@@ -119,10 +119,8 @@ impl View {
 		{
 			let mut label_exec = state.fetch_widget_as::<WidgetLabel>(&params.layout.state, "label_exec")?;

-			label_exec.set_text_simple(
-				&mut params.globals.get(),
-				Translation::from_raw_text_string(format!("{} {}", params.entry.exec_path, params.entry.exec_args)),
-			);
+			let command = shell_words::join(params.entry.exec_argv.iter().map(|x| x.as_ref()));
+			label_exec.set_text_simple(&mut params.globals.get(), Translation::from_raw_text_string(command));
 		}

 		let tasks = Tasks::new();
@@ -406,14 +404,19 @@ impl View {
 			env.push("ELECTRON_OZONE_PLATFORM_HINT=wayland".into());
 		}

-		let args = match params.compositor_mode {
-			AppCompositorMode::Cage => format!("-- {} {}", params.application.exec_path, params.application.exec_args),
-			AppCompositorMode::Native => params.application.exec_args.to_string(),
-		};
-
-		let exec = match params.compositor_mode {
-			AppCompositorMode::Cage => "cage".to_string(),
-			AppCompositorMode::Native => params.application.exec_path.to_string(),
+		let argv = match params.compositor_mode {
+			AppCompositorMode::Cage => ["cage", "--"]
+				.iter()
+				.copied()
+				.chain(params.application.exec_argv.iter().map(|x| x.as_ref()))
+				.map(|x| x.to_string())
+				.collect::<Vec<_>>(),
+			AppCompositorMode::Native => params
+				.application
+				.exec_argv
+				.iter()
+				.map(|x| x.to_string())
+				.collect::<Vec<_>>(),
 		};

 		let pos_mode = match params.pos_mode {
@@ -423,7 +426,7 @@ impl View {
 		};

 		let mut userdata = HashMap::new();
-		userdata.insert("desktop-entry".to_string(), serde_json::to_string(params.application)?);
+		userdata.insert("desktop-entry".into(), serde_json::to_string(params.application)?);

 		let resolution = Self::calculate_resolution(params.res_mode, params.orientation_mode);

@@ -432,12 +435,11 @@ impl View {
 			params.auto_start,
 			WvrProcessLaunchParams {
 				env,
-				exec,
+				argv,
 				name: params.application.app_name.to_string(),
-				args,
 				resolution,
 				pos_mode,
-				icon: params.application.icon_path.as_ref().map(|x| x.as_ref().to_string()),
+				icon: params.application.icon_path.as_deref().map(String::from),
 				userdata,
 			},
 		)?;
@@ -486,7 +488,7 @@ impl View {
 pub fn mount_popup(
 	frontend_tasks: FrontendTasks,
 	globals: WguiGlobals,
-	entry: DesktopEntry,
+	entry: Rc<DesktopEntry>,
 	popup: PopupHolder<View>,
 	on_app_pins_changed: Box<dyn Fn()>,
 	pinned_app: Option<PinnedApp>,
@@ -3,17 +3,13 @@ use std::rc::Rc;
 use strum::EnumProperty;
 use wgui::{
 	assets::AssetPathRef,
-	components::{
-		button::{ButtonClickEvent, ComponentButton},
-		slider::ComponentSlider,
-	},
+	components::{button::ComponentButton, slider::ComponentSlider},
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, WidgetID},
 	log::LogErr,
 	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
-	widget::label::WidgetLabel,
 	windowing::context_menu::{self, TickResult},
 };
 use wlx_common::{
@@ -1012,7 +1008,7 @@ fn create_dropdown<B: 'static + BindingsDropdown>(
 		.iter()
 		.map(|item| {
 			context_menu::Cell::Button(context_menu::Button {
-				action_name: Some(item.action_str(&action, side)),
+				action_name: Some(item.action_str(&action, side).into()),
 				title: item.translation(),
 				..Default::default()
 			})
@@ -1023,7 +1019,7 @@ fn create_dropdown<B: 'static + BindingsDropdown>(
 		cells.insert(
 			0,
 			context_menu::Cell::Button(context_menu::Button {
-				action_name: Some(action_str),
+				action_name: Some(action_str.into()),
 				title: Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"),
 				..Default::default()
 			}),
@@ -1036,35 +1032,24 @@ fn create_dropdown<B: 'static + BindingsDropdown>(
 fn create_dropdown_with_cells(
 	mp: &mut MacroParams,
 	parent: WidgetID,
-	mut params: TemplateParams,
+	params: TemplateParams,
 	current_text: Translation,
 	cells: Vec<context_menu::Cell>,
 ) -> anyhow::Result<()> {
 	let id = mp.idx.to_string();
 	mp.idx += 1;
-	params.insert("id", &id);
-
-	mp.parser_state
-		.instantiate_template(mp.doc_params, "DropdownButton", mp.layout, parent, params)?;
-
-	{
-		let mut label = mp
-			.parser_state
-			.fetch_widget_as::<WidgetLabel>(&mp.layout.state, &format!("{id}_value"))?;
-		label.set_text_simple(&mut mp.layout.state.globals.get(), current_text);
-	}
-
-	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
-	btn.on_click(Rc::new({
-		let tasks = mp.tasks.clone();
-		let cells = cells.clone();
-		move |_common, e: ButtonClickEvent| {
-			tasks.push(Task::OpenContextMenu(e.mouse_pos_absolute.into(), cells.clone()));
-			Ok(())
-		}
-	}));
-
-	Ok(())
+	let tasks = mp.tasks.clone();
+	wgui_simple::mount_dropdown(wgui_simple::MountDropdownParams {
+		layout: mp.layout,
+		parser_state: mp.parser_state,
+		doc_params: mp.doc_params,
+		parent,
+		id,
+		params,
+		current_text,
+		cells,
+		on_open: Box::new(move |pos, cells| tasks.push(Task::OpenContextMenu(pos, cells))),
+	})
 }

 fn apply_subpath(
@@ -1082,9 +1067,7 @@ fn apply_subpath(
 	};

 	if action_name == "scroll" {
-		*side_mut = Some(OneOrMany::One(format!(
-			"/user/hand/{side_str}/input/{subpath_str}"
-		)));
+		*side_mut = Some(OneOrMany::One(format!("/user/hand/{side_str}/input/{subpath_str}")));
 		return;
 	}

@@ -1,6 +1,32 @@
 #!/bin/bash

-# Do not run this script if you don't have at least 32 GiB of system memory.
+# This is the translation tool intended for machine-translating strings.
+#
+# ###########################
+# # Adding new translations #
+# ###########################
+# 
+# If you want to add a new language, follow these steps:
+#
+# 1. Include the language in `wlx-common/src/locale.rs`:
+#   - add your entry in `enum Language` 
+#   - add your entry in Language::code() function
+#   - add your language code in Language::add_codes() function
+# 
+# 2. Create a new template file
+#   - Add your language code in `scripts/translator/templates/<lang code>.json`
+#     (you can copy one of nearby files and adapt them accordingly)
+# 
+# 3. Modify this very file
+#   - Go to the bottom and add your language code entry here too
+#
+# 4. Run the script (it will hint you which LANG_PATHs are supported)
+# 
+# ############################################
+# # Running machine translations (local LLM) #
+# ############################################
+#
+# Do not run this script if you don't have at least ~16 GiB of free system memory.
 # Submitting PRs that lack translated strings is okay if you don't meet the
 # system requirements to run this script, or if you simply prefer not to; we are
 # regularly updating the missing translation strings anyway.
@@ -8,15 +34,18 @@
 # Base language: English (en.json)
 # 
 # This tool expects llama.cpp server being present (llama-server) at port 8080.
+# 
+# Currently we're using Gemma 4 for machine translations.
+# Model URL:
+# https://huggingface.co/unsloth/gemma-4-31B-it-GGUF
+# Recommended quantization: Q4_K_M
+# 

 set -e
 cd "$(dirname "$0")"

 bun install

-# model URL:
-# https://huggingface.co/unsloth/gemma-4-31B-it-GGUF
-# you can specify your own if you want to.
 if [ -z "${MODEL}" ]; then
 	export MODEL="gemma-4-31B-it-Q4_K_M"
 fi
@@ -31,4 +60,5 @@ TEMPLATE="de" bun main.ts
 TEMPLATE="ja" bun main.ts
 TEMPLATE="es" bun main.ts
 TEMPLATE="it" bun main.ts
+TEMPLATE="sv" bun main.ts
 TEMPLATE="zh_CN" bun main.ts
@@ -0,0 +1,20 @@
+{
+	"full_name": "Swedish",
+	"examples": [
+		{
+			"key": "BAR.OPACITY",
+			"en": "Opacity",
+			"translated": "Opacitet"
+		},
+		{
+			"key": "PANEL.CLOSE",
+			"en": "Close panel",
+			"translated": "Stäng panelen"
+		},
+		{
+			"key": "SETTINGS.LEFT_HANDED_MODE",
+			"en": "Left-handed mode",
+			"translated": "Vänsterhänt läge"
+		}
+	]
+}
@@ -2,7 +2,7 @@ use std::{rc::Rc, sync::Arc};

 use crate::testbed::{Testbed, TestbedUpdateParams};
 use dash_frontend::frontend::{self, FrontendUpdateParams};
-use wgui::{gfx::WGfx, layout::Layout, theme::WguiTheme};
+use wgui::{gfx::WGfx, i18n::Locale, layout::Layout, theme::WguiTheme};
 use wlx_common::{
 	async_executor::AsyncExecutor, dash_interface_emulated::DashInterfaceEmulated,
 	locale::WayVRLangProvider,
@@ -15,8 +15,9 @@ pub struct TestbedDashboard {

 impl TestbedDashboard {
 	pub fn new(gfx: Arc<WGfx>) -> anyhow::Result<Self> {
-		let interface = DashInterfaceEmulated::new(gfx);
 		let lang_provider = WayVRLangProvider::default();
+		let locale = Locale::from_env(&lang_provider);
+		let interface = DashInterfaceEmulated::new(gfx, &locale);
 		let palette_name = std::env::var("PALETTE").unwrap_or_else(|_| "Default".to_string());
 		let executor = wlx_common::async_executor::create_local();

@@ -49,9 +49,8 @@ pub enum HandsfreeParams {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WvrProcessLaunchParams {
 	pub name: String,
-	pub exec: String,
+	pub argv: Vec<String>,
 	pub env: Vec<String>,
-	pub args: String,
 	pub icon: Option<String>,
 	pub resolution: [u32; 2],
 	pub pos_mode: PositionMode,
@@ -109,7 +109,13 @@ smithay-clipboard = "0.7.3"
 sysinfo = { version = "0.39.6" }
 thiserror = "2.0.18"
 tracing = "0.1.44"
-whisper-rs = { version = "0.16.0", features = ["vulkan"], optional = true }
+whisper-rs = {
+  # version = "0.16.0",
+  git = "https://github.com/wayvr-org/whisper-rs.git",
+  rev = "2d908ec36cd41521a28f7f5fb5dc95499fd40051",
+  features = ["vulkan"],
+  optional = true
+}
 xcb = {
  version = "1.7.0",
  features = [
@@ -0,0 +1,185 @@
+{
+	"DEFINITIONS": {
+		"ANCHORED": "Förankrad",
+		"FLOATING": "Flytande",
+		"STATIC": "Statisk",
+		"SET": "Set",
+		"WATCH": "Klocka",
+		"DASHBOARD": "Kontrollpanel",
+		"EDIT_MODE": "Redigeringsläge",
+		"MIRROR": "Spegling",
+		"SETTINGS": "Inställningar",
+		"KEYBOARD": "Tangentbord",
+		"TASKBAR": "Uppgiftspanel",
+		"FEATURES": "Funktioner",
+		"OVERLAY": "Overlay"
+	},
+	"ANCHOR": {
+		"CENTER": "Center"
+	},
+	"BAR": {
+		"ADD_MIRROR": "Lägg till ny spegling-overlay",
+		"ADD_NEW_SET": "Lägg till ny set",
+		"ADD_PASSTHRU": "Lägg till ny passthrough-utskärning",
+		"CLOSE_APP": "Stäng appen",
+		"CLOSE_OVERLAY": "Stäng {$DEFINITIONS.OVERLAY}",
+		"DELETE_CURRENT_SET": "Ta bort nuvarande set",
+		"EDIT_MODE_TOGGLE": "Växla redigeringsläge",
+		"FORCE_CLOSE_APP": "Tvinga stäng app",
+		"HANDSFREE": {
+			"EYE_ONLY": "Ögonsiktet",
+			"EYE_TRACKING": "Öga + pinch",
+			"HMD": "HMD + pinch",
+			"HMD_ONLY": "HMD-laser",
+			"NONE": "Av",
+			"TITLE": "Händsfree-läge"
+		},
+		"RELOAD_FROM_DISK": "Ladda om XML från disk",
+		"RESET_POSITION": "Återställ position",
+		"TOGGLE_VISIBILITY": "Växla synlighet"
+	},
+	"DEFAULT": "Standard",
+	"DISABLED": "Inaktiverat",
+	"DONE": "Klar",
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "Justera krökning",
+		"ALIGN_TO_HMD": "Rikta mot HMD",
+		"ALPHA_BLEND_MODE": "Alfablendingsläge",
+		"ANGLE_FADE": "Vinkeltoning",
+		"ANGLE_FADE_HELP": "Tona ut när den inte är vänd mot HMD",
+		"BLENDING_ADDITIVE": "Additiv blandning",
+		"BLOCK_INPUT": "Blockera spel-input",
+		"CURVATURE": "Krökning",
+		"DELETE": "Håll inne för att ta bort från nuvarande set",
+		"DISABLE_GRAB": "Inaktivera grepp",
+		"GLOBAL": "Alltid synlig",
+		"HINT_POINT_WINDOW": "Peka på ett fönster för att ändra dess parametrar.\nNär du är klar, lämna redigeringsläget via knappen till höger.",
+		"INTERPOLATION": "Interpolation",
+		"KEYBOARD": "Tangentbord",
+		"LEAVE": "Lämna redigeringsläge",
+		"LOCK_INTERACTION": "Lås interaktion",
+		"MOUSE": {
+			"FLIP180": "Speglad 180°",
+			"FLIP270": "Speglad 270°",
+			"FLIP90": "Speglad 90°",
+			"FLIPPED": "Speglad",
+			"NORMAL": "Normal",
+			"ROTATE180": "Roterad 180°",
+			"ROTATE270": "Roterad 270°",
+			"ROTATE90": "Roterad 90°",
+			"TITLE": "Musfixar",
+			"WRONG_SCREEN_SELECTION_HELP": "Om markören rör sig på en helt annan skärm\nhar skärmarna troligtvis valts fel. Se readme."
+		},
+		"MOVE_PRESS_AND_DRAG": "Flytta (tryck & dra)",
+		"OPACITY": "Opacitet",
+		"POS_ANCHORED": "Förankrad: Flyttas tillsammans med set. Standard.",
+		"POS_FLOATING": "Flytande: Flyttas oberoende, centreras om vid visning.",
+		"POS_HAND_L": "Följ vänster hand.",
+		"POS_HAND_R": "Följ höger hand.",
+		"POS_HMD": "Följ HMD.",
+		"POS_STATIC": "Statisk: Inte en del av något set, ingen återcentrering.",
+		"POSITIONING": "Positionering",
+		"RESIZE_PRESS_AND_DRAG": "Ändra storlek (tryck & dra)",
+		"RESIZE_CORNER": "Dra för att ändra storlek",
+		"STEREO_3D_MODE": {
+			"ADJUST_MOUSE": "Justera mus",
+			"FULL_FRAME": "Full 3D",
+			"FULL_FRAME_BAT": "Full-BAT",
+			"FULL_FRAME_SBS": "Full-SBS",
+			"FULL_FRAME_TAB": "Full-TAB",
+			"SPLIT_BOTTOM_TOP": "NEDRE→ÖVRE",
+			"SPLIT_LEFT_RIGHT": "VÄNSTRER→HÖGER",
+			"SPLIT_RIGHT_LEFT": "HÖGER→VÄNSTER",
+			"SPLIT_TOP_BOTTOM": "TOPP→BOTTEN",
+			"TITLE": "3D-stereoläge"
+		}
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "Sikta på en app och släpp Super för att fokusera på den.",
+		"WHILE_AIMING": "Vid sikte",
+		"CLICK": "VR-pekarklick",
+		"GRABALL": "Flytta hela setet",
+		"GRAB": "Flytta enskild overlay",
+		"DASH": "Växla WayVR Dashboard",
+		"EDIT": "Växla redigeringsläge",
+		"KEYBOARD": "Växla tangentbord",
+		"SET": "Byt set",
+		"RECENTER": "Visa/dölj/centrera",
+		"GENERAL_BINDS": "Allmänna bindningar",
+		"TOGGLE_CAPTURE": "Återlämna kontrollen till skrivbordet",
+		"FOCUS_MODE": "Fokusläge (håll in Super)",
+		"CLOSE": "Stäng fokuserad app",
+		"MOUSE": "Klick och skroll med fysisk mus översätts även till VR-pekaren"
+	},
+	"GRAB": {
+		"ADJUST_DISTANCE": "Justera avstånd",
+		"ADJUST_SIZE": "Justera storlek",
+		"GRABBING_ANCHORED": "Förankrade överlägg rör sig med setet. Separera ett enskilt fönster genom att greppa det med den andra handen samtidigt som du håller i setet.",
+		"GRABBING_ANCHORED_EDIT": "Det här överlägget kommer att förbli förankrat vid centreringsmarkören.",
+		"GRABBING_FLOATING": "Det här överlägget är flytande och kommer att stanna på plats, om det inte centreras om.",
+		"GRABBING_FOLLOW": "Detta overlay följer den enhet den är kopplad till.",
+		"GRABBING_STATIC": "Det här överlägget är statiskt och kommer att stanna kvar på platsen, oavsett om du centrerar om.",
+		"GRABBING_WATCH": "För att byta hand, flytta klockan framför dig och greppa den med den andra handen.",
+		"UNRESTRICTED_MOVEMENT": "Obegränsad rörelse"
+	},
+	"SCREENCAST": {
+		"PENDING": "Vänligen vänta...",
+		"QUEUED": "Väntar på att en annan overlays skärmdelningsförfrågan ska godkännas.",
+		"WAITING_FOR_USER_DESC": "Kontrollera skrivbordet efter ett popup-fönster för skärmdelning.\nVälj följande:",
+		"WAITING_FOR_USER": "Kontrollera din skrivbordsdisplay för ett popup-fönster om skärmdelning.",
+		"FAIL": "Kunde inte initiera källan för skärmöverföring."
+	},
+	"TOAST": {
+		"TITLE_SCREENCAST_FAIL": "Kunde inte starta källan för skärmdelning!",
+		"CANNOT_ADD_SET": "Kunde inte lägga till set!",
+		"CANNOT_REMOVE_SET": "Kan inte ta bort set!",
+		"STEAMVR_DASH_TITLE": "SteamVR-kontrollpanelen är öppen",
+		"STEAMVR_DASH_TEXT": "Stäng SteamVR-panelen för att börja använda WayVR.",
+		"WAYVR_RUNNING_TITLE": "WayVR körs!",
+		"WAYVR_RUNNING_TEXT": "Kolla handleden för klockan, eller använd bindningen för visa/dölj för att komma igång!",
+		"DEFAULT_TITLE": "Avisering",
+		"EMPTY_SET": "Tomt set!",
+		"ERROR": "Fel",
+		"FIXING_FLOOR_IN_X_SECS": "Justerar golvet om {SECONDS} sekunder...",
+		"LAST_EXISTING_SET": "Detta är det sista befintliga setet.",
+		"LETS_ADD_OVERLAYS": "Låt oss lägga till några overlays från uppgiftspanelen!",
+		"MAXIMUM_SETS_REACHED": "Maximalt antal set har uppnåtts.",
+		"NO_KEYMAPS_CONFIGURED": "Inga tangentbordslayouts konfigurerade",
+		"NO_KEYMAPS_CONFIGURED_HELP": "Kolla wayvr.org för att se hur du ställer in dina tangentbordslayouter!",
+		"NO_SET_SELECTED": "Inget Set är valt.",
+		"ONE_CONTROLLER_ON_FLOOR": "Placera en kontroller på golvet!"
+	},
+	"WATCH": {
+		"ADD_NEW_SET": "Lägg till ett nytt set",
+		"CLEANUP_MIRRORS": "Ta bort speglingar som\ninte är synliga just nu",
+		"DASHBOARD": "Kontrollpanel",
+		"EDIT_MODE": "Redigeringsläge",
+		"FIX_FLOOR": "Justera golvnivå",
+		"LONG_PRESS_TO_DELETE_SET": "Håll för att ta bort",
+		"RECENTER": "Centrera playspace",
+		"SWITCH_TO_SET": "Byt till set",
+		"TOGGLE_FOR_CURRENT_SET": "Växla för nuvarande set"
+	},
+	"WHISPER": {
+		"TRANSCRIBE": "Håll ned för att transkribera text",
+		"PASTE": "Kopiera transkribering till urklipp",
+		"PASTE_AND_GO": "Kopiera transkribering och skicka Ctrl-V till fokuserad app",
+		"SEND_OSC": "Skicka transkription till OSC-chatt",
+		"UNLOAD_AND_CLOSE": "Avlasta modell och stäng",
+		"MODEL_NOT_DOWNLOADED": "Tal-till-text är inte konfigurerat!",
+		"DOWNLOAD_GUIDANCE": "Konfigurera tal-till-text under inställningar, funktioner!",
+		"INITIAL_TEXT": "Håll inne mikroknappen för att börja transkribera...",
+		"INIT_ERROR": "Fel vid start av Whisper-motorn",
+		"ENTER_KEY": "Enter-tangent"
+	},
+	"NOTIFICATION": {
+		"COUD_NOT_CONNECT_TO_VR_RUNTIME": "Kunde inte ansluta till VR-runtime.",
+		"NOT_RUNNING_XR_VR": "Se till att Monado, WiVRn eller SteamVR är igång.",
+		"NOT_RUNNING_VR": "Se till att Monado, WiVRn eller SteamVR är igång.",
+		"NOT_RUNNING_XR": "Se till att Monado eller WiVRn är igång.",
+		"INVALID_ARGS": "Kontrollera dina startargument.",
+		"SELECT_SCREEN_CAST_FOR": "Välj skärmdelning för display {DISPLAY}",
+		"CANNOT_CAPTURE_KBD_MOUSE": "Kunde inte initiera fångst av tangentbord/mus!\nKontrollera att din användare tillhör gruppen 'input'.",
+		"WE_ARE_GRABBING": "WayVR styr nu ditt tangentbord och din mus!\nTryck Super+Z för att släppa."
+	}
+}
@@ -21,7 +21,7 @@ use smithay::{
 use wgui::log::LogErr;
 use xkbcommon::xkb;

-use crate::backend::wayvr::{ExternalProcessRequest, WayVRTask};
+use crate::backend::wayvr::WayVRTask;

 use super::{
    ProcessWayVREnv,
@@ -32,6 +32,7 @@ use super::{
 pub struct WayVRClient {
    pub client: wayland_server::Client,
    pub pid: u32,
+    pub process: process::ProcessHandle,
 }

 pub struct WayVRCompositor {
@@ -160,16 +161,17 @@ impl WayVRCompositor {
        let process_env = get_wayvr_env_from_pid(credentials.pid)?;

        // Find suitable auth key from the process list
-        for (_, process) in processes {
-            if let process::Process::Managed(process) = &process
+        for (handle, process) in processes.iter() {
+            if let process::Process::Managed(process) = process
                && let Some(auth_key) = &process_env.display_auth
            {
                // Find process with matching auth key
                if process.auth_key.as_str() == auth_key {
-                    // Add client
+                    // Associate client now, instead of trying to match env later
                    self.add_client(WayVRClient {
                        client,
                        pid: credentials.pid as u32,
+                        process: handle,
                    });
                    return Ok(());
                }
@@ -178,18 +180,15 @@ impl WayVRCompositor {

        // This is a new process which we didn't met before.
        // Treat external processes exclusively (spawned by the user or external program)
-        log::warn!(
-            "External process ID {} connected to this Wayland server",
-            credentials.pid
-        );
-
-        self.state
-            .wayvr_tasks
-            .send(WayVRTask::NewExternalProcess(ExternalProcessRequest {
-                env: process_env,
-                client,
-                pid: credentials.pid as u32,
-            }));
+        let pid = credentials.pid as u32;
+        log::warn!("External process ID {pid} connected to this Wayland server");
+        let process =
+            processes.insert(process::Process::External(process::ExternalProcess { pid }));
+        self.add_client(WayVRClient {
+            client,
+            pid,
+            process,
+        });

        Ok(())
    }
@@ -118,14 +118,6 @@ pub struct ProcessWayVREnv {
    pub display_name: Option<String>, // Externally spawned process by a user script
 }

-#[derive(Clone)]
-pub struct ExternalProcessRequest {
-    #[allow(dead_code)]
-    pub env: ProcessWayVREnv,
-    pub client: wayland_server::Client,
-    pub pid: u32,
-}
-
 #[derive(Clone)]
 pub enum WayVRTask {
    NewToplevel(ClientId, ToplevelSurface),
@@ -133,7 +125,6 @@ pub enum WayVRTask {
    MinimizeRequest(ClientId, ToplevelSurface),
    TitleChange(ClientId, ToplevelSurface),
    VisibilityChange(window::WindowHandle, bool),
-    NewExternalProcess(ExternalProcessRequest),
    ProcessTerminationRequest(process::ProcessHandle, KillSignal),
    CloseWindowRequest(window::WindowHandle),
    DndStarted {
@@ -173,10 +164,6 @@ pub enum PointerFocusTarget {
    None,
 }

-pub enum TickTask {
-    NewExternalProcess(ExternalProcessRequest), // Call WayVRCompositor::add_client after receiving this message
-}
-
 const KEY_REPEAT_DELAY: i32 = 500;
 const KEY_REPEAT_RATE: i32 = 50;
 const WAYVR_SCREEN_RES: [i32; 2] = [2560, 1440];
@@ -325,26 +312,29 @@ impl WvrServerState {

    #[allow(clippy::too_many_lines)]
    #[allow(clippy::significant_drop_tightening)]
-    pub fn tick_events(app: &mut AppState) -> anyhow::Result<Vec<TickTask>> {
-        let mut tasks: Vec<TickTask> = Vec::new();
-
+    pub fn tick_events(app: &mut AppState) -> anyhow::Result<()> {
        let Some(wvr_server) = app.wvr_server.as_mut() else {
-            return Ok(tasks);
+            return Ok(());
        };

        app.ipc_server.tick(&mut ipc_server::TickParams {
            wvr_server,
            input_state: &app.input_state,
-            tasks: &mut tasks,
            signals: &app.wayvr_signals,
            hid_wrapper: &mut app.hid_provider,
        });

-        // Tick all child processes
+        // Keep launch records while wl client is attached
+        let attached_processes: HashSet<_> = wvr_server
+            .manager
+            .clients
+            .iter()
+            .map(|client| client.process)
+            .collect();
        let mut to_remove: SmallVec<[process::ProcessHandle; 2]> = SmallVec::new();

        for (handle, process) in &mut wvr_server.processes {
-            if !process.is_running() {
+            if !process.is_running() && !attached_processes.contains(&handle) {
                to_remove.push(handle);
            }
        }
@@ -356,9 +346,6 @@ impl WvrServerState {

        while let Some(task) = wvr_server.tasks.read() {
            match task {
-                WayVRTask::NewExternalProcess(req) => {
-                    tasks.push(TickTask::NewExternalProcess(req));
-                }
                WayVRTask::NewToplevel(client_id, toplevel) => {
                    let toplevel = Rc::new(toplevel);

@@ -368,15 +355,14 @@ impl WvrServerState {
                            continue;
                        }

-                        let Some(process_handle) =
-                            process::find_by_pid(&wvr_server.processes, client.pid)
-                        else {
+                        let process_handle = client.process;
+                        if !wvr_server.processes.contains_key(process_handle) {
                            log::error!(
-                                "WayVR window creation failed: Unexpected process ID {}. It wasn't registered before.",
+                                "WayVR window creation failed: Process for PID {} was removed after the client connected.",
                                client.pid
                            );
                            continue;
-                        };
+                        }

                        let output_bounds = wvr_server.manager.state.output_logical_size();

@@ -601,7 +587,7 @@ impl WvrServerState {
                        }
                        let Some(window_handle) = wvr_server.wm.find_window_handle(&toplevel)
                        else {
-                            log::warn!("MinimizeRequest: Couldn't find matching window handle");
+                            log::warn!("TitleChange: Couldn't find matching window handle");
                            continue;
                        };
                        if let Some(oid) = wvr_server.window_to_overlay.get(&window_handle) {
@@ -703,7 +689,7 @@ impl WvrServerState {

        wvr_server.ticks += 1;

-        Ok(tasks)
+        Ok(())
    }

    pub fn config_changed(&mut self, config: &GeneralConfig) {
@@ -1307,11 +1293,6 @@ impl WvrServerState {
        self.manager.state.set_clipboard_text(content);
    }

-    pub fn add_external_process(&mut self, pid: u32) -> process::ProcessHandle {
-        self.processes
-            .insert(process::Process::External(process::ExternalProcess { pid }))
-    }
-
    #[allow(clippy::too_many_arguments)]
    pub fn spawn_process(
        &mut self,
@@ -87,12 +87,14 @@ impl Process {

 impl Drop for WayVRProcess {
    fn drop(&mut self) {
-        log::info!(
-            "Sending SIGTERM (graceful exit) to process {} ({})",
-            self.child.id(),
-            self.exec_path.as_str()
-        );
-        self.kill(libc::SIGTERM);
+        if self.is_running() {
+            log::info!(
+                "Sending SIGTERM (graceful exit) to process {} ({})",
+                self.child.id(),
+                self.exec_path.as_str()
+            );
+            self.kill(libc::SIGTERM);
+        }
    }
 }

@@ -127,9 +129,11 @@ impl WayVRProcess {
    }

    fn kill(&mut self, signal: i32) {
-        unsafe {
-            // Gracefully stop process
-            libc::kill(self.child.id() as i32, signal);
+        if self.is_running() {
+            unsafe {
+                // Gracefully stop process
+                libc::kill(self.child.id() as i32, signal);
+            }
        }
    }

@@ -1,6 +1,6 @@
 use std::sync::Arc;

-use crate::backend::wayvr::{self, WayVRTask, WvrServerState};
+use crate::backend::wayvr::{WayVRTask, WvrServerState};
 use wayvr_ipc::packet_client::{HandsfreeMode, HandsfreeParams};
 use wayvr_ipc::packet_server::PacketServer;
 use wlx_common::config::HandsfreePointer;
@@ -15,24 +15,6 @@ use crate::{
    windowing::{OverlaySelector, manager::OverlayWindowManager},
 };

-fn process_tick_tasks(
-    tick_tasks: Vec<backend::wayvr::TickTask>,
-    server_state: &mut WvrServerState,
-) {
-    for tick_task in tick_tasks {
-        match tick_task {
-            backend::wayvr::TickTask::NewExternalProcess(request) => {
-                log::info!("Registering external process with PID {}", request.pid);
-                server_state.add_external_process(request.pid);
-                server_state.manager.add_client(wayvr::client::WayVRClient {
-                    client: request.client,
-                    pid: request.pid,
-                });
-            }
-        }
-    }
-}
-
 pub fn tick_events<O>(
    app: &mut AppState,
    overlays: &mut OverlayWindowManager<O>,
@@ -135,10 +117,7 @@ where
        }
    }

-    let tick_tasks = WvrServerState::tick_events(app)?;
-    if let Some(wayvr_server) = app.wvr_server.as_mut() {
-        process_tick_tasks(tick_tasks, wayvr_server);
-    }
+    WvrServerState::tick_events(app)?;

    Ok(())
 }
@@ -6,6 +6,7 @@ use crate::{
    backend::input::InputState,
    ipc::{event_queue::SyncEventQueue, signal::WayVRSignal},
 };
+use anyhow::Context;
 use bytes::BufMut;
 use glam::Vec3A;
 use interprocess::local_socket::{self, ToNsName, traits::Listener};
@@ -88,17 +89,11 @@ fn read_payload(conn: &mut local_socket::Stream, size: u32) -> anyhow::Result<Op

 pub struct TickParams<'a> {
    pub wvr_server: &'a mut WvrServerState,
-    #[allow(dead_code)]
-    pub tasks: &'a mut Vec<wayvr::TickTask>,
    pub signals: &'a SyncEventQueue<WayVRSignal>,
    pub input_state: &'a InputState,
    pub hid_wrapper: &'a mut HidWrapper,
 }

-pub fn gen_args_vec(input: &str) -> Vec<&str> {
-    input.split_whitespace().collect()
-}
-
 pub fn gen_env_vec(input: &[String]) -> Vec<(&str, &str)> {
    input
        .iter()
@@ -226,22 +221,28 @@ impl Connection {
        serial: ipc::Serial,
        packet_params: packet_client::WvrProcessLaunchParams,
    ) -> anyhow::Result<()> {
-        let args_vec = gen_args_vec(&packet_params.args);
-        let env_vec = gen_env_vec(&packet_params.env);
+        let res = {
+            let mut argv_iter = packet_params.argv.iter().map(String::as_str);
+            let exec_path = argv_iter
+                .next()
+                .context("No executable for process_launch")?;
+            let exec_args = argv_iter.collect::<Box<_>>();
+            let env_vec = gen_env_vec(&packet_params.env);

-        let res = params.wvr_server.spawn_process(
-            &packet_params.name,
-            &packet_params.exec,
-            &args_vec,
-            &env_vec,
-            packet_params.resolution,
-            packet_params.pos_mode,
-            None,
-            packet_params.icon.as_deref(),
-            packet_params.userdata,
-        );
-
-        let res = res.map(ProcessHandle::as_packet).map_err(|e| e.to_string());
+            params.wvr_server.spawn_process(
+                &packet_params.name,
+                exec_path,
+                &exec_args,
+                &env_vec,
+                packet_params.resolution,
+                packet_params.pos_mode,
+                None,
+                packet_params.icon.as_deref(),
+                packet_params.userdata,
+            )
+        }
+        .map(ProcessHandle::as_packet)
+        .map_err(|e| e.to_string());

        send_packet(
            &mut self.conn,
@@ -4,6 +4,7 @@ use std::{
    time::{Duration, Instant},
 };

+use anyhow::Context;
 use dash_frontend::frontend::{self, FrontendTask, FrontendUpdateParams};
 use glam::{Affine2, Affine3A, Quat, Vec2, vec2, vec3};
 use wayvr_ipc::{
@@ -43,7 +44,7 @@ use crate::{
        },
    },
    config::{none_if_0, save_settings},
-    ipc::ipc_server::{gen_args_vec, gen_env_vec},
+    ipc::ipc_server::gen_env_vec,
    state::AppState,
    subsystem::hid::WheelDelta,
    windowing::{
@@ -440,7 +441,11 @@ impl DashInterface<AppState> for DashInterfaceLive {
    ) -> anyhow::Result<WvrProcessHandle> {
        let wvr_server = app.wvr_server.as_mut().unwrap();

-        let args_vec = gen_args_vec(&params.args);
+        let mut argv_iter = params.argv.iter().map(String::as_str);
+        let exec_path = argv_iter
+            .next()
+            .context("No executable for process_launch")?;
+        let exec_args = argv_iter.collect::<Box<_>>();
        let env_vec = gen_env_vec(&params.env);

        if auto_start {
@@ -451,8 +456,8 @@ impl DashInterface<AppState> for DashInterfaceLive {
        wvr_server
            .spawn_process(
                &params.name,
-                &params.exec,
-                &args_vec,
+                exec_path,
+                &exec_args,
                &env_vec,
                params.resolution,
                params.pos_mode,
@@ -31,6 +31,9 @@ use crate::{

 const CURSOR_SIZE: f32 = 16. / 1440.;

+// synchronize queue shared by the WlxCapture worker threads
+static CAPTURE_QUEUE_MUTEX: Mutex<()> = Mutex::new(());
+
 struct BufPass {
    pass: WGfxPass<Vert2Uv>,
    buf_vert: Arc<Buffer<Vert2Uv>>,
@@ -664,6 +667,17 @@ fn upload_image(
    height: u32,
    format: Format,
    data: &[u8],
+) -> Option<Arc<Image>> {
+    upload_image_with_row_length(me, width, height, format, data, 0)
+}
+
+fn upload_image_with_row_length(
+    me: &WlxCaptureIn,
+    width: u32,
+    height: u32,
+    format: Format,
+    data: &[u8],
+    buffer_row_length: u32,
 ) -> Option<Arc<Image>> {
    let cmd_result = if me.use_capture_queue {
        me.gfx
@@ -679,15 +693,23 @@ fn upload_image(
            return None;
        }
    };
-    let image = match cmd_xfer.upload_image(width, height, format, data) {
-        Ok(x) => x,
-        Err(e) => {
-            log::error!("{}: Could not create vkImage: {:?}", me.name, e);
-            return None;
-        }
-    };
+    let image =
+        match cmd_xfer.upload_image_with_row_length(width, height, format, data, buffer_row_length)
+        {
+            Ok(x) => x,
+            Err(e) => {
+                log::error!("{}: Could not create vkImage: {:?}", me.name, e);
+                return None;
+            }
+        };

-    if let Err(e) = cmd_xfer.build_and_execute_now() {
+    let result = if me.use_capture_queue {
+        let _guard = CAPTURE_QUEUE_MUTEX.lock().unwrap(); // mutex poison only
+        cmd_xfer.build_and_execute_now()
+    } else {
+        cmd_xfer.build_and_execute_now()
+    };
+    if let Err(e) = result {
        log::error!("{}: Could not execute upload: {:?}", me.name, e);
        return None;
    }
@@ -757,8 +779,22 @@ pub(super) fn receive_callback(me: &WlxCaptureIn, frame: WlxFrame) -> Option<Wlx
                }
            };

-            let data = unsafe { std::slice::from_raw_parts(frame.ptr as *const u8, frame.size) };
-            let image = upload_image(me, frame.format.width, frame.format.height, format, data)?;
+            // SAFETY: the MemPtr params & allocation and must be valid and must outlive the callback
+            let pixels = unsafe {
+                std::slice::from_raw_parts(
+                    (frame.ptr as *const u8).add(frame.offset),
+                    frame.size - frame.offset,
+                )
+            };
+            let buffer_row_length = (frame.stride / 4) as u32;
+            let image = upload_image_with_row_length(
+                me,
+                frame.format.width,
+                frame.format.height,
+                format,
+                pixels,
+                buffer_row_length,
+            )?;

            Some(WlxCaptureOut {
                image: me.gfx.create_image_view(image).ok()?,
@@ -811,6 +847,8 @@ pub(super) enum MainThreadFrame {
    Cpu {
        format: FrameFormat,
        data: Vec<u8>,
+        offset: usize,
+        stride: usize,
        mouse: Option<MouseMeta>,
    },
    Dmabuf {
@@ -870,12 +908,16 @@ where
            MainThreadFrame::Cpu {
                format,
                data,
+                offset,
+                stride,
                mouse,
            } => {
                let frame = wlx_frame::MemPtrFrame {
                    format,
                    ptr: data.as_ptr() as usize,
                    size: data.len(),
+                    offset,
+                    stride,
                    mouse,
                };
                receive_callback(
@@ -910,22 +952,24 @@ fn receive_callback_dummy(_: &DmaExporterProxy, frame: WlxFrame) -> Option<MainT
            Some(MainThreadFrame::Cpu {
                format: frame.format,
                data: map.as_slice().to_vec(),
+                offset: frame.plane.offset as _,
+                stride: (frame.format.width as usize).checked_mul(4)?,
                mouse: frame.mouse,
            })
        }
        WlxFrame::MemPtr(frame) => {
-            let data = if frame.size == 0 {
-                Vec::new()
-            } else {
-                if frame.ptr == 0 {
-                    log::error!("Main-thread CPU capture received a null MemPtr frame");
-                    return None;
-                }
-                unsafe { std::slice::from_raw_parts(frame.ptr as *const u8, frame.size) }.to_vec()
+            // SAFETY: Allocation must be valid & must outlive the callback
+            let pixels = unsafe {
+                std::slice::from_raw_parts(
+                    (frame.ptr as *const u8).add(frame.offset),
+                    frame.size - frame.offset,
+                )
            };
            Some(MainThreadFrame::Cpu {
                format: frame.format,
-                data,
+                data: pixels.to_vec(),
+                offset: frame.offset,
+                stride: frame.stride,
                mouse: frame.mouse,
            })
        }
@@ -179,7 +179,7 @@ impl AppState {

        let ipc_server = ipc_server::WayVRServer::new()?;

-        let mut desktop_finder = DesktopFinder::new();
+        let mut desktop_finder = DesktopFinder::new(params.wgui_globals.i18n().get_locale());
        desktop_finder.refresh();

        #[cfg(feature = "pipewire")]
@@ -320,8 +320,12 @@ impl OverlayWindowConfig {
            return;
        }

-        let to_hmd = (state.transform.translation - app.input_state.hmd.translation).normalize();
-        let watch_normal = state.transform.transform_vector3a(Vec3A::NEG_Z).normalize();
+        let to_hmd =
+            (state.transform.translation - app.input_state.hmd.translation).normalize_or_zero();
+        let watch_normal = state
+            .transform
+            .transform_vector3a(Vec3A::NEG_Z)
+            .normalize_or_zero();
        let dot = to_hmd.dot(watch_normal);

        let range = (app.session.config.watch_view_angle_max
@@ -15,7 +15,7 @@ clap.workspace = true
 log.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+shell-words.workspace = true
 smol.workspace = true

 env_logger = "0.11.11"
-shell-words = "1.1.1"
@@ -107,13 +107,12 @@ pub async fn wvr_process_terminate(
 #[allow(clippy::too_many_arguments)]
 pub async fn wvr_process_launch(
    state: &mut WayVRClientState,
-    exec: String,
+    argv: Vec<String>,
    name: String,
    env: Vec<String>,
    resolution: [u32; 2],
    pos_mode: PositionMode,
    icon: Option<String>,
-    args: String,
    userdata: HashMap<String, String>,
 ) {
    handle_result(
@@ -123,9 +122,8 @@ pub async fn wvr_process_launch(
            state.serial_generator.increment_get(),
            packet_client::WvrProcessLaunchParams {
                env,
-                exec,
+                argv,
                name,
-                args,
                resolution,
                pos_mode,
                icon,
@@ -157,13 +157,12 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
            wvr_process_terminate(state, handle).await;
        }
        Subcommands::ProcessLaunch {
-            exec,
            name,
            env,
            resolution,
            pos,
            icon,
-            args,
+            command,
        } => {
            let env = env.split(",").map(|s| s.to_string()).collect::<Vec<_>>();
            let resolution = resolution
@@ -181,13 +180,12 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()

            wvr_process_launch(
                state,
-                exec,
+                command,
                name,
                env,
                resolution,
                pos_mode,
                icon,
-                args,
                HashMap::new(),
            )
            .await;
@@ -316,17 +314,17 @@ enum Subcommands {
        /// Environment variables, separated by comma
        #[arg(short, long, default_value = "")]
        env: String,
-        /// Executable to run
-        exec: String,
-        #[arg(default_value = "1920x1080")]
+        #[arg(short, long, default_value = "1920x1080")]
        resolution: String,
        /// Default positioning
+        #[arg(short, long, default_value = "anchored")]
        pos: PosModeEnum,
        /// Absolute path to the app icon
+        #[arg(short, long, default_value = "")]
        icon: Option<String>,
-        /// Arguments to pass to executable
-        #[arg(default_value = "")]
-        args: String,
+        /// Executable and optional arguments
+        #[arg(required = true, num_args = 1..)]
+        command: Vec<String>,
    },
    /// Trigger haptics on the user's controller
    Haptics {
@@ -139,6 +139,17 @@ impl CommandBufferBuilder<CmdBufGfx> {

 impl CommandBufferBuilder<CmdBufXfer> {
 	pub fn upload_image(&mut self, width: u32, height: u32, format: Format, data: &[u8]) -> anyhow::Result<Arc<Image>> {
+		self.upload_image_with_row_length(width, height, format, data, 0)
+	}
+
+	pub fn upload_image_with_row_length(
+		&mut self,
+		width: u32,
+		height: u32,
+		format: Format,
+		data: &[u8],
+		buffer_row_length: u32,
+	) -> anyhow::Result<Arc<Image>> {
 		let image = self.graphics.create_image(ImageCreateInfo::new_2d(
 			width,
 			height,
@@ -149,9 +160,13 @@ impl CommandBufferBuilder<CmdBufXfer> {
 			.graphics
 			.empty_buffer::<u8>(BufferUsage::TRANSFER_SRC, data.len() as u64)?;
 		staging.write()?.copy_from_slice(data);
-		self
-			.raw
-			.copy_buffer_to_image(&staging.raw, &image.raw, [0, 0, 0], [width, height, 1]);
+		self.raw.copy_buffer_to_image_with_row_length(
+			&staging.raw,
+			&image.raw,
+			[0, 0, 0],
+			[width, height, 1],
+			buffer_row_length,
+		);
 		self.keepalive.push(Box::new(staging));
 		self.keepalive.push(Box::new(image.clone()));
 		Ok(image)
@@ -2494,11 +2494,22 @@ impl RawCommandBuffer {
 		image: &Arc<RawImage>,
 		offset: [u32; 3],
 		extent: [u32; 3],
+	) {
+		self.copy_buffer_to_image_with_row_length(buffer, image, offset, extent, 0);
+	}
+
+	pub(super) fn copy_buffer_to_image_with_row_length(
+		&mut self,
+		buffer: &RawBuffer,
+		image: &Arc<RawImage>,
+		offset: [u32; 3],
+		extent: [u32; 3],
+		buffer_row_length: u32,
 	) {
 		self.transition_image(image, ImageLayout::TransferDst);
 		let regions = [vk::BufferImageCopy::default()
 			.buffer_offset(0)
-			.buffer_row_length(0)
+			.buffer_row_length(buffer_row_length)
 			.buffer_image_height(0)
 			.image_subresource(vk::ImageSubresourceLayers {
 				aspect_mask: vk::ImageAspectFlags::COLOR,
@@ -69,6 +69,16 @@ pub trait LangsList {
 }

 impl Locale {
+	#[must_use]
+	/// Returns a clone of `self` without `region`
+	pub fn without_region(&self) -> Locale {
+		Locale {
+			lang: self.lang.clone(),
+			region: None,
+			matched: self.matched.clone(),
+		}
+	}
+
 	fn match_locale<'o>(
 		default_lang: &'static str,
 		lang: &str,
@@ -31,7 +31,9 @@ wayland-protocols = {

 drm-fourcc = "2.2.0"
 rxscreen = {
-  version = "0.1.7",
+  git = "https://github.com/galister/rxscreen.git",
+  rev = "7197e1de6622b65859e6f2060b5750185e0dad2a",
+  # version = "0.1.7",
  features = [
    "mouse",
    "shm",
@@ -128,6 +128,8 @@ pub struct MemPtrFrame {
    pub format: FrameFormat,
    pub ptr: usize,
    pub size: usize,
+    pub offset: usize,
+    pub stride: usize,
    pub mouse: Option<MouseMeta>,
 }

@@ -376,10 +376,24 @@ where
                            }
                        }
                        DataType::MemPtr => {
+                            let raw = datas[0].as_raw();
+                            let chunk = datas[0].chunk();
+                            let offset = chunk.offset() as usize;
+                            let chunk_size = chunk.size() as usize;
+                            let Some(size) = offset.checked_add(chunk_size) else {
+                                log::error!("{name}: PipeWire chunk range overflow");
+                                return;
+                            };
+                            if size > raw.maxsize as usize {
+                                log::error!("{name}: PipeWire chunk extends beyond allocation");
+                                return;
+                            }
                            let memptr = MemPtrFrame {
                                format: *format,
-                                ptr: datas[0].as_raw().data as _,
-                                size: datas[0].chunk().size() as _,
+                                ptr: raw.data as _,
+                                size,
+                                offset,
+                                stride: chunk.stride() as _,
                                mouse: mouse_meta,
                            };

@@ -109,6 +109,8 @@ where
                                        transform: Transform::Normal,
                                    },
                                    ptr: unsafe { image.as_ptr() as _ },
+                                    offset: 0,
+                                    stride: image.bytes_per_line() as _,
                                    size,
                                    mouse: d.root_mouse_position().and_then(|root_pos| {
                                        monitor.mouse_to_local(root_pos).map(|(x, y)| MouseMeta {
@@ -24,6 +24,7 @@ smol.workspace = true
 strum.workspace = true
 xdg.workspace = true

+freedesktop-desktop-entry = "0.8.4"
 glob = "0.3.3"
 identicons-svg = "0.1.0"
 rodio = {
@@ -31,6 +32,5 @@ rodio = {
  default-features = false,
  features = ["hound", "mp3", "playback", "recording"]
 }
-rust-ini = "0.21.3"
 walkdir = "2.5.0"
 wgui = { path = "../wgui/" }
@@ -5,7 +5,7 @@ use wayvr_ipc::{
 	packet_client::WvrProcessLaunchParams,
 	packet_server::{WvrProcess, WvrProcessHandle, WvrWindow, WvrWindowHandle},
 };
-use wgui::gfx::WGfx;
+use wgui::{gfx::WGfx, i18n::Locale};

 use crate::{
 	config::GeneralConfig,
@@ -73,7 +73,7 @@ pub struct DashInterfaceEmulated {
 }

 impl DashInterfaceEmulated {
-	pub fn new(gfx: Arc<WGfx>) -> Self {
+	pub fn new(gfx: Arc<WGfx>, locale: &Locale) -> Self {
 		let mut processes = DenseSlotMap::<EmuProcessHandle, EmuProcess>::default();
 		let process_handle = processes.insert(EmuProcess {
 			name: String::from("My app"),
@@ -85,7 +85,7 @@ impl DashInterfaceEmulated {
 			visible: true,
 		});

-		let mut desktop_finder = DesktopFinder::new();
+		let mut desktop_finder = DesktopFinder::new(locale);
 		desktop_finder.refresh();

 		// Use serde defaults
@@ -10,37 +10,35 @@ use std::{
 	time::Instant,
 };

-use crate::cache_dir;
+use crate::{cache_dir, locale::Language};
 use anyhow::Context;
-use ini::Ini;
+use freedesktop_desktop_entry::DesktopEntry as FreedesktopDesktopEntry;
 use serde::{Deserialize, Serialize};
 use walkdir::WalkDir;
+use wgui::i18n::Locale;

 struct DesktopEntryOwned {
-	app_id: String,
-	exec_path: String,
-	exec_args: String,
-	app_name: String,
-	icon_path: Option<String>,
-	categories: Vec<String>,
+	app_id: Box<str>,
+	exec_argv: Box<[Box<str>]>,
+	app_name: Box<str>,
+	icon_path: Option<Box<str>>,
+	categories: Box<[Box<str>]>,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DesktopEntry {
-	pub exec_path: Rc<str>,
-	pub exec_args: Rc<str>,
+	pub exec_argv: Rc<[Rc<str>]>,
 	pub app_id: Rc<str>,
 	pub app_name: Rc<str>,
 	pub icon_path: Option<Rc<str>>,
-	pub categories: Vec<Rc<str>>,
+	pub categories: Rc<[Rc<str>]>,
 }

 impl From<DesktopEntryOwned> for DesktopEntry {
 	fn from(value: DesktopEntryOwned) -> Self {
 		Self {
 			app_id: value.app_id.into(),
-			exec_path: value.exec_path.into(),
-			exec_args: value.exec_args.into(),
+			exec_argv: value.exec_argv.into_iter().map(|x| x.into()).collect(),
 			app_name: value.app_name.into(),
 			icon_path: value.icon_path.map(|x| x.into()),
 			categories: value.categories.into_iter().map(|x| x.into()).collect(),
@@ -60,17 +58,18 @@ struct DesktopFinderParams {
 	size_preferences: Vec<&'static OsStr>,
 	icon_folders: Vec<String>,
 	app_folders: Vec<String>,
+	langs: Vec<String>,
 }

 pub struct DesktopFinder {
 	params: Arc<DesktopFinderParams>,
-	entry_cache: HashMap<String, DesktopEntry>,
+	entry_cache: HashMap<String, Rc<DesktopEntry>>,
 	bg_task: Option<JoinHandle<HashMap<String, DesktopEntryOwned>>>,
 }

 impl DesktopFinder {
 	#[allow(clippy::new_without_default)]
-	pub fn new() -> Self {
+	pub fn new(locale: &Locale) -> Self {
 		let xdg = xdg::BaseDirectories::new();

 		let mut app_folders = vec![];
@@ -107,11 +106,21 @@ impl DesktopFinder {
 			.map(OsStr::new)
 			.collect();

+		let langs = {
+			let main_lang = locale.without_region().to_string();
+			if main_lang == Language::get_default().code() {
+				vec![main_lang]
+			} else {
+				vec![main_lang, Language::get_default().code().to_string()]
+			}
+		};
+
 		Self {
 			params: Arc::new(DesktopFinderParams {
 				app_folders,
 				icon_folders,
 				size_preferences,
+				langs,
 			}),
 			entry_cache: HashMap::new(),
 			bg_task: None,
@@ -146,79 +155,53 @@ impl DesktopFinder {
 				}

 				let file_name = entry.file_name().to_string_lossy();
-				let Some(app_id) = Path::new(entry.file_name())
-					.file_stem()
-					.map(|x| x.to_string_lossy().to_string())
-				else {
-					continue;
-				};
+				let file_path = entry.path().display().to_string();

-				if known_files.contains(file_name.as_ref()) {
-					// as per xdg spec, user entries of the same filename will override system entries
-					continue;
-				}
-
-				let file_path = format!("{}/{}", path, file_name);
-
-				let ini = match Ini::load_from_file(&file_path) {
-					Ok(ini) => ini,
+				let desktop = match FreedesktopDesktopEntry::from_path(entry.path(), Some(&params.langs)) {
+					Ok(desktop) => desktop,
 					Err(e) => {
-						log::debug!("Failed to read INI for .desktop file {}: {:?}, skipping", file_path, e);
+						log::debug!("Failed to read .desktop file {}: {:?}, skipping", file_path, e);
 						continue;
 					}
 				};

-				let Some(section) = ini.section(Some("Desktop Entry")) else {
+				if desktop.groups.desktop_entry().is_none() {
 					log::debug!("Failed to get [Desktop Entry] section for file {}, skipping", file_path);
 					continue;
-				};
-
-				if section.contains_key("OnlyShowIn") {
-					continue; // probably XFCE, KDE, GNOME or other DE-specific stuff
 				}

-				if let Some(x) = section.get("Terminal")
-					&& x == "true"
-				{
+				// prefer entries from earlier data directories
+				let app_id = desktop.id();
+				if known_files.contains(app_id) {
 					continue;
 				}

-				if let Some(x) = section.get("NoDisplay")
-					&& x.eq_ignore_ascii_case("true")
-				{
-					continue; // This application is hidden
+				if desktop.only_show_in().is_some() || desktop.terminal() || desktop.no_display() || desktop.hidden() {
+					continue;
 				}

-				if let Some(x) = section.get("Hidden")
-					&& x.eq_ignore_ascii_case("true")
-				{
-					continue; // This application is hidden
-				}
-
-				let Some(exec) = section.get("Exec") else {
+				let Some(exec) = desktop.exec() else {
 					log::debug!("Failed to get desktop entry Exec for file {}, skipping", file_path);
 					continue;
 				};

-				for entry in &CMD_BLOCKLIST {
-					if exec.contains(entry) {
-						continue 'entries;
-					}
+				if CMD_BLOCKLIST.iter().any(|blocked| exec.contains(blocked)) {
+					continue;
 				}

-				let (exec_path, exec_args) = match exec.split_once(" ") {
-					Some((left, right)) => (
-						left,
-						right
-							.split(" ")
-							.filter(|arg| !arg.starts_with('%')) // exclude arguments like "%f"
-							.map(String::from)
-							.collect(),
-					),
-					None => (exec, Vec::new()),
+				let exec_argv = desktop
+					.parse_exec_with_uris(&[], &params.langs)
+					.into_iter()
+					.flatten()
+					.map(|x| x.into_boxed_str())
+					.collect::<Box<[_]>>();
+
+				if exec_argv.is_empty() {
+					log::debug!("Invalid Exec in desktop file {}, skipping", file_path);
+					continue;
 				};

-				let Some(app_name) = section.get("Name") else {
+				let Some(app_name) = desktop.name(&params.langs) else {
 					log::debug!(
 						"Failed to get desktop entry application name for file {}, skipping",
 						file_path
@@ -226,33 +209,31 @@ impl DesktopFinder {
 					continue;
 				};

-				let icon_path = section
-					.get("Icon")
+				let icon_path = desktop
+					.icon()
 					.and_then(|icon_name| Self::find_icon(&params, icon_name))
 					.or_else(|| Self::create_icon(&file_name).ok());

-				let mut vec_categories = Vec::<String>::new();
-
-				if let Some(categories) = section.get("Categories") {
-					for cat in categories.split(";") {
-						if CATEGORY_TYPE_BLOCKLIST.contains(&cat) {
-							continue 'entries;
-						}
-						vec_categories.push(String::from(cat));
+				let mut vec_categories = Vec::<Box<str>>::new();
+				for cat in desktop.categories().unwrap_or_default() {
+					if CATEGORY_TYPE_BLOCKLIST.contains(&cat) {
+						continue 'entries;
+					}
+					if !cat.is_empty() {
+						vec_categories.push(cat.into());
 					}
 				}

-				known_files.insert(file_name.to_string());
+				known_files.insert(app_id.to_owned());

 				entries.insert(
-					app_id.clone(),
+					app_id.to_owned(),
 					DesktopEntryOwned {
-						app_id,
-						app_name: String::from(app_name),
-						exec_path: String::from(exec_path),
-						exec_args: exec_args.join(" "),
-						icon_path,
-						categories: vec_categories,
+						app_id: app_id.into(),
+						app_name: app_name.into(),
+						exec_argv,
+						icon_path: icon_path.map(|i| i.into_boxed_str()),
+						categories: vec_categories.into_boxed_slice(),
 					},
 				);
 			}
@@ -331,15 +312,15 @@ impl DesktopFinder {

 		self.entry_cache.clear();
 		for (app_id, entry) in entries {
-			self.entry_cache.insert(app_id, entry.into());
+			self.entry_cache.insert(app_id, Rc::new(entry.into()));
 		}
 	}

-	pub fn get_cached_entry(&self, app_id: &str) -> Option<&DesktopEntry> {
+	pub fn get_cached_entry(&self, app_id: &str) -> Option<&Rc<DesktopEntry>> {
 		self.entry_cache.get(app_id)
 	}

-	pub fn find_entries(&mut self) -> HashMap<String, DesktopEntry> {
+	pub fn find_entries(&mut self) -> HashMap<String, Rc<DesktopEntry>> {
 		self.wait_for_entries();
 		self.entry_cache.clone()
 	}
@@ -23,6 +23,8 @@ pub enum Language {
 	ChineseSimplified,
 	#[strum(props(Text = "Español"))]
 	Spanish,
+	#[strum(props(Text = "Svenska"))]
+	Swedish,
 }

 impl Language {
@@ -36,6 +38,7 @@ impl Language {
 			Language::Italian => "it_IT",
 			Language::ChineseSimplified => "zh_CN",
 			Language::Spanish => "es_ES",
+			Language::Swedish => "sv_SE",
 		}
 	}

@@ -44,7 +47,7 @@ impl Language {
 	}

 	pub const fn all_codes() -> &'static [&'static str] {
-		&["en", "pl", "ja", "de", "it", "zh_CN", "es"]
+		&["en", "pl", "ja", "de", "it", "zh_CN", "es", "sv"]
 	}
 }

@@ -95,10 +95,10 @@ pub struct OpenXrInputProfile {
 fn strip_axis_component(path: &str) -> String {
 	if let Some((prefix, suffix)) = path.rsplit_once('/')
 		&& (suffix == "x" || suffix == "y")
-			&& (prefix.ends_with("/thumbstick") || prefix.ends_with("/trackpad") || prefix.ends_with("/joystick"))
-		{
-			return prefix.to_owned();
-		}
+		&& (prefix.ends_with("/thumbstick") || prefix.ends_with("/trackpad") || prefix.ends_with("/joystick"))
+	{
+		return prefix.to_owned();
+	}
 	path.to_owned()
 }
Author	SHA1	Message	Date
galister	89eb2e04f5	add spirv-headers to ci	2026-10-28 06:00:02 +09:00
galister	12253a5e20	bump whisper-rs	2026-10-28 05:53:43 +09:00
galister	9e116988ac	wvr_server: process matching tweaks	2026-10-28 05:26:14 +09:00
Aleksander	466960d32a	Add contribution instructions regarding LLM usage policy [skip ci]	2026-10-27 12:13:34 +09:00
Aleksander	abafddefd8	add Swedish translation strings	2026-10-24 23:31:49 +02:00
Jonatan Nyberg	9b1fc2774a	Add Swedish template to the translation tool (#701 )	2026-10-24 22:48:43 +02:00
galister	c539ff6a90	XSHM & PipeWire CPU capture fixes (#698 )	2026-10-23 21:13:08 +09:00
galister	f94c0c4ace	desktop_finder rework (#697 ) * desktop_finder rework * fix args for wayvrctl process-launch	2026-10-23 19:29:25 +09:00
Aleksander	5f4c97794c	wayvr: prevent alpha from going NaN again	2026-10-22 18:04:40 +02:00
Aleksander	d9288a877c	dash-frontend: refactoring: deduplicate dropdown code	2026-10-21 19:57:14 +02:00