X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/907fb6ff8ea724f0642075be615ac77c26ac62bb..af30c92b12e46a3b9deb94859950c90c63d1c7b1:/helpers.lua?ds=sidebyside

diff --git a/helpers.lua b/helpers.lua
index 4e90e16..137bd6a 100644
--- a/helpers.lua
+++ b/helpers.lua
@@ -8,11 +8,12 @@
 
 local debug  = require("debug")
 
-local capi   = { timer = timer }
+local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }
 local rawget = rawget
+local table  = { sort   = table.sort }
 
 -- Lain helper functions for internal use
 -- lain.helpers
@@ -76,8 +77,11 @@ end
 
 helpers.timer_table = {}
 
-function helpers.newtimer(name, timeout, fun, nostart)
-    helpers.timer_table[name] = capi.timer({ timeout = timeout })
+function helpers.newtimer(_name, timeout, fun, nostart)
+    local name = timeout
+    if not helpers.timer_table[name] then
+        helpers.timer_table[name] = capi.timer({ timeout = timeout })
+    end
     helpers.timer_table[name]:connect_signal("timeout", fun)
     helpers.timer_table[name]:start()
     if not nostart then
@@ -113,4 +117,23 @@ end
 
 -- }}}
 
+--{{{ Iterate over table of records sorted by keys
+function helpers.spairs(t)
+    -- collect the keys
+    local keys = {}
+    for k in pairs(t) do keys[#keys+1] = k end
+
+    table.sort(keys)
+
+    -- return the iterator function
+    local i = 0
+    return function()
+        i = i + 1
+        if keys[i] then
+            return keys[i], t[keys[i]]
+        end
+    end
+end
+--}}}
+
 return helpers