[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.0-beta.1-5-g64d03b6
Darren Salt
linux at youmustbejoking.demon.co.uk
Sat Apr 25 15:15:30 UTC 2009
The following commit has been merged in the master branch:
commit 64d03b645054ceeb90778cf8b994b93666f6dc9c
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date: Sat Apr 25 16:10:49 2009 +0100
Hotkey handling: support 10xx Fn-F7, rename FnF* config variables.
Rearrange handling a bit (no functional changes), fix comments, and document
newer keys for which we don't yet have event codes.
diff --git a/debian/changelog b/debian/changelog
index b040d42..13f146a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+eeepc-acpi-scripts (1.1.1) unstable; urgency=low
+
+ * Add support for Fn-F7 (on 10xx models). Default is screen blanking.
+ * Rearrange hotkey handling a bit (no functional changes), fix comments
+ and document keys for which we don't yet have event codes.
+ * Configuration settings FnF6, FnF7, FnF8 and FnF9 are renamed to reflect
+ function rather than location.
+ (We've had one instance of renaming to reflect location on a 1000-series
+ without corresponding fixes in the hotkey handler script.)
+
+ -- Darren Salt <linux at youmustbejoking.demon.co.uk> Sat, 25 Apr 2009 16:07:32 +0100
+
eeepc-acpi-scripts (1.1.0) unstable; urgency=low
[ Darren Salt ]
diff --git a/debian/eeepc-acpi-scripts.default b/debian/eeepc-acpi-scripts.default
index 0aa39be..5cacdf0 100644
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@ -67,7 +67,7 @@ LOCK_SCREEN_ON_SUSPEND='yes'
# /sys/devices/platform/bluetooth is not present
BLUETOOTH_FALLBACK_TO_HCITOOL='yes'
-# Configuration of "soft" keys found on models 900 and above
+# Configuration of "soft" keys
# The possible actions are:
# - handle_blank_screen
# Turns the lid off. Does not activate any screen saver.
@@ -89,11 +89,24 @@ BLUETOOTH_FALLBACK_TO_HCITOOL='yes'
# - custom command
# For example you can write a shell function in this file and use its name
# as an action, or call another internal or external command
+
+# The silver keys, found on models 900 and above
SOFTBTN1_ACTION='handle_blank_screen'
SOFTBTN2_ACTION='NONE'
SOFTBTN3_ACTION='handle_camera_toggle'
SOFTBTN4_ACTION='handle_bluetooth_toggle'
-FnF6='NONE'
-FnF7='handle_mute_toggle'
-FnF8='handle_volume_down'
-FnF9='handle_volume_up'
+
+# 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
+# --/F7 - backlight off
+FnF_BACKLIGHTOFF='handle_blank_screen'
+# F6/F9 - 'task manager' key
+FnF_TASKMGR='NONE'
+# F7/F10 - mute/unmute speakers
+FnF_MUTE='handle_mute_toggle'
+# F8/F11 - decrease volume
+FnF_VOLUMEDOWN='handle_volume_down'
+# F9/F12 - increase volume
+FnF_VOLUMEUP='handle_volume_up'
+
diff --git a/etc/acpi/actions/hotkey.sh b/etc/acpi/actions/hotkey.sh
index c6eeca2..a6b1784 100755
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@ -94,7 +94,14 @@ show_brightness() {
}
case $code in
- # Fn+F2 -- toggle wireless
+ # Fn + key:
+ # <700/900-series key>/<1000-series key> - function
+ # "--" = not available
+
+ # F1/F1 - suspend
+ # (not a hotkey, not handled here)
+
+ # F2/F2 - toggle wireless
0000001[01])
notify wireless 'Wireless ...'
if grep -q '^H.*\brfkill\b' /proc/bus/input/devices; then
@@ -104,62 +111,90 @@ case $code in
fi
show_wireless
;;
- # Fn+F6
+
+ # --/F3 - touchpad toggle
+ # (ACPI event code not known)
+
+ # --/F4 - resolution change
+ # (ACPI event code not known)
+
+ # F3/F5 - decrease brightness
+ # F4/F6 - increase brightness
+ 0000002?)
+ # actual brightness change is handled in hardware
+ if [ "x$ENABLE_OSD_BRIGHTNESS" != "xno" ]; then
+ show_brightness
+ fi
+ ;;
+
+ # --/F7 - backlight off
+ 00000016)
+ if [ "${FnF_BACKLIGHTOFF:-handle_blank_screen}" != 'NONE' ]; then
+ ${FnF_BACKLIGHTOFF:-handle_blank_screen}
+ fi
+ ;;
+
+ # F5/F8 - toggle VGA
+ 0000003[012])
+ /etc/acpi/actions/vga-toggle.sh
+ ;;
+
+ # F6/F9 - 'task manager' key
00000012)
- if [ "${FnF6:-NONE}" != 'NONE' ]; then
- $FnF6
+ if [ "${FnF_TASKMGR:-NONE}" != 'NONE' ]; then
+ $FnF_TASKMGR
fi
;;
- # Fn+F7 -- mute/unmute speakers
+
+ # F7/F10 - mute/unmute speakers
00000013)
- if [ "${FnF7:-handle_mute_toggle}" != 'NONE' ]; then
- ${FnF7:-handle_mute_toggle}
+ if [ "${FnF_MUTE:-handle_mute_toggle}" != 'NONE' ]; then
+ ${FnF_MUTE:-handle_mute_toggle}
fi
;;
- # Fn+F8 -- decrease volume
+
+ # F8/F11 - decrease volume
00000014)
- if [ "${FnF8:-handle_volume_down}" != 'NONE' ]; then
- ${FnF8:-handle_volume_down}
+ if [ "${FnF_VOLUMEDOWN:-handle_volume_down}" != 'NONE' ]; then
+ ${FnF_VOLUMEDOWN:-handle_volume_down}
fi
;;
- # Fn+F9 -- increase volume
+
+ # F9/F12 - increase volume
00000015)
- if [ "${FnF9:-handle_volume_up}" != 'NONE' ]; then
- ${FnF9:-handle_volume_up}
- fi
- ;;
- # F+F5 -- toggle vga
- 0000003[012])
- /etc/acpi/actions/vga-toggle.sh
- ;;
- # Fn+F3 -- decrease brightness
- # Fn+F4 -- increase brightness
- 0000002?)
- # actual brightness change is handled in hardware
- if [ "x$ENABLE_OSD_BRIGHTNESS" != "xno" ]; then
- show_brightness
+ if [ "${FnF_VOLUMEUP:-handle_volume_up}" != 'NONE' ]; then
+ ${FnF_VOLUMEUP:-handle_volume_up}
fi
;;
+
+ # --/Space - SHE management
+ # (ACPI event code not known)
+
+ # Silver keys, left to right
+
+ # Soft button 1
0000001a)
- # soft-buton 1
if [ "${SOFTBTN1_ACTION:-handle_blank_screen}" != 'NONE' ]; then
${SOFTBTN1_ACTION:-handle_blank_screen}
fi
;;
+
+ # Soft button 2
0000001b)
- # soft-buton 2
if [ "${SOFTBTN2_ACTION}" != 'NONE' ]; then
${SOFTBTN2_ACTION}
fi
;;
+
+ # Soft button 3
0000001c)
- # soft-buton 3
if [ "${SOFTBTN3_ACTION:-handle_camera_toggle}" != 'NONE' ]; then
${SOFTBTN3_ACTION:-handle_camera_toggle}
fi
;;
+
+ # Soft button 4
0000001d)
- # soft-buton 4
if [ "${SOFTBTN4_ACTION:-handle_bluetooth_toggle}" != 'NONE' ]; then
${SOFTBTN4_ACTION:-handle_bluetooth_toggle}
fi
--
Maintenance of eeepc-acpi-scripts debian package
More information about the Debian-eeepc-commits
mailing list