PyPI - pwr_tray - Versions diffs - 1.0.2__tar.gz → 1.0.3__tar.gz - Mend

pwr_tray 1.0.2tar.gz → 1.0.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

{pwr_tray-1.0.2 → pwr_tray-1.0.3}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pwr_tray
-Version: 1.0.2
+Version: 1.0.3
 Summary: A GTK tray applet for power management for i3/sway/KDE
 Keywords: power,energy,GTK,applet,tray,kde,i3wm,sway
 Author-email: Joe Defen <joedef@google.com>
@@ -18,7 +18,7 @@ Project-URL: Homepage, https://github.com/joedefen/pwr-tray
 # pwr-tray
-`pwr-tray` is a GTK5 Tray Applet for Power/Energy Saving and System/DE Controls; currently supported/tested DEs are: i3wm, swaywm, and KDE on X11. `systemd` is required. The `pwr-tray` menu will look similar to:
+`pwr-tray` is a PyQt5 Tray Applet for Power/Energy Saving and System/DE Controls; currently supported/tested DEs are: i3wm, swaywm, and KDE (X11 and Wayland). `systemd` is required. The `pwr-tray` menu will look similar to:
 <p align="center">
   <img src="https://github.com/joedefen/pwr-tray/blob/main/images/pwr-tray-screenshot.png?raw=true" alt="screenshot">
@@ -27,14 +27,14 @@ Project-URL: Homepage, https://github.com/joedefen/pwr-tray
 With just a right-click and a left-click, you can do most operations such as change to Presentation Mode, change screen lock and sleep timeouts, log off, lock and blank your monitors, and more. The `pwr-tray` icon changes based on state:
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/FullSun-v03.svg?raw=true" alt="FullSun" width="24" height="24"> Presentation Mode (i.e., the full sun)
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/SettingSun-v03.svg?raw=true" alt="SettingSun" width="24" height="24"> SleepAfterLock Mode (i.e., the setting sun)
-    * <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/RisingMoon-v03.svg?raw=true" alt="RisingMoon" width="24" height="24"> SleepAfterLock Mode and Locking Screen Soon
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/Unlocked-v03.svg?raw=true" alt="Unlocked" width="24" height="24"> LockOnly Mode  (i.e., the unlocked lock)
-    * <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/UnlockedMoon-v03.svg?raw=true" alt="UnlockedMoon" width="24" height="24"> LockOnly Mode and Locking Screen Soon
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/GoingDown-v03.svg?raw=true" alt="GoingDown" width="24" height="24"> LowBattery State (going down).
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/PlayingNow-v03.svg?raw=true" alt="PlayingNow" width="24" height="24"> Inhibited by playing media.
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/StopSign-v03.svg?raw=true" alt="StopSign" width="24" height="24"> Inhibited by systemd inhibitors.
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/FullSun-v03.svg?raw=true" alt="FullSun" width="24" height="24"> Presentation Mode (i.e., the full sun)
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/SettingSun-v03.svg?raw=true" alt="SettingSun" width="24" height="24"> SleepAfterLock Mode (i.e., the setting sun)
+    * <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/RisingMoon-v03.svg?raw=true" alt="RisingMoon" width="24" height="24"> SleepAfterLock Mode and Locking Screen Soon
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/Unlocked-v03.svg?raw=true" alt="Unlocked" width="24" height="24"> LockOnly Mode  (i.e., the unlocked lock)
+    * <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/UnlockedMoon-v03.svg?raw=true" alt="UnlockedMoon" width="24" height="24"> LockOnly Mode and Locking Screen Soon
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/GoingDown-v03.svg?raw=true" alt="GoingDown" width="24" height="24"> LowBattery State (going down).
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/PlayingNow-v03.svg?raw=true" alt="PlayingNow" width="24" height="24"> Inhibited by playing media.
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/StopSign-v03.svg?raw=true" alt="StopSign" width="24" height="24"> Inhibited by systemd inhibitors.
 ---
@@ -45,31 +45,31 @@ With just a right-click and a left-click, you can do most operations such as cha
     * Shows system-level commands (DE dependent) that must be installed if missing. Note:
       * `systemctl` is always required.
       * Optionally, install `playerctl` if you wish playing media to inhibit screen saving and sleeping.
