cal: terminal-colors.d independent highlight matching pattern

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

diff --git a/widgets/mem.lua b/widgets/mem.lua
index dc72279d800e787ea684062d9138e0c6d7c6ab1a..e96dc1b735d1184a4ee4e3a32887015c6d813a3b 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -7,74 +7,50 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local helpers      = require("lain.helpers")
+local newtimer     = require("lain.helpers").newtimer

 local wibox        = require("wibox")
 local wibox        = require("wibox")

-
-local io           = { lines  = io.lines }
-local math         = { floor  = math.floor }
-local string       = { gmatch = string.gmatch }
-
+local gmatch       = string.gmatch
+local lines        = io.lines
+local floor        = math.floor

 local setmetatable = setmetatable
 
 local setmetatable = setmetatable
 

--- Memory usage
+-- Memory usage (ignoring caches)

 -- lain.widgets.mem
 local mem = {}
 
 local function worker(args)
     local args     = args or {}
 -- lain.widgets.mem
 local mem = {}
 
 local function worker(args)
     local args     = args or {}

-    local timeout  = args.timeout or 1
+    local timeout  = args.timeout or 2

     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 

-    mem.widget = wibox.widget.textbox('')
-
-    helpers.set_map("mem_last_total", 0)
-    helpers.set_map("mem_last_free", 0)
-    helpers.set_map("mem_last_buf", 0)
-    helpers.set_map("mem_last_cache", 0)
-    helpers.set_map("mem_last_swap", 0)
-    helpers.set_map("mem_last_swapf", 0)
+    mem.widget = wibox.widget.textbox()

 
     function update()
         mem_now = {}
 
     function update()
         mem_now = {}

-        for line in io.lines("/proc/meminfo")
-        do
-            for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
-            do
-                if     k == "MemTotal"  then mem_now.total = math.floor(v / 1024)
-                elseif k == "MemFree"   then mem_now.free  = math.floor(v / 1024)
-                elseif k == "Buffers"   then mem_now.buf   = math.floor(v / 1024)
-                elseif k == "Cached"    then mem_now.cache = math.floor(v / 1024)
-                elseif k == "SwapTotal" then mem_now.swap  = math.floor(v / 1024)
-                elseif k == "SwapFree"  then mem_now.swapf = math.floor(v / 1024)
+        for line in lines("/proc/meminfo") do
+            for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
+                if     k == "MemTotal"     then mem_now.total = floor(v / 1024 + 0.5)
+                elseif k == "MemFree"      then mem_now.free  = floor(v / 1024 + 0.5)
+                elseif k == "Buffers"      then mem_now.buf   = floor(v / 1024 + 0.5)
+                elseif k == "Cached"       then mem_now.cache = floor(v / 1024 + 0.5)
+                elseif k == "SwapTotal"    then mem_now.swap  = floor(v / 1024 + 0.5)
+                elseif k == "SwapFree"     then mem_now.swapf = floor(v / 1024 + 0.5)
+                elseif k == "SReclaimable" then mem_now.srec  = floor(v / 1024 + 0.5)

                 end
             end
         end
 
                 end
             end
         end
 

-        if mem_now.total ~= helpers.set_map("mem_last_total")
-        or mem_now.free  ~= helpers.set_map("mem_last_free")
-        or mem_now.buf   ~= helpers.set_map("mem_last_buf")
-        or mem_now.cache ~= helpers.set_map("mem_last_cache")
-        or mem_now.swap  ~= helpers.set_map("mem_last_swap")
-        or mem_now.swapf ~= helpers.set_map("mem_last_swapf")
-        then
-            mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache)
-            mem_now.swapused = mem_now.swap - mem_now.swapf
+        mem_now.used = mem_now.total - mem_now.free - mem_now.buf - mem_now.cache - mem_now.srec
+        mem_now.swapused = mem_now.swap - mem_now.swapf
+        mem_now.perc = math.floor(mem_now.used / mem_now.total * 100)

 
 

-            widget = mem.widget
-            settings()
-
-            helpers.set_map("mem_last_total", mem_now.total)
-            helpers.set_map("mem_last_free", mem_now.free)
-            helpers.set_map("mem_last_buf", mem_now.buf)
-            helpers.set_map("mem_last_cache", mem_now.cache)
-            helpers.set_map("mem_last_swap", mem_now.swap)
-            helpers.set_map("mem_last_swapf", mem_now.swapf)
-        end
+        widget = mem.widget
+        settings()

     end
 
     end
 

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

 
 

-    return mem.widget
+    return setmetatable(mem, { __index = mem.widget })

 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })