xfce4-mixer patchset

Natanael Copa ncopa at alpinelinux.org
Tue Sep 25 09:50:07 CEST 2012


On Mon, 24 Sep 2012 13:55:40 +0200
Harald Judt <h.judt at gmx.at> wrote:
 
> How about handling this in xfce4-keyboard-settings 

Agree, that was what the proposed patch was for (the xml is
shipped with libxfce4ui package)

> and let the 
> distribution patch the default shortcuts XML file? They know best
> what to use.

Distributions like less patching and if needed, try submit patch as
high upstream as possible. If xfce don't given them a convenient way to
set the commands, many will simply not do so. (how many distros set it
today?)

How about a --with-audio-raise-command="..." option to configure?

This example is for libxfce4ui package, for setting default command in
xfce4-keyboard-settings (after renaming
libxfce4kbd-private/xfce4-keyboard-shortcuts.xml to .in):

diff --git a/configure.ac.in b/configure.ac.in
index f5fcc52..5c8bd83 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -154,6 +154,21 @@ AC_ARG_ENABLE([keyboard-library],
               [enable_keyboard_library=$enableval], [enable_keyboard_library=yes])
 if test "x$enable_keyboard_library" = "xyes"; then
   XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
+  AC_ARG_WITH([audio-raise-command],
+              [AC_HELP_STRING([--with-audio-raise-command=COMMAND],
+                              [Default command for XF86AudioRaiseVolume])],
+              [AUDIO_RAISE_COMMAND="$withval"])
+  AC_ARG_WITH([audio-lower-command],
+              [AC_HELP_STRING([--with-audio-lower-command=COMMAND],
+                              [Default command for XF86AudioLowerVolume])],
+              [AUDIO_LOWER_COMMAND="$withval"])
+  AC_ARG_WITH([audio-mute-command],
+              [AC_HELP_STRING([--with-audio-mute-command=COMMAND],
+                              [Default command for XF86AudioMute])],
+              [AUDIO_MUTE_COMMAND="$withval"])
+  AC_SUBST([AUDIO_RAISE_COMMAND])
+  AC_SUBST([AUDIO_LOWER_COMMAND])
+  AC_SUBST([AUDIO_MUTE_COMMAND])
 fi
 AM_CONDITIONAL([ENABLE_KEYBOARD_LIBRARY], [test "x$enable_keyboard_library" = "xyes"])
 
@@ -308,6 +323,7 @@ icons/Makefile
 icons/48x48/Makefile
 libxfce4kbd-private/libxfce4kbd-private-2.pc
 libxfce4kbd-private/libxfce4kbd-private-3.pc
+libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
 libxfce4kbd-private/Makefile
 libxfce4ui/libxfce4ui-1.pc
 libxfce4ui/libxfce4ui-2.pc
@@ -333,6 +349,9 @@ echo "* Glade Interface Designer:  no"
 fi
 if test x"$enable_keyboard_library" = x"yes"; then
 echo "* Keyboard library support:  yes"
+echo "  - Audio raise command:     $AUDIO_RAISE_COMMAND"
+echo "  - Audio lower command:     $AUDIO_LOWER_COMMAND"
+echo "  - Audio mute command:      $AUDIO_MUTE_COMMAND"
 else
 echo "* Keyboard library support:  no"
 fi
diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml.in b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml.in
index cf1978d..d9d0dc3 100644
--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml.in
+++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml.in
@@ -16,6 +16,9 @@
       <property name="<Control>Escape" type="string" value="xfdesktop --menu"/>
       <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
       <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+      <property name="XF86AuidioRaiseVolume" type="string" value="@AUDIO_RAISE_COMMAND@"/>
+      <property name="XF86AudioLowerVolume" type="string" value="@AUDIO_LOWER_COMMAND@"/>
+      <property name="XF86AudioMute" type="string" value="@AUDIO_MUTE_COMMAND@"/>
     </property>
   </property>
   <property name="xfwm4" type="empty">




I can git send-mail a proper patch so you can git am it.

-nc


More information about the Xfce4-dev mailing list