From e5e338e8ee58d7225272f3902adc27efaa747c32 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@luffy.cx>
Date: Sat, 14 Jul 2012 01:29:24 +0200
Subject: [PATCH] tags: rework how tags are defined

Instead of using a list of names and a list of layouts, we use an
array with optional names and layouts and additional properties. If no
name is given, only numerical ID is used. Default to first
layout. Additional properties are set using `setproperty`.
---
 rc.lua      |  9 +++++++++
 rc/tags.lua | 33 ++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/rc.lua b/rc.lua
index aab8f8e..33f7846 100644
--- a/rc.lua
+++ b/rc.lua
@@ -40,6 +40,15 @@ config.layouts = {
    awful.layout.suit.fair,
    awful.layout.suit.floating,
 }
+config.tags = { 
+   { layout = awful.layout.suit.fair }, -- 1
+   { name = "emacs", mwfact = 0.6 },
+   { name = "www", mwfact = 0.7 },
+   { name = "im" , mwfact = 0.2 },
+   { }, -- 5
+   { }, -- 6
+   { }, -- 7
+}
 config.hostname = awful.util.pread('uname -n'):gsub('\n', '')
 
 -- Remaining modules
diff --git a/rc/tags.lua b/rc/tags.lua
index 0965d89..0f5fa4b 100644
--- a/rc/tags.lua
+++ b/rc/tags.lua
@@ -2,17 +2,18 @@
 
 loadrc("sharetags")
 
-local tags = { names = { 1, "emacs", "www", "im", 5, 6, 7 },
-	       layout = { awful.layout.suit.tile,
-			  awful.layout.suit.tile,
-			  awful.layout.suit.tile,
-			  awful.layout.suit.tile,
-			  awful.layout.suit.tile,
-			  awful.layout.suit.tile,
-			  awful.layout.suit.tile }}
-tags = sharetags.create_tags(tags.names, tags.layout)
+local otags = config.tags
 config.tags = {}
 
+local names = {}
+local layouts = {}
+for i, v in ipairs(otags) do
+   names[i] = v.name or i
+   layouts[i] = v.layout or config.layouts[1]
+end
+
+tags = sharetags.create_tags(names, layouts)
+
 -- Compute the maximum number of digit we need, limited to 9
 keynumber = math.min(9, #tags)
 
@@ -20,10 +21,20 @@ keynumber = math.min(9, #tags)
 -- Be careful: we use keycodes to make it works on any keyboard layout.
 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, #tags do
+   -- Name
    config.tags[tags[i].name] = tags[i]
    if tags[i].name ~= tostring(i) then
       tags[i].name = tostring(i) .. "↭" .. tags[i].name
    end
+
+   -- Properties
+   for pname, pvalue in pairs(otags[i]) do
+      if pname ~= "name" and pname ~= "layout" then
+	 awful.tag.setproperty(tags[i], pname, pvalue)
+      end
+   end
+
+   -- Key bindings
    if i <= keynumber then
       config.keys.global = awful.util.table.join(
 	 config.keys.global,
@@ -71,7 +82,3 @@ for i = 1, #tags do
 		   end))
    end
 end
-
-awful.tag.setproperty(config.tags.emacs, "mwfact", 0.6)
-awful.tag.setproperty(config.tags.www, "mwfact", 0.7)
-awful.tag.setproperty(config.tags.im, "mwfact", 0.2)