Vertical client resizing fix

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 8331c54ef50a0346a010f7626fe1985c8abf9eb4..65a2b33018ea043e6c2458030058e00096fcc9b8 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


@@ -24,77 +24,76 @@ local setmetatable = setmetatable
 
 -- ALSA volume bar
 -- lain.widgets.alsabar
 
 -- ALSA volume bar
 -- lain.widgets.alsabar

-local alsabar =
-{
-  channel = "Master",
-  step    = "5%",
-
-  colors =
-  {
-     background = beautiful.bg_normal,
-     mute       = "#EB8F8F",
-     unmute     = "#A4CE8A"
-  },
-
-  terminal = terminal or "xterm",
-  mixer    = terminal .. " -e alsamixer",
-
-  notifications =
-  {
-     font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
-     font_size = "11",
-     color     = beautiful.fg_focus,
-     bar_size  = 18 
-  },
-
-  _current_level = 0,
-  _muted         = false
+local alsabar = {
+    channel = "Master",
+    step    = "5%",
+
+    colors = {
+        background = beautiful.bg_normal,
+        mute       = "#EB8F8F",
+        unmute     = "#A4CE8A"
+    },
+
+    terminal = terminal or "xterm",
+    mixer    = terminal .. " -e alsamixer",
+
+    notifications = {
+        font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
+        font_size = "11",
+        color     = beautiful.fg_normal,
+        bar_size  = 18,
+        screen    = 1
+    },
+
+    _current_level = 0,
+    _muted         = false

 }
 
 function alsabar.notify()
 }
 
 function alsabar.notify()

-  alsabar.update()
-
-       local preset =
-       {
-      title   = "",
-      text    = "",
-      timeout = 4,
-      font    = alsabar.notifications.font .. " " ..
-                alsabar.notifications.font_size,
-      fg      = alsabar.notifications.color
-       }
-
-       if alsabar._muted
-  then
-               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 = "["
+    alsabar.update()
+
+    local preset = {
+        title   = "",
+        text    = "",
+        timeout = 4,
+        screen  = alsabar.notifications.screen,
+        font    = alsabar.notifications.font .. " " ..
+                  alsabar.notifications.font_size,
+        fg      = alsabar.notifications.color
+    }
+
+    if alsabar._muted
+    then
+        preset.title = alsabar.channel .. " - Muted"
+    else
+        preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
+    end
+
+    int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
+    preset.text = "["

                 .. string.rep("|", int)
                 .. string.rep(" ", alsabar.notifications.bar_size - int)
                 .. "]"
 
                 .. string.rep("|", int)
                 .. string.rep(" ", alsabar.notifications.bar_size - int)
                 .. "]"
 

-  if alsabar._notify ~= nil then
-               alsabar._notify = naughty.notify ({
-        replaces_id = alsabar._notify.id,
-                         preset      = preset
-    })
-       else
-               alsabar._notify = naughty.notify ({
-        preset = preset
-    })
-       end
+    if alsabar._notify ~= nil then
+        alsabar._notify = naughty.notify ({
+            replaces_id = alsabar._notify.id,
+            preset      = preset,
+        })
+    else
+        alsabar._notify = naughty.notify ({
+            preset = preset,
+        })
+    end

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

-        local f = io.popen("amixer get " .. alsabar.channel)
-        local mixer = f:read("*all")
+        local f = io.popen("amixer -M get " .. alsabar.channel)
+        local mixer = f:read("*a")

         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
             mute = "off"
         end
 
 
         if volu == nil then
             volu = 0
             mute = "off"
         end
 

-        alsabar._current_level = tonumber(volu) / 100
-        alsabar.bar:set_value(alsabar._current_level)
+        alsabar._current_level = tonumber(volu)
+        alsabar.bar:set_value(alsabar._current_level / 100)

 
         if not mute and tonumber(volu) == 0 or mute == "off"
         then
 
         if not mute and tonumber(volu) == 0 or mute == "off"
         then


@@ -142,6 +140,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)