]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/alsabar.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Updated tpbat (markdown)
[etc/awesome.git] / widgets / alsabar.lua
index d8f1731b287bb5ee219545f04b9cba03f6839b70..365ac2d20ce71bcad3a6c4062169eb22fca1fc76 100644 (file)
@@ -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
   },
 
@@ -92,9 +92,10 @@ 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 +113,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 +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
+
+        volume_now = {}
+        volume_now.level = tonumber(volu)
+        volume_now.status = mute
+        settings()
     end
 
     newtimer("alsabar", timeout, alsabar.update)