X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b963bb6bde2b708e6f01b8a9d469d960501a2e0a..555b872d16393774089df3b3453000571a73a3dd:/widgets/contrib/tpbat/init.lua
diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index 206fd38..20a10f4 100644
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -17,39 +17,33 @@
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 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
-- lain.widgets.contrib.tpbat
-local tpbat = { }
-local tpbat_notification = nil
+local tpbat = {}
-function tpbat:hide()
- if tpbat_notification ~= nil
- then
- naughty.destroy(tpbat_notification)
- tpbat_notification = nil
- end
+function tpbat.hide()
+ if not tpbat.notification then return end
+ naughty.destroy(tpbat.notification)
+ tpbat.notification = nil
end
-function tpbat:show(t_out)
- tpbat:hide()
+function tpbat.show(t_out)
+ tpbat.hide()
- local bat = self.bat
- local t_out = t_out or 0
+ local bat = tpbat.bat
if bat == nil or not bat:installed() then return end
+ local t_out = t_out or 0
local mfgr = bat:get('manufacturer') or "no_mfgr"
local model = bat:get('model') or "no_model"
local chem = bat:get('chemistry') or "no_chem"
@@ -57,10 +51,8 @@ function tpbat:show(t_out)
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")
@@ -72,10 +64,10 @@ function tpbat:show(t_out)
local str = string.format("%s : %s %s (%s)\n", bat.name, mfgr, model, chem)
.. string.format("\n%s \t\t\t %s", status:upper(), msg)
- tpbat_notification = naughty.notify({
- preset = { fg = beautiful.fg_normal },
- text = str,
- timeout = t_out
+ tpbat.notification = naughty.notify({
+ text = str,
+ timeout = t_out,
+ screen = client.focus and client.focus.screen or 1
})
end
@@ -88,22 +80,35 @@ function tpbat.register(args)
tpbat.bat = smapi:battery(battery) -- Create a new battery
local bat = tpbat.bat
- tpbat.widget = wibox.widget.textbox('')
+ tpbat.widget = wibox.widget.textbox()
+
+ 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({
+ 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.",
- position = "top_right",
- timeout = 15,
- fg="#202020",
- bg="#cdcdcd",
- ontop = true
+ screen = client.focus and client.focus.screen or 1
})
end
- function update()
+ function tpbat.update()
bat_now = {
status = "Not present",
perc = "N/A",
@@ -113,51 +118,45 @@ function tpbat.register(args)
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)
- -- 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
- 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
widget = tpbat.widget
+
settings()
end
- newtimer("tpbat", timeout, update)
+ newtimer("tpbat-" .. bat.name, timeout, tpbat.update)
- widget:connect_signal('mouse::enter', function () tpbat:show() end)
- widget:connect_signal('mouse::leave', function () tpbat:hide() end)
+ widget:connect_signal('mouse::enter', function () tpbat.show() end)
+ widget:connect_signal('mouse::leave', function () tpbat.hide() end)
- return tpbat.widget
+ return tpbat
end
return setmetatable(tpbat, { __call = function(_, ...) return tpbat.register(...) end })