Update keycode mappings of multimedia keys

Updates keycode mappings for evdev, directfb and android.

Change-Id: I6789f13dbb662da4261a3c947757644e12306dd9
Reviewed-by: BogDan Vatra <bogdan@kde.org>

2 files changed, 48 insertions, 6 deletions

diff --git a/src/plugins/platforms/android/src/androidjniinput.cpp b/src/plugins/platforms/android/src/androidjniinput.cpp
index 4a2d87d6a4..bd40f736e0 100644
--- a/src/plugins/platforms/android/src/androidjniinput.cpp
+++ b/src/plugins/platforms/android/src/androidjniinput.cpp
@@ -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:
diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp
index 5b4c958616..b56d75a16e 100644
--- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp
@@ -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);