add volume widget

diff --git a/awesome/rc.lua b/awesome/rc.lua
index b716457bd4dc94a0930d0e67dee74ca13d50ff99..0de85cc1bd539c6563599ba2e35710b9fc565a29 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -3,8 +3,6 @@ gears = require("gears")
 awful = require("awful")
 awful.rules = require("awful.rules")
 require("awful.autofocus")
 awful = require("awful")
 awful.rules = require("awful.rules")
 require("awful.autofocus")

--- Widget and layout library
-wibox = require("wibox")

 -- Theme handling library
 beautiful = require("beautiful")
 -- Notification library
 -- Theme handling library
 beautiful = require("beautiful")
 -- Notification library

diff --git a/awesome/topbar.lua b/awesome/topbar.lua
index c0b6ee7ba9fde8b778a21e7b8eaf64221a7260ba..84a7b5a29edecd2e4417d5d4a3f027e50c26ee64 100644 (file)
--- a/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@ -1,3 +1,8 @@
+-- Widget and layout library
+wibox = require("wibox")
+-- my widgets
+require("widgets")
+

 -- {{{ Wibox
 -- Create a textclock widget
 mytextclock = awful.widget.textclock()
 -- {{{ Wibox
 -- Create a textclock widget
 mytextclock = awful.widget.textclock()


@@ -82,6 +87,7 @@ for s = 1, screen.count() do
     local right_layout = wibox.layout.fixed.horizontal()
     if s == 1 then right_layout:add(wibox.widget.systray()) end
     --right_layout:add(APW)
     local right_layout = wibox.layout.fixed.horizontal()
     if s == 1 then right_layout:add(wibox.widget.systray()) end
     --right_layout:add(APW)

+    right_layout:add(volwidget)

     right_layout:add(mytextclock)
     right_layout:add(mylayoutbox[s])
 
     right_layout:add(mytextclock)
     right_layout:add(mylayoutbox[s])
 

diff --git a/awesome/widgets.lua b/awesome/widgets.lua
new file mode 100644 (file)
index 0000000..66a34fa
--- /dev/null
+++ b/awesome/widgets.lua
@@ -0,0 +1,14 @@
+local vicious = require("vicious")
+vicious.contrib = require("vicious.contrib")
+
+--{{{ Volume
+volwidget = wibox.widget.textbox()
+vicious.register(volwidget, vicious.contrib.pulse,
+    function (widget, args) 
+        return "<b>("..math.floor(args[1]).."%)</b> "
+    end, 2, "alsa_output.pci-0000_00_14.2.analog-stereo")
+volwidget:buttons(awful.util.table.join( awful.button({ }, 1, function () awful.util.spawn("pavucontrol") end), -- FIXME replace pavucontrol with something else
+      awful.button({ }, 4, function () vicious.contrib.pulse.add( 5,"alsa_output.pci-0000_00_14.2.analog-stereo") end),
+      awful.button({ }, 5, function () vicious.contrib.pulse.add(-5,"alsa_output.pci-0000_00_14.2.analog-stereo") end)
+      ))
+--}}}