alsabar: revert #275; remove buttons and beautiful deps

diff --combined widgets/alsabar.lua
index 20a678efb4f8411285d866b096bbe6121e0be7e6,3ade35c190622e2e7c9c620584e4ce2a3dde33f7..430063be3b3caee5e676093e19e677dcee292d4e
--- 1/widgets/alsabar.lua
--- 2/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@@ -1,14 -1,12 +1,11 @@@
- 
  --[[
-                                                   
-      Licensed under GNU General Public License v2 
-       * (c) 2013, Luke Bonham                     
-       * (c) 2013, Rman                            
-                                                   
+      Licensed under GNU General Public License v2
+       * (c) 2013, Luke Bonham
+       * (c) 2013, Rman
  --]]
  
  local helpers      = require("lain.helpers")
  local awful        = require("awful")
 -local beautiful    = require("beautiful")
  local naughty      = require("naughty")
  local wibox        = require("wibox")
  local math         = { modf   = math.modf }
@@@ -18,16 -16,28 +15,24 @@@ local string       = { format = string.
  local tonumber     = tonumber
  local type         = type
  local setmetatable = setmetatable
+ local terminal     = "urxvtc" or "xterm"
  
  -- ALSA volume bar
  -- lain.widgets.alsabar
  local alsabar = {
++<<<<<<< HEAD
++=======
+     channel = "Master",
+     step    = "1%",
+     mixer   = "amixer",
+ 
++>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8
      colors = {
 -        background = beautiful.bg_normal,
 +        background = "#000000",
          mute       = "#EB8F8F",
          unmute     = "#A4CE8A"
      },
  
 -    notifications = {
 -        font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
 -        font_size = "11",
 -        color     = beautiful.fg_normal,
 -        screen    = 1
 -    },
 -
      _current_level = 0,
      _muted         = false
  }
@@@ -42,16 -52,16 +47,29 @@@ local function worker(args
      local ticks_size   = args.ticks_size or 7
      local vertical     = args.vertical or false
  
++<<<<<<< HEAD
 +    alsabar.cmd                 = args.cmd or "amixer"
 +    alsabar.channel             = args.channel or "Master"
 +    alsabar.colors              = args.colors or alsabar.colors
 +    alsabar.followtag           = args.followtag or false
 +    alsabar._notify             = args.notify or "on"
 +    alsabar.notification_preset = args.notification_preset
 +
 +    if not alsabar.notification_preset then
 +        alsabar.notification_preset      = naughty.config.defaults
 +        alsabar.notification_preset.font = "Monospace 11"
++=======
+     alsabar.mixer         = args.mixer or alsabar.mixer
+     alsabar.channel       = args.channel or alsabar.channel
+     alsabar.togglechannel = args.togglechannel or alsabar.togglechannel
+     alsabar.cmd           = args.cmd or {"bash", "-c", string.format("%s get %s", alsabar.mixer, alsabar.channel)}
+     alsabar.step          = args.step or alsabar.step
+     alsabar.colors        = args.colors or alsabar.colors
+     alsabar.notifications = args.notifications or alsabar.notifications
+     alsabar.followtag     = args.followtag or false
+     if alsabar.togglechannel then
+             alsabar.cmd   = args.cmd or { "bash", "-c", string.format("%s get %s; %s get %s", alsabar.mixer, alsabar.channel, alsabar.mixer, alsabar.togglechannel)}
++>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8
      end
  
      alsabar.bar = wibox.widget {
@@@ -67,6 -77,27 +85,27 @@@
          layout           = vertical and wibox.container.rotate
      }
  
+     alsabar.bar:buttons (awful.util.table.join(
+         awful.button({}, 1, function()
+                 awful.spawn(string.format('%s -e alsamixer', terminal))
+         end),
+         awful.button({}, 2, function()
+                 awful.spawn(string.format("%s set %s 100%%", alsabar.mixer, alsabar.channel))
+                 alsabar.update()
+         end),
+         awful.button({}, 3, function()
+                 awful.spawn(string.format("%s set %s toggle", alsabar.mixer, alsabar.togglechannel or alsabar.channel))
+                 alsabar.update()
+         end),
+         awful.button({}, 4, function()
+                 awful.spawn(string.format("%s set %s %s+", alsabar.mixer, alsabar.channel, alsabar.step))
+                 alsabar.update()
+         end),
+         awful.button({}, 5, function()
+                 awful.spawn(string.format("%s set %s %s-", alsabar.mixer, alsabar.channel, alsabar.step))
+                 alsabar.update()
+         end)))
+ 
      alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
  
      function alsabar.update(callback)
@@@ -76,7 -107,8 +115,7 @@@
              then
                  alsabar._current_level = tonumber(volu) or alsabar._current_level
                  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
                      alsabar._muted = true
                      alsabar.tooltip:set_text ("[Muted]")
                      alsabar.bar.color = alsabar.colors.mute
@@@ -99,7 -131,15 +138,7 @@@
  
      function alsabar.notify()
          alsabar.update(function()
 -            local preset = {
 -                title   = "",
 -                text    = "",
 -                timeout = 5,
 -                screen  = alsabar.notifications.screen,
 -                font    = string.format("%s %s", alsabar.notifications.font,
 -                          alsabar.notifications.font_size),
 -                fg      = alsabar.notifications.color
 -            }
 +            local preset = alsabar.notification_preset
  
              if alsabar._muted then
                  preset.title = string.format("%s - Muted", alsabar.channel)
@@@ -113,17 -153,18 +152,17 @@@
  
              if alsabar.followtag then preset.screen = awful.screen.focused() end
  
 -            if alsabar._notify then
 -                alsabar._notify = naughty.notify ({
 -                    replaces_id = alsabar._notify.id,
 -                    preset      = preset,
 -                })
 -            else
 -                alsabar._notify = naughty.notify ({ preset = preset })
 +            if alsabar._notify == "on" then
 +                alsabar.id = naughty.notify ({
 +                    replaces_id = alsabar.id,
 +                    preset      = preset
 +                }).id
              end
          end)
      end
  
      timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
 +
      helpers.newtimer(timer_id, timeout, alsabar.update)
  
      return alsabar