fix(launcher): pass cursor theme and size to child apps

commit: ed24532912d318be2e3e6823b247ff89f0cb74d8
author: brice · 27d ago · 2026-09-25 14:58 UTC
parent: 88e2b23
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +8 -3

M internal/adapters/launcher/launcher.go +6 -1


@@ -31,7 +31,7 @@ func ChildEnv(base []string, waylandDisplay, runtimeDir string) []string {
31	31		continue
32	32		}
33	33		switch {
34		-	case key == "HOME", key == "USER", key == "LOGNAME", key == "SHELL", key == "PATH", key == "LANG", strings.HasPrefix(key, "LC_"), strings.HasPrefix(key, "XDG_"):
	34	+	case key == "HOME", key == "USER", key == "LOGNAME", key == "SHELL", key == "PATH", key == "LANG", strings.HasPrefix(key, "LC_"), strings.HasPrefix(key, "XDG_"), strings.HasPrefix(key, "XCURSOR_"):
35	35		values[key] = value
36	36		}
37	37		}

@@ -39,6 +39,11 @@ func ChildEnv(base []string, waylandDisplay, runtimeDir string) []string {
39	39		values["XDG_RUNTIME_DIR"] = runtimeDir
40	40		values["XDG_CURRENT_DESKTOP"] = "nefertty"
41	41		values["XDG_SESSION_TYPE"] = "wayland"
	42	+	// X11 apps (through Xwayland) and toolkits pick their own cursor size:
	43	+	// give them the compositor's, 24 unless set.
	44	+	if values["XCURSOR_SIZE"] == "" {
	45	+	values["XCURSOR_SIZE"] = "24"
	46	+	}
42	47		keys := make([]string, 0, len(values))
43	48		for key := range values {
44	49		keys = append(keys, key)

 			continue
 		}
 		switch {
-		case key == "HOME", key == "USER", key == "LOGNAME", key == "SHELL", key == "PATH", key == "LANG", strings.HasPrefix(key, "LC_"), strings.HasPrefix(key, "XDG_"):
+		case key == "HOME", key == "USER", key == "LOGNAME", key == "SHELL", key == "PATH", key == "LANG", strings.HasPrefix(key, "LC_"), strings.HasPrefix(key, "XDG_"), strings.HasPrefix(key, "XCURSOR_"):
 			values[key] = value
 		}
 	}
 	values["XDG_RUNTIME_DIR"] = runtimeDir
 	values["XDG_CURRENT_DESKTOP"] = "nefertty"
 	values["XDG_SESSION_TYPE"] = "wayland"
+	// X11 apps (through Xwayland) and toolkits pick their own cursor size:
+	// give them the compositor's, 24 unless set.
+	if values["XCURSOR_SIZE"] == "" {
+		values["XCURSOR_SIZE"] = "24"
+	}
 	keys := make([]string, 0, len(values))
 	for key := range values {
 		keys = append(keys, key)

M internal/adapters/launcher/launcher_test.go +2 -2


@@ -13,8 +13,8 @@ import (
13	13		)
14	14
15	15		func TestChildEnv(t *testing.T) {
16		-	got := ChildEnv([]string{"TERM=x", "DISPLAY=:0", "WAYLAND_SOCKET=4", "WAYLAND_DISPLAY=old", "HOME=/home/me", "PATH=/bin", "LC_ALL=C", "XDG_RUNTIME_DIR=old", "SECRET=bad"}, "wayland-7", "/run/me")
17		-	want := []string{"HOME=/home/me", "LC_ALL=C", "PATH=/bin", "WAYLAND_DISPLAY=wayland-7", "XDG_CURRENT_DESKTOP=nefertty", "XDG_RUNTIME_DIR=/run/me", "XDG_SESSION_TYPE=wayland"}
	16	+	got := ChildEnv([]string{"TERM=x", "DISPLAY=:0", "WAYLAND_SOCKET=4", "WAYLAND_DISPLAY=old", "HOME=/home/me", "PATH=/bin", "LC_ALL=C", "XDG_RUNTIME_DIR=old", "XCURSOR_THEME=Adwaita", "SECRET=bad"}, "wayland-7", "/run/me")
	17	+	want := []string{"HOME=/home/me", "LC_ALL=C", "PATH=/bin", "WAYLAND_DISPLAY=wayland-7", "XCURSOR_SIZE=24", "XCURSOR_THEME=Adwaita", "XDG_CURRENT_DESKTOP=nefertty", "XDG_RUNTIME_DIR=/run/me", "XDG_SESSION_TYPE=wayland"}
18	18		if !reflect.DeepEqual(got, want) {
19	19		t.Fatalf("got %v want %v", got, want)
20	20		}


@@ -13,8 +13,8 @@ import (
13		)	13		)
14			14
15		func TestChildEnv(t *testing.T) {	15		func TestChildEnv(t *testing.T) {
16	-	got := ChildEnv([]string{"TERM=x", "DISPLAY=:0", "WAYLAND_SOCKET=4", "WAYLAND_DISPLAY=old", "HOME=/home/me", "PATH=/bin", "LC_ALL=C", "XDG_RUNTIME_DIR=old", "SECRET=bad"}, "wayland-7", "/run/me")	16	+	got := ChildEnv([]string{"TERM=x", "DISPLAY=:0", "WAYLAND_SOCKET=4", "WAYLAND_DISPLAY=old", "HOME=/home/me", "PATH=/bin", "LC_ALL=C", "XDG_RUNTIME_DIR=old", "XCURSOR_THEME=Adwaita", "SECRET=bad"}, "wayland-7", "/run/me")
17	-	want := []string{"HOME=/home/me", "LC_ALL=C", "PATH=/bin", "WAYLAND_DISPLAY=wayland-7", "XDG_CURRENT_DESKTOP=nefertty", "XDG_RUNTIME_DIR=/run/me", "XDG_SESSION_TYPE=wayland"}	17	+	want := []string{"HOME=/home/me", "LC_ALL=C", "PATH=/bin", "WAYLAND_DISPLAY=wayland-7", "XCURSOR_SIZE=24", "XCURSOR_THEME=Adwaita", "XDG_CURRENT_DESKTOP=nefertty", "XDG_RUNTIME_DIR=/run/me", "XDG_SESSION_TYPE=wayland"}
18		if !reflect.DeepEqual(got, want) {	18		if !reflect.DeepEqual(got, want) {
19		t.Fatalf("got %v want %v", got, want)	19		t.Fatalf("got %v want %v", got, want)
20		}	20		}