pwr_tray 1.0.3__tar.gz → 1.0.4__tar.gz

{pwr_tray-1.0.3 → pwr_tray-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pwr_tray
-Version: 1.0.3
+Version: 1.0.4
 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>
@@ -53,8 +53,17 @@ With just a right-click and a left-click, you can do most operations such as cha
 * 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-tray/config.ini`)
-* `pwr-tray -f` tails the log file (`~/.config/pwr-tray/debug.log`)
+
+### Command Line Options
+| Option | Description |
+|--------|-------------|
+| `-o`, `--stdout` | Log to stdout (in addition to the log file); useful for debugging from a terminal. |
+| `-D`, `--debug` | Enable debug mode (more frequent/elaborate logging); overrides the `debug_mode` config setting. |
+| `-q`, `--quick` | Quick mode: sets lock and sleep timeouts to 1 minute and runs double-time (timers expire in 30s wall clock). Useful for testing. |
+| `-e`, `--edit-config` | Open `~/.config/pwr-tray/config.ini` in `$EDITOR` (default: `vim`). |
+| `-f`, `--follow-log` | Tail the log file (`~/.config/pwr-tray/debug.log`). |
+
+For initial setup and troubleshooting, `pwr-tray -D -o` is a good starting point.
 
 ---
 
@@ -167,7 +176,7 @@ bindsym $mod+Escape exec --no-startup-id $screenlock  # create shortcut to lock
 * 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 Wayland**, `swayidle` is required (install it if missing). `pwr-tray` manages `swayidle` for idle timeout handling since KDE Wayland does not expose idle time via D-Bus. 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.3 → pwr_tray-1.0.4}/README.md

@@ -35,8 +35,17 @@ With just a right-click and a left-click, you can do most operations such as cha
 * 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-tray/config.ini`)
-* `pwr-tray -f` tails the log file (`~/.config/pwr-tray/debug.log`)
+
+### Command Line Options
+| Option | Description |
+|--------|-------------|
+| `-o`, `--stdout` | Log to stdout (in addition to the log file); useful for debugging from a terminal. |
+| `-D`, `--debug` | Enable debug mode (more frequent/elaborate logging); overrides the `debug_mode` config setting. |
+| `-q`, `--quick` | Quick mode: sets lock and sleep timeouts to 1 minute and runs double-time (timers expire in 30s wall clock). Useful for testing. |
+| `-e`, `--edit-config` | Open `~/.config/pwr-tray/config.ini` in `$EDITOR` (default: `vim`). |
+| `-f`, `--follow-log` | Tail the log file (`~/.config/pwr-tray/debug.log`). |
+
+For initial setup and troubleshooting, `pwr-tray -D -o` is a good starting point.
 
 ---
 
@@ -149,6 +158,6 @@ bindsym $mod+Escape exec --no-startup-id $screenlock  # create shortcut to lock
 * 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 Wayland**, `swayidle` is required (install it if missing). `pwr-tray` manages `swayidle` for idle timeout handling since KDE Wayland does not expose idle time via D-Bus. 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.3 → pwr_tray-1.0.4}/pwr_tray/SwayIdleMgr.py

@@ -16,28 +16,36 @@ from types import SimpleNamespace
 from pwr_tray.Utils import prt
 
 class SwayIdleManager:
-    """ Class to manage 'swayidle' """
+    """ Class to manage 'swayidle' for sway and KDE Wayland """
     def __init__(self, applet):
         self.process = None
         self.applet = applet
         self.current_cmd = ''
         # we construct the sway idle from these clauses which various
         # substitutions.
