]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/contrib/tpbat/init.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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
localize variables
[etc/awesome.git] / widgets / contrib / tpbat / init.lua
diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index d46697a895c620e551ae607d757ed7e197c9249d..0a22526fedffb3e6937d86218861ff2d088bbfa1 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -1,36 +1,42 @@
---[[
-     tpbat.lua
-     Battery status widget for ThinkPad laptops that use SMAPI
-     lain.widgets.contrib.tpbat
-
-     More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi
 
 
-     Licensed under GNU General Public License v2 
-      * (c) 2013,      Conor Heine
-      * (c) 2013,      Luke Bonham                
-      * (c) 2010-2012, Peter Hofmann              
-                                                  
+--[[
+                                                               
+     tpbat.lua                                                 
+     Battery status widget for ThinkPad laptops that use SMAPI 
+     lain.widgets.contrib.tpbat                                
+                                                               
+     More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi  
+                                                               
+     Licensed under GNU General Public License v2              
+      * (c) 2013,      Conor Heine                             
+      * (c) 2013,      Luke Bonham                             
+      * (c) 2010-2012, Peter Hofmann                           
+                                                               
 --]]
 
 --]]
 
+local debug        = { getinfo = debug.getinfo }
 local newtimer     = require("lain.helpers").newtimer
 local first_line   = require("lain.helpers").first_line
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local newtimer     = require("lain.helpers").newtimer
 local first_line   = require("lain.helpers").first_line
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-local smapi        = require("lain.widgets.contrib.tpbat.smapi") -- Ugly :(
 
 local string       = { format = string.format }
 local math         = { floor = math.floor }
 local tostring     = tostring
 local setmetatable = setmetatable
 
 
 local string       = { format = string.format }
 local math         = { floor = math.floor }
 local tostring     = tostring
 local setmetatable = setmetatable
 
+package.path       = debug.getinfo(1,"S").source:match[[^@?(.*[\/])[^\/]-$]] .. "?.lua;" .. package.path
+local smapi        = require("smapi")
+
 -- ThinkPad SMAPI-enabled battery info widget
 -- ThinkPad SMAPI-enabled battery info widget
+-- lain.widgets.contrib.tpbat
 local tpbat = { }
 local tpbat = { }
-
 local tpbat_notification = nil
 
 function tpbat:hide()
 local tpbat_notification = nil
 
 function tpbat:hide()
-    if tpbat_notification ~= nil then
+    if tpbat_notification ~= nil
+    then
         naughty.destroy(tpbat_notification)
         tpbat_notification = nil
     end
         naughty.destroy(tpbat_notification)
         tpbat_notification = nil
     end
@@ -38,8 +44,10 @@ end
 
 function tpbat:show(t_out)
     tpbat:hide()
 
 function tpbat:show(t_out)
     tpbat:hide()
-    
-    local bat = self.bat
+
+    local bat   = self.bat
+    local t_out = t_out or 0
+
     if bat == nil or not bat:installed() then return end
 
     local mfgr   = bat:get('manufacturer') or "no_mfgr"
     if bat == nil or not bat:installed() then return end
 
     local mfgr   = bat:get('manufacturer') or "no_mfgr"
@@ -49,8 +57,10 @@ function tpbat:show(t_out)
     local time   = bat:remaining_time()
     local msg    = "\t"
 
     local time   = bat:remaining_time()
     local msg    = "\t"
 
-    if status ~= "idle" and status ~= "nil" then
-        if time == "N/A" then
+    if status ~= "idle" and status ~= "nil"
+    then
+        if time == "N/A"
+        then
             msg = "...Calculating time remaining..."
         else
             msg = time .. (status == "charging" and " until charged" or " remaining")
             msg = "...Calculating time remaining..."
         else
             msg = time .. (status == "charging" and " until charged" or " remaining")
@@ -60,12 +70,13 @@ function tpbat:show(t_out)
     end
 
     local str = string.format("%s : %s %s (%s)\n", bat.name, mfgr, model, chem)
     end
 
     local str = string.format("%s : %s %s (%s)\n", bat.name, mfgr, model, chem)
-    str = str .. string.format("\n%s \t\t\t %s", status:upper(), msg)
+                .. string.format("\n%s \t\t\t %s", status:upper(), msg)
 
     tpbat_notification = naughty.notify({
         preset = { fg = beautiful.fg_normal },
         text = str,
 
     tpbat_notification = naughty.notify({
         preset = { fg = beautiful.fg_normal },
         text = str,
-        timeout = t_out
+        timeout = t_out,
+        screen = client.focus and client.focus.screen or 1
     })
 end
 
     })
 end
 
@@ -77,18 +88,32 @@ function tpbat.register(args)
 
     tpbat.bat = smapi:battery(battery) -- Create a new battery
     local bat = tpbat.bat
 
     tpbat.bat = smapi:battery(battery) -- Create a new battery
     local bat = tpbat.bat
-    
+
     tpbat.widget = wibox.widget.textbox('')
 
     tpbat.widget = wibox.widget.textbox('')
 
-    if bat:get('state') == nil then
+    bat_notification_low_preset = {
+        title = "Battery low",
+        text = "Plug the cable!",
+        timeout = 15,
+        fg = "#202020",
+        bg = "#CDCDCD"
+    }
+
+    bat_notification_critical_preset = {
+        title = "Battery exhausted",
+        text = "Shutdown imminent",
+        timeout = 15,
+        fg = "#000000",
+        bg = "#FFFFFF"
+    }
+
+    if bat:get('state') == nil
+    then
         local n = naughty.notify({
         local n = naughty.notify({
+            preset = bat_notification_low_preset,
             title = "SMAPI Battery Warning: Unable to read battery state!",
             text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
             title = "SMAPI Battery Warning: Unable to read battery state!",
             text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
-            position = "top_right",
-            timeout = 15,
-            fg="#202020",
-            bg="#cdcdcd",
-            ontop = true
+            screen = client.focus and client.focus.screen or 1
         })
     end
 
         })
     end
 
@@ -102,48 +127,41 @@ function tpbat.register(args)
 
         if bat:installed()
         then
 
         if bat:installed()
         then
-            bat_now.status = bat:status()
+            bat_now.status = bat:status() or "N/A"
             bat_now.perc   = bat:percent()
             bat_now.time   = bat:remaining_time()
             -- bat_now.watt = string.format("%.2fW", (VOLTS * AMPS) / 1e12)
 
             bat_now.perc   = bat:percent()
             bat_now.time   = bat:remaining_time()
             -- bat_now.watt = string.format("%.2fW", (VOLTS * AMPS) / 1e12)
 
-            -- notifications for low and critical states
-            if bat_now.perc <= 5
-            then
-                tpbat.id = naughty.notify({
-                    text = "shutdown imminent",
-                    title = "battery nearly exhausted",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#000000",
-                    bg="#ffffff",
-                    ontop = true,
-                    replaces_id = tpbat.id
-                }).id
-            elseif bat_now.perc <= 15
+            -- notifications for low and critical states (when discharging)
+            if bat_now.status == "discharging"
             then
             then
-                tpbat.id = naughty.notify({
-                    text = "plug the cable",
-                    title = "battery low",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#202020",
-                    bg="#cdcdcd",
-                    ontop = true,
-                    replaces_id = tpbat.id
-                }).id
+                if bat_now.perc <= 5
+                then
+                    tpbat.id = naughty.notify({
+                        preset = bat_notification_critical_preset,
+                        replaces_id = tpbat.id,
+                        screen = client.focus and client.focus.screen or 1
+                    }).id
+                elseif bat_now.perc <= 15
+                then
+                    tpbat.id = naughty.notify({
+                        preset = bat_notification_low_preset,
+                        replaces_id = tpbat.id,
+                        screen = client.focus and client.focus.screen or 1
+                    }).id
+                end
             end
 
             bat_now.perc = tostring(bat_now.perc)
         end
 
             end
 
             bat_now.perc = tostring(bat_now.perc)
         end
 
-        widget = tpbat.widget -- 'widget' needed in rc.lua (following convention)
+        widget = tpbat.widget
         settings()
     end
 
         settings()
     end
 
-    newtimer("tpbat", timeout, update)
+    newtimer("tpbat-" .. bat.name, timeout, update)
 
 
-    widget:connect_signal('mouse::enter', function () tpbat:show(0) end)
+    widget:connect_signal('mouse::enter', function () tpbat:show() end)
     widget:connect_signal('mouse::leave', function () tpbat:hide() end)
 
     return tpbat.widget
     widget:connect_signal('mouse::leave', function () tpbat:hide() end)
 
     return tpbat.widget
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.