X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8af4a03c754fa1bcac24736633f1b3be8ce8888c..cf1bb42a83dcb9687db47a9a1eacf1ce087f76ff:/widgets/alsabar.lua

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index d8f1731..4ae12e5 100644
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -43,7 +43,7 @@ local alsabar =
   {
      font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
      font_size = "11",
-     color     = beautiful.fg_focus,
+     color     = beautiful.fg_normal,
      bar_size  = 18
   },
 
@@ -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
@@ -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)