-    * If you find you are missing the QT5 foundation, then you'll need to install that; examples:
-        * `sudo apt install qt5-default` # if debian based
-        * `sudo pacman -S qt5-base` # if arch based
-        * `sudo dnf install qt5-qtbase` # if fedora based
+    * If you find you are missing PyQt5, then you'll need to install it; examples:
+        * `sudo apt install python3-pyqt5` # if debian based
+        * `sudo pacman -S python-pyqt5` # if arch based
+        * `sudo dnf install python3-qt5` # if fedora based
 * Then, follow the "Per-DE Specific Notes" below to ensure proper operation. To just kick the tires, you can defer this until ready to go forward.
 * Read the other sections for customization and everyday use.
 * From the CLI, you can start/restart pwr-tray in the background with `setsid pwr-tray`; typically, you will "autostart" `pwr-tray` when you log in however your DE/WM manages autostarts.
-* `pwr-tray -e` edits the config file (`~/.config/pwr-ini/config.ini`)
-* `pwr-tray -f` tails the log file (`~/.config/pwr-ini/debug.log`)
+* `pwr-tray -e` edits the config file (`~/.config/pwr-tray/config.ini`)
+* `pwr-tray -f` tails the log file (`~/.config/pwr-tray/debug.log`)
 ---
 ### HowTo Use pwr-tray
-Open the `pwr-tray' menu with a right-click. Then left-click a line to have an effect ...
+Open the `pwr-tray` menu with a right-click. Then left-click a line to have an effect ...
 Choose from three *major power modes* (to control the effects of timeouts):
 - **🅟 Presentation ⮜** -  Keeps the screen unlocked/on and system up.
 - **🅛 LockOnly ⮜** - Keeps the system up, but the screen may lock.
 - **🅢 SleepAfterLock ⮜** - Allows screen locking and system to go down (the "normal" mode).
-Ory choose from various locking/blanking/DE operations:
+Or choose from various locking/blanking/DE operations:
 - **▷ Lock Screen** - locks the screen immediately.
 - **▷ Blank Monitors** - blanks the screen after locking the screen.
-- **▷ Reload i3** - various DE-dependent actions.
+- **▷ Reload** - various DE-dependent actions (reload WM config, etc.).
 - **▷ Log Off** - terminate your user session.
 Or choose a new *system state*:
@@ -110,7 +110,8 @@ Or act on the applet itself:
 Here are the current 'Settings' defaults with explanation.
 ```
     [Settings]
-    i3lock_args = -t -i ./lockpaper.png # arguments when running i3lock for wallpaper
+    i3lock_args = -t -i ./lockpaper.png # extra arguments for i3lock
+    swaylock_args = -i ./lockpaper.png  # extra arguments for swaylock
     debug_mode = False                  # more frequent and elaborate logging
     power_down = False                  # power down (rather than suspend)
     turn_off_monitors = False           # turn off monitors after locking screen
@@ -159,11 +160,14 @@ bindsym $mod+Escape exec --no-startup-id $screenlock  # create shortcut to lock
 ### sway Specific Notes
 * Uninstall or disable all competing energy saving programs (e.g., `swayidle`, `xfce4-power-manager`, etc.) when running `sway` whether started by `systemd` or `sway/config` or whatever.
 * **NOTE**: on `sway`, `pwr-tray` cannot read the idle time and do its usual micromanagement; instead, it runs a `swayidle` command whose arguments may vary with your settings.
-* Edit `/etc/system/logind.conf` and uncomment `HandlePowerKey=` and `HandleLidSwitch=`, and set each action to `suspend`; then either reboot or restart `systemd-logind`.  That enables the ever-running `swayidle` to handle the suspend / resume events.
+* Edit `/etc/systemd/logind.conf` and uncomment `HandlePowerKey=` and `HandleLidSwitch=`, and set each action to `suspend`; then either reboot or restart `systemd-logind`.  That enables the ever-running `swayidle` to handle the suspend / resume events.
 * Again, find a way to start `pwr-tray`; perhaps adding to sway's config: `exec_always --no-startup-id sleep 2 && ~/.local/bin/pwr-tray`; a delay may be required to let the tray initialize.
-### KDE (X11) Specific Notes
+### KDE Specific Notes
 * In Settings/Energy Saving, disable "Screen Energy Saving", "Suspend session", etc., except keep the "Button events handling" and make it as you wish (e.g., "When power button pressed", "Sleep").
 * In Settings/AutoStart, add the full path of `~/.local/bin/pwr-tray`.
+* `qdbus` (or `qdbus6` on Plasma 6) is required; `pwr-tray` auto-detects which is available.
+* On **KDE Wayland**, idle time is read via D-Bus (`org.freedesktop.ScreenSaver`). Locking uses `loginctl lock-session`.
+* On **KDE X11**, idle time is read via `xprintidle` and screen locking uses `loginctl lock-session`.

