From 1c88925eee79b6f2094f3a5434bc237b3f3b7f13 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 6 Jul 2013 22:52:03 -0400 Subject: keymaps, keymaps-force-release: updates from upstream Signed-off-by: Anthony G. Basile --- keymaps/Makefile.am | 1 + keymaps/acer | 34 ++++++++-------- keymaps/acer-aspire_5720 | 6 +-- keymaps/acer-aspire_8930 | 4 +- keymaps/dell | 54 ++++++++++++------------- keymaps/dell-latitude-xt2 | 8 ++-- keymaps/everex-xt5000 | 4 +- keymaps/fujitsu-amilo_li_2732 | 4 +- keymaps/fujitsu-amilo_pro_edition_v3505 | 8 ++-- keymaps/fujitsu-amilo_pro_v3205 | 2 +- keymaps/hewlett-packard | 14 +++---- keymaps/hewlett-packard-hdx9494nr | 2 +- keymaps/hewlett-packard-pavilion | 6 +-- keymaps/hewlett-packard_elitebook-8460p | 6 +-- keymaps/lenovo-3000 | 8 ++-- keymaps/lenovo-ideapad | 2 +- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint | 24 +++++------ keymaps/lenovo-thinkpad_x200_tablet | 6 +-- keymaps/lenovo-thinkpad_x6_tablet | 16 ++++---- keymaps/lg-x110 | 22 +++++----- keymaps/logitech-usb | 12 +++--- keymaps/logitech-wave | 32 +++++++-------- keymaps/logitech-wave-cordless | 8 ++-- keymaps/maxdata-pro_7000 | 8 ++-- keymaps/medion-fid2060 | 4 +- keymaps/medionnb-a555 | 8 ++-- keymaps/micro-star | 24 +++++------ keymaps/module-ibm | 24 +++++------ keymaps/module-lenovo | 28 ++++++------- keymaps/module-sony | 16 ++++---- keymaps/module-sony-vgn | 8 ++-- keymaps/module-sony-vpc | 6 +-- keymaps/olpc-xo | 22 +++++----- keymaps/onkyo | 26 ++++++------ keymaps/samsung-other | 24 +++++------ keymaps/samsung-series-3 | 3 ++ keymaps/samsung-series-9 | 6 +-- keymaps/toshiba-satellite_m30x | 4 +- 38 files changed, 249 insertions(+), 245 deletions(-) create mode 100644 keymaps/samsung-series-3 (limited to 'keymaps') diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am index afac244830..10fcd72741 100644 --- a/keymaps/Makefile.am +++ b/keymaps/Makefile.am @@ -57,6 +57,7 @@ KEYMAPS = \ onkyo \ oqo-model2 \ samsung-other \ + samsung-series-3 \ samsung-series-9 \ samsung-sq1us \ samsung-sx20s \ diff --git a/keymaps/acer b/keymaps/acer index 4e7c297dea..a0c6fd278a 100644 --- a/keymaps/acer +++ b/keymaps/acer @@ -1,22 +1,22 @@ -0xA5 help # Fn+F1 -0xA6 setup # Fn+F2 Acer eSettings -0xA7 battery # Fn+F3 Power Management +0xA5 help # Fn+F1 +0xA6 setup # Fn+F2 Acer eSettings +0xA7 battery # Fn+F3 Power Management 0xA9 switchvideomode # Fn+F5 0xB3 euro 0xB4 dollar -0xCE brightnessup # Fn+Right -0xD4 bluetooth # (toggle) off-to-on -0xD5 wlan # (toggle) on-to-off -0xD6 wlan # (toggle) off-to-on -0xD7 bluetooth # (toggle) on-to-off -0xD8 bluetooth # (toggle) off-to-on -0xD9 brightnessup # Fn+Right -0xEE brightnessup # Fn+Right -0xEF brightnessdown # Fn+Left -0xF1 f22 # Fn+F7 Touchpad toggle (off-to-on) -0xF2 f23 # Fn+F7 Touchpad toggle (on-to-off) -0xF3 prog2 # "P2" programmable button -0xF4 prog1 # "P1" programmable button +0xCE brightnessup # Fn+Right +0xD4 bluetooth # (toggle) off-to-on +0xD5 wlan # (toggle) on-to-off +0xD6 wlan # (toggle) off-to-on +0xD7 bluetooth # (toggle) on-to-off +0xD8 bluetooth # (toggle) off-to-on +0xD9 brightnessup # Fn+Right +0xEE brightnessup # Fn+Right +0xEF brightnessdown # Fn+Left +0xF1 f22 # Fn+F7 Touchpad toggle (off-to-on) +0xF2 f23 # Fn+F7 Touchpad toggle (on-to-off) +0xF3 prog2 # "P2" programmable button +0xF4 prog1 # "P1" programmable button 0xF5 presentation 0xF8 fn -0xF9 f23 # Launch NTI shadow +0xF9 f23 # Launch NTI shadow diff --git a/keymaps/acer-aspire_5720 b/keymaps/acer-aspire_5720 index 3ff9de3f32..b9381f86c6 100644 --- a/keymaps/acer-aspire_5720 +++ b/keymaps/acer-aspire_5720 @@ -1,5 +1,5 @@ 0x84 bluetooth # sent when bluetooth module missing, and key pressed -0x92 media # acer arcade -0xD4 bluetooth # bluetooth on -0xD9 bluetooth # bluetooth off +0x92 media # Acer arcade +0xD4 bluetooth # Bluetooth on +0xD9 bluetooth # Bluetooth off 0xF4 prog3 # e-key diff --git a/keymaps/acer-aspire_8930 b/keymaps/acer-aspire_8930 index fb27bfb4f5..8e36cd947c 100644 --- a/keymaps/acer-aspire_8930 +++ b/keymaps/acer-aspire_8930 @@ -1,5 +1,5 @@ -0xCA prog3 # key 'HOLD' on cine dash media console +0xCA prog3 # key 'HOLD' on CineDash Media Console 0x83 rewind 0x89 fastforward -0x92 media # key 'ARCADE' on cine dash media console +0x92 media # key 'ARCADE' on CineDash Media Console 0x9E back diff --git a/keymaps/dell b/keymaps/dell index 4f907b3eef..cef41d3e7b 100644 --- a/keymaps/dell +++ b/keymaps/dell @@ -1,29 +1,29 @@ -0x81 playpause # Play/Pause -0x82 stopcd # Stop -0x83 previoussong # Previous song -0x84 nextsong # Next song -0x85 brightnessdown # Fn+Down arrow Brightness Down -0x86 brightnessup # Fn+Up arrow Brightness Up -0x87 battery # Fn+F3 battery icon -0x88 unknown # Fn+F2 Turn On/Off Wireless - handled in hardware -0x89 ejectclosecd # Fn+F10 Eject CD -0x8A suspend # Fn+F1 hibernate +0x81 playpause # Play/Pause +0x82 stopcd # Stop +0x83 previoussong # Previous song +0x84 nextsong # Next song +0x85 brightnessdown # Fn+Down Brightness Down +0x86 brightnessup # Fn+Up Brightness Up +0x87 battery # Fn+F3 battery icon +0x88 unknown # Fn+F2 Turn On/Off Wireless - handled in hardware +0x89 ejectclosecd # Fn+F10 Eject CD +0x8A suspend # Fn+F1 hibernate 0x8B switchvideomode # Fn+F8 CRT/LCD (high keycode: "displaytoggle") -0x8C f23 # Fn+Right arrow Auto Brightness +0x8C f23 # Fn+Right Auto Brightness 0x8F switchvideomode # Fn+F7 aspect ratio -0x90 previoussong # Front panel previous song -0x91 prog1 # Wifi Catcher (DELL Specific) -0x92 media # MediaDirect button (house icon) -0x93 f23 # FIXME Fn+Left arrow Auto Brightness -0x95 camera # Shutter button Takes a picture if optional camera available -0x97 email # Tablet email button -0x98 f21 # FIXME: Tablet screen rotatation -0x99 nextsong # Front panel next song -0x9A setup # Tablet tools button -0x9B switchvideomode # Display Toggle button -0x9E f21 #touchpad toggle -0xA2 playpause # Front panel play/pause -0xA4 stopcd # Front panel stop -0xED media # MediaDirect button -0xD8 screenlock # FIXME: Tablet lock button -0xD9 f21 # touchpad toggle +0x90 previoussong # Front panel previous song +0x91 prog1 # Wi-Fi Catcher (Dell-specific) +0x92 media # MediaDirect button (house icon) +0x93 f23 # FIXME Fn+Left Auto Brightness +0x95 camera # Shutter button - Takes a picture if optional camera available +0x97 email # Tablet email button +0x98 f21 # FIXME: Tablet screen rotation +0x99 nextsong # Front panel next song +0x9A setup # Tablet tools button +0x9B switchvideomode # Display toggle button +0x9E f21 # Touchpad toggle +0xA2 playpause # Front panel play/pause +0xA4 stopcd # Front panel stop +0xED media # MediaDirect button +0xD8 screenlock # FIXME: Tablet lock button +0xD9 f21 # Touchpad toggle diff --git a/keymaps/dell-latitude-xt2 b/keymaps/dell-latitude-xt2 index 39872f559d..59ff6ff264 100644 --- a/keymaps/dell-latitude-xt2 +++ b/keymaps/dell-latitude-xt2 @@ -1,4 +1,4 @@ -0x9B up # tablet rocker up -0x9E enter # tablet rocker press -0x9F back # tablet back -0xA3 down # tablet rocker down +0x9B up # tablet rocker up +0x9E enter # tablet rocker press +0x9F back # tablet back +0xA3 down # tablet rocker down diff --git a/keymaps/everex-xt5000 b/keymaps/everex-xt5000 index 4823a832f5..bd89a23d3e 100644 --- a/keymaps/everex-xt5000 +++ b/keymaps/everex-xt5000 @@ -1,6 +1,6 @@ 0x5C media -0x65 f21 # Fn+F5 Touchpad toggle -0x67 prog3 # Fan Speed Control button +0x65 f21 # Fn+F5 Touchpad toggle +0x67 prog3 # Fan speed control button 0x6F brightnessup 0x7F brightnessdown 0xB2 www diff --git a/keymaps/fujitsu-amilo_li_2732 b/keymaps/fujitsu-amilo_li_2732 index 9b8b36a170..c9b3198d1b 100644 --- a/keymaps/fujitsu-amilo_li_2732 +++ b/keymaps/fujitsu-amilo_li_2732 @@ -1,3 +1,3 @@ -0xD9 brightnessdown # Fn+F8 brightness down -0xEF brightnessup # Fn+F9 brightness up +0xD9 brightnessdown # Fn+F8 brightness down +0xEF brightnessup # Fn+F9 brightness up 0xA9 switchvideomode # Fn+F10 Cycle between available video outputs diff --git a/keymaps/fujitsu-amilo_pro_edition_v3505 b/keymaps/fujitsu-amilo_pro_edition_v3505 index d2e38cbb23..fd95b000c6 100644 --- a/keymaps/fujitsu-amilo_pro_edition_v3505 +++ b/keymaps/fujitsu-amilo_pro_edition_v3505 @@ -1,4 +1,4 @@ -0xA5 help # Fn-F1 -0xA9 switchvideomode # Fn-F3 -0xD9 brightnessdown # Fn-F8 -0xE0 brightnessup # Fn-F9 +0xA5 help # Fn+F1 +0xA9 switchvideomode # Fn+F3 +0xD9 brightnessdown # Fn+F8 +0xE0 brightnessup # Fn+F9 diff --git a/keymaps/fujitsu-amilo_pro_v3205 b/keymaps/fujitsu-amilo_pro_v3205 index 43e3199d59..8cbf239464 100644 --- a/keymaps/fujitsu-amilo_pro_v3205 +++ b/keymaps/fujitsu-amilo_pro_v3205 @@ -1,2 +1,2 @@ -0xF4 f21 # FIXME: silent-mode decrease CPU/GPU clock +0xF4 f21 # FIXME: silent-mode decrease CPU/GPU clock 0xF7 switchvideomode # Fn+F3 diff --git a/keymaps/hewlett-packard b/keymaps/hewlett-packard index 4461fa2ce5..3f5f5ace6f 100644 --- a/keymaps/hewlett-packard +++ b/keymaps/hewlett-packard @@ -1,12 +1,12 @@ 0x81 fn_esc -0x89 battery # FnF8 -0x8A screenlock # FnF6 +0x89 battery # Fn+F8 +0x8A screenlock # Fn+F6 0x8B camera -0x8C media # music +0x8C media # music 0x8E dvd 0xB1 help -0xB3 f23 # FIXME: Auto brightness +0xB3 f23 # FIXME: Auto brightness 0xD7 wlan -0x92 brightnessdown # FnF7 (FnF9 on 6730b) -0x97 brightnessup # FnF8 (FnF10 on 6730b) -0xEE switchvideomode # FnF4 +0x92 brightnessdown # Fn+F7 (Fn+F9 on 6730b) +0x97 brightnessup # Fn+F8 (Fn+F10 on 6730b) +0xEE switchvideomode # Fn+F4 diff --git a/keymaps/hewlett-packard-hdx9494nr b/keymaps/hewlett-packard-hdx9494nr index 92217879c8..39e8b4c9f7 100644 --- a/keymaps/hewlett-packard-hdx9494nr +++ b/keymaps/hewlett-packard-hdx9494nr @@ -1,3 +1,3 @@ -0xB2 www # FnF3 +0xB2 www # Fn+F3 0xD8 f23 # touchpad off 0xD9 f22 # touchpad on diff --git a/keymaps/hewlett-packard-pavilion b/keymaps/hewlett-packard-pavilion index 3d3cefc8e6..60d1191106 100644 --- a/keymaps/hewlett-packard-pavilion +++ b/keymaps/hewlett-packard-pavilion @@ -1,3 +1,3 @@ -0x88 media # FIXME: quick play -0xD8 f23 # touchpad off -0xD9 f22 # touchpad on +0x88 media # FIXME: quick play +0xD8 f23 # touchpad off +0xD9 f22 # touchpad on diff --git a/keymaps/hewlett-packard_elitebook-8460p b/keymaps/hewlett-packard_elitebook-8460p index 1fe1b7237c..59035f4005 100644 --- a/keymaps/hewlett-packard_elitebook-8460p +++ b/keymaps/hewlett-packard_elitebook-8460p @@ -1,3 +1,3 @@ -0xF8 wlan # Wireless HW switch button -0xB3 prog1 # Fn+F11 - Ambient Light Sensor button -0xB1 prog2 # Fn+ESC - System information button +0xF8 wlan # Wireless HW switch button +0xB3 prog1 # Fn+F11 - Ambient Light Sensor button +0xB1 prog2 # Fn+ESC - System information button diff --git a/keymaps/lenovo-3000 b/keymaps/lenovo-3000 index 5bd165654a..7973369a9d 100644 --- a/keymaps/lenovo-3000 +++ b/keymaps/lenovo-3000 @@ -1,5 +1,5 @@ 0x8B switchvideomode # Fn+F7 video -0x96 wlan # Fn+F5 wireless -0x97 sleep # Fn+F4 suspend -0x98 suspend # Fn+F12 hibernate -0xB4 prog1 # Lenovo Care +0x96 wlan # Fn+F5 wireless +0x97 sleep # Fn+F4 suspend +0x98 suspend # Fn+F12 hibernate +0xB4 prog1 # Lenovo Care diff --git a/keymaps/lenovo-ideapad b/keymaps/lenovo-ideapad index fc339839f2..0de16466b4 100644 --- a/keymaps/lenovo-ideapad +++ b/keymaps/lenovo-ideapad @@ -4,5 +4,5 @@ 0xB9 brightnessup # does nothing in BIOS 0xBA brightnessdown # does nothing in BIOS 0xF1 camera # BIOS toggles camera power -0xf2 f21 # touchpad toggle (key alternately emits f2 and f3) +0xf2 f21 # touchpad toggle (key alternately emits F2 and F3) 0xf3 f21 diff --git a/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint index d87549e445..78701acbc7 100644 --- a/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint +++ b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint @@ -1,13 +1,13 @@ -0x90012 screenlock # Fn+F2 -0x90013 battery # Fn+F3 -0x90014 wlan # Fn+F5 -0x90016 switchvideomode # Fn+F7 -0x90017 f21 # Fn+F8 touchpadtoggle -0x90019 suspend # Fn+F12 -0x9001A brightnessup # Fn+Home -0x9001B brightnessdown # Fn+End -0x9001D zoom # Fn+Space -0x90011 prog1 # Thinkvantage button +0x90012 screenlock # Fn+F2 +0x90013 battery # Fn+F3 +0x90014 wlan # Fn+F5 +0x90016 switchvideomode # Fn+F7 +0x90017 f21 # Fn+F8 touchpad toggle +0x90019 suspend # Fn+F12 +0x9001A brightnessup # Fn+Home +0x9001B brightnessdown # Fn+End +0x9001D zoom # Fn+Space +0x90011 prog1 # ThinkVantage button -0x90015 camera # Fn+F6 headset/camera VoIP key ?? -0x90010 f20 # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html +0x90015 camera # Fn+F6 headset/camera VoIP key ?? +0x90010 f20 # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html diff --git a/keymaps/lenovo-thinkpad_x200_tablet b/keymaps/lenovo-thinkpad_x200_tablet index 31ea3b2c70..f22ec65a5b 100644 --- a/keymaps/lenovo-thinkpad_x200_tablet +++ b/keymaps/lenovo-thinkpad_x200_tablet @@ -1,6 +1,6 @@ 0x5D menu 0x63 fn 0x66 screenlock -0x67 cyclewindows # bezel circular arrow -0x68 setup # bezel setup / menu -0x6c direction # rotate screen +0x67 cyclewindows # bezel circular arrow +0x68 setup # bezel setup / menu +0x6c direction # rotate screen diff --git a/keymaps/lenovo-thinkpad_x6_tablet b/keymaps/lenovo-thinkpad_x6_tablet index 6fd16b5662..49c5f64f4c 100644 --- a/keymaps/lenovo-thinkpad_x6_tablet +++ b/keymaps/lenovo-thinkpad_x6_tablet @@ -1,8 +1,8 @@ -0x6C f21 # rotate -0x68 screenlock # screenlock -0x6B esc # escape -0x6D right # right on d-pad -0x6E left # left on d-pad -0x71 up # up on d-pad -0x6F down # down on d-pad -0x69 enter # enter on d-pad +0x6C f21 # rotate +0x68 screenlock # screenlock +0x6B esc # escape +0x6D right # right on d-pad +0x6E left # left on d-pad +0x71 up # up on d-pad +0x6F down # down on d-pad +0x69 enter # enter on d-pad diff --git a/keymaps/lg-x110 b/keymaps/lg-x110 index ba08cba3fe..bbc29a13e9 100644 --- a/keymaps/lg-x110 +++ b/keymaps/lg-x110 @@ -1,12 +1,12 @@ -0xA0 mute # Fn-F9 -0xAE volumedown # Fn-Left -0xAF search # Fn-F3 -0xB0 volumeup # Fn-Right -0xB1 battery # Fn-F10 Info -0xB3 suspend # Fn-F12 -0xDF sleep # Fn-F4 +0xA0 mute # Fn+F9 +0xAE volumedown # Fn+Left +0xAF search # Fn+F3 +0xB0 volumeup # Fn+Right +0xB1 battery # Fn+F10 Info +0xB3 suspend # Fn+F12 +0xDF sleep # Fn+F4 # 0xE2 bluetooth # satellite dish2 -0xE4 f21 # Fn-F5 Touchpad disable -0xF6 wlan # Fn-F6 -0xF7 reserved # brightnessdown # Fn-Down -0xF8 reserved # brightnessup # Fn-Up +0xE4 f21 # Fn+F5 Touchpad toggle +0xF6 wlan # Fn+F6 +0xF7 reserved # Fn+Down brightness down +0xF8 reserved # Fn+Up brightness up diff --git a/keymaps/logitech-usb b/keymaps/logitech-usb index 728f0e02b2..b575aa7c47 100644 --- a/keymaps/logitech-usb +++ b/keymaps/logitech-usb @@ -1,6 +1,6 @@ -0x90001 shop # Shopping -0x90002 config # iTouch -0x90003 finance # Finance -0x90004 prog1 # My Sites -0x90005 prog2 # Community -0xC0183 media # Media +0x90001 shop # Shopping +0x90002 config # iTouch +0x90003 finance # Finance +0x90004 prog1 # My Sites +0x90005 prog2 # Community +0xC0183 media # Media diff --git a/keymaps/logitech-wave b/keymaps/logitech-wave index caa5d5d310..781dbe26f7 100644 --- a/keymaps/logitech-wave +++ b/keymaps/logitech-wave @@ -1,16 +1,16 @@ -0x9001C scale #expo -0x9001F zoomout #zoom out -0x90020 zoomin #zoom in -0x9003D prog1 #gadget -0x90005 camera #camera -0x90018 media #media center -0x90041 wordprocessor #fn+f1 (word) -0x90042 spreadsheet #fn+f2 (excel) -0x90043 calendar #fn+f3 (calendar) -0x90044 prog2 #fn+f4 (program a) -0x90045 prog3 #fn+f5 (program b) -0x90046 prog4 #fn+f6 (program c) -0x90048 messenger #fn+f8 (msn messenger) -0x9002D find #fn+f10 (search www) -0x9004B search #fn+f11 (search pc) -0x9004C ejectclosecd #fn+f12 (eject) +0x9001C scale # expo +0x9001F zoomout # zoom out +0x90020 zoomin # zoom in +0x9003D prog1 # gadget +0x90005 camera # camera +0x90018 media # media center +0x90041 wordprocessor # Fn+F1 (Word) +0x90042 spreadsheet # Fn+F2 (Excel) +0x90043 calendar # Fn+F3 (calendar) +0x90044 prog2 # Fn+F4 (program a) +0x90045 prog3 # Fn+F5 (program b) +0x90046 prog4 # Fn+F6 (program c) +0x90048 messenger # Fn+F8 (MSN messenger) +0x9002D find # Fn+F10 (search www) +0x9004B search # Fn+F11 (search PC) +0x9004C ejectclosecd # Fn+F12 (eject) diff --git a/keymaps/logitech-wave-cordless b/keymaps/logitech-wave-cordless index a10dad5e4d..b40c4dbff7 100644 --- a/keymaps/logitech-wave-cordless +++ b/keymaps/logitech-wave-cordless @@ -7,9 +7,9 @@ 0xC1041 wordprocessor 0xC1042 spreadsheet 0xC1043 calendar -0xC1044 prog2 #fn+f4 (program a) -0xC1045 prog3 #fn+f5 (program b) -0xC1046 prog4 #fn+f6 (program c) +0xC1044 prog2 # Fn+F4 (program a) +0xC1045 prog3 # Fn+F5 (program b) +0xC1046 prog4 # Fn+F6 (program c) 0xC1048 messenger -0xC104A find #fn+f10 (search www) +0xC104A find # Fn+F10 (search www) 0xC104C ejectclosecd diff --git a/keymaps/maxdata-pro_7000 b/keymaps/maxdata-pro_7000 index c0e4f77af4..0d5bbf3ce5 100644 --- a/keymaps/maxdata-pro_7000 +++ b/keymaps/maxdata-pro_7000 @@ -1,9 +1,9 @@ 0x97 prog2 0x9F prog1 -0xA0 mute # Fn-F5 +0xA0 mute # Fn+F5 0x82 www 0xEC email -0xAE volumedown # Fn-Down -0xB0 volumeup # Fn-Up -0xDF suspend # Fn+F2 +0xAE volumedown # Fn+Down +0xB0 volumeup # Fn+Up +0xDF suspend # Fn+F2 0xF5 help diff --git a/keymaps/medion-fid2060 b/keymaps/medion-fid2060 index 5a76c76799..75b1647e43 100644 --- a/keymaps/medion-fid2060 +++ b/keymaps/medion-fid2060 @@ -1,2 +1,2 @@ -0x6B channeldown # Thottle Down -0x6D channelup # Thottle Up +0x6B channeldown # Thottle Down +0x6D channelup # Thottle Up diff --git a/keymaps/medionnb-a555 b/keymaps/medionnb-a555 index c3b5dfa60b..b69618308b 100644 --- a/keymaps/medionnb-a555 +++ b/keymaps/medionnb-a555 @@ -1,4 +1,4 @@ -0x63 www # N button -0x66 prog1 # link 1 button -0x67 email # envelope button -0x69 prog2 # link 2 button +0x63 www # N button +0x66 prog1 # link 1 button +0x67 email # envelope button +0x69 prog2 # link 2 button diff --git a/keymaps/micro-star b/keymaps/micro-star index 4a438698ed..c283cde8bb 100644 --- a/keymaps/micro-star +++ b/keymaps/micro-star @@ -1,13 +1,13 @@ -0xA0 mute # Fn-F9 -0xAE volumedown # Fn-F7 -0xB0 volumeup # Fn-F8 -0xB2 www # e button -0xDF sleep # Fn-F12 -0xE2 bluetooth # satellite dish2 -0xE4 f21 # Fn-F3 Touchpad disable -0xEC email # envelope button -0xEE camera # Fn-F6 camera disable -0xF6 wlan # satellite dish1 -0xF7 brightnessdown # Fn-F4 -0xF8 brightnessup # Fn-F5 +0xA0 mute # Fn+F9 +0xAE volumedown # Fn+F7 +0xB0 volumeup # Fn+F8 +0xB2 www # e button +0xDF sleep # Fn+F12 +0xE2 bluetooth # satellite dish2 +0xE4 f21 # Fn+F3 Touchpad disable +0xEC email # envelope button +0xEE camera # Fn+F6 camera disable +0xF6 wlan # satellite dish1 +0xF7 brightnessdown # Fn+F4 +0xF8 brightnessup # Fn+F5 0xF9 search diff --git a/keymaps/module-ibm b/keymaps/module-ibm index a92dfa2506..ee61b6cf3b 100644 --- a/keymaps/module-ibm +++ b/keymaps/module-ibm @@ -1,16 +1,16 @@ -0x01 battery # Fn+F2 -0x02 screenlock # Fn+F3 -0x03 sleep # Fn+F4 -0x04 wlan # Fn+F5 +0x01 battery # Fn+F2 +0x02 screenlock # Fn+F3 +0x03 sleep # Fn+F4 +0x04 wlan # Fn+F5 0x06 switchvideomode # Fn+F7 -0x07 zoom # Fn+F8 screen expand -0x08 f24 # Fn+F9 undock -0x0B suspend # Fn+F12 -0x0F brightnessup # Fn+Home -0x10 brightnessdown # Fn+End -0x11 kbdillumtoggle # Fn+PgUp - ThinkLight -0x13 zoom # Fn+Space +0x07 zoom # Fn+F8 screen expand +0x08 f24 # Fn+F9 undock +0x0B suspend # Fn+F12 +0x0F brightnessup # Fn+Home +0x10 brightnessdown # Fn+End +0x11 kbdillumtoggle # Fn+PgUp - ThinkLight +0x13 zoom # Fn+Space 0x14 volumeup 0x15 volumedown 0x16 mute -0x17 prog1 # ThinkPad/ThinkVantage button (high keycode: "vendor") +0x17 prog1 # ThinkPad/ThinkVantage button (high keycode: "vendor") diff --git a/keymaps/module-lenovo b/keymaps/module-lenovo index 573a6a774b..ed31899d0f 100644 --- a/keymaps/module-lenovo +++ b/keymaps/module-lenovo @@ -1,17 +1,17 @@ -0x1 screenlock # Fn+F2 -0x2 battery # Fn+F3 -0x3 sleep # Fn+F4 -0x4 wlan # Fn+F5 -0x6 switchvideomode # Fn+F7 -0x7 f21 # Fn+F8 touchpadtoggle -0x8 f24 # Fn+F9 undock -0xB suspend # Fn+F12 -0xF brightnessup # Fn+Home -0x10 brightnessdown # Fn+End -0x11 kbdillumtoggle # Fn+PgUp - ThinkLight -0x13 zoom # Fn+Space +0x1 screenlock # Fn+F2 +0x2 battery # Fn+F3 +0x3 sleep # Fn+F4 +0x4 wlan # Fn+F5 +0x6 switchvideomode # Fn+F7 +0x7 f21 # Fn+F8 touchpadtoggle +0x8 f24 # Fn+F9 undock +0xB suspend # Fn+F12 +0xF brightnessup # Fn+Home +0x10 brightnessdown # Fn+End +0x11 kbdillumtoggle # Fn+PgUp - ThinkLight +0x13 zoom # Fn+Space 0x14 volumeup 0x15 volumedown 0x16 mute -0x17 prog1 # ThinkPad/ThinkVantage button (high keycode: "vendor") -0x1A f20 # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html +0x17 prog1 # ThinkPad/ThinkVantage button (high keycode: "vendor") +0x1A f20 # Microphone mute button; should be micmute, but see https://mail.gnome.org/archives/commits-list/2013-January/msg05822.html diff --git a/keymaps/module-sony b/keymaps/module-sony index 7c000131d1..5d3742b463 100644 --- a/keymaps/module-sony +++ b/keymaps/module-sony @@ -1,8 +1,8 @@ -0x06 mute # Fn+F2 -0x07 volumedown # Fn+F3 -0x08 volumeup # Fn+F4 -0x09 brightnessdown # Fn+F5 -0x0A brightnessup # Fn+F6 -0x0B switchvideomode # Fn+F7 -0x0E zoom # Fn+F10 -0x10 suspend # Fn+F12 +0x06 mute # Fn+F2 +0x07 volumedown # Fn+F3 +0x08 volumeup # Fn+F4 +0x09 brightnessdown # Fn+F5 +0x0A brightnessup # Fn+F6 +0x0B switchvideomode # Fn+F7 +0x0E zoom # Fn+F10 +0x10 suspend # Fn+F12 diff --git a/keymaps/module-sony-vgn b/keymaps/module-sony-vgn index c8ba001516..cb4ce33717 100644 --- a/keymaps/module-sony-vgn +++ b/keymaps/module-sony-vgn @@ -1,8 +1,8 @@ -0x00 brightnessdown # Fn+F5 -0x10 brightnessup # Fn+F6 -0x11 switchvideomode # Fn+F7 +0x00 brightnessdown # Fn+F5 +0x10 brightnessup # Fn+F6 +0x11 switchvideomode # Fn+F7 0x12 zoomout 0x14 zoomin -0x15 suspend # Fn+F12 +0x15 suspend # Fn+F12 0x17 prog1 0x20 media diff --git a/keymaps/module-sony-vpc b/keymaps/module-sony-vpc index 681082c59e..1b52779535 100644 --- a/keymaps/module-sony-vpc +++ b/keymaps/module-sony-vpc @@ -1,4 +1,4 @@ # 0x05 touchpad_toggle # fn_f1 -> KEY_TOUCHPAD_TOGGLE -0x05 f21 # fn_f1 -> KEY_F21 (The actual touchpad toggle) -0x0d zoomout # fn_f9 -0x0e zoomin # fn_f10 +0x05 f21 # fn_f1 -> KEY_F21 (The actual touchpad toggle) +0x0d zoomout # fn_f9 +0x0e zoomin # fn_f10 diff --git a/keymaps/olpc-xo b/keymaps/olpc-xo index 34434a121d..0fa497211a 100644 --- a/keymaps/olpc-xo +++ b/keymaps/olpc-xo @@ -1,7 +1,7 @@ 0x59 fn 0x81 fn_esc 0xF9 camera -0xF8 sound # Fn-CAMERA = Mic +0xF8 sound # Fn+CAMERA = Mic # Function key mappings, as per @@ -14,7 +14,7 @@ 0x57 volumedown 0x58 volumeup -# fn-modified fkeys all produce the unmodified version of the key. +# Fn-modified fkeys all produce the unmodified version of the key. 0xBB f1 0xBC f2 0xBD f3 @@ -41,11 +41,11 @@ 0xEF f21 0xEE chat -0xE4 chat # Just mapping Fn-Chat to Chat for now -0xDD menu # Frame -0xDA prog1 # Fn-Frame +0xE4 chat # Just mapping Fn+Chat to Chat for now +0xDD menu # Frame +0xDA prog1 # Fn+Frame -# The FN of some keys is other keys +# The Fn of some keys is other keys 0xD3 delete 0xD2 insert 0xC9 pageup @@ -57,11 +57,11 @@ 0x73 hp 0x7E hp -0xDB leftmeta # left grab -0xDC rightmeta # right grab -0x85 rightmeta # Right grab releases on a different scancode -0xD6 kbdillumtoggle # Fn-space -0x69 switchvideomode # Brightness key +0xDB leftmeta # left grab +0xDC rightmeta # right grab +0x85 rightmeta # Right grab releases on a different scancode +0xD6 kbdillumtoggle # Fn+Space +0x69 switchvideomode # Brightness key # Game keys 0x65 kp8 # up diff --git a/keymaps/onkyo b/keymaps/onkyo index ee864ade4d..8fc4cffa92 100644 --- a/keymaps/onkyo +++ b/keymaps/onkyo @@ -1,14 +1,14 @@ -0xA0 mute # Fn+D -0xAE volumedown # Fn+F -0xB0 volumeup # Fn+G -0xDF sleep # Fn+W -0xE0 bluetooth # Fn+H -0xE2 cyclewindows # Fn+Esc -0xEE battery # Fn+Q -0xF0 media # Fn+R +0xA0 mute # Fn+D +0xAE volumedown # Fn+F +0xB0 volumeup # Fn+G +0xDF sleep # Fn+W +0xE0 bluetooth # Fn+H +0xE2 cyclewindows # Fn+Esc +0xEE battery # Fn+Q +0xF0 media # Fn+R 0xF5 switchvideomode # Fn+E -0xF6 camera # Fn+T -0xF7 f21 # Fn+Y (touchpad toggle) -0xF8 brightnessup # Fn+S -0xF9 brightnessdown # Fn+A -0xFB wlan # Fn+J +0xF6 camera # Fn+T +0xF7 f21 # Fn+Y (touchpad toggle) +0xF8 brightnessup # Fn+S +0xF9 brightnessdown # Fn+A +0xFB wlan # Fn+J diff --git a/keymaps/samsung-other b/keymaps/samsung-other index 3ac0c2f10c..d950c2cbd9 100644 --- a/keymaps/samsung-other +++ b/keymaps/samsung-other @@ -1,14 +1,14 @@ -0x74 prog1 # User key +0x74 prog1 # User key 0x75 www 0x78 mail -0x82 switchvideomode # Fn+F4 CRT/LCD (high keycode: "displaytoggle") -0x83 battery # Fn+F2 -0x84 prog1 # Fn+F5 backlight on/off -0x86 wlan # Fn+F9 -0x88 brightnessup # Fn-Up -0x89 brightnessdown # Fn-Down -0xB1 prog2 # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice) -0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance) -0xB4 wlan # Fn+F9 (X60P) -0xF7 f22 # Fn+F10 Touchpad on -0xF9 f23 # Fn+F10 Touchpad off +0x82 switchvideomode # Fn+F4 CRT/LCD (high keycode: "displaytoggle") +0x83 battery # Fn+F2 +0x84 prog1 # Fn+F5 backlight on/off +0x86 wlan # Fn+F9 +0x88 brightnessup # Fn+Up +0x89 brightnessdown # Fn+Down +0xB1 prog2 # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice) +0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance) +0xB4 wlan # Fn+F9 (X60P) +0xF7 f22 # Fn+F10 Touchpad on +0xF9 f23 # Fn+F10 Touchpad off diff --git a/keymaps/samsung-series-3 b/keymaps/samsung-series-3 new file mode 100644 index 0000000000..303a428b47 --- /dev/null +++ b/keymaps/samsung-series-3 @@ -0,0 +1,3 @@ +0xCE prog1 # Fn+F1 launch control setting +0xB3 prog2 # Fn+F11 performance mode +0xD5 wlan # Fn+F12 Wi-Fi toggle diff --git a/keymaps/samsung-series-9 b/keymaps/samsung-series-9 index 3b65735fa0..c0712f02a0 100644 --- a/keymaps/samsung-series-9 +++ b/keymaps/samsung-series-9 @@ -1,5 +1,5 @@ -0x96 kbdillumup # Fn+F8 keyboard backlit up -0x97 kbdillumdown # Fn+F7 keyboard backlit down -0xD5 wlan # Fn+F12 wifi on/off +0x96 kbdillumup # Fn+F8 keyboard backlight up +0x97 kbdillumdown # Fn+F7 keyboard backlight down +0xD5 wlan # Fn+F12 Wi-Fi toggle 0xCE prog1 # Fn+F1 performance mode 0x8D prog2 # Fn+F6 battery life extender diff --git a/keymaps/toshiba-satellite_m30x b/keymaps/toshiba-satellite_m30x index ae8e34941b..26e0bbd939 100644 --- a/keymaps/toshiba-satellite_m30x +++ b/keymaps/toshiba-satellite_m30x @@ -2,5 +2,5 @@ 0xd9 brightnessup 0xee screenlock 0x93 media -0x9e f22 #touchpad_enable -0x9f f23 #touchpad_disable +0x9e f22 # touchpad enable +0x9f f23 # touchpad disable -- cgit v1.2.3-54-g00ecf