add functions to append globalkeys and rules

this required to move root.keys() to rc.lua so that appended keys will
get registered... as long as they are added before this function

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 1aeedcc08bca7d37581bc991eafe28b0f842c9e4..bede8e7bc3408f965831e2bda8f7f0e5a597f80f 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -155,6 +155,4 @@ for i = 1, 9 do
                   end))
 end
 
--- Set keys
-root.keys(globalkeys)
 -- }}}

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 0de85cc1bd539c6563599ba2e35710b9fc565a29..5289b90a8793511306df3f5210f679615bf5a0cc 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -104,6 +104,9 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
 
+-- Set keys
+root.keys(globalkeys)
+
 -- {{{ Autostart applications
 require("autostart")
 -- }}}

diff --git a/awesome/utils.lua b/awesome/utils.lua
index e97aa22f96da93a41e3ec4802353e9dd3f5bf5ab..0ec93aa355f14c5abd5dfd22df7486bf29b01576 100644 (file)
--- a/awesome/utils.lua
+++ b/awesome/utils.lua
@@ -1,4 +1,6 @@
 local utils = { }
+utils.rules = { }
+utils.globalkeys = { }
 
 local host = io.popen("hostname")
 utils.host = host:read("*l")
@@ -21,4 +23,16 @@ function utils.run_or_kill(command)
     awful.util.spawn(command)
 end
 
+function utils.joinTables(t1, t2)
+    for k,v in ipairs(t2) do table.insert(t1, v) end return t1
+end
+
+function utils.rules.append(rules)
+    awful.rules.rules = awful.util.table.join(awful.rules.rules, rules)
+end
+
+function utils.globalkeys.append(keys)
+    globalkeys = awful.util.table.join(globalkeys, keys)
+end
+
 return utils