show individual display values and reduce update issues

client/brightness.py

@@ -24,7 +24,9 @@ calibration = {
 
 running = True
 is_active = True
+is_unpaused = True
 last_brightness = 0
+disps = None
 
 def cal(v, c):
     # out = out_b + out_a * in_a * max(0, in_b + in)
@@ -42,7 +44,7 @@ def lux_to_disp(name, val):
     return min(max(val, 0), 100)
 
 def main():
-    global running, is_active, last_brightness
+    global running, is_active, is_unpaused, last_brightness, disps
 
     print("usb init")
     usb = lux.usb_init()
@@ -79,6 +81,7 @@ def main():
     time_window = time.time()
 
     is_active = True
+    is_unpaused = True
 
     while running:
         # read brightness at approx. 1Hz with low-pass filtering
@@ -129,7 +132,7 @@ def main():
             is_active = not info["fullscreen"]
 
         # set displays at most every 10s
-        if is_active and ((time.time() - time_displays) > 10.0):
+        if is_active and is_unpaused and ((time.time() - time_displays) > 10.0):
             time_displays = time.time()
 
             for d in disps:

client/tray.py

@@ -14,14 +14,34 @@ from PIL import Image
 #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"
+prev_pause = None
+prev_active = None
+prev_last = None
+prev_disp = None
+
+def is_running_name():
+    #print("check 1")
+    return "Running" if (brightness.is_active and brightness.is_unpaused) else "Stopped"
+
+def is_running_checked():
+    #print("check 2")
+    return True if (brightness.is_active and brightness.is_unpaused) else False
 
 def get_value():
-    #print("check2")
+    #print("check 3")
     return f"Brightness: {brightness.last_brightness}"
 
+def is_paused_checked():
+    #print("check 4")
+    return False if brightness.is_unpaused else True
+
+def is_paused_name():
+    #print("check 5")
+    return "Unpaused" if brightness.is_unpaused else "Paused"
+
+def toggle_pause():
+    brightness.is_unpaused = False if brightness.is_unpaused else True
+
 def quit(icon):
     print("stop brightness")
     brightness.running = False
@@ -30,10 +50,35 @@ def quit(icon):
     icon.stop()
 
 def poll(icon):
+    global prev_pause, prev_active, prev_last, prev_disp
+
     while brightness.running:
+        time.sleep(1.0)
+
+        if (prev_pause == brightness.is_unpaused) and (prev_active == brightness.is_active) and (prev_last == brightness.last_brightness) and (prev_disp == brightness.disps):
+            #print("skip")
+            continue
+
+        prev_pause = brightness.is_unpaused
+        prev_active = brightness.is_active
+        prev_last = brightness.last_brightness
+        prev_disp = brightness.disps
+
         #print("update")
         icon.update_menu()
-        time.sleep(5.0)
+
+def display_menu():
+    #print("menu")
+    if (brightness.disps == None) or (len(brightness.disps) <= 0):
+        return (pystray.MenuItem("No displays", None, enabled=False), )
+
+    display_entries = []
+    for d in brightness.disps:
+        #s = "{} ({}) @ {}".format(d["name"], d["_id"], d["prev"])
+        s = f"{d['prev']} @ {d['name']}"
+        display_entries.append(pystray.MenuItem(s, None, enabled=False))
+
+    return display_entries
 
 def main():
     out = BytesIO()
@@ -48,18 +93,27 @@ def main():
     icon = pystray.Icon("AutoBrightness", image, "AutoBrightness",
         menu=pystray.Menu(
             pystray.MenuItem(
-                'Activated',
+                lambda icon=pystray.Icon: get_value(),
                 None,
                 enabled=False,
-                checked=lambda icon=pystray.Icon: is_running(),
             ),
-
             pystray.MenuItem(
-                lambda icon=pystray.Icon: get_value(),
+                "Displays",
+                pystray.Menu(
+                    lambda icon=pystray.Icon: display_menu(),
+                )
+            ),
+            pystray.MenuItem(
+                lambda icon=pystray.Icon: is_running_name(),
                 None,
                 enabled=False,
+                checked=lambda icon=pystray.Icon: is_running_checked(),
+            ),
+            pystray.MenuItem(
+                lambda icon=pystray.Icon: is_paused_name(),
+                lambda icon=pystray.Icon: toggle_pause(),
+                checked=lambda icon=pystray.Icon: is_paused_checked(),
             ),
-
             pystray.MenuItem(
                 "Quit",
                 lambda icon=pystray.Icon: quit(icon),