[Xfce4-commits] <xfce4-volumed:master> Now binding all keys with modifiers instead of just the modless volume keys

[Steve Dodier]

Updating branch refs/heads/master
         to 8a97a19a9b8adfe06b5bbdf67f9a753541069ea4 (commit)
       from af2ddc039bc575518a99c80c39abe0ddcc388156 (commit)

commit 8a97a19a9b8adfe06b5bbdf67f9a753541069ea4
Author: Steve Dodier <sidnioulz at gmail.com>
Date:   Tue Nov 2 13:59:35 2010 +0100

    Now binding all keys with modifiers instead of just the modless volume keys

 ChangeLog      |    3 ++
 src/xvd_keys.c |  100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01e847e..9de7b82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-11-02  Steve Dodier <sidnioulz at gmail.com>
+	* Bind all variants of the volume keys with modifiers (fixes lp #665146)
+
 2010-06-07  Jérôme Guelfucci <jeromeg at xfce.org>
 	* Use libkeybinder instead of libxcb for key grabbing
 
diff --git a/src/xvd_keys.c b/src/xvd_keys.c
index fdb3473..313b4b5 100644
--- a/src/xvd_keys.c
+++ b/src/xvd_keys.c
@@ -86,14 +86,114 @@ xvd_keys_init(XvdInstance *Inst)
     keybinder_init();
 
     keybinder_bind ("XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Alt>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Shift>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Alt>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Alt><Shift>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Shift><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Alt>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Shift><Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler, Inst);
+    
+    
     keybinder_bind ("XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Alt>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Shift>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Alt>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Alt><Shift>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Alt><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Shift><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Alt>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Alt><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Shift><Alt><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Alt><Super>XF86AudioLowerVolume", xvd_lower_handler, Inst);
+    
+    
     keybinder_bind ("XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Alt>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Shift>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Alt>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Alt><Shift>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Alt><Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Shift><Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Alt>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Alt><Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Shift><Alt><Super>XF86AudioMute", xvd_mute_handler, Inst);
+    keybinder_bind ("<Ctrl><Shift><Alt><Super>XF86AudioMute", xvd_mute_handler, Inst);
 }
 
 void
 xvd_keys_release (XvdInstance *Inst)
 {
+
     keybinder_unbind ("XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Alt>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Shift>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Shift>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Alt>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Alt><Shift>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Shift><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Shift><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Shift><Alt>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Shift><Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    keybinder_unbind ("<Ctrl><Shift><Alt><Super>XF86AudioRaiseVolume", xvd_raise_handler);
+    
+    
     keybinder_unbind ("XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Alt>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Shift>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Shift>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Alt>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Alt><Shift>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Alt><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Shift><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Shift><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Shift><Alt>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Alt><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Shift><Alt><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    keybinder_unbind ("<Ctrl><Shift><Alt><Super>XF86AudioLowerVolume", xvd_lower_handler);
+    
+    
     keybinder_unbind ("XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Alt>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Shift>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Shift>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Alt>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Alt><Shift>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Alt><Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Shift><Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Shift><Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Shift><Alt>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Alt><Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Shift><Alt><Super>XF86AudioMute", xvd_mute_handler);
+    keybinder_unbind ("<Ctrl><Shift><Alt><Super>XF86AudioMute", xvd_mute_handler);
+
 }