make mwfact work

also fix names

diff --git a/awesome/tags.lua b/awesome/tags.lua
index 41d65769e0b276a16d2dd6c0863b2c200c87b7bf..36653d147cfc59711ace2f1563c540347a8a85fb 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -22,42 +22,42 @@ local mytags = {}
 -- {{{ single screen
 mytags[1] = {}
 mytags[1][1] = {
-    { name = "1-main",  layout = awful.layout.suit.floating,            wmfact=0.87 },
-    { name = "2-www",   layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "3-im",    layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "4-media", layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "5",       layout = awful.layout.suit.tile,                wmfact=0.3 },
-    { name = "6",       layout = awful.layout.suit.magnifier,           wmfact=0.88 },
-    { name = "7",       layout = awful.layout.suit.tile.bottom,         wmfact=0.84 },
-    { name = "8",       layout = awful.layout.suit.max,                 wmfact=0.7 },
-    { name = "9",       layout = awful.layout.suit.max,                 wmfact=0.5 },
+    { name = "1-main",  layout = awful.layout.suit.floating,            mwfact=0.87 },
+    { name = "2-www",   layout = awful.layout.suit.tile.left,           mwfact=0.6 },
+    { name = "3-im",    layout = awful.layout.suit.tile.left,           mwfact=0.6 },
+    { name = "4-media", layout = awful.layout.suit.tile.left,           mwfact=0.6 },
+    { name = "5",       layout = awful.layout.suit.tile,                mwfact=0.3 },
+    { name = "6",       layout = awful.layout.suit.magnifier,           mwfact=0.88 },
+    { name = "7",       layout = awful.layout.suit.tile.bottom,         mwfact=0.84 },
+    { name = "8",       layout = awful.layout.suit.max,                 mwfact=0.7 },
+    { name = "9",       layout = awful.layout.suit.max,                 mwfact=0.5 },
 }
 -- }}}
 
 -- {{{ Dual screen
 mytags[2] = {}
 mytags[2][1] = {
-    { name = "1-test",  layout = awful.layout.suit.magnifier,           wmfact=0.87 },
-    { name = "2",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "3",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "4",       layout = awful.layout.suit.tile.left,           wmfact=0.6 },
-    { name = "5",       layout = awful.layout.suit.tile,                wmfact=0.3 },
-    { name = "6",       layout = awful.layout.suit.magnifier,           wmfact=0.88 },
-    { name = "7",       layout = awful.layout.suit.tile.bottom,         wmfact=0.84 },
-    { name = "8",       layout = awful.layout.suit.max,                 wmfact=0.7 },
-    { name = "9",       layout = awful.layout.suit.max,                 wmfact=0.5 },
+    { name = "1-test",  layout = awful.layout.suit.magnifier,           mwfact=0.87 },
+    { name = "2",       layout = awful.layout.suit.tile.left,           mwfact=0.6 },
+    { name = "3",       layout = awful.layout.suit.tile.left,           mwfact=0.6 },
+    { name = "4",       layout = awful.layout.suit.tile.left,           mwfact=0.6 },
+    { name = "5",       layout = awful.layout.suit.tile,                mwfact=0.3 },
+    { name = "6",       layout = awful.layout.suit.magnifier,           mwfact=0.88 },
+    { name = "7",       layout = awful.layout.suit.tile.bottom,         mwfact=0.84 },
+    { name = "8",       layout = awful.layout.suit.max,                 mwfact=0.7 },
+    { name = "9",       layout = awful.layout.suit.max,                 mwfact=0.5 },
 }
 
 mytags[2][2] = {
-    { name = "1-www",   layout = awful.layout.suit.max,                 wmfact=0.5 },
+    { name = "1-www",   layout = awful.layout.suit.max,                 mwfact=0.5 },
     { name = "2-im",    layout = awful.layout.suit.tile,                mwfact=0.88 },
-    { name = "3-music", layout = awful.layout.suit.tile.bottom,         wmfact=0.1 },
-    { name = "4",       layout = awful.layout.suit.tile.bottom,         wmfact=0.9 },
-    { name = "5",       layout = awful.layout.suit.max,                 wmfact=0.5 },
-    { name = "6",       layout = awful.layout.suit.floating,            wmfact=0.5 },
-    { name = "7",       layout = awful.layout.suit.floating,            wmfact=0.5 },
-    { name = "8",       layout = awful.layout.suit.floating,            wmfact=0.5 },
-    { name = "9",       layout = awful.layout.suit.floating,            wmfact=0.5 },
+    { name = "3-music", layout = awful.layout.suit.tile.bottom,         mwfact=0.1 },
+    { name = "4",       layout = awful.layout.suit.tile.bottom,         mwfact=0.9 },
+    { name = "5",       layout = awful.layout.suit.max,                 mwfact=0.5 },
+    { name = "6",       layout = awful.layout.suit.floating,            mwfact=0.5 },
+    { name = "7",       layout = awful.layout.suit.floating,            mwfact=0.5 },
+    { name = "8",       layout = awful.layout.suit.floating,            mwfact=0.5 },
+    { name = "9",       layout = awful.layout.suit.floating,            mwfact=0.5 },
 }
 -- }}}
 
@@ -66,7 +66,7 @@ local sc = screen.count()
 for s = 1, sc do
     tags[s] = {}
     for i,v in ipairs(mytags[sc][s]) do
-        tags[s][i] = awful.tag.add(v.name, { layout = v.layout, screen = s })
+        tags[s][i] = awful.tag.add(v.name, { layout = v.layout, screen = s, mwfact = v.mwfact })
     end
     tags[s][1].selected = true
 end