]> 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:

using timer sharing; #114
[etc/awesome.git] / widgets / bat.lua
index 60bd71cd581c56965621b7fbc43c4366ead168b9..d55be1746def102d4e8db39a96fcc15b160204ab 100644 (file)
@@ -96,21 +96,17 @@ local function worker(args)
             if min < 0 then min = 0 elseif min > 59 then min = 59 end
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
-                       
-                       local perc = tonumber(first_line(bstr .. "/capacity"))                  
-
-            if not perc then
-                          perc = (rem / tot) * 100
-                       end
-                       
-                       if perc <= 100 then
-                          bat_now.perc = string.format("%d", perc)
-                       elseif perc > 100 then
-                          bat_now.perc = "100"
-                       elseif perc < 0 then
-                          bat_now.perc = "0"
-                       end
-               
+
+            local perc = tonumber(first_line(bstr .. "/capacity")) or math.floor((rem / tot) * 100)
+
+            if perc <= 100 then
+                bat_now.perc = string.format("%d", perc)
+            elseif perc > 100 then
+                bat_now.perc = "100"
+            elseif perc < 0 then
+                bat_now.perc = "0"
+            end
+
             if rate ~= nil and ratev ~= nil then
                 bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
             else