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

[Darren Salt]

The following commit has been merged in the master branch:
commit 4b3dc4d246ee20891754887ce3858fa8bc2b0997
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Wed Oct 14 16:47:14 2009 +0100

    Make VGA toggling a bindable function.

diff --git a/debian/changelog b/debian/changelog
index 498f880..21e26a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ eeepc-acpi-scripts (1.1.3) UNRELEASED; urgency=low
   * Strip out comments from /etc/default/eeepc-acpi-scripts and store a
     fully-commented copy in /usr/share/doc/eeepc-acpi-scripts/examples/.
   * Add configuration support for Fn-F4 on 10" models. No action is defined.
+  * Make VGA toggling into a bindable function.
 
   [ Damyan Ivanov ]
   * rules: call dh_installinit with -u'start 20 S .' to prevent
diff --git a/debian/eeepc-acpi-scripts.default.in b/debian/eeepc-acpi-scripts.default.in
index ecb2d33..76519d8 100644
--- a/debian/eeepc-acpi-scripts.default.in
+++ b/debian/eeepc-acpi-scripts.default.in
@@ -90,6 +90,8 @@ BLUETOOTH_FALLBACK_TO_HCITOOL='yes'
 #      on/off any USB bluetooth adapter found.
 #  - handle_camera_toggle
 #      Toggles internal camera on/off.
+#  - handle_vga_toggle
+#      Toggles between panel and VGA (as configured above).
 #  - handle_gsm_toggle
 #      Toggles internal GSM modem (HUAWEI) on/off.
 #  - handle_mute_toggle
@@ -122,6 +124,8 @@ FnF_TOUCHPAD='handle_touchpad_toggle'
 FnF_RESCHANGE='NONE'
 # --/F7 - backlight off
 FnF_BACKLIGHTOFF='handle_blank_screen'
+# F5/F8 - VGA toggle
+FnF_VGATOGGLE='handle_vga_toggle'
 # F6/F9 - 'task manager' key
 FnF_TASKMGR='NONE'
 # F7/F10 - mute/unmute speakers
diff --git a/etc/acpi/actions/hotkey.sh b/etc/acpi/actions/hotkey.sh
index d1dee0b..a9f8bb3 100755
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@ -105,6 +105,10 @@ handle_touchpad_toggle() {
 	notify touchpad 'Touchpad off'
 }
 
+handle_vga_toggle() {
+    /etc/acpi/actions/vga-toggle.sh
+}
+
 handle_gsm_toggle() {
     /etc/acpi/actions/gsm.sh toggle
     if /etc/acpi/actions/gsm.sh detect; then
@@ -166,7 +170,9 @@ case $code in
 
     # F5/F8 - toggle VGA
     0000003[012])
-	/etc/acpi/actions/vga-toggle.sh
+	if [ "${FnF_VGATOGGLE}" != 'NONE' ]; then
+	    ${FnF_VGATOGGLE:-handle_vga_toggle}
+	fi
 	;;
 
     # F6/F9 - 'task manager' key

-- 
Maintenance of eeepc-acpi-scripts debian package