Merge pull request #223 from monokles/bat-perc-fix

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

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 78ed3e0a4076705e3254de5f9340de491c6806da..aede803c0c9a50fe8aef6f051efcc72e19a767ad 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -1,23 +1,21 @@
 
 --[[
 
 --[[

-                                                   
-     Licensed under GNU General Public License v2  
-      * (c) 2013,      Luke Bonham                 
-      * (c) 2010-2012, Peter Hofmann               
-                                                   
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013,      Luke Bonham                
+      * (c) 2010-2012, Peter Hofmann              
+                                                  

 --]]
 
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
+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          = { format = string.format,
-                          gmatch = string.gmatch,
-                          len    = string.len }
+local io           = { lines  = io.lines }
+local math         = { floor  = math.floor }
+local string       = { gmatch = string.gmatch }

 
 

-local setmetatable    = setmetatable
+local setmetatable = setmetatable

 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem
 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem


@@ -25,7 +23,7 @@ local mem = {}
 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}

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

     local settings = args.settings or function() end
 
     mem.widget = wibox.widget.textbox('')
     local settings = args.settings or function() end
 
     mem.widget = wibox.widget.textbox('')


@@ -48,6 +46,7 @@ local function worker(args)
 
         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.swapused = mem_now.swap - mem_now.swapf

+        mem_now.perc = math.floor(mem_now.used / mem_now.total * 100)

 
         widget = mem.widget
         settings()
 
         widget = mem.widget
         settings()