{pwr_tray-1.0.2 → pwr_tray-1.0.3}/README.md RENAMED Viewed

@@ -1,6 +1,6 @@
 # pwr-tray
-`pwr-tray` is a GTK5 Tray Applet for Power/Energy Saving and System/DE Controls; currently supported/tested DEs are: i3wm, swaywm, and KDE on X11. `systemd` is required. The `pwr-tray` menu will look similar to:
+`pwr-tray` is a PyQt5 Tray Applet for Power/Energy Saving and System/DE Controls; currently supported/tested DEs are: i3wm, swaywm, and KDE (X11 and Wayland). `systemd` is required. The `pwr-tray` menu will look similar to:
 <p align="center">
   <img src="https://github.com/joedefen/pwr-tray/blob/main/images/pwr-tray-screenshot.png?raw=true" alt="screenshot">
@@ -9,14 +9,14 @@
 With just a right-click and a left-click, you can do most operations such as change to Presentation Mode, change screen lock and sleep timeouts, log off, lock and blank your monitors, and more. The `pwr-tray` icon changes based on state:
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/FullSun-v03.svg?raw=true" alt="FullSun" width="24" height="24"> Presentation Mode (i.e., the full sun)
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/SettingSun-v03.svg?raw=true" alt="SettingSun" width="24" height="24"> SleepAfterLock Mode (i.e., the setting sun)
-    * <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/RisingMoon-v03.svg?raw=true" alt="RisingMoon" width="24" height="24"> SleepAfterLock Mode and Locking Screen Soon
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/Unlocked-v03.svg?raw=true" alt="Unlocked" width="24" height="24"> LockOnly Mode  (i.e., the unlocked lock)
-    * <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/UnlockedMoon-v03.svg?raw=true" alt="UnlockedMoon" width="24" height="24"> LockOnly Mode and Locking Screen Soon
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/GoingDown-v03.svg?raw=true" alt="GoingDown" width="24" height="24"> LowBattery State (going down).
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/PlayingNow-v03.svg?raw=true" alt="PlayingNow" width="24" height="24"> Inhibited by playing media.
-* <img src="https://github.com/joedefen/pwr-tray/blob/main/src/pwr_tray/resources/StopSign-v03.svg?raw=true" alt="StopSign" width="24" height="24"> Inhibited by systemd inhibitors.
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/FullSun-v03.svg?raw=true" alt="FullSun" width="24" height="24"> Presentation Mode (i.e., the full sun)
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/SettingSun-v03.svg?raw=true" alt="SettingSun" width="24" height="24"> SleepAfterLock Mode (i.e., the setting sun)
+    * <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/RisingMoon-v03.svg?raw=true" alt="RisingMoon" width="24" height="24"> SleepAfterLock Mode and Locking Screen Soon
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/Unlocked-v03.svg?raw=true" alt="Unlocked" width="24" height="24"> LockOnly Mode  (i.e., the unlocked lock)
+    * <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/UnlockedMoon-v03.svg?raw=true" alt="UnlockedMoon" width="24" height="24"> LockOnly Mode and Locking Screen Soon
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/GoingDown-v03.svg?raw=true" alt="GoingDown" width="24" height="24"> LowBattery State (going down).
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/PlayingNow-v03.svg?raw=true" alt="PlayingNow" width="24" height="24"> Inhibited by playing media.
+* <img src="https://github.com/joedefen/pwr-tray/blob/main/pwr_tray/resources/StopSign-v03.svg?raw=true" alt="StopSign" width="24" height="24"> Inhibited by systemd inhibitors.
 ---
@@ -27,31 +27,31 @@ With just a right-click and a left-click, you can do most operations such as cha
     * Shows system-level commands (DE dependent) that must be installed if missing. Note:
       * `systemctl` is always required.
       * Optionally, install `playerctl` if you wish playing media to inhibit screen saving and sleeping.
-    * If you find you are missing the QT5 foundation, then you'll need to install that; examples:
-        * `sudo apt install qt5-default` # if debian based
-        * `sudo pacman -S qt5-base` # if arch based
-        * `sudo dnf install qt5-qtbase` # if fedora based
+    * If you find you are missing PyQt5, then you'll need to install it; examples:
+        * `sudo apt install python3-pyqt5` # if debian based
+        * `sudo pacman -S python-pyqt5` # if arch based
+        * `sudo dnf install python3-qt5` # if fedora based
 * Then, follow the "Per-DE Specific Notes" below to ensure proper operation. To just kick the tires, you can defer this until ready to go forward.
 * Read the other sections for customization and everyday use.
 * From the CLI, you can start/restart pwr-tray in the background with `setsid pwr-tray`; typically, you will "autostart" `pwr-tray` when you log in however your DE/WM manages autostarts.
