i3a 2.2.1__tar.gz → 2.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: i3a
-Version: 2.2.1
+Version: 2.2.3
 Summary: Automatic manager for i3 tiling
 Home-page: https://git.goral.net.pl/i3a.git
 License: GPL-3.0-or-later
@@ -140,7 +140,7 @@ available outputs if none was explicitly set).
 will cycle so it must be escaped in configuration file:
 
 ```
-bindsym $mod+s exec "i3a-scale -f 1.0,1.5,2.0 -o HDMI-1 -o HDMI-2 --next"
+bindsym $mod+s exec "i3a-scale-cycle -f 1.0,1.5,2.0 -o HDMI-1 -o HDMI-2 --next"
 ```
 
 ## Installation

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

@@ -111,7 +111,7 @@ available outputs if none was explicitly set).
 will cycle so it must be escaped in configuration file:
 
 ```
-bindsym $mod+s exec "i3a-scale -f 1.0,1.5,2.0 -o HDMI-1 -o HDMI-2 --next"
+bindsym $mod+s exec "i3a-scale-cycle -f 1.0,1.5,2.0 -o HDMI-1 -o HDMI-2 --next"
 ```
 
 ## Installation

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

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "i3a"
-version = "2.2.1"
+version = "2.2.3"
 description = "Automatic manager for i3 tiling"
 authors = ["Michal Goral <dev@goral.net.pl>"]
 license = "GPL-3.0-or-later"

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

@@ -129,9 +129,16 @@ class Autotiler:
             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))
-            await self.intermove(curr, 'move window to mark {}'.format(STACKMARK))
+
+            # Coumpound 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,
+            # but it's more bearable now
+            move_cmd = 'move window to mark {}'.format(STACKMARK)
             if curr.workspace() == tree.find_focused().workspace():
-                await self.cmd('[con_id="{}"] focus'.format(curr.id))
+                move_cmd += ", focus"
+            await self.intermove(curr, move_cmd)
 
     async def win_close(self, i3, e):
         log.debug('called win_close()')
@@ -211,8 +218,9 @@ class Autotiler:
 
     async def intermove(self, node, cmd):
         movemark = INTERNAL_MOVE_MARK + '_{}'.format(node.id)
-        await self.cmd('[con_id="{}"] mark --add {}'.format(node.id, movemark))
-        await self.cmd('[con_id="{}"] {}'.format(node.id, cmd))
+        # Note: compound commands separated with a colon retain their criteria
+        # ("con_id"); compound commands separated with semicolon don't.
+        await self.cmd('[con_id="{}"] mark --add {}, {}'.format(node.id, movemark, cmd))
 
     async def rmmovemarks(self, node):
         removed = False

{i3a-2.2.1 → i3a-2.2.3}/src/i3a/scale_cycle.py

@@ -87,7 +87,11 @@ def _(f: float):
 
 
 def get_current_scales(i3: Connection):
-    return {outp.name: to_dec(outp.scale) for outp in i3.get_outputs()}
+    return {
+        outp.name: to_dec(outp.scale)
+        for outp in i3.get_outputs()
+        if outp.scale is not None
+    }
 
 
 def main():