support for mute and audio stream changing buttons

.github/workflows/build.yml

@@ -5,7 +5,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [~1.17, ^1]
+        go-version: [~1.23, ^1]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     env:

.gitignore

@@ -19,3 +19,7 @@ dist/
 
 # direnv
 .envrc
+
+# GoLand Project Files
+.idea/
+*.iml

config.go

@@ -5,14 +5,14 @@
 	"errors"
 	"fmt"
 	"image/color"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	colorful "github.com/lucasb-eyer/go-colorful"
+	"github.com/lucasb-eyer/go-colorful"
 )
 
 // DBusConfig describes a dbus action.
@@ -51,11 +51,18 @@
 // Keys is a slice of keys.
 type Keys []KeyConfig
 
+type WindowConfig struct {
+	Resource string `toml:"resource,omitempty"`
+	Title    string `toml:"title,omitempty"`
+	Keys     Keys   `toml:"keys"`
+}
+
 // DeckConfig is the central configuration struct.
 type DeckConfig struct {
-	Background string `toml:"background,omitempty"`
-	Parent     string `toml:"parent,omitempty"`
-	Keys       Keys   `toml:"keys"`
+	Background string         `toml:"background,omitempty"`
+	Parent     string         `toml:"parent,omitempty"`
+	Windows    []WindowConfig `toml:"window,omitempty"`
+	Keys       Keys           `toml:"keys"`
 }
 
 // MergeDeckConfig merges key configuration from multiple configs.
@@ -77,7 +84,9 @@
 	if background == "" {
 		background = parent.Background
 	}
-	return DeckConfig{background, base.Parent, keys}
+
+	windows := append(base.Windows, parent.Windows...)
+	return DeckConfig{background, base.Parent, windows, keys}
 }
 
 // LoadConfigFromFile loads a DeckConfig from a file while checking for circular
@@ -98,12 +107,14 @@
 		}
 	}
 
-	file, err := ioutil.ReadFile(filename)
+	file, err := os.ReadFile(filename)
 	if err != nil {
 		return config, err
 	}
 
-	_, err = toml.Decode(string(file), &config)
+	if _, err = toml.Decode(string(file), &config); err != nil {
+		return config, err
+	}
 	if config.Parent != "" {
 		parent, err := LoadConfigFromFile(base, config.Parent, append(files, filename))
 		if err != nil {
@@ -133,7 +144,7 @@
 		return err
 	}
 
-	return ioutil.WriteFile(filename, b.Bytes(), 0600)
+	return os.WriteFile(filename, b.Bytes(), 0600)
 }
 
 // ConfigValue tries to convert an interface{} to the desired type.

dbus.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"github.com/godbus/dbus/v5"
+	"github.com/godbus/dbus/v5/introspect"
+)
+
+const (
+	dbusInterface   = "io.github.muesli.DeckMaster"
+	dbusMonitorPath = "/Monitor"
+	introInterface  = "org.freedesktop.DBus.Introspectable"
+	intro           = `<node>
+	<interface name="` + dbusInterface + `">
+		<method name="ActiveWindowChanged">
+			<arg direction="in" type="s" />
+			<arg direction="in" type="s" />
+		</method>
+	</interface>` + introspect.IntrospectDataString + "<node>"
+)
+
+type ActiveWindow struct {
+	resource string
+	title    string
+	id       string
+}
+
+type WindowChannel struct {
+	channel chan ActiveWindow
+}
+
+func (w *WindowChannel) ActiveWindowChanged(class, title, id string) *dbus.Error {
+	w.channel <- ActiveWindow{class, title, id}
+	return nil
+}
+
+func MonitorActiveWindowChanged() <-chan ActiveWindow {
+	w := WindowChannel{make(chan ActiveWindow)}
+	cnn, _ := dbus.SessionBus()
+	_ = cnn.Export(&w, dbusMonitorPath, dbusInterface)
+
+	introspectable := introspect.Introspectable(intro)
+	_ = cnn.Export(introspectable, dbusMonitorPath, introInterface)
+
+	reply, e := cnn.RequestName(dbusInterface, dbus.NameFlagDoNotQueue)
+	if e != nil {
+		errorLog(e, "failed to request name on active window changed")
+	}
+	if reply != dbus.RequestNameReplyPrimaryOwner {
+		errorLogF("service '%s' already running", dbusInterface)
+	}
+	return w.channel
+}
+
+func CallDBus(object, path, method string, args ...interface{}) error {
+	cnn, _ := dbus.SessionBus()
+
+	o := cnn.Object(object, dbus.ObjectPath(path))
+	return o.Call(method, 0, args...).Err
+}