-* `pwr-tray -e` edits the config file (`~/.config/pwr-ini/config.ini`)
-* `pwr-tray -f` tails the log file (`~/.config/pwr-ini/debug.log`)
+* `pwr-tray -e` edits the config file (`~/.config/pwr-tray/config.ini`)
+* `pwr-tray -f` tails the log file (`~/.config/pwr-tray/debug.log`)
 ---
 ### HowTo Use pwr-tray
-Open the `pwr-tray' menu with a right-click. Then left-click a line to have an effect ...
+Open the `pwr-tray` menu with a right-click. Then left-click a line to have an effect ...
 Choose from three *major power modes* (to control the effects of timeouts):
 - **🅟 Presentation ⮜** -  Keeps the screen unlocked/on and system up.
 - **🅛 LockOnly ⮜** - Keeps the system up, but the screen may lock.
 - **🅢 SleepAfterLock ⮜** - Allows screen locking and system to go down (the "normal" mode).
-Ory choose from various locking/blanking/DE operations:
+Or choose from various locking/blanking/DE operations:
 - **▷ Lock Screen** - locks the screen immediately.
 - **▷ Blank Monitors** - blanks the screen after locking the screen.
-- **▷ Reload i3** - various DE-dependent actions.
+- **▷ Reload** - various DE-dependent actions (reload WM config, etc.).
 - **▷ Log Off** - terminate your user session.
 Or choose a new *system state*:
@@ -92,7 +92,8 @@ Or act on the applet itself:
 Here are the current 'Settings' defaults with explanation.
 ```
     [Settings]
-    i3lock_args = -t -i ./lockpaper.png # arguments when running i3lock for wallpaper
+    i3lock_args = -t -i ./lockpaper.png # extra arguments for i3lock
+    swaylock_args = -i ./lockpaper.png  # extra arguments for swaylock
     debug_mode = False                  # more frequent and elaborate logging
     power_down = False                  # power down (rather than suspend)
     turn_off_monitors = False           # turn off monitors after locking screen
@@ -141,10 +142,13 @@ bindsym $mod+Escape exec --no-startup-id $screenlock  # create shortcut to lock
 ### sway Specific Notes
 * Uninstall or disable all competing energy saving programs (e.g., `swayidle`, `xfce4-power-manager`, etc.) when running `sway` whether started by `systemd` or `sway/config` or whatever.
 * **NOTE**: on `sway`, `pwr-tray` cannot read the idle time and do its usual micromanagement; instead, it runs a `swayidle` command whose arguments may vary with your settings.
-* Edit `/etc/system/logind.conf` and uncomment `HandlePowerKey=` and `HandleLidSwitch=`, and set each action to `suspend`; then either reboot or restart `systemd-logind`.  That enables the ever-running `swayidle` to handle the suspend / resume events.
+* Edit `/etc/systemd/logind.conf` and uncomment `HandlePowerKey=` and `HandleLidSwitch=`, and set each action to `suspend`; then either reboot or restart `systemd-logind`.  That enables the ever-running `swayidle` to handle the suspend / resume events.
 * Again, find a way to start `pwr-tray`; perhaps adding to sway's config: `exec_always --no-startup-id sleep 2 && ~/.local/bin/pwr-tray`; a delay may be required to let the tray initialize.
-### KDE (X11) Specific Notes
+### KDE Specific Notes
 * In Settings/Energy Saving, disable "Screen Energy Saving", "Suspend session", etc., except keep the "Button events handling" and make it as you wish (e.g., "When power button pressed", "Sleep").
 * In Settings/AutoStart, add the full path of `~/.local/bin/pwr-tray`.
+* `qdbus` (or `qdbus6` on Plasma 6) is required; `pwr-tray` auto-detects which is available.
+* On **KDE Wayland**, idle time is read via D-Bus (`org.freedesktop.ScreenSaver`). Locking uses `loginctl lock-session`.
+* On **KDE X11**, idle time is read via `xprintidle` and screen locking uses `loginctl lock-session`.

{pwr_tray-1.0.2 → pwr_tray-1.0.3}/pwr_tray/main.py RENAMED Viewed

