Merge branch 'master' of github.com:copycat-killer/lain

[etc/awesome.git] / widgets / temp.lua

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 301bc1c5aa1a6fa6180c16b23d60ebaf9f0b3dea..6831588f3e7714d330c55dba73412331d327c233 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,12 +6,10 @@
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
-
-local beautiful    = require("beautiful")
+local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { open = io.open }
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -20,33 +18,35 @@ local setmetatable = setmetatable
 -- lain.widgets.temp
 local temp = {}
 
-function worker(args)
-    local args = args or {}
-    local refresh_timeout = args.refresh_timeout or 5
-    local header = args.header or " Temp "
-    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    local color = args.color or beautiful.fg_focus or header_color
-    local footer = args.footer or "C "
-
-    local mytemp = wibox.widget.textbox()
-
-    local mytempupdate = function()
-        local f = io.open("/sys/class/thermal/thermal_zone0/temp")
-        local ret = f:read("*all")
-        f:close()
-
-        ret = tonumber(ret) / 1000
-
-        mytemp:set_markup(markup(header_color, header) ..
-                          markup(color, ret .. footer))
+local function worker(args)
+    local args     = args or {}
+    local timeout  = args.timeout or 1
+    local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
+    local settings = args.settings or function() end
+
+    temp.widget = wibox.widget.textbox('')
+    helpers.set_map("temp_last", 0)
+
+    function update()
+        local f = io.open(tempfile)
+        if f ~= nil
+        then
+            coretemp_now = tonumber(f:read("*all")) / 1000
+            f:close()
+        else
+            coretemp_now = "N/A"
+        end
+
+        if helpers.get_map("temp_last") ~= coretemp_now then
+            widget = temp.widget
+            settings()
+            helpers.set_map("temp_last", coretemp_now)
+        end
     end
 
-    local mytemptimer = timer({ timeout = refresh_timeout })
-    mytemptimer:connect_signal("timeout", mytempupdate)
-    mytemptimer:start()
-    mytemptimer:emit_signal("timeout")
+    helpers.newtimer("coretemp", timeout, update)
 
-    return mytemp
+    return temp.widget
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })