AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update keycode mappings of multimedia keys

Browse Source 
Updates keycode mappings for evdev, directfb and android.

Change-Id: I6789f13dbb662da4261a3c947757644e12306dd9
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Allan Sandfeld Jensen 2013-07-22 19:24:49 +02:00 committed by The Qt Project
parent 407ac121b9
commit b8da27bc90
4 changed files with 80 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/global/qnamespace.h
View File

@ -907,7 +907,7 @@ public:
Key_BrightnessAdjust = 0x010000c2,
Key_Finance = 0x010000c3,
Key_Community = 0x010000c4,
Key_AudioRewind = 0x010000c5,
Key_AudioRewind = 0x010000c5, // Media rewind
Key_BackForward = 0x010000c6,
Key_ApplicationLeft = 0x010000c7,
Key_ApplicationRight = 0x010000c8,
@ -919,7 +919,7 @@ public:
Key_Close = 0x010000ce,
Key_Copy = 0x010000cf,
Key_Cut = 0x010000d0,
Key_Display = 0x010000d1,
Key_Display = 0x010000d1, // Output switch key
Key_DOS = 0x010000d2,
Key_Documents = 0x010000d3,
Key_Excel = 0x010000d4,
@ -968,9 +968,9 @@ public:
Key_Bluetooth = 0x010000ff,
Key_WLAN = 0x01000100,
Key_UWB = 0x01000101,
Key_AudioForward = 0x01000102,
Key_AudioRepeat = 0x01000103,
Key_AudioRandomPlay = 0x01000104,
Key_AudioForward = 0x01000102, // Media fast-forward
Key_AudioRepeat = 0x01000103, // Toggle repeat mode
Key_AudioRandomPlay = 0x01000104, // Toggle shuffle mode
Key_Subtitle = 0x01000105,
Key_AudioCycleTrack = 0x01000106,
Key_Time = 0x01000107,

28
src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
View File

