1 files changed, 35 insertions, 7 deletions

diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 52646220e7..4fd276ac97 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -313,33 +313,51 @@ void button_event(int key, bool pressed)
 
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
     case SDLK_KP4:
-    case SDLK_LEFT:
         new_btn = BUTTON_LEFT;
         break;
+    case SDLK_LEFT:
+        new_btn = BUTTON_RC_REW;
+        break;
     case SDLK_KP6:
-    case SDLK_RIGHT:
         new_btn = BUTTON_RIGHT;
         break;
+    case SDLK_RIGHT:
+        new_btn = BUTTON_RC_FF;
+        break;
     case SDLK_KP8:
-    case SDLK_UP:
         new_btn = BUTTON_VOL_UP;
         break;
+    case SDLK_UP:
+        new_btn = BUTTON_RC_VOL_UP;
+        break;
     case SDLK_KP2:
-    case SDLK_DOWN:
         new_btn = BUTTON_VOL_DOWN;
         break;
+    case SDLK_DOWN:
+        new_btn = BUTTON_RC_VOL_DOWN;
+        break;
     case SDLK_KP_PERIOD:
-    case SDLK_INSERT:
         new_btn = BUTTON_MODE;
         break;
+    case SDLK_INSERT:
+        new_btn = BUTTON_RC_MODE;
+        break;
     case SDLK_KP_DIVIDE:
-    case SDLK_F1:
         new_btn = BUTTON_REC;
         break;
+    case SDLK_F1:
+        new_btn = BUTTON_RC_REC;
+        break;
     case SDLK_KP5:
-    case SDLK_SPACE:
         new_btn = BUTTON_PLAY;
         break;
+    case SDLK_SPACE:
+        new_btn = BUTTON_RC_PLAY;
+        break;
+    case SDLK_KP_ENTER:
+    case SDLK_RETURN:
+        new_btn = BUTTON_RC_MENU;
+        break;
 
 #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \
    || (CONFIG_KEYPAD == IPOD_4G_PAD)
@@ -1572,8 +1590,18 @@ struct button_map bm[] = {
     { SDLK_KP4,         257, 201, 26, "Left" },
     { SDLK_KP8,         338,  31, 27, "Up" },
     { SDLK_KP2,         339,  92, 23, "Down" },
+    { SDLK_KP_PERIOD,   336,  50, 23, "Mode" },
     { SDLK_KP_DIVIDE,   336, 147, 23, "Rec" },
     { SDLK_h,           336, 212, 30, "Hold" },
+    /* remote */
+    { SDLK_SPACE,       115, 308, 20, "RC Play" },
+    { SDLK_RIGHT,        85, 308, 20, "RC Rew" },
+    { SDLK_LEFT,        143, 308, 20, "RC FF" },
+    { SDLK_UP,          143, 498, 20, "RC Up" },
+    { SDLK_DOWN,         85, 498, 20, "RC Down" },
+    { SDLK_INSERT,      212, 308, 30, "RC Mode" },
+    { SDLK_F1,          275, 308, 25, "RC Rec" },
+    { SDLK_KP_ENTER,    115, 498, 20, "RC Menu" },
     { 0, 0, 0, 0, "None" }
 };
 #elif defined (IAUDIO_M5)