wiki enhanced

diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index e65cde82f3fac20d52a7cde12dd9eb6e0a901952..20a10f4140e6dbf61e250449e050a13c353d9411 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -108,7 +108,7 @@ function tpbat.register(args)
         })
     end
 
         })
     end
 

-    function update()
+    function tpbat.update()

         bat_now = {
             status = "Not present",
             perc   = "N/A",
         bat_now = {
             status = "Not present",
             perc   = "N/A",


@@ -151,12 +151,12 @@ function tpbat.register(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("tpbat-" .. bat.name, timeout, update)
+    newtimer("tpbat-" .. bat.name, timeout, tpbat.update)

 
     widget:connect_signal('mouse::enter', function () tpbat.show() end)
     widget:connect_signal('mouse::leave', function () tpbat.hide() end)
 
 
     widget:connect_signal('mouse::enter', function () tpbat.show() end)
     widget:connect_signal('mouse::leave', function () tpbat.hide() end)
 

-    return tpbat.widget
+    return tpbat

 end
 
 return setmetatable(tpbat, { __call = function(_, ...) return tpbat.register(...) end })
 end
 
 return setmetatable(tpbat, { __call = function(_, ...) return tpbat.register(...) end })

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index 79f99afa956e6dd2059d96e5eea7f245e44c2e6f..076b692c80279aac98b6035e8f5b74537d7f708d 100644 (file)
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -26,7 +26,7 @@ local function worker(args)
 
     cpu.widget = wibox.widget.textbox()
 
 
     cpu.widget = wibox.widget.textbox()
 

-    function update()
+    function cpu.update()

         -- Read the amount of time the CPUs have spent performing
         -- different kinds of work. Read the first line of /proc/stat
         -- which is the sum of all CPUs.
         -- Read the amount of time the CPUs have spent performing
         -- different kinds of work. Read the first line of /proc/stat
         -- which is the sum of all CPUs.


@@ -74,7 +74,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    helpers.newtimer("cpu", timeout, update)
+    helpers.newtimer("cpu", timeout, cpu.update)

 
     return cpu
 end
 
     return cpu
 end

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 2b414ef1bb31156b80749ce05eb5283ba2ef16d6..7b717ef7aca05e7e016b9fd5c3170017f10db9e2 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -25,7 +25,7 @@ local function worker(args)
 
     mem.widget = wibox.widget.textbox()
 
 
     mem.widget = wibox.widget.textbox()
 

-    function update()
+    function mem.update()

         mem_now = {}
         for line in lines("/proc/meminfo") do
             for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
         mem_now = {}
         for line in lines("/proc/meminfo") do
             for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do


@@ -48,7 +48,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    helpers.newtimer("mem", timeout, update)
+    helpers.newtimer("mem", timeout, mem.update)

 
     return mem
 end
 
     return mem
 end

diff --git a/widgets/net.lua b/widgets/net.lua
index 1dfef43afbbd6e4f84e969dcef9aadd04f28c3d9..223f3aff15f409e8518727c54a7d4475ce5d9a65 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -97,12 +97,10 @@ local function worker(args)
                 helpers.set_map(dev, true)
             end
 
                 helpers.set_map(dev, true)
             end
 

-            -- Old api compatibility

             net_now.carrier      = dev_now.carrier
             net_now.state        = dev_now.state
             net_now.carrier      = dev_now.carrier
             net_now.state        = dev_now.state

-            -- And new api

             net_now.devices[dev] = dev_now
             net_now.devices[dev] = dev_now

-            -- With the new api new_now.sent and net_now.received will be the
+            -- new_now.sent and net_now.received will be the

             -- totals across all specified devices
         end
 
             -- totals across all specified devices
         end
 

diff --git a/widgets/sysload.lua b/widgets/sysload.lua
index 49f640ce85e6242eeff3ad335ede38de8b417b06..df9dbea06bfeb265febeab5ba015cce3c15833c9 100644 (file)
--- a/widgets/sysload.lua
+++ b/widgets/sysload.lua
@@ -24,7 +24,7 @@ local function worker(args)
 
     sysload.widget = wibox.widget.textbox()
 
 
     sysload.widget = wibox.widget.textbox()
 

-    function update()
+    function sysload.update()

         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()
         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()


@@ -35,7 +35,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    helpers.newtimer("sysload", timeout, update)
+    helpers.newtimer("sysload", timeout, sysload.update)

 
     return sysload
 end
 
     return sysload
 end

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 9f41fdbbc7522e1590f9bb82a56194db2fa0a76e..1c7e86c92de8e3074eece379457d427ebb1093e0 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -24,7 +24,7 @@ local function worker(args)
 
     temp.widget = wibox.widget.textbox()
 
 
     temp.widget = wibox.widget.textbox()
 

-    function update()
+    function temp.update()

         local f = io.open(tempfile)
         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
         local f = io.open(tempfile)
         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000


@@ -37,7 +37,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    helpers.newtimer("coretemp", timeout, update)
+    helpers.newtimer("coretemp", timeout, temp.update)

 
     return temp
 end
 
     return temp
 end

diff --git a/wiki b/wiki
index ed824beb75262f9f78e49baa6e1a591220ca5249..425169b35b105e5a240997ff8f5aa12bec6099cb 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit ed824beb75262f9f78e49baa6e1a591220ca5249
+Subproject commit 425169b35b105e5a240997ff8f5aa12bec6099cb