diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/acer.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/acer.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/acer.hk 2006-01-06 19:10:07.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/acer.hk 2006-01-16 09:56:09.000000000 +0200 @@ -1,8 +1,4 @@ -# Help key -setkeycodes e025 138 - -# Misc 1 -setkeycodes e074 148 - -# Misc 2 -setkeycodes e073 149 +# Acer Laptops +setkeycodes e025 $KEY_HELP # Help key +setkeycodes e074 $KEY_PROG1 # Misc 1 +setkeycodes e073 $KEY_PROG2 # Misc 2 diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/asus.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/asus.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/asus.hk 2005-08-18 00:58:31.000000000 +0300 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/asus.hk 2006-01-16 09:57:23.000000000 +0200 @@ -1,8 +1,4 @@ -# Mute key -setkeycodes 6f 113 - -# Volume up -setkeycodes 6d 115 - -# Volume down -setkeycodes 6e 114 +# Asus Laptops +setkeycodes 6f $KEY_MUTE # Mute key +setkeycodes 6d $KEY_VOLUMEUP # Volume up +setkeycodes 6e $KEY_VOLUMEDOWN # Volume down diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/debian/changelog /tmp/9wWmWliOyZ/hotkey-setup-0.1/debian/changelog --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/debian/changelog 2006-01-06 20:31:53.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/debian/changelog 2006-01-16 14:22:38.000000000 +0200 @@ -1,3 +1,12 @@ +hotkey-setup (0.1-13) dapper; urgency=low + + * Add additional IBM ThinkPad keys + * Automatically grep CONSTANTS from /usr/include/linux/input.h and + source this. + * Switch *.hk to use $KEY_NAMES instead of obscure numbers + + -- Paul Sladen Mon, 16 Jan 2006 08:37:59 +0200 + hotkey-setup (0.1-12) unstable; urgency=low * Fix Dell hibernate and HP sound keys diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/debian/init.d /tmp/9wWmWliOyZ/hotkey-setup-0.1/debian/init.d --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/debian/init.d 2005-12-24 03:12:56.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/debian/init.d 2006-01-16 08:14:14.000000000 +0200 @@ -13,6 +13,8 @@ rm /var/run/hotkey-setup fi + . /usr/share/hotkey-setup/key-constants + case "$manufacturer" in Hewlett-Packard*) case "$name" in diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/debian/rules /tmp/9wWmWliOyZ/hotkey-setup-0.1/debian/rules --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/debian/rules 2005-09-24 20:52:04.000000000 +0300 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/debian/rules 2006-01-16 08:36:01.000000000 +0200 @@ -28,6 +28,7 @@ # Add here commands to install the package into debian/hotkey-setup. mkdir -p $(CURDIR)/debian/hotkey-setup/usr/share/hotkey-setup cp $(CURDIR)/*.hk $(CURDIR)/debian/hotkey-setup/usr/share/hotkey-setup + cp $(CURDIR)/key-constants $(CURDIR)/debian/hotkey-setup/usr/share/hotkey-setup mkdir $(CURDIR)/debian/hotkey-setup/usr/sbin cp $(CURDIR)/dumpkeycodes $(CURDIR)/debian/hotkey-setup/usr/sbin diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/default.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/default.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/default.hk 2005-10-08 20:22:47.000000000 +0300 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/default.hk 2006-01-16 10:34:48.000000000 +0200 @@ -1 +1 @@ -# Nothing in here for now +# Non-matched laptops diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/dell.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/dell.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/dell.hk 2006-01-06 20:30:41.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/dell.hk 2006-01-16 14:09:00.000000000 +0200 @@ -1,8 +1,4 @@ -# Hibernate -setkeycodes e00a 205 - -# Battery -setkeycodes e007 230 - -# Eject -setkeycodes e009 161 +# Dell Laptops +setkeycodes e00a $KEY_SUSPEND # Hibernate +setkeycodes e007 $KEY_F24 # Battery [was: 230] +setkeycodes e009 $KEY_EJECTCD # Eject diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/generic.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/generic.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/generic.hk 2006-01-06 19:09:30.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/generic.hk 2006-01-16 10:34:45.000000000 +0200 @@ -0,0 +1 @@ +# All laptops diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/hp /tmp/9wWmWliOyZ/hotkey-setup-0.1/hp --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/hp 1970-01-01 02:00:00.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/hp 2006-01-16 09:57:47.000000000 +0200 @@ -0,0 +1 @@ +# HP Laptops diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/hp.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/hp.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/hp.hk 2006-01-06 20:31:20.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/hp.hk 2006-01-16 14:09:30.000000000 +0200 @@ -1,23 +1,9 @@ -# Help -setkeycodes e059 138 - -# Another help key -setkeycodes e031 138 - -# Fn+Escape? -setkeycodes e001 148 - -# DVD -setkeycodes e00e 226 - -# Music -setkeycodes e00c 213 - -# Lock -setkeycodes e00a 152 - -# Presentation (Misc 1) -setkeycodes e008 148 - -# Battery -setkeycodes e009 230 +# HP Laptops +setkeycodes e001 $KEY_PROG1 # Fn+Escape? +setkeycodes e008 $KEY_F23 # Presentation (Misc 1) +setkeycodes e009 $KEY_F24 # Battery [was: 230] +setkeycodes e00a $KEY_COFFEE # Lock +setkeycodes e00c $KEY_SOUND # Music +setkeycodes e00e $KEY_MEDIA # DVD +setkeycodes e031 $KEY_HELP # Help +setkeycodes e059 $KEY_HELP # Another help key diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/hptablet.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/hptablet.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/hptablet.hk 2006-01-06 19:12:08.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/hptablet.hk 2006-01-16 10:13:46.000000000 +0200 @@ -1,17 +1,7 @@ -# Escape -setkeycodes e005 1 - -# Tab -setkeycodes e004 15 - -# Q -setkeycodes e003 148 - -# Funny key -setkeycodes e002 149 - -# Rocker left (Page up) -setkeycodes e006 104 - -# Rocker right (Page down) -setkeycodes e007 109 +# HP Tablets +setkeycodes e002 $KEY_PROG2 # Funny key +setkeycodes e003 $KEY_PROG1 # Q +setkeycodes e004 $KEY_TAB # Tab +setkeycodes e005 $KEY_ESC # Escape +setkeycodes e006 $KEY_PAGEUP # Rocker left (Page up) +setkeycodes e007 $KEY_PAGEDOWN # Rocker right (Page down) diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/ibm.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/ibm.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/ibm.hk 2005-09-24 20:21:45.000000000 +0300 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/ibm.hk 2006-01-16 14:04:04.000000000 +0200 @@ -1,11 +1,42 @@ -# Escape -setkeycodes 6b 1 +# IBM/Lenovo ThinkPads +setkeycodes e05d $KEY_PROG1 # Fn-click (Press & release with no action), observed on R52 +setkeycodes e063 $KEY_PROG1 # Fn-click (Press & release with no action), found on Google -# Enter -setkeycodes 69 28 +# ThinkPad A and S series +setkeycodes e032 $KEY_HOMEPAGE # Home +setkeycodes e065 $KEY_SEARCH # Search +setkeycodes e06c $KEY_MAIL # Mail [also: KEY_EMAIL] -# Page up -setkeycodes 6d 104 +# ThinkPad A-series +setkeycodes e066 $KEY_BOOKMARKS # Favorites +setkeycodes e067 $KEY_REFRESH # Reload +setkeycodes e068 $KEY_STOP # Abort + +# ThinkPads from 2002 onwards +setkeycodes e069 $KEY_BACK # Back +setkeycodes e06a $KEY_FORWARD # Forward + +# X41 Tablet series only +# L-to-R: Scancodes have differing reports. Are these correct? +# Power and Power lock (ACPI), Ctrl-Alt-Delete (recessed), +# Screen Rotate, Tablet Utility, Escape, Enter, +# Page Up, Page Down +setkeycodes 67 $KEY_COFFEE # Tablet Ctrl-Alt-Delete +setkeycodes 6c $KEY_DIRECTION # Tablet Rotate +setkeycodes 68 $KEY_SETUP # Tablet Utility Menu +setkeycodes 6b $KEY_ESC # Tablet Escape +setkeycodes 69 $KEY_ENTER # Tablet Enter +setkeycodes 6d $KEY_PAGEUP # Tablet Up +setkeycodes 6e $KEY_PAGEDOWN # Tablet Down + +# TODO: Fn + Spacebar -> $KEY_ZOOM (/dev/nvram) +# TODO: ThinkPad Button -> $KEY_VENDOR (/dev/nvram) + +# TODO: ThinkPad R30, R31, R40e (Acer OEMs, no hardware mixer on these) +# TODO: Map Volume Mute/Down/Up to KEY_MUTE, KEY_VOLUMEDOWN, KEY_VOLUMEUP (/dev/nvram) + +# TODO: Fix Num-Lock, work out what it's going on. +# Shift+Scroll_Lock (0x45) to NumLock (77) and disable X's Pointer_EnableKeys +#Works in X with xmodmap -e 'keycode 77 = Num_Lock' ... How to do it on console? +#setkeycodes 45 $KEY_KP6 # ??? -# Page down -setkeycodes 6e 109 diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/key-constants /tmp/9wWmWliOyZ/hotkey-setup-0.1/key-constants --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/key-constants 1970-01-01 02:00:00.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/key-constants 2006-01-16 10:49:53.000000000 +0200 @@ -0,0 +1,220 @@ +# Generated from /usr/include/linux/input.h dated Tue Dec 6 15:47:18 EET 2005 +KEY_RESERVED=0 +KEY_ESC=1 +KEY_1=2 +KEY_2=3 +KEY_3=4 +KEY_4=5 +KEY_5=6 +KEY_6=7 +KEY_7=8 +KEY_8=9 +KEY_9=10 +KEY_0=11 +KEY_MINUS=12 +KEY_EQUAL=13 +KEY_BACKSPACE=14 +KEY_TAB=15 +KEY_Q=16 +KEY_W=17 +KEY_E=18 +KEY_R=19 +KEY_T=20 +KEY_Y=21 +KEY_U=22 +KEY_I=23 +KEY_O=24 +KEY_P=25 +KEY_LEFTBRACE=26 +KEY_RIGHTBRACE=27 +KEY_ENTER=28 +KEY_LEFTCTRL=29 +KEY_A=30 +KEY_S=31 +KEY_D=32 +KEY_F=33 +KEY_G=34 +KEY_H=35 +KEY_J=36 +KEY_K=37 +KEY_L=38 +KEY_SEMICOLON=39 +KEY_APOSTROPHE=40 +KEY_GRAVE=41 +KEY_LEFTSHIFT=42 +KEY_BACKSLASH=43 +KEY_Z=44 +KEY_X=45 +KEY_C=46 +KEY_V=47 +KEY_B=48 +KEY_N=49 +KEY_M=50 +KEY_COMMA=51 +KEY_DOT=52 +KEY_SLASH=53 +KEY_RIGHTSHIFT=54 +KEY_KPASTERISK=55 +KEY_LEFTALT=56 +KEY_SPACE=57 +KEY_CAPSLOCK=58 +KEY_F1=59 +KEY_F2=60 +KEY_F3=61 +KEY_F4=62 +KEY_F5=63 +KEY_F6=64 +KEY_F7=65 +KEY_F8=66 +KEY_F9=67 +KEY_F10=68 +KEY_NUMLOCK=69 +KEY_SCROLLLOCK=70 +KEY_KP7=71 +KEY_KP8=72 +KEY_KP9=73 +KEY_KPMINUS=74 +KEY_KP4=75 +KEY_KP5=76 +KEY_KP6=77 +KEY_KPPLUS=78 +KEY_KP1=79 +KEY_KP2=80 +KEY_KP3=81 +KEY_KP0=82 +KEY_KPDOT=83 +KEY_103RD=84 +KEY_ZENKAKUHANKAKU=85 +KEY_102ND=86 +KEY_F11=87 +KEY_F12=88 +KEY_RO=89 +KEY_KATAKANA=90 +KEY_HIRAGANA=91 +KEY_HENKAN=92 +KEY_KATAKANAHIRAGANA=93 +KEY_MUHENKAN=94 +KEY_KPJPCOMMA=95 +KEY_KPENTER=96 +KEY_RIGHTCTRL=97 +KEY_KPSLASH=98 +KEY_SYSRQ=99 +KEY_RIGHTALT=100 +KEY_LINEFEED=101 +KEY_HOME=102 +KEY_UP=103 +KEY_PAGEUP=104 +KEY_LEFT=105 +KEY_RIGHT=106 +KEY_END=107 +KEY_DOWN=108 +KEY_PAGEDOWN=109 +KEY_INSERT=110 +KEY_DELETE=111 +KEY_MACRO=112 +KEY_MUTE=113 +KEY_VOLUMEDOWN=114 +KEY_VOLUMEUP=115 +KEY_POWER=116 +KEY_KPEQUAL=117 +KEY_KPPLUSMINUS=118 +KEY_PAUSE=119 +KEY_KPCOMMA=121 +KEY_HANGUEL=122 +KEY_HANJA=123 +KEY_YEN=124 +KEY_LEFTMETA=125 +KEY_RIGHTMETA=126 +KEY_COMPOSE=127 +KEY_STOP=128 +KEY_AGAIN=129 +KEY_PROPS=130 +KEY_UNDO=131 +KEY_FRONT=132 +KEY_COPY=133 +KEY_OPEN=134 +KEY_PASTE=135 +KEY_FIND=136 +KEY_CUT=137 +KEY_HELP=138 +KEY_MENU=139 +KEY_CALC=140 +KEY_SETUP=141 +KEY_SLEEP=142 +KEY_WAKEUP=143 +KEY_FILE=144 +KEY_SENDFILE=145 +KEY_DELETEFILE=146 +KEY_XFER=147 +KEY_PROG1=148 +KEY_PROG2=149 +KEY_WWW=150 +KEY_MSDOS=151 +KEY_COFFEE=152 +KEY_DIRECTION=153 +KEY_CYCLEWINDOWS=154 +KEY_MAIL=155 +KEY_BOOKMARKS=156 +KEY_COMPUTER=157 +KEY_BACK=158 +KEY_FORWARD=159 +KEY_CLOSECD=160 +KEY_EJECTCD=161 +KEY_EJECTCLOSECD=162 +KEY_NEXTSONG=163 +KEY_PLAYPAUSE=164 +KEY_PREVIOUSSONG=165 +KEY_STOPCD=166 +KEY_RECORD=167 +KEY_REWIND=168 +KEY_PHONE=169 +KEY_ISO=170 +KEY_CONFIG=171 +KEY_HOMEPAGE=172 +KEY_REFRESH=173 +KEY_EXIT=174 +KEY_MOVE=175 +KEY_EDIT=176 +KEY_SCROLLUP=177 +KEY_SCROLLDOWN=178 +KEY_KPLEFTPAREN=179 +KEY_KPRIGHTPAREN=180 +KEY_F13=183 +KEY_F14=184 +KEY_F15=185 +KEY_F16=186 +KEY_F17=187 +KEY_F18=188 +KEY_F19=189 +KEY_F20=190 +KEY_F21=191 +KEY_F22=192 +KEY_F23=193 +KEY_F24=194 +KEY_PLAYCD=200 +KEY_PAUSECD=201 +KEY_PROG3=202 +KEY_PROG4=203 +KEY_SUSPEND=205 +KEY_CLOSE=206 +KEY_PLAY=207 +KEY_FASTFORWARD=208 +KEY_BASSBOOST=209 +KEY_PRINT=210 +KEY_HP=211 +KEY_CAMERA=212 +KEY_SOUND=213 +KEY_QUESTION=214 +KEY_EMAIL=215 +KEY_CHAT=216 +KEY_SEARCH=217 +KEY_CONNECT=218 +KEY_FINANCE=219 +KEY_SPORT=220 +KEY_SHOP=221 +KEY_ALTERASE=222 +KEY_CANCEL=223 +KEY_BRIGHTNESSDOWN=224 +KEY_BRIGHTNESSUP=225 +KEY_MEDIA=226 +KEY_UNKNOWN=240 diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/Makefile /tmp/9wWmWliOyZ/hotkey-setup-0.1/Makefile --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/Makefile 2005-09-24 20:46:50.000000000 +0300 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/Makefile 2006-01-16 10:56:17.000000000 +0200 @@ -1,7 +1,16 @@ dumpkeycodes: dumpkeycodes.c gcc -o dumpkeycodes dumpkeycodes.c +# Keep this manually generated so that it doesn't build-dep on +# 'linux-headers' and stays predictable. + +key-constants: /usr/include/linux/input.h + test -f $< + echo -n '# Generated from $< dated ' > $@ + date -r $< >> $@ + awk '/#define *KEY_/{if(($$3+0) <= 255) print $$2"="($$3+0)}' $< | sort -nt'=' -k2 >> $@ + clean: - - rm dumpkeycodes + - rm dumpkeycodes all: dumpkeycodes diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/medion-md41100.hk /tmp/9wWmWliOyZ/hotkey-setup-0.1/medion-md41100.hk --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/medion-md41100.hk 1970-01-01 02:00:00.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/medion-md41100.hk 2006-01-16 10:33:10.000000000 +0200 @@ -0,0 +1,6 @@ +# Medion MD41100 Laptop +# Found on Google. Not currently used. +# http://www.thp.uni-duisburg.de/~me/md41100/MD41100.html +setkeycodes 66 $KEY_CONNECT # WLAN +setkeycodes 6b $KEY_PROG1 # P1 +setkeycodes 6d $KEY_PROG2 # P2 diff -Nru /tmp/5uQSwl7P2Q/hotkey-setup-0.1/NOTES /tmp/9wWmWliOyZ/hotkey-setup-0.1/NOTES --- /tmp/5uQSwl7P2Q/hotkey-setup-0.1/NOTES 1970-01-01 02:00:00.000000000 +0200 +++ /tmp/9wWmWliOyZ/hotkey-setup-0.1/NOTES 2006-01-16 14:12:22.000000000 +0200 @@ -0,0 +1,28 @@ +Additional keys that need assigning: + + KEY_LOCK COFFEE Lock screen immediately + KEY_BATTERY F24 Battery key (was does this do under $other_os)? + KEY_ROTATE DIREC.. Tablet rotation (Xrandr); use KEY_DIRECTION? + +Possibly: + + KEY_FN Laptop Function key (this already exists >256), TP's + KEY_FULLSCREEN F23 Presentation mode on HP's + KEY_WLAN CONNECT Using KEY_CONNECT (likely to come via ACPI). + KEY_VENDOR AccessIBM/ThinkPad button + +Candiates to combine: + + KEY_MAIL KEY_EMAIL + +Ideas: + KEY_SCROLLUP Use for Tablet jog-dial/scroll buttons vs. PageUp? + KEY_SCROLLDOWN Use for Tablet jog-dial/scroll buttons vs. PageDown? + +Daemons: + + mini_tpb Monitor /dev/nvram ThinkPad Zoom, and AccessIBM keys. + Also monitor Volume and Mute for R30, R31, R40e. + + Work out how to synchronize h/w + s/w Mute status a la Windows. +