@ -42,6 +42,9 @@
#ifndef QEVDEVKEYBOARDHANDLER_DEFAULTMAP_P_H
#define QEVDEVKEYBOARDHANDLER_DEFAULTMAP_P_H
#include "qnamespace.h"
#include "linux/input.h"
// no QT_BEGIN_NAMESPACE, since we include it internally...
const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
@ -631,7 +634,30 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
{ 111, 0xffff, 0x01000007, 0x00, 0x00, 0x0000 },
{ 111, 0xffff, 0x01000000, 0x06, 0x08, 0x0200 },
{ 111, 0xffff, 0x01000000, 0x0c, 0x08, 0x0200 },
{ 119, 0xffff, 0x01000008, 0x00, 0x00, 0x0000 },
// 113 -> 248
{ KEY_MUTE, 0xffff, Qt::Key_VolumeMute, 0x00, 0x00, 0x0000 },
{ KEY_VOLUMEDOWN, 0xffff, Qt::Key_VolumeDown, 0x00, 0x00, 0x0000 },
{ KEY_VOLUMEUP, 0xffff, Qt::Key_VolumeUp, 0x00, 0x00, 0x0000 },
{ KEY_PAUSE, 0xffff, Qt::Key_Pause, 0x00, 0x00, 0x0000 },
{ KEY_STOP, 0xffff, Qt::Key_Stop, 0x00, 0x00, 0x0000 },
{ KEY_RECORD, 0xffff, Qt::Key_MediaRecord, 0x00, 0x00, 0x0000 },
{ KEY_REWIND, 0xffff, Qt::Key_AudioRewind, 0x00, 0x00, 0x0000 },
{ KEY_PLAYPAUSE, 0xffff, Qt::Key_MediaTogglePlayPause, 0x00, 0x00, 0x0000 },
{ KEY_PLAY, 0xffff, Qt::Key_MediaPlay, 0x00, 0x00, 0x0000 },
{ KEY_FASTFORWARD, 0xffff, Qt::Key_AudioForward, 0x00, 0x00, 0x0000 },
{ KEY_CANCEL, 0xffff, Qt::Key_Cancel, 0x00, 0x00, 0x0000 },
{ 248, 0xffff, Qt::Key_MicMute, 0x00, 0x00, 0x0000 },
// 0x160 ->
{ KEY_SELECT, 0xffff, Qt::Key_Select, 0x00, 0x00, 0x0000 },
{ KEY_CLEAR, 0xffff, Qt::Key_Clear, 0x00, 0x00, 0x0000 },
{ KEY_CALENDAR, 0xffff, Qt::Key_Calendar, 0x00, 0x00, 0x0000 },
{ KEY_RED, 0xffff, Qt::Key_Red, 0x00, 0x00, 0x0000 },
{ KEY_GREEN, 0xffff, Qt::Key_Green, 0x00, 0x00, 0x0000 },
{ KEY_YELLOW, 0xffff, Qt::Key_Yellow, 0x00, 0x00, 0x0000 },
{ KEY_BLUE, 0xffff, Qt::Key_Blue, 0x00, 0x00, 0x0000 },
{ KEY_CHANNELUP, 0xffff, Qt::Key_ChannelUp, 0x00, 0x00, 0x0000 },
{ KEY_CHANNELDOWN, 0xffff, Qt::Key_ChannelDown, 0x00, 0x00, 0x0000 },
};
const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = {

50
src/plugins/platforms/android/src/androidjniinput.cpp
View File

@ -271,8 +271,8 @@ namespace QtAndroidInput
case 0x00000005:
return Qt::Key_Call;
case 0x0000001b:
return Qt::Key_WebCam;
case 0x0000001b: // KEYCODE_CAMERA
return Qt::Key_Camera;
case 0x0000001c:
return Qt::Key_Clear;
@ -280,7 +280,7 @@ namespace QtAndroidInput
case 0x00000037:
return Qt::Key_Comma;
case 0x00000043:
case 0x00000043: // KEYCODE_DEL
return Qt::Key_Backspace;
case 0x00000017: // KEYCODE_DPAD_CENTER
@ -398,6 +398,27 @@ namespace QtAndroidInput
case 0x00000018:
return Qt::Key_VolumeUp;
case 0x00000011: // KEYCODE_STAR
return Qt::Key_Asterisk;
case 0x00000012: // KEYCODE_POUND
return Qt::Key_NumberSign;
case 0x00000050: // KEYCODE_FOCUS
return Qt::Key_CameraFocus;
case 0x00000070: // KEYCODE_FORWARD_DEL
return Qt::Key_Delete;
case 0x00000080: // KEYCODE_MEDIA_CLOSE
return Qt::Key_Close;
case 0x00000081: // KEYCODE_MEDIA_EJECT
return Qt::Key_Eject;
case 0x00000082: // KEYCODE_MEDIA_RECORD
return Qt::Key_MediaRecord;
case 0x000000b7: // KEYCODE_PROG_RED
return Qt::Key_Red;
@ -416,13 +437,30 @@ namespace QtAndroidInput
case 0x000000a7: // KEYCODE_CHANNEL_DOWN
return Qt::Key_ChannelDown;
case 0x000000a8: // KEYCODE_ZOOM_IN
return Qt::Key_ZoomIn;
case 0x000000a9: // KEYCODE_ZOOM_OUT
return Qt::Key_ZoomOut;
case 0x000000af: // KEYCODE_CAPTIONS
return Qt::Key_Subtitle;
case 0x000000d0: // KEYCODE_CALENDAR
return Qt::Key_Calendar;
case 0x000000d1: // KEYCODE_MUSIC
return Qt::Key_Music;
case 0x000000d2: // KEYCODE_CALCULATOR
return Qt::Key_Calculator;
case 0x00000000: // KEYCODE_UNKNOWN
case 0x00000011: // KEYCODE_STAR ?!?!?
case 0x00000012: // KEYCODE_POUND ?!?!?
return Qt::Key_unknown;
case 0x00000053: // KEYCODE_NOTIFICATION ?!?!?
case 0x0000004f: // KEYCODE_HEADSETHOOK ?!?!?
case 0x00000044: // KEYCODE_GRAVE ?!?!?
case 0x00000050: // KEYCODE_FOCUS ?!?!?
return Qt::Key_Any;
default:

4
src/plugins/platforms/directfb/qdirectfbconvenience.cpp
View File

@ -282,9 +282,12 @@ QDirectFbKeyMap::QDirectFbKeyMap()
insert(DIKS_MENU , Qt::Key_Menu);
insert(DIKS_HELP , Qt::Key_Help);
insert(DIKS_CD , Qt::Key_CD);
insert(DIKS_INTERNET , Qt::Key_HomePage);
insert(DIKS_MAIL , Qt::Key_LaunchMail);
insert(DIKS_FAVORITES , Qt::Key_Favorites);
insert(DIKS_PHONE , Qt::Key_Phone);
insert(DIKS_TIME , Qt::Key_Time);
insert(DIKS_RED , Qt::Key_Red);
insert(DIKS_GREEN , Qt::Key_Green);
@ -307,6 +310,7 @@ QDirectFbKeyMap::QDirectFbKeyMap()
insert(DIKS_NEXT , Qt::Key_MediaNext);
insert(DIKS_REWIND , Qt::Key_AudioRewind);
insert(DIKS_FASTFORWARD , Qt::Key_AudioForward);
insert(DIKS_SUBTITLE , Qt::Key_Subtitle);
insert(DIKS_F1 , Qt::Key_F1);
insert(DIKS_F2 , Qt::Key_F2);