bat: #177 fix Watt computation; make AC state available #178

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 503c40eaf0dbc54df0854e2f86f08e90d4799670..137bd6ab54f4e36bd051f84e1b1cf39cd515b25f 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -8,11 +8,12 @@
 
 local debug  = require("debug")
 
 
 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 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
 
 -- Lain helper functions for internal use
 -- lain.helpers


@@ -78,14 +79,11 @@ helpers.timer_table = {}
 
 function helpers.newtimer(_name, timeout, fun, nostart)
     local name = 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 })
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = capi.timer({ timeout = timeout })

-        helpers.timer_table[name]:start()

     end
     end

-

     helpers.timer_table[name]:connect_signal("timeout", fun)
     helpers.timer_table[name]:connect_signal("timeout", fun)

-
+    helpers.timer_table[name]:start()

     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end


@@ -119,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
 return helpers