]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/bat.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

clean a little bit
[etc/awesome.git] / widgets / bat.lua
index 5a811f0c7b300b0ca881289793e51ebbde458071..7b14a9a8dfa260191011a35e9274bc85ff344a81 100644 (file)
@@ -20,7 +20,7 @@ local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
 
 -- Battery infos
 -- lain.widgets.bat
-local bat = { id = nil }
+local bat = {}
 
 local function worker(args)
     local args = args or {}
 
 local function worker(args)
     local args = args or {}
@@ -28,16 +28,16 @@ local function worker(args)
     local battery = args.battery or "BAT0"
     local settings = args.settings or function() end
 
     local battery = args.battery or "BAT0"
     local settings = args.settings or function() end
 
-    bat_now = {
-        status = "not present",
-        perc   = "N/A",
-        time   = "N/A",
-        watt   = "N/A"
-    }
-
-    widget = wibox.widget.textbox('')
+    bat.widget = wibox.widget.textbox('')
 
     function update()
 
     function update()
+        bat_now = {
+            status = "Not present",
+            perc   = "N/A",
+            time   = "N/A",
+            watt   = "N/A"
+        }
+
         local present = first_line("/sys/class/power_supply/"
                                    .. battery
                                    .. "/present")
         local present = first_line("/sys/class/power_supply/"
                                    .. battery
                                    .. "/present")
@@ -89,7 +89,7 @@ local function worker(args)
                     ontop = true,
                     replaces_id = bat.id
                 }).id
                     ontop = true,
                     replaces_id = bat.id
                 }).id
-            elseif bat.perc <= 15
+            elseif bat_now.perc <= 15
             then
                 bat.id = naughty.notify({
                     text = "plug the cable",
             then
                 bat.id = naughty.notify({
                     text = "plug the cable",
@@ -106,12 +106,13 @@ local function worker(args)
             bat_now.perc = string.format("%d", bat_now.perc)
         end
 
             bat_now.perc = string.format("%d", bat_now.perc)
         end
 
+        widget = bat.widget
         settings()
     end
 
     newtimer("bat", timeout, update)
 
         settings()
     end
 
     newtimer("bat", timeout, update)
 
-    return widget
+    return bat.widget
 end
 
 return setmetatable(bat, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(bat, { __call = function(_, ...) return worker(...) end })