@@ -71,7 +71,6 @@ class PwrTray:
             if is_wayland:
                 env = 'kde-wayland'
                 prt(f'ENV: {env} {desktop_session=} {wayland_display=}')
-                assert False, f'unsupported env: {env}'
                 return 'kde-wayland', is_wayland
             if display:
                 env = 'kde-x11'
@@ -101,6 +100,7 @@ class PwrTray:
         'monitors_off': '',
         'locker': '',
         'get_idle_ms': '',
+        'get_idle_s': '',
         'reset_idle': '',
         'reload_wm': '',
         'restart_wm': '',
@@ -137,29 +137,11 @@ class PwrTray:
             'restart_wm': 'killall plasmashell && kstart5 plasmashell && sleep 3 && pwr-tray',
             'must_haves': 'loginctl qdbus'.split(),
         }, 'kde-wayland': {
-            # sudo apt-get install xdg-utils
+            'get_idle_s': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver GetSessionIdleTime',
             'reset_idle': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver SimulateUserActivity',
-            # gdbus introspect --session --dest org.gnome.SessionManager
-            #       --object-path /org/gnome/SessionManager
-            # gdbus call --session --dest org.gnome.SessionManager
-            #       --object-path /org/gnome/SessionManager
-            #       --method org.gnome.SessionManager.GetIdleTime
-            #   from pydbus import SessionBus
-            #   import time
-            #   def get_idle_time():
-            #       bus = SessionBus()
-            #       screensaver = bus.get("org.freedesktop.ScreenSaver")
-            #       # The GetSessionIdleTime method returns the idle time in seconds.
-            #       idle_time = screensaver.GetSessionIdleTime()
-            #       return idle_time
-            #   if __name__ == "__main__":
-            #       while True:
-            #           idle_time = get_idle_time()
-            #           print(f"Idle time in seconds: {idle_time}")
-            #           time.sleep(5)
             'locker': 'loginctl lock-session',
-            'must_haves': 'loginctl qdbus'.split(),
+            'logoff': 'qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout 0 0 0',
+            'must_haves': 'loginctl'.split(),
         }, 'gnome-x11': {
         }, 'gnome-wayland': {
@@ -260,6 +242,16 @@ class PwrTray:
             if shutil.which(must_have) is None:
                 dont_haves.append(must_have)
         assert not dont_haves, f'commands NOT on $PATH: {dont_haves}'
+        if self.graphical in ('kde-x11', 'kde-wayland'):
+            qdbus_cmd = shutil.which('qdbus') or shutil.which('qdbus6')
+            assert qdbus_cmd, 'neither qdbus nor qdbus6 found on $PATH'
+            qdbus_name = os.path.basename(qdbus_cmd)
+            if qdbus_name != 'qdbus':
+                for key, val in list(self.variables.items()):
+                    if isinstance(val, str) and 'qdbus ' in val:
+                        self.variables[key] = val.replace('qdbus ', f'{qdbus_name} ')
         self.has_playerctl = bool(shutil.which('playerctl'))
@@ -271,6 +263,9 @@ class PwrTray:
         self.tray_icon.activated.connect(self.on_tray_icon_activated)
         if self.idle_manager:
             self.idle_manager_start()
+        self._resume_proc = self._start_resume_monitor()
+        self._resume_buf = b''
         self.timer = QTimer()
         self.timer.setInterval(100) # 100 is initial ... gets recomputed
         self.timer.timeout.connect(self.on_timeout)
@@ -362,8 +357,13 @@ class PwrTray:
     def update_running_idle_s(self):
         """ Update the running idle seconds (called after each regular timeout) """
         cmd = self.variables['get_idle_ms']
+        scale = 1
+        if not cmd:
+            cmd = self.variables.get('get_idle_s', '')
+            scale = 1000
         if cmd:
-            xidle_ms = int(subprocess.check_output(cmd.split()).strip())
+            xidle = int(subprocess.check_output(cmd.split()).strip())
+            xidle_ms = xidle * scale
             xidle_ms *= 2 if self.quick else 1  # time warp
             self.running_idle_s = round(xidle_ms/1000, 3)
@@ -499,9 +499,10 @@ class PwrTray:
         if self.DB():
             prt('DB', f'on_timeout() {self.loop=}/{self.loop_sample} ...')
         if not QSystemTrayIcon.isSystemTrayAvailable():
-            prt('SystemTray is gone ... exiting')
-            self.exit_wm(None)
+            prt('SystemTray is gone ... restarting')
+            self.restart_self(None)
+        self._check_resume()
         self.reconfig()
         if self.idle_manager:
             self.idle_manager.checkup()
@@ -645,7 +646,11 @@ class PwrTray:
             self.menu.addAction(item)
             self.menu_items.append(item)
-        self.menu = QMenu()
+        first_menu = self.menu is None
+        if first_menu:
+            self.menu = QMenu()
+        else:
+            self.menu.clear()
         self.menu_items = []
         if rows:
@@ -703,8 +708,9 @@ class PwrTray:
         add_item('↺ Restart this Applet', self.restart_self)
-        self.tray_icon.setContextMenu(self.menu)
+        if first_menu:
+            self.tray_icon.setContextMenu(self.menu)
         if not self.tray_icon.isVisible():
             prt('self.tray_icon.isVisible() is False ... restarting app')
             time.sleep(0.5)
@@ -770,7 +776,9 @@ class PwrTray:
         if this:
             this.tray_icon.hide()
         PwrTray.save_picks()
-        subprocess.Popen([sys.executable] + sys.argv)
+        project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        args = [sys.executable, '-m', 'pwr_tray.main'] + sys.argv[1:]
+        subprocess.Popen(args, cwd=project_root)
         os._exit(0)
     @staticmethod
@@ -795,6 +803,9 @@ class PwrTray:
         if this.graphical in ('i3', ):
             PwrTray.run_command('locker')
         PwrTray.run_command('suspend')
+        # systemctl suspend blocks until resume; restart to restore tray icon
+        prt('suspend: resumed, restarting applet...')
+        PwrTray.restart_self(None)
     @staticmethod
     def poweroff(_):
@@ -888,20 +899,39 @@ class PwrTray:
         this.save_picks()
         this.idle_manager_start()
-    # Function to check for ACPI events
-    @staticmethod
-    def acpi_event_listener():
-        acpi_pipe = subprocess.Popen(["acpi_listen"], stdout=subprocess.PIPE)
-        for line in acpi_pipe.stdout:
-            this = PwrTray.singleton
-            if this and b"resume" in line:
-                prt('acpi event:', line)
-                # Reset idle timer
-                this.reset_xidle_ms()
-            elif this:
-                prt('UNSELECTED acpi event:', line)
-                # Reset idle timer
-                this.reset_xidle_ms()
+    def _start_resume_monitor(self):
+        """Start dbus-monitor subprocess for resume detection (non-blocking)."""
+        try:
+            proc = subprocess.Popen(
+                ['dbus-monitor', '--system',
+                 "type='signal',interface='org.freedesktop.login1.Manager',"
+                 "member='PrepareForSleep'"],
+                stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+            os.set_blocking(proc.stdout.fileno(), False)
+            prt('resume monitor: started')
+            return proc
+        except FileNotFoundError:
+            prt('WARN: dbus-monitor not found; resume detection disabled')
+            return None
+    def _check_resume(self):
+        """Poll dbus-monitor for resume signal (called from on_timeout)."""
+        if not self._resume_proc:
+            return
+        try:
+            chunk = os.read(self._resume_proc.stdout.fileno(), 4096)
+            if chunk:
+                self._resume_buf += chunk
+                if b'boolean false' in self._resume_buf:
+                    prt('resume detected, restarting...')
+                    self.restart_self(None)
+                # Prevent unbounded growth; keep tail for partial matches
+                if len(self._resume_buf) > 1024:
+                    self._resume_buf = self._resume_buf[-512:]
+        except BlockingIOError:
+            pass
+        except OSError:
+            pass
     @staticmethod
     def goodbye(message=''):
         prt(f'ENDED {message}')

{pwr_tray-1.0.2 → pwr_tray-1.0.3}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 [project]
 name = "pwr_tray"
-version = "1.0.2"
+version = "1.0.3"
 description = "A GTK tray applet for power management for i3/sway/KDE"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

pwr_tray-1.0.3/runner ADDED Viewed

@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+"""
+runner - Development wrapper for app
+Located in the top-level app directory.
+Allows running app from source for debugging with support for command-line arguments.
+Usage:
+    ./runner {options-and-args}
+    ./runner --help     (show all available options)
+"""
+import runpy
+import sys
+if __name__ == '__main__':
+    # Set program name but preserve all command-line arguments
+    sys.argv[0] = 'pwr-tray'
+    # Run the dwipe.main module with alter_sys=True to propagate sys.argv
+    runpy.run_module('pwr_tray.main', run_name='__main__', alter_sys=True)