Merge pull request #53 from wooparadog/show-notify-in-focused-screen

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 8331c54ef50a0346a010f7626fe1985c8abf9eb4..4ae12e563bf170fb9c38dab9f39e49e5e63ee139 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -15,7 +15,7 @@ local naughty      = require("naughty")
 
 local io           = { popen  = io.popen }
 local math         = { modf   = math.modf }
-local string       = { format = string.format, 
+local string       = { format = string.format,
                        match  = string.match,
                        rep    = string.rep }
 local tonumber     = tonumber
@@ -43,8 +43,8 @@ local alsabar =
   {
      font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
      font_size = "11",
-     color     = beautiful.fg_focus,
-     bar_size  = 18 
+     color     = beautiful.fg_normal,
+     bar_size  = 18
   },
 
   _current_level = 0,
@@ -54,22 +54,22 @@ local alsabar =
 function alsabar.notify()
   alsabar.update()
 
-       local preset =
-       {
+    local preset =
+    {
       title   = "",
       text    = "",
       timeout = 4,
       font    = alsabar.notifications.font .. " " ..
                 alsabar.notifications.font_size,
       fg      = alsabar.notifications.color
-       }
+    }
 
-       if alsabar._muted
+    if alsabar._muted
   then
-               preset.title = alsabar.channel .. " - Muted"
-       else
-               preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
-       end
+        preset.title = alsabar.channel .. " - Muted"
+    else
+        preset.title = alsabar.channel .. " - " .. alsabar._current_level * 100 .. "%"
+    end
 
   int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
   preset.text = "["
@@ -78,23 +78,26 @@ function alsabar.notify()
                 .. "]"
 
   if alsabar._notify ~= nil then
-               alsabar._notify = naughty.notify ({
+        alsabar._notify = naughty.notify ({
         replaces_id = alsabar._notify.id,
-                         preset      = preset
+        preset      = preset,
+        screen = client.focus and client.focus.screen or 1
     })
-       else
-               alsabar._notify = naughty.notify ({
-        preset = preset
+    else
+        alsabar._notify = naughty.notify ({
+        preset = preset,
+        screen = client.focus and client.focus.screen or 1
     })
-       end
+    end
 end
 
 local function worker(args)
     local args = args or {}
     local timeout = args.timeout or 4
+    local settings = args.settings or function() end
     local width = args.width or 63
     local height = args.heigth or 1
-    local ticks = args.ticks or true
+    local ticks = args.ticks or false
     local ticks_size = args.ticks_size or 7
     local vertical = args.vertical or false
 
@@ -112,8 +115,7 @@ local function worker(args)
     alsabar.bar:set_height(height)
     alsabar.bar:set_ticks(ticks)
     alsabar.bar:set_ticks_size(ticks_size)
-
-    if vertical then alsabar.bar:set_vertical(true) end
+    alsabar.bar:set_vertical(vertical)
 
     function alsabar.update()
         -- Get mixer control contents
@@ -122,7 +124,7 @@ local function worker(args)
         f:close()
 
         -- Capture mixer control state:          [5%] ... ... [on]
-        local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") 
+        local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
         if volu == nil then
             volu = 0
@@ -142,6 +144,11 @@ local function worker(args)
             alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
             alsabar.bar:set_color(alsabar.colors.unmute)
         end
+
+        volume_now = {}
+        volume_now.level = tonumber(volu)
+        volume_now.status = mute
+        settings()
     end
 
     newtimer("alsabar", timeout, alsabar.update)