awesome: add multimedia bindings

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index ddade279f24c99dc90c8d5bad047dedbe309575b..6e06e674babdacb188c282407b16ae1fc8e89802 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -59,7 +59,7 @@ globalkeys = awful.util.table.join(globalkeys,
                   awful.util.getdir("cache") .. "/history_eval")
               end),
     -- Menubar
                   awful.util.getdir("cache") .. "/history_eval")
               end),
     -- Menubar

-    awful.key({ modkey }, "p", function() menubar.show() end),
+    -- awful.key({ modkey }, "p", function() menubar.show() end),

 
     -- My Keys {{{2
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
 
     -- My Keys {{{2
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),


@@ -92,7 +92,10 @@ globalkeys = awful.util.table.join(globalkeys,
     -- Volume
     awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),
     awful.key({ }, "XF86AudioLowerVolume",  function () awful.util.spawn("ponymix decrease 5") end),
     -- Volume
     awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),
     awful.key({ }, "XF86AudioLowerVolume",  function () awful.util.spawn("ponymix decrease 5") end),

-    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end)
+    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end),
+    awful.key({ modkey }, "F10",  function () awful.util.spawn("ponymix toggle")     end),
+    awful.key({ modkey }, "F11",  function () awful.util.spawn("ponymix decrease 5") end),
+    awful.key({ modkey }, "F12",  function () awful.util.spawn("ponymix increase 5") end)

 )
 
 -- Client keys {{{1
 )
 
 -- Client keys {{{1

diff --git a/awesome/rc.lua b/awesome/rc.lua
index 9d8a7d38bd3aed9726e9bee9f2858dc5616eb123..d7d3a4321c2563f96b756d6f380abc7d978052a5 100644 (file)
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -50,10 +50,10 @@ if beautiful.wallpaper then
 end
 
 -- Require files {{{1
 end
 
 -- Require files {{{1

+require("bindings")

 require("tags")
 require("menu")
 require("topbar")
 require("tags")
 require("menu")
 require("topbar")

-require("bindings")

 require("rules")
 require("conky")
 require("autostart")
 require("rules")
 require("conky")
 require("autostart")

diff --git a/awesome/widgets/awesompd.lua b/awesome/widgets/awesompd.lua
index 6ac896435332e498b6195f8e889f40702d895e06..d697be1a9823d689bdec9e9c0641a350418efde4 100644 (file)
--- a/awesome/widgets/awesompd.lua
+++ b/awesome/widgets/awesompd.lua
@@ -43,6 +43,11 @@ musicwidget:register_buttons({
     { "",        awesompd.MOUSE_SCROLL_UP,   musicwidget:command_volume_up()   },
     { "",        awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_volume_down() },
     { "",        awesompd.MOUSE_RIGHT,       musicwidget:command_show_menu()   },
     { "",        awesompd.MOUSE_SCROLL_UP,   musicwidget:command_volume_up()   },
     { "",        awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_volume_down() },
     { "",        awesompd.MOUSE_RIGHT,       musicwidget:command_show_menu()   },

+    { modkey,    "p",                        musicwidget:command_playpause()   },
+    { modkey,    ",",                        musicwidget:command_prev_track()   },
+    { modkey,    ".",                        musicwidget:command_next_track()   },
+    { { modkey, "Shift" },    ",",           musicwidget:command_previous_server()   },
+    { { modkey, "Shift" },    ".",           musicwidget:command_next_server()   },

     { "",        "XF86AudioPlay",            musicwidget:command_playpause()   },
     { "",        "XF86AudioPrev",            musicwidget:command_prev_track()  },
     { "",        "XF86AudioNext",            musicwidget:command_next_track()  },
     { "",        "XF86AudioPlay",            musicwidget:command_playpause()   },
     { "",        "XF86AudioPrev",            musicwidget:command_prev_track()  },
     { "",        "XF86AudioNext",            musicwidget:command_next_track()  },