Merge branch 'master' of github.com:copycat-killer/lain

[etc/awesome.git] / widgets / alsabar.lua

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 5fe74c4ca27f9cde70ad41b5d32ac78be8dc21d1..fc45c726488eb82b17a6fd9d6354f4fdaee19639 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -8,13 +8,14 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer

+local read_pipe    = require("lain.helpers").read_pipe

 
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 

-local io           = { popen  = io.popen }

 local math         = { modf   = math.modf }
 local math         = { modf   = math.modf }

+local mouse        = mouse

 local string       = { format = string.format,
                        match  = string.match,
                        rep    = string.rep }
 local string       = { format = string.format,
                        match  = string.match,
                        rep    = string.rep }


@@ -46,7 +47,8 @@ local alsabar = {
     },
 
     _current_level = 0,
     },
 
     _current_level = 0,

-    _muted         = false
+    _muted         = false,
+    _status        = "off"

 }
 
 function alsabar.notify()
 }
 
 function alsabar.notify()


@@ -55,7 +57,7 @@ function alsabar.notify()
     local preset = {
         title   = "",
         text    = "",
     local preset = {
         title   = "",
         text    = "",

-        timeout = 5,
+        timeout = 1,

         screen  = alsabar.notifications.screen,
         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,
         screen  = alsabar.notifications.screen,
         font    = alsabar.notifications.font .. " " ..
                   alsabar.notifications.font_size,


@@ -75,6 +77,10 @@ function alsabar.notify()
                 .. string.rep(" ", alsabar.notifications.bar_size - int)
                 .. "]"
 
                 .. string.rep(" ", alsabar.notifications.bar_size - int)
                 .. "]"
 

+    if alsabar.followmouse then
+        preset.screen = mouse.screen
+    end
+

     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,
     if alsabar._notify ~= nil then
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,


@@ -89,7 +95,7 @@ end
 
 local function worker(args)
     local args       = args or {}
 
 local function worker(args)
     local args       = args or {}

-    local timeout    = args.timeout or 5
+    local timeout    = args.timeout or 1

     local settings   = args.settings or function() end
     local width      = args.width or 63
     local height     = args.heigth or 1
     local settings   = args.settings or function() end
     local width      = args.width or 63
     local height     = args.heigth or 1


@@ -102,6 +108,7 @@ local function worker(args)
     alsabar.step          = args.step or alsabar.step
     alsabar.colors        = args.colors or alsabar.colors
     alsabar.notifications = args.notifications or alsabar.notifications
     alsabar.step          = args.step or alsabar.step
     alsabar.colors        = args.colors or alsabar.colors
     alsabar.notifications = args.notifications or alsabar.notifications

+    alsabar.followmouse   = args.followmouse or false

 
     alsabar.bar = awful.widget.progressbar()
 
 
     alsabar.bar = awful.widget.progressbar()
 


@@ -116,35 +123,38 @@ local function worker(args)
 
     function alsabar.update()
         -- Get mixer control contents
 
     function alsabar.update()
         -- Get mixer control contents

-        local f = assert(io.popen(string.format("%s get %s", alsabar.cmd, alsabar.channel)))
-        local mixer = f:read("*all")
-        f:close()
+        local mixer = read_pipe(string.format("%s get %s", alsabar.cmd, alsabar.channel))

 
         -- Capture mixer control state:          [5%] ... ... [on]
         local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
 
         -- Capture mixer control state:          [5%] ... ... [on]
         local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 

-        if volu == nil then
-            volu = 0
-            mute = "off"
-        end
+        volu = tonumber(volu) or 0
+        if mute == "" then mute = "off"

 
 

-        alsabar._current_level = tonumber(volu)
-        alsabar.bar:set_value(alsabar._current_level / 100)
-        if not mute and tonumber(volu) == 0 or mute == "off"
-        then
-            alsabar._muted = true
-            alsabar.tooltip:set_text (" [Muted] ")
-            alsabar.bar:set_color(alsabar.colors.mute)
-        else
-            alsabar._muted = false
-            alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
-            alsabar.bar:set_color(alsabar.colors.unmute)
-        end
+        if alsabar._current_level ~= volu or alsabar._status ~= mute then
+
+            alsabar._current_level = volu
+            alsabar._status = mute

 
 

-        volume_now = {}
-        volume_now.level = tonumber(volu)
-        volume_now.status = mute
-        settings()
+            alsabar.bar:set_value(alsabar._current_level / 100)
+
+            if not mute and volu == 0 or mute == "off"
+            then
+                alsabar._muted = true
+                alsabar.tooltip:set_text (" [Muted] ")
+                alsabar.bar:set_color(alsabar.colors.mute)
+            else
+                alsabar._muted = false
+                alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
+                alsabar.bar:set_color(alsabar.colors.unmute)
+            end
+
+            volume_now = {}
+            volume_now.level = volu
+            volume_now.status = mute
+
+            settings()
+        end

     end
 
     alsabar.bar:buttons (awful.util.table.join (
     end
 
     alsabar.bar:buttons (awful.util.table.join (