]> git.madduck.net Git - etc/awesome.git/commitdiff

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 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 3567058)
thinkpad bat widget integrated
authorluke bonham <dadasignificanulla@gmail.com>
Thu, 26 Sep 2013 09:35:59 +0000 (11:35 +0200)
committerluke bonham <dadasignificanulla@gmail.com>
Thu, 26 Sep 2013 09:35:59 +0000 (11:35 +0200)
widgets/contrib/init.lua patch | blob | history
widgets/contrib/tpbat/init.lua patch | blob | history
widgets/contrib/tpbat/smapi.lua patch | blob | history

diff --git a/widgets/contrib/init.lua b/widgets/contrib/init.lua
index 81321c6cce6d4e900456309049ffb39d59f6e1fb..9a9fa63da598e036aac858d093665981747a0648 100644 (file)
--- a/widgets/contrib/init.lua
+++ b/widgets/contrib/init.lua
@@ -4,7 +4,7 @@
      Lain                                          
      Layouts, widgets and utilities for Awesome WM 
                                                    
      Lain                                          
      Layouts, widgets and utilities for Awesome WM 
                                                    
-     User contributed widgets section              
+     Users contributed widgets section             
                                                    
      Licensed under GNU General Public License v2  
       * (c) 2013,      Luke Bonham                 
                                                    
      Licensed under GNU General Public License v2  
       * (c) 2013,      Luke Bonham                 
diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index 1bb6a9b7fcb898d2053c037aec9ae07b6f212278..206fd38f48e851c3d93bbd2bbf81c8362ea93d2f 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -1,36 +1,41 @@
---[[
-     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 
+    if tpbat_notification ~= nil
     then
         naughty.destroy(tpbat_notification)
         tpbat_notification = nil
     then
         naughty.destroy(tpbat_notification)
         tpbat_notification = nil
@@ -39,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"
@@ -50,9 +57,9 @@ 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" 
+    if status ~= "idle" and status ~= "nil"
     then
     then
-        if time == "N/A" 
+        if time == "N/A"
         then
             msg = "...Calculating time remaining..."
         else
         then
             msg = "...Calculating time remaining..."
         else
@@ -63,7 +70,7 @@ 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 },
 
     tpbat_notification = naughty.notify({
         preset = { fg = beautiful.fg_normal },
@@ -80,10 +87,10 @@ 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 
+    if bat:get('state') == nil
     then
         local n = naughty.notify({
             title = "SMAPI Battery Warning: Unable to read battery state!",
     then
         local n = naughty.notify({
             title = "SMAPI Battery Warning: Unable to read battery state!",
@@ -141,13 +148,13 @@ function tpbat.register(args)
             bat_now.perc = tostring(bat_now.perc)
         end
 
             bat_now.perc = tostring(bat_now.perc)
         end
 
-        widget = tpbat.widget -- 'widget' needed in rc.lua (following convention)
+        widget = tpbat.widget
         settings()
     end
 
     newtimer("tpbat", timeout, update)
 
         settings()
     end
 
     newtimer("tpbat", 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
diff --git a/widgets/contrib/tpbat/smapi.lua b/widgets/contrib/tpbat/smapi.lua
index 59b916bdd558387a3ef268e8564b1803f95d1bc0..862d4cd66e16189bd81066364c3cbe8afd82a000 100644 (file)
--- a/widgets/contrib/tpbat/smapi.lua
+++ b/widgets/contrib/tpbat/smapi.lua
@@ -1,9 +1,11 @@
---[[
-     smapi.lua
-     Interface with thinkpad battery information
 
 
+--[[
+                                                  
+     smapi.lua                                    
+     Interface with thinkpad battery information  
+                                                  
      Licensed under GNU General Public License v2 
      Licensed under GNU General Public License v2 
-      * (c) 2013,      Conor Heine           
+      * (c) 2013, Conor Heine                     
                                                   
 --]]
 
                                                   
 --]]
 
@@ -19,42 +21,42 @@ local apipath = "/sys/devices/platform/smapi"
 
 -- Most are readable values, but some can be written to (not implemented, yet?)
 local readable = {
 
 -- Most are readable values, but some can be written to (not implemented, yet?)
 local readable = {
-    barcoding = true,
-    charging_max_current = true,
-    charging_max_voltage = true,
-    chemistry = true,
-    current_avg = true,
-    current_now = true,
-    cycle_count = true,
-    design_capacity = true,
-    design_voltage = true,
-    dump = true,
-    first_use_date = true,
-    force_discharge = false,
-    group0_voltage = true,
-    group1_voltage = true,
-    group2_voltage = true,
-    group3_voltage = true,
-    inhibit_charge_minutes = false,
-    installed = true,
-    last_full_capacity = true,
-    manufacture_date = true,
-    manufacturer = true,
-    model = true,
-    power_avg = true,
-    power_now = true,
-    remaining_capacity = true,
-    remaining_charging_time = true,
-    remaining_percent = true,
-    remaining_percent_error = true,
-    remaining_running_time = true,
+    barcoding                  = true,
+    charging_max_current       = true,
+    charging_max_voltage       = true,
+    chemistry                  = true,
+    current_avg                = true,
+    current_now                = true,
+    cycle_count                = true,
+    design_capacity            = true,
+    design_voltage             = true,
+    dump                       = true,
+    first_use_date             = true,
+    force_discharge            = false,
+    group0_voltage             = true,
+    group1_voltage             = true,
+    group2_voltage             = true,
+    group3_voltage             = true,
+    inhibit_charge_minutes     = false,
+    installed                  = true,
+    last_full_capacity         = true,
+    manufacture_date           = true,
+    manufacturer               = true,
+    model                      = true,
+    power_avg                  = true,
+    power_now                  = true,
+    remaining_capacity         = true,
+    remaining_charging_time    = true,
+    remaining_percent          = true,
+    remaining_percent_error    = true,
+    remaining_running_time     = true,
     remaining_running_time_now = true,
     remaining_running_time_now = true,
-    serial = true,
-    start_charge_thresh = false,
-    state = true,
-    stop_charge_thresh = false,
-    temperature = true,
-    voltage = true,
+    serial                     = true,
+    start_charge_thresh        = false,
+    state                      = true,
+    stop_charge_thresh         = false,
+    temperature                = true,
+    voltage                    = true,
 }
 
 function smapi:battery(name)
 }
 
 function smapi:battery(name)
@@ -62,7 +64,7 @@ function smapi:battery(name)
 
     bat.name = name
     bat.path = apipath .. "/" .. name
 
     bat.name = name
     bat.path = apipath .. "/" .. name
-    
+
     function bat:get(item)
         return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
     end
     function bat:get(item)
         return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
     end
@@ -80,11 +82,11 @@ function smapi:battery(name)
         local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
         local mins_left = self:get(time_val)
 
         local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
         local mins_left = self:get(time_val)
 
-        if mins_left:find("^%d+") == nil 
-        then 
-            return "N/A" 
+        if mins_left:find("^%d+") == nil
+        then
+            return "N/A"
         end
         end
-        
+
         local hrs = mins_left / 60
         local min = mins_left % 60
         return string.format("%02d:%02d", hrs, min)
         local hrs = mins_left / 60
         local min = mins_left % 60
         return string.format("%02d:%02d", hrs, min)
@@ -97,4 +99,4 @@ function smapi:battery(name)
     return setmetatable(bat, {__metatable = false, __newindex = false})
 end
 
     return setmetatable(bat, {__metatable = false, __newindex = false})
 end
 
-return smapi
\ No newline at end of file
+return smapi
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.