alsabar: added argument for maximum number of ticks in notification; #438

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index 9b9f4b97a21dec7a43bdba2a23d42d0137a11715..b86c085aae1e7bf8df191932a883ee64c68665e8 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -48,8 +48,7 @@ local function factory(args)
     alsabar.notification_preset = args.notification_preset
 
     if not alsabar.notification_preset then
-        alsabar.notification_preset      = {}
-        alsabar.notification_preset.font = "Monospace 10"
+        alsabar.notification_preset = { font = "Monospace 10" }
     end
 
     local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
@@ -115,16 +114,21 @@ local function factory(args)
             end
 
             -- tot is the maximum number of ticks to display in the notification
-            -- fallback: default horizontal wibox height
-            local wib, tot = awful.screen.focused().mywibox, 20
-
-            -- if we can grab mywibox, tot is defined as its height if
-            -- horizontal, or width otherwise
-            if wib then
-                if wib.position == "left" or wib.position == "right" then
-                    tot = wib.width
+            local tot = alsabar.notification_preset.max_ticks
+
+            if not tot then
+                local wib = awful.screen.focused().mywibox
+                -- if we can grab mywibox, tot is defined as its height if
+                -- horizontal, or width otherwise
+                if wib then
+                    if wib.position == "left" or wib.position == "right" then
+                        tot = wib.width
+                    else
+                        tot = wib.height
+                    end
+                -- fallback: default horizontal wibox height
                 else
-                    tot = wib.height
+                    tot = 20
                 end
             end
 

diff --git a/widget/temp.lua b/widget/temp.lua
index e909b322f14a197b1d51f4448dc845ab18df1069..2b97a4e27dbdb6a8c761597e78177a7b882c6318 100644 (file)
--- a/widget/temp.lua
+++ b/widget/temp.lua
@@ -20,7 +20,7 @@ local function factory(args)
     local settings = args.settings or function() end
 
     function temp.update()
-        helpers.async({"find", "/sys/devices", "-type", "f", "-name", "*temp*"}, function(f)
+        helpers.async({"find", "/sys/devices/virtual/thermal", "-type", "f", "-name", "*temp*"}, function(f)
             temp_now = {}
             local temp_fl, temp_value
             for t in f:gmatch("[^\n]+") do

diff --git a/wiki b/wiki
index d7fd4db9122b26e8e8408f3515a0cb1cdb8b03e6..e37a9eb41b37cccdd307b4e88d4fcdecb920dcaa 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit d7fd4db9122b26e8e8408f3515a0cb1cdb8b03e6
+Subproject commit e37a9eb41b37cccdd307b4e88d4fcdecb920dcaa