en2zmax/streamdeck-lets-go
1
0
Fork 0
Code Issues 1 Activity

Compare commits

base: en2zmax:e8b4eafc2ec0d960f5f199773f799a8cf12011a5
Branches Tags
en2zmax:main
en2zmax:feat/custom-dropdown
..
compare: en2zmax:56a5cb5bba2b18e2cb82d0ec2e4a533e8e8467e6
Branches Tags
en2zmax:main
en2zmax:feat/custom-dropdown

No commits in common. "e8b4eafc2ec0d960f5f199773f799a8cf12011a5" and "56a5cb5bba2b18e2cb82d0ec2e4a533e8e8467e6" have entirely different histories.
e8b4eafc2e ... 56a5cb5bba

3 changed files with 2 additions and 33 deletions
Show Stats Expand all files Collapse all files

13
action.go
View File

@ -232,9 +232,6 @@ func deckBuiltinAction(action string, deck *Deck) error {
func keyboardTool() string {
if os.Getenv("WAYLAND_DISPLAY") != "" {
if _, err := exec.LookPath("ydotool"); err == nil {
return "ydotool"
}
if _, err := exec.LookPath("wtype"); err == nil {
return "wtype"
}
@ -267,8 +264,6 @@ func execKeyboard(a *config.Action) error {
}
switch tool {
case "ydotool":
return execYDOTool(keys)
case "wtype":
return execWType(parts)
case "xdotool":
@ -305,14 +300,6 @@ func execXDoTool(keys string) error {
return cmd.Run()
}
func execYDOTool(keys string) error {
// Use 'type' command instead of 'key' for better compatibility with Wine/games on Wayland
cmd := exec.Command("ydotool", "type", keys)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
}
func (pm *PageManager) PageNames() []string {
pm.mu.RLock()
defer pm.mu.RUnlock()

15
daemon.go
View File

@ -289,19 +289,8 @@ func Run(ctx context.Context, cfg *config.Config, opts RunOptions) error {
func checkKeyboardTool() {
if os.Getenv("WAYLAND_DISPLAY") != "" {
// On Wayland, prefer ydotool over wtype
if _, err := exec.LookPath("ydotool"); err == nil {
// Start ydotoold daemon if not already running
cmd := exec.Command("ydotoold")
cmd.Stdout = nil
cmd.Stderr = nil
// Run in background, don't wait
_ = cmd.Start()
slog.Info("ydotoold daemon started for keyboard input")
} else if _, err := exec.LookPath("wtype"); err == nil {
slog.Warn("ydotool not found, falling back to wtype — consider installing ydotool for better Wayland support (e.g. apk add ydotool)")
} else {
slog.Warn("keyboard actions require ydotool or wtype on Wayland — install one (e.g. apk add ydotool) and restart")
if _, err := exec.LookPath("wtype"); err != nil {
slog.Warn("keyboard actions require wtype on Wayland — install it (e.g. apk add wtype) and restart")
}
} else {
if _, err := exec.LookPath("xdotool"); err != nil {

7
page.go
View File

@ -249,13 +249,6 @@ func (pm *PageManager) renderKey(idx int, k *config.KeyConfig) {
if err := pm.deck.WriteText(idx, k.Label, image.Black, fontName, fontSize); err != nil {
slog.Warn("write text", "error", err)
}
} else if k.Background != "" {
bg, err := parseHexColor(k.Background)
if err == nil {
pm.deck.FillColor(idx, bg.R, bg.G, bg.B)
} else {
slog.Warn("invalid background color", "value", k.Background, "error", err)
}
}
}