add systray version

README.md

@@ -35,9 +35,23 @@ Uses [KWin scripting](https://develop.kde.org/docs/plasma/kwin/) to get the acti
 This is used to pause adjustments while a fullscreen window is focused (eg. while gaming).
 Also sends status updates to a local InfluxDB.
 
+Run the command-line version with systemd automatically (modify paths in the commands and file accordingly):
+
+    mkdir -p ~/.config/systemd/user
+    ln -s /home/thomas/Projekte/AutoBrightness/client/autobrightness.service ~/.config/systemd/user
+    systemctl --user daemon-reload
+    systemctl --user enable --now autobrightness
+
+Or alternatively modify the paths in the `AutoBrightness.desktop` file and copy it to `~/.local/share/applications` for a graphical version that you can easily auto-start on boot in eg. the KDE settings menu.
+
 ### Quick Start
 
-Install dependency and run the client.
+Install dependencies and run the systray client:
+
+    yay -S python-pyusb python-pystray python-pillow python-cairosvg
+    ./client/tray.py
+
+Or for just the command-line version:
 
     yay -S python-pyusb
     ./client/brightness.py

client/AutoBrightness.desktop

@@ -0,0 +1,17 @@
+[Desktop Entry]
+Comment[en_US]=
+Comment=
+Exec=/home/thomas/Projekte/AutoBrightness/client/tray.py
+GenericName[en_US]=
+GenericName=
+Icon=brightness-high
+MimeType=
+Name[en_US]=AutoBrightness
+Name=AutoBrightness
+Path=/home/thomas/Projekte/AutoBrightness/client/
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-KDE-SubstituteUID=false
+X-KDE-Username=

client/autobrightness.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Auto DDC/CI display brightness
+
+[Service]
+Type=exec
+WorkingDirectory=/home/thomas/Projekte/AutoBrightness
+ExecStart=/home/thomas/Projekte/AutoBrightness/client/brightness.py
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=fritzinfluxdb
+RemainAfterExit=no
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=default.target

client/brightness.py

@@ -2,10 +2,13 @@
 
 import lux
 import ddc
-import time
 import influx
 import window
 
+import time
+import sys
+import select
+
 filter_fact = 0.90
 
 c_in = 0.6, -30.0, # in_a, in_b
@@ -19,6 +22,10 @@ calibration = {
     ],
 }
 
+running = True
+is_active = True
+last_brightness = 0
+
 def cal(v, c):
     # out = out_b + out_a * in_a * max(0, in_b + in)
     return c[1] + c[0] * c_in[0] * max(0, c_in[1] + v)
@@ -34,14 +41,20 @@ def lux_to_disp(name, val):
     val = int(val)
     return min(max(val, 0), 100)
 
-if __name__ == "__main__":
+def main():
+    global running, is_active, last_brightness
+
+    print("usb init")
     usb = lux.usb_init()
+    print("check usb connection")
     lux.check_connection(usb)
 
+    print("detect displays")
     disps = ddc.ddc_detect()
     if len(disps) <= 0:
         raise ValueError("no displays found")
 
+    print("query displays")
     for d in disps:
         # select i2c bus if available, id otherwise
         if "bus" in d:
@@ -62,16 +75,25 @@ if __name__ == "__main__":
     print()
 
     time_brightness = time.time()
-    time_displays = time.time()
+    time_displays = time.time() - 8.0
     time_window = time.time()
 
     is_active = True
 
-    while True:
+    while running:
         # read brightness at approx. 1Hz with low-pass filtering
         time.sleep(1.0)
         brightness = filter_lux(brightness, lux.read_brightness(usb))
 
+        if select.select([sys.stdin, ], [], [], 0.0)[0]:
+            line = sys.stdin.readline()
+            print("Resetting displays")
+            for d in disps:
+                try:
+                    ddc.ddc_set(d["_id"], d["prev"])
+                except Exception as e:
+                    print(e)
+
         # print brightness changes at most every 5s
         if (time.time() - time_brightness) > 5.0:
             time_brightness = time.time()
@@ -122,3 +144,6 @@ if __name__ == "__main__":
 
                         # set to zero to show display is disconnected
                         d["prev"] = -1
+
+if __name__ == "__main__":
+    main()

client/tray.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+
+import brightness
+import threading
+import time
+
+import pystray
+from io import BytesIO
+import cairosvg
+from PIL import Image
+
+#icon_path = "/usr/share/icons/breeze-dark/devices/22/video-display-brightness.svg"
+#icon_path = "/usr/share/icons/breeze-dark/devices/32/video-display-brightness-symbolic.svg"
+#icon_path = "/usr/share/icons/breeze-dark/status/32/input-keyboard-brightness.svg"
+icon_path = "/usr/share/icons/breeze-dark/actions/24/brightness-high.svg"
+
+def is_running():
+    #print("check1")
+    return "Active" if brightness.is_active else "Inactive"
+
+def get_value():
+    #print("check2")
+    return f"Brightness: {brightness.last_brightness}"
+
+def quit(icon):
+    print("stop brightness")
+    brightness.running = False
+
+    print("stop tray")
+    icon.stop()
+
+def poll(icon):
+    while brightness.running:
+        #print("update")
+        icon.update_menu()
+        time.sleep(5.0)
+
+def main():
+    out = BytesIO()
+    cairosvg.svg2png(url=icon_path, write_to=out)
+    image = Image.open(out)
+
+    print("start brightness")
+    t_b = threading.Thread(target=brightness.main)
+    t_b.start()
+
+    print("prepare tray")
+    icon = pystray.Icon("AutoBrightness", image, "AutoBrightness",
+        menu=pystray.Menu(
+            pystray.MenuItem(
+                'Activated',
+                None,
+                enabled=False,
+                checked=lambda icon=pystray.Icon: is_running(),
+            ),
+
+            pystray.MenuItem(
+                lambda icon=pystray.Icon: get_value(),
+                None,
+                enabled=False,
+            ),
+
+            pystray.MenuItem(
+                "Quit",
+                lambda icon=pystray.Icon: quit(icon),
+            ),
+        )
+    )
+
+    print("start polling")
+    t_p = threading.Thread(target=poll, args=(icon,))
+    t_p.start()
+
+    print("start tray")
+    icon.run()
+
+    print("join brightness")
+    t_b.join()
+    t_p.join()
+
+    print("done")
+
+if __name__ == "__main__":
+    main()