diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/sdl/button.c | 29 | ||||
-rw-r--r-- | uisimulator/sdl/uisdl.h | 13 |
2 files changed, 42 insertions, 0 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index ba384b31b4..ee1117481b 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -802,6 +802,7 @@ void button_event(int key, bool pressed) | |||
802 | case SDLK_KP_ENTER: | 802 | case SDLK_KP_ENTER: |
803 | new_btn = BUTTON_MENU; | 803 | new_btn = BUTTON_MENU; |
804 | break; | 804 | break; |
805 | |||
805 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 806 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
806 | case SDLK_KP1: | 807 | case SDLK_KP1: |
807 | new_btn = BUTTON_BACK; | 808 | new_btn = BUTTON_BACK; |
@@ -886,6 +887,34 @@ void button_event(int key, bool pressed) | |||
886 | break; | 887 | break; |
887 | case SDLK_s: | 888 | case SDLK_s: |
888 | new_btn = BUTTON_VOL_UP; | 889 | new_btn = BUTTON_VOL_UP; |
890 | |||
891 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD | ||
892 | case SDLK_KP1: | ||
893 | new_btn = BUTTON_PREV; | ||
894 | break; | ||
895 | case SDLK_KP3: | ||
896 | new_btn = BUTTON_NEXT; | ||
897 | break; | ||
898 | case SDLK_KP_ENTER: | ||
899 | case SDLK_RETURN: | ||
900 | case SDLK_a: | ||
901 | new_btn = BUTTON_PLAY; | ||
902 | break; | ||
903 | case SDLK_KP_PERIOD: | ||
904 | case SDLK_INSERT: | ||
905 | new_btn = BUTTON_MENU; | ||
906 | break; | ||
907 | case SDLK_KP8: | ||
908 | case SDLK_UP: | ||
909 | new_btn = BUTTON_UP; | ||
910 | break; | ||
911 | case SDLK_KP2: | ||
912 | case SDLK_DOWN: | ||
913 | new_btn = BUTTON_DOWN; | ||
914 | break; | ||
915 | case SDLK_KP5: | ||
916 | case SDLK_SPACE: | ||
917 | new_btn = BUTTON_SELECT; | ||
889 | break; | 918 | break; |
890 | #else | 919 | #else |
891 | #error No keymap defined! | 920 | #error No keymap defined! |
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index abd320ad18..dde505bf91 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h | |||
@@ -404,6 +404,19 @@ | |||
404 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ | 404 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
405 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | 405 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ |
406 | 406 | ||
407 | #elif defined(MEIZU_M6SL) | ||
408 | #define UI_TITLE "Meizu M6" | ||
409 | #define UI_WIDTH 512 /* width of GUI window */ | ||
410 | #define UI_HEIGHT 322 /* height of GUI window */ | ||
411 | #define UI_LCD_POSX 39 /* x position of lcd */ | ||
412 | #define UI_LCD_POSY 38 /* y position of lcd */ | ||
413 | #define UI_LCD_WIDTH 320 | ||
414 | #define UI_LCD_HEIGHT 240 | ||
415 | #define UI_LCD_BGCOLOR 32, 32, 32 /* bkgnd color of LCD (no backlight) */ | ||
416 | #define UI_LCD_BGCOLORLIGHT 192, 192, 192 /* bkgnd color of LCD (backlight) */ | ||
417 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ | ||
418 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
419 | |||
407 | #endif | 420 | #endif |
408 | extern SDL_Surface *gui_surface; | 421 | extern SDL_Surface *gui_surface; |
409 | extern bool background; /* True if the background image is enabled */ | 422 | extern bool background; /* True if the background image is enabled */ |