From ac23353125e9b9812ae33243e15a0e40883547bc Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Mon, 26 Sep 2016 12:06:35 +0200
Subject: [PATCH] fix up rules to tag clients

---
 .config/awesome/rc.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index f844e8e..5e1b06a 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -523,6 +523,13 @@ root.keys(globalkeys)
 
 -- {{{ Rules
 -- Rules to apply to new clients (through the "manage" signal).
+
+local function move_to_tag(s, t)
+    return function(c)
+        c:move_to_tag(tags[s][t])
+    end
+end
+
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -553,47 +560,40 @@ awful.rules.rules = {
                } },
     { rule = { class = "URxvt", instance = "irc" },
                properties = {
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
+                   switch_to_tag = true
                },
-               callback = function(c) c:move_to_tag(tags[1][2]) end
+               callback = move_to_tag(screen.count(), screen.count() == 1 and 2 or 1)
            },
     { rule = { class = "Firefox" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Icedove" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][8]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 8)
            },
     { rule = { class = "chromium" },
                properties = {
                    floating = false,
---                   screen = screen.count(),
---                   tag = screen.count() == 1 and "2" or "1"
                },
-               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(screen.count() == 1 and 1 or 2, 9)
            },
     { rule = { class = "Gscan2pdf" },
                properties = {
                    screen = 1,
                    tag = "5"
                },
---               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(1, 5)
            },
     { rule = { name = "gscan2pdf .*" },
                properties = {
                    floating = false,
                },
---               callback = function(c) c:move_to_tag(tags[1][9]) end
+               callback = move_to_tag(1, 5)
            },
 }
 -- }}}
-- 
2.39.5