-        self.clauses = SimpleNamespace(
-            leader="""exec swayidle""",
-            locker=""" timeout [lock_s] '[screenlock] [lockopts]'""",
-            blanker=""" timeout [blank_s] 'swaymsg "output * dpms off"'""",
-            sleeper=""" timeout [sleep_s] 'systemctl suspend'""",
-            # dimmer="""\\\n timeout [dim_s] 'brightnessctl set 50%'""", # perms?
-            before_sleep=""" before-sleep '[screenlock] [lockopts]'""",
-            after_resume=""" after-resume '[unblank]'""",
-                        # + """ 'pgrep -x copyq || copyq --start-server hide;"""
-                        # + """ pgrep -x nm-applet || nm-applet [undim][dpmsOn]'""",
-                        # + """ pgrep -x nm-applet || nm-applet [unblank]'""",
-            # undim = """; brightnessctl set 100%""",
-            screenlock = """pkill swaylock ; exec swaylock --ignore-empty-password --show-failed-attempts""",
-            unblank='''; swaymsg "output * dpms on"''',
-        )
+        if applet.graphical == 'kde-wayland':
+            locker = applet.variables.get('locker', 'loginctl lock-session')
+            self.clauses = SimpleNamespace(
+                leader="""exec swayidle""",
+                locker=f""" timeout [lock_s] '{locker}'""",
+                blanker="",
+                sleeper=""" timeout [sleep_s] 'systemctl suspend'""",
+                before_sleep=f""" before-sleep '{locker}'""",
+                after_resume="",
+                screenlock=locker,
+                unblank='',
+            )
+        else:
+            self.clauses = SimpleNamespace(
+                leader="""exec swayidle""",
+                locker=""" timeout [lock_s] '[screenlock] [lockopts]'""",
+                blanker=""" timeout [blank_s] 'swaymsg "output * dpms off"'""",
+                sleeper=""" timeout [sleep_s] 'systemctl suspend'""",
+                before_sleep=""" before-sleep '[screenlock] [lockopts]'""",
+                after_resume=""" after-resume '[unblank]'""",
+                screenlock = """pkill swaylock ; exec swaylock --ignore-empty-password --show-failed-attempts""",
+                unblank='''; swaymsg "output * dpms on"''',
+            )
         self.kill_other_swayidle()
 
     @staticmethod

{pwr_tray-1.0.3 → pwr_tray-1.0.4}/pwr_tray/main.py

@@ -137,11 +137,9 @@ class PwrTray:
             'restart_wm': 'killall plasmashell && kstart5 plasmashell && sleep 3 && pwr-tray',
             'must_haves': 'loginctl qdbus'.split(),
         }, 'kde-wayland': {
-            'get_idle_s': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver GetSessionIdleTime',
-            'reset_idle': 'qdbus org.freedesktop.ScreenSaver /ScreenSaver SimulateUserActivity',
             'locker': 'loginctl lock-session',
             'logoff': 'qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout 0 0 0',
-            'must_haves': 'loginctl'.split(),
+            'must_haves': 'loginctl swayidle'.split(),
         }, 'gnome-x11': {
 
         }, 'gnome-wayland': {
@@ -255,7 +253,8 @@ class PwrTray:
         self.has_playerctl = bool(shutil.which('playerctl'))
 
 
-        self.idle_manager = SwayIdleManager(self) if self.graphical == 'sway' else None
+        self.idle_manager = (SwayIdleManager(self)
+            if self.graphical in ('sway', 'kde-wayland') else None)
 
         self.menu_items = []
         self.menu = None
@@ -362,10 +361,13 @@ class PwrTray:
             cmd = self.variables.get('get_idle_s', '')
             scale = 1000
         if cmd:
-            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)
+            try:
+                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)
+            except Exception as e:
+                prt(f'WARN: idle time command failed: {e}')
 
     def DB(self):
         """ is debug on? """
@@ -535,8 +537,8 @@ class PwrTray:
             prt(emit)
 
             if emode in ('Presentation',) or self.was_inhibited:
-                if 'sway' in self.graphical:
-                    self.reset_xidle_ms() # we don't know when
+                if self.idle_manager:
+                    self.reset_xidle_ms() # idle_manager handles timeouts
                 elif self.running_idle_s > min(50, lock_secs*0.40):
                     self.reset_xidle_ms() # we don't know when
 
@@ -980,6 +982,7 @@ def main():
     atexit.register(PwrTray.goodbye)
 
 
+    ini_tool.update_config()
     if opts.debug:
         for selector in ini_tool.get_selectors():
             ini_tool.params_by_selector[selector].debug_mode = True # one-time override

{pwr_tray-1.0.3 → pwr_tray-1.0.4}/pyproject.toml

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