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 90d3a0d8cc45d98ba16980ad12a125744f62a2b1..4ae12e563bf170fb9c38dab9f39e49e5e63ee139 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -54,22 +54,22 @@ local alsabar =
 function alsabar.notify()
   alsabar.update()
 
 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
       title   = "",
       text    = "",
       timeout = 4,
       font    = alsabar.notifications.font .. " " ..
                 alsabar.notifications.font_size,
       fg      = alsabar.notifications.color

-       }
+    }

 
 

-       if alsabar._muted
+    if alsabar._muted

   then
   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 = "["
 
   int = math.modf(alsabar._current_level * alsabar.notifications.bar_size)
   preset.text = "["


@@ -78,15 +78,17 @@ function alsabar.notify()
                 .. "]"
 
   if alsabar._notify ~= nil then
                 .. "]"
 
   if alsabar._notify ~= nil then

-               alsabar._notify = naughty.notify ({
+        alsabar._notify = naughty.notify ({

         replaces_id = alsabar._notify.id,
         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)
 end
 
 local function worker(args)


@@ -95,7 +97,7 @@ local function worker(args)
     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

-    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
 
     local ticks_size = args.ticks_size or 7
     local vertical = args.vertical or false
 


@@ -113,8 +115,7 @@ local function worker(args)
     alsabar.bar:set_height(height)
     alsabar.bar:set_ticks(ticks)
     alsabar.bar:set_ticks_size(ticks_size)
     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
 
     function alsabar.update()
         -- Get mixer control contents