i3a 2.2.3__tar.gz → 2.3.1__tar.gz

{i3a-2.2.3 → i3a-2.3.1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: i3a
-Version: 2.2.3
+Version: 2.3.1
 Summary: Automatic manager for i3 tiling
-Home-page: https://git.goral.net.pl/i3a.git
 License: GPL-3.0-or-later
 Author: Michal Goral
 Author-email: dev@goral.net.pl
@@ -20,6 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Utilities
 Requires-Dist: i3ipc (>=2.2.1,<3.0.0)
@@ -128,6 +128,16 @@ bindsym $mod+Right exec i3a-resize-compass right 2ppt
 bindsym $mod+Left exec i3a-resize-compass left 2ppt
 ```
 
+### i3a-cycle-focus
+
+Change the currently focused window up or down, cycling the tiled windows
+within the current workspace.
+
+```
+bindsym $mod+j exec i3a-cycle-focus down
+bindsym $mod+k exec i3a-cycle-focus up 
+```
+
 ### i3a-scale-cycle
 
 **sway-specific**

{i3a-2.2.3 → i3a-2.3.1}/README.md

@@ -99,6 +99,16 @@ bindsym $mod+Right exec i3a-resize-compass right 2ppt
 bindsym $mod+Left exec i3a-resize-compass left 2ppt
 ```
 
+### i3a-cycle-focus
+
+Change the currently focused window up or down, cycling the tiled windows
+within the current workspace.
+
+```
+bindsym $mod+j exec i3a-cycle-focus down
+bindsym $mod+k exec i3a-cycle-focus up 
+```
+
 ### i3a-scale-cycle
 
 **sway-specific**

{i3a-2.2.3 → i3a-2.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "i3a"
-version = "2.2.3"
+version = "2.3.1"
 description = "Automatic manager for i3 tiling"
 authors = ["Michal Goral <dev@goral.net.pl>"]
 license = "GPL-3.0-or-later"
@@ -36,3 +36,4 @@ i3a-move-to-empty = "i3a.move_to_empty:main"
 i3a-swap = "i3a.swap:main"
 i3a-resize-compass = "i3a.resize_compass:main"
 i3a-scale-cycle = "i3a.scale_cycle:main"
+i3a-cycle-focus = "i3a.cycle_focus:main"

i3a-2.3.1/src/i3a/cycle_focus.py

@@ -0,0 +1,64 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2024 DjejDjej
+
+import argparse
+import asyncio
+
+from i3ipc.aio import Connection
+
+FLOATING_MODES = ("auto_on", "user_on")
+
+
+async def move_stack(direction: str):
+    """
+    Move the focused window up or down the stack in the current workspace.
+    :param direction: 'up' to move up, 'down' to move down.
+    """
+    i3 = await Connection(auto_reconnect=True).connect()
+    tree = await i3.get_tree()
+    focused = tree.find_focused()
+
+    if not focused:
+        return
+
+    ws = focused.workspace()
+    if not ws:
+        return
+
+    # Collect all tiled (non-floating) windows
+    tiled_windows = [
+        n
+        for n in ws.leaves()
+        if n.floating not in FLOATING_MODES
+    ]
+
+    if len(tiled_windows) < 2:
+        return
+
+    try:
+        idx = tiled_windows.index(focused)
+        if direction == "up":
+            target_idx = (idx - 1) % len(tiled_windows)
+        elif direction == "down":
+            target_idx = (idx + 1) % len(tiled_windows)
+        else:
+            raise ValueError("Invalid direction; use 'up' or 'down'.")
+
+        target_window = tiled_windows[target_idx]
+        await i3.command(f'[con_id="{target_window.id}"] focus')
+    except ValueError:
+        pass
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Move the focused window up or down the stack."
+    )
+    parser.add_argument(
+        "direction",
+        choices=["up", "down"],
+        help="Direction to move the window in the stack.",
+    )
+    args = parser.parse_args()
+
+    asyncio.run(move_stack(args.direction))

{i3a-2.2.3 → i3a-2.3.1}/src/i3a/master_stack.py

@@ -105,13 +105,19 @@ class Autotiler:
         master, stack = master_stack(tree, tree.find_focused())
 
         if master and not stack:
-            await self.cmd('[con_id="{}"] split horizontal'.format(master.id))
+            # move up: we have only 1 window, which previously could be in a
+            # stack, but now we "reinterpret" it as a master. It might still be inside
+            # its empty container which was created for the purpose of vertical split.
+            # 'move up' breaks free from it.
+            await self.cmd('[con_id="{}"] move up, split horizontal'.format(master.id))
             return
 
         if not master and stack:
             await self.intermove(stack[0], 'move left')
             if len(stack) > 1:  # stack[0] becomes a new master, resize remains
                 await self.cmd('[con_id="{}"] resize set {} ppt 0 ppt'.format(stack[-1].id, self.args.stack_size))
+            elif len(stack) == 1:
+                await self.cmd('[con_id="{}"] move up'.format(stack[0]))
 
     async def _node_added(self, tree, e):
         master, stack = master_stack(tree, e.container, exclude_node=True)
@@ -124,16 +130,21 @@ class Autotiler:
             return
 
         if not stack:
-            await self.cmd('[con_id="{}"] split horizontal'.format(master.id))
+            # Split master.parent instead of master? Easy explanation: we don't
+            # want to split the container for the window to not create artificial empty
+            # tree nodes (implementation detail of i3/sway) which clutter the
+            # output of get_tree command. They aren't garbaged when we close stack, so
+            # long sessions might accumulate quite a lot of them.
+            await self.cmd('[con_id="{}"] split horizontal'.format(master.parent.id))
             await self.make_stack(curr)
             await self.cmd('[con_id="{}"] resize set {} ppt 0 ppt'.format(curr.id, self.args.stack_size))
         else:
             await self.cmd('[con_id="{}"] mark --add {}'.format(stack[-1].id, STACKMARK))
 
-            # Coumpound command are A LOT faster than separate ones; running
+            # Compound command are A LOT faster than separate ones; running
             # additional focus after "intermove" left a visible visual glitch
             # of "jumping" window when new window was spawned when focus was on
-            # a master window. There's still a minor artifact with coumpound command,
+            # a master window. There's still a minor artifact with compound command,
             # but it's more bearable now
             move_cmd = 'move window to mark {}'.format(STACKMARK)
             if curr.workspace() == tree.find_focused().workspace():