use awful.tag.gettags in order to keep compatibility with custom configs such as...

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 8331c54ef50a0346a010f7626fe1985c8abf9eb4..365ac2d20ce71bcad3a6c4062169eb22fca1fc76 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 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
                        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",
   {
      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,
   },
 
   _current_level = 0,


@@ -92,9 +92,10 @@ end
 local function worker(args)
     local args = args or {}
     local timeout = args.timeout or 4
 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 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
 


@@ -112,8 +113,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


@@ -122,7 +122,7 @@ local function worker(args)
         f:close()
 
         -- Capture mixer control state:          [5%] ... ... [on]
         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
 
         if volu == nil then
             volu = 0


@@ -142,6 +142,11 @@ local function worker(args)
             alsabar.tooltip:set_text(string.format(" %s:%s ", alsabar.channel, volu))
             alsabar.bar:set_color(alsabar.colors.unmute)
         end
             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)
     end
 
     newtimer("alsabar", timeout, alsabar.update)