issue #9 fix attempt

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 7677768686d4358efc30fcb1cb384d6393e3bb8b..c42ce6184dce4ba3ef9e595ca1854f8a09fd7a00 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -1,16 +1,16 @@
 
 --[[
 
 --[[

-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013,      Luke Bonham                    
-      * (c) 2010-2012, Peter Hofmann                  
-      * (c) 2010,      Adrian C. <anrxc@sysphere.org> 
-                                                      
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013,      Luke Bonham                
+      * (c) 2010-2012, Peter Hofmann              
+                                                  

 --]]
 
 --]]
 

-local awful  = require("awful")

 local debug  = require("debug")
 local debug  = require("debug")

-local pairs  = pairs
+
+local capi   = { timer = timer }
+local io     = { open = io.open }

 local rawget = rawget
 
 -- Lain helper functions for internal use
 local rawget = rawget
 
 -- Lain helper functions for internal use


@@ -30,34 +30,7 @@ end
 
 -- }}}
 
 
 -- }}}
 

--- {{{
--- If lain.terminal is a string, e.g. "xterm", then "xterm -e " .. cmd is
--- run. But if lain.terminal is a function, then terminal(cmd) is run.
-
-function helpers.run_in_terminal(cmd)
-    if type(terminal) == "function"
-    then
-        terminal(cmd)
-    elseif type(terminal) == "string"
-    then
-        awful.util.spawn(terminal .. ' -e ' .. cmd)
-    end
-end
-
--- }}}
-
--- {{{ Format units to one decimal point
-
-function helpers.uformat(array, key, value, unit)
-    for u, v in pairs(unit) do
-        array["{"..key.."_"..u.."}"] = string.format("%.1f", value/v)
-    end
-    return array
-end
-
--- }}}
-
--- {{{ Read the first line of a file or return nil.
+-- {{{ Read the first line of a file or return nil

 
 function helpers.first_line(f)
     local fp = io.open(f)
 
 function helpers.first_line(f)
     local fp = io.open(f)


@@ -73,6 +46,21 @@ end
 
 -- }}}
 
 
 -- }}}
 

+-- {{{ Timer maker
+
+helpers.timer_table = {}
+
+function helpers.newtimer(name, timeout, fun, nostart)
+    helpers.timer_table[name] = capi.timer({ timeout = timeout })
+    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
+end
+
+-- }}}
+

 -- {{{ A map utility
 
 helpers.map_table = {}
 -- {{{ A map utility
 
 helpers.map_table = {}