X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0279482eeb5867f49b4efc83d591393f9c3d0adb..2ddb55bc44dd0ea06e8caa40798d27f907169c07:/helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 9755dc0..4e5ce1f 100644
--- a/helpers.lua
+++ b/helpers.lua
@@ -7,17 +7,14 @@
 --]]
 
 
+local easy_async = require("awful.spawn").easy_async
+local timer      = require("gears.timer")
 local debug      = require("debug")
 local io         = { lines = io.lines,
-                     open  = io.open,
-                     popen = io.popen }
+                     open  = io.open }
 local rawget     = rawget
 local table      = { sort  = table.sort }
 
-local easy_async = require("awful.spawn").easy_async
-local timer      = require("gears.timer")
-local wibox      = require("wibox")
-
 -- Lain helper functions for internal use
 -- lain.helpers
 local helpers = {}
@@ -92,8 +89,9 @@ end
 
 helpers.timer_table = {}
 
-function helpers.newtimer(_name, timeout, fun, nostart)
-    local name = timeout
+function helpers.newtimer(name, timeout, fun, nostart, stoppable)
+    if not name or #name == 0 then return end
+    name = (stoppable and name) or timeout
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = timer({ timeout = timeout })
         helpers.timer_table[name]:start()
@@ -102,22 +100,13 @@ function helpers.newtimer(_name, timeout, fun, nostart)
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end
+    return stoppable and helpers.timer_table[name]
 end
 
 -- }}}
 
 -- {{{ Pipe operations
 
--- return the full output of an input command (synchronous pipe)
--- @param cmd the input command
--- @return command output (string)
-function helpers.read_pipe(cmd)
-   local f = io.popen(cmd)
-   local output = f:read("*all")
-   f:close()
-   return output
-end
-
 -- run a command and execute a function on its output (asynchronous pipe)
 -- @param cmd the input command
 -- @param callback function to execute on cmd output
@@ -175,14 +164,6 @@ function helpers.spairs(t)
     end
 end
 
--- create a lain textbox widget
-function helpers.make_widget_textbox()
-    local w = wibox.widget.textbox('')
-    local t = wibox.widget.base.make_widget(w)
-    t.widget = w
-    return t
-end
-
 -- }}}
 
 return helpers