quake: uncomment client.border

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

diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index 6955b0436961240282d042666af85b36f6e5e342..9bac521b77add4d35c8d25e98074e74c87dc7bec 100644 (file)
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[

-
-     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 newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer


@@ -13,6 +13,7 @@ local read_pipe    = require("lain.helpers").read_pipe
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")

+local wibox        = require("wibox")

 
 local math         = { modf   = math.modf }
 local mouse        = mouse
 
 local math         = { modf   = math.modf }
 local mouse        = mouse


@@ -27,6 +28,7 @@ local setmetatable = setmetatable
 -- lain.widgets.pulsebar
 local pulsebar = {
     sink = 0,
 -- lain.widgets.pulsebar
 local pulsebar = {
     sink = 0,

+    step = "1%",

 
     colors = {
         background = beautiful.bg_normal,
 
     colors = {
         background = beautiful.bg_normal,


@@ -105,9 +107,10 @@ local function worker(args)
     pulsebar.colors        = args.colors or pulsebar.colors
     pulsebar.notifications = args.notifications or pulsebar.notifications
     pulsebar.sink          = args.sink or 0
     pulsebar.colors        = args.colors or pulsebar.colors
     pulsebar.notifications = args.notifications or pulsebar.notifications
     pulsebar.sink          = args.sink or 0

+    pulsebar.step          = args.step or pulsebar.step

     pulsebar.followmouse   = args.followmouse or false
 
     pulsebar.followmouse   = args.followmouse or false
 

-    pulsebar.bar = awful.widget.progressbar()
+    pulsebar.bar = wibox.widget.progressbar()

 
     pulsebar.bar:set_background_color(pulsebar.colors.background)
     pulsebar.bar:set_color(pulsebar.colors.unmute)
 
     pulsebar.bar:set_background_color(pulsebar.colors.background)
     pulsebar.bar:set_color(pulsebar.colors.unmute)


@@ -148,10 +151,26 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    pulsebar.bar:buttons (awful.util.table.join (
-          awful.button ({}, 1, function()
+    pulsebar.bar:buttons(awful.util.table.join (
+          awful.button({}, 1, function()

             awful.util.spawn(pulsebar.mixer)
             awful.util.spawn(pulsebar.mixer)

-          end)
+          end),
+          awful.button({}, 2, function()
+                                               awful.util.spawn(string.format("pactl set-sink-volume %d 100%%", pulsebar.sink))
+            pulsebar.update()
+          end),
+          awful.button({}, 3, function()
+                                               awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))
+            pulsebar.update()
+          end),
+          awful.button({}, 4, function()
+                                               awful.util.spawn(string.format("pactl set-sink-volume %d +%s", pulsebar.sink, pulsebar.step))
+            pulsebar.update()
+          end),
+          awful.button({}, 5, function()
+                                               awful.util.spawn(string.format("pactl set-sink-volume %d -%s", pulsebar.sink, pulsebar.step))
+            pulsebar.update()
+                                       end)

     ))
 
     timer_id = string.format("pulsebar-%s", pulsebar.sink)
     ))
 
     timer_id = string.format("pulsebar-%s", pulsebar.sink)