[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.1-20-g16d1143

[Darren Salt]

The following commit has been merged in the master branch:
commit 16d11435fad31fba6b2cf3fca4941b8a9b16957b
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sun Jul 26 02:32:13 2009 +0100

    Make touchpad toggling into a bindable function.

diff --git a/debian/changelog b/debian/changelog
index bfd5f2b..3943182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ eeepc-acpi-scripts (1.1.2) UNRELEASED; urgency=low
     control & muting. Off by default; normally takes effect while booting.
   * Don't run the init script on installation or upgrade; just while
     booting. This avoids altering current settings.
+  * Make touchpad toggling into a bindable function.
 
   [ Thiemo Nagel ]
   * spelling fix in the default file
diff --git a/debian/eeepc-acpi-scripts.default b/debian/eeepc-acpi-scripts.default
index cdd6a95..f53efff 100644
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@ -98,6 +98,8 @@ BLUETOOTH_FALLBACK_TO_HCITOOL='yes'
 #      Adjust volume level
 #  - handle_shengine
 #      Change 'super hybrid engine' setting
+#  - handle_touchpad_toggle
+#      Toggles the touchpad on/off
 #  - NONE
 #      Ignore the key
 #  - custom command
@@ -113,6 +115,8 @@ SOFTBTN4_ACTION='handle_bluetooth_toggle'
 # Various Fn + key, not all of which are found on all models (or all BIOSes)
 # Labelling is "<700/900-series key>/<1000-series key> - function"
 # "--" = not available
+# --/F3 - touchpad toggle
+FnF_TOUCHPAD='handle_touchpad_toggle'
 # --/F7 - backlight off
 FnF_BACKLIGHTOFF='handle_blank_screen'
 # F6/F9 - 'task manager' key
diff --git a/etc/acpi/actions/hotkey.sh b/etc/acpi/actions/hotkey.sh
index a0da708..6ab038d 100755
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@ -98,6 +98,13 @@ handle_shengine() {
     handle_shengine "$@"
 }
 
+handle_touchpad_toggle() {
+    . /etc/acpi/lib/touchpad.sh
+    toggle_touchpad &&
+	notify touchpad 'Touchpad on' ||
+	notify touchpad 'Touchpad off'
+}
+
 case $code in
     # Fn + key:
     # <700/900-series key>/<1000-series key> - function
@@ -119,10 +126,9 @@ case $code in
 
     # --/F3 - touchpad toggle
     00000037)
-	. /etc/acpi/lib/touchpad.sh
-	toggle_touchpad &&
-	    notify touchpad 'Touchpad on' ||
-	    notify touchpad 'Touchpad off'
+	if [ "${FnF_TOUCHPAD}" != 'NONE' ]; then
+	    ${FnF_BACKLIGHTOFF:-handle_touchpad_toggle}
+	fi
 	;;
 
     # --/F4 - resolution change

-- 
Maintenance of eeepc-acpi-scripts debian package