revert fix coretemp

This commit is contained in:
copycat-killer 2017-01-22 01:27:24 +01:00
parent 6cce5b6fe1
commit fadc722655
4 changed files with 9 additions and 6 deletions

View File

@ -13,7 +13,7 @@ local setmetatable = setmetatable
-- Lain markup util submodule
-- lain.util.markup
local markup = {}
local markup = { fg = {}, bg = {} }
-- Convenience tags.
function markup.bold(text) return '<b>' .. text .. '</b>' end
@ -30,12 +30,12 @@ function markup.font(font, text)
end
-- Set the foreground.
function markup.fgcolor(color, text)
function markup.fg.color(color, text)
return '<span foreground="' .. color .. '">' .. text .. '</span>'
end
-- Set the background.
function markup.bgcolor(color, text)
function markup.bg.color(color, text)
return '<span background="' .. color .. '">' .. text .. '</span>'
end
@ -49,5 +49,9 @@ function markup.fontcolor(font, fg, bg, text)
return string.format('<span font="%s" foreground="%s" background="%s">%s</span>', font, fg, bg, text)
end
-- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)
setmetatable(markup.fg, { __call = function(_, ...) return markup.fg.color(...) end })
setmetatable(markup.bg, { __call = function(_, ...) return markup.bg.color(...) end })
-- link markup(...) calls to markup.fg.color(...)
return setmetatable(markup, { __call = function(_, ...) return markup.fg.color(...) end })

View File

@ -25,7 +25,7 @@ local function worker(args)
local timeout = args.timeout or 2
local settings = args.settings or function() end
cpu.widget = wibox.widget.textbox('')
cpu.widget = wibox.widget.textbox()
function update()
-- Read the amount of time the CPUs have spent performing

View File

@ -26,7 +26,6 @@ local function worker(args)
function update()
local f = io.open(tempfile)
local coretemp_now
if f then
coretemp_now = tonumber(f:read("*all")) / 1000
f:close()

2
wiki

@ -1 +1 @@
Subproject commit eb533f62754d1403e01048b7f2006ab2d8c94b11
Subproject commit 2a2beda916322177695fbd8b042b04001bc07509