diff options
Diffstat (limited to 'uisimulator/sdl')
-rw-r--r-- | uisimulator/sdl/button.c | 31 | ||||
-rw-r--r-- | uisimulator/sdl/uisdl.h | 13 |
2 files changed, 0 insertions, 44 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 78be6700ec..03f7dc1e96 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -772,37 +772,6 @@ void button_event(int key, bool pressed) | |||
772 | case SDLK_KP9: | 772 | case SDLK_KP9: |
773 | new_btn = BUTTON_MENU; | 773 | new_btn = BUTTON_MENU; |
774 | break; | 774 | break; |
775 | |||
776 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD | ||
777 | case SDLK_KP4: | ||
778 | case SDLK_LEFT: | ||
779 | new_btn = BUTTON_LEFT; | ||
780 | break; | ||
781 | case SDLK_KP6: | ||
782 | case SDLK_RIGHT: | ||
783 | new_btn = BUTTON_RIGHT; | ||
784 | break; | ||
785 | case SDLK_KP8: | ||
786 | case SDLK_UP: | ||
787 | new_btn = BUTTON_UP; | ||
788 | break; | ||
789 | case SDLK_KP2: | ||
790 | case SDLK_DOWN: | ||
791 | new_btn = BUTTON_DOWN; | ||
792 | break; | ||
793 | case SDLK_KP_ENTER: | ||
794 | case SDLK_RETURN: | ||
795 | case SDLK_a: | ||
796 | new_btn = BUTTON_PLAY; | ||
797 | break; | ||
798 | case SDLK_KP5: | ||
799 | case SDLK_SPACE: | ||
800 | new_btn = BUTTON_SELECT; | ||
801 | break; | ||
802 | case SDLK_KP_PERIOD: | ||
803 | case SDLK_INSERT: | ||
804 | new_btn = BUTTON_MENU; | ||
805 | break; | ||
806 | #else | 775 | #else |
807 | #error No keymap defined! | 776 | #error No keymap defined! |
808 | #endif /* CONFIG_KEYPAD */ | 777 | #endif /* CONFIG_KEYPAD */ |
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index 890c6d0638..37989a682b 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h | |||
@@ -374,19 +374,6 @@ | |||
374 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ | 374 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
375 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | 375 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ |
376 | 376 | ||
377 | #elif defined(MEIZU_M6SL) | ||
378 | #define UI_TITLE "Meizu M6" | ||
379 | #define UI_WIDTH 512 /* width of GUI window */ | ||
380 | #define UI_HEIGHT 322 /* height of GUI window */ | ||
381 | #define UI_LCD_POSX 39 /* x position of lcd */ | ||
382 | #define UI_LCD_POSY 38 /* y position of lcd */ | ||
383 | #define UI_LCD_WIDTH 320 | ||
384 | #define UI_LCD_HEIGHT 240 | ||
385 | #define UI_LCD_BGCOLOR 32, 32, 32 /* bkgnd color of LCD (no backlight) */ | ||
386 | #define UI_LCD_BGCOLORLIGHT 192, 192, 192 /* bkgnd color of LCD (backlight) */ | ||
387 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ | ||
388 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
389 | |||
390 | #endif | 377 | #endif |
391 | extern SDL_Surface *gui_surface; | 378 | extern SDL_Surface *gui_surface; |
392 | extern bool background; /* True if the background image is enabled */ | 379 | extern bool background; /* True if the background image is enabled */ |