mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-09 13:12:37 -05:00
SDL: Migrate to SDL2
Incorporates large portions of g#5879 g#5282 g#5285 g#5286 g#5287 Differences from the above patches: * Removed all MacOS-specific stuff * Removed support for SDL1 entirely * Properly implement mousewheel support * Bumped up minimum stack size for sigalstack threading * Check for overflow before enqueing scrollwheel events Tested on: * sdl application (Linux) * Simulator (x86_64, Linux) -- xduoox3/ipod4g/sansafuze * Simulator (i686, Windows) -- xduoox3 * Simulator (arm64, Linux) Change-Id: Ia3012dd1be123feb2888798a42d5b7cc149f382b
This commit is contained in:
parent
d13029ebdd
commit
7927423e34
49 changed files with 709 additions and 717 deletions
|
|
@ -29,19 +29,19 @@ int key_to_button(int keyboard_button)
|
|||
int new_btn = BUTTON_NONE;
|
||||
switch (keyboard_button)
|
||||
{
|
||||
case SDLK_KP4:
|
||||
case SDLK_KP_4:
|
||||
case SDLK_LEFT:
|
||||
new_btn = BUTTON_LEFT;
|
||||
break;
|
||||
case SDLK_KP6:
|
||||
case SDLK_KP_6:
|
||||
case SDLK_RIGHT:
|
||||
new_btn = BUTTON_RIGHT;
|
||||
break;
|
||||
case SDLK_KP8:
|
||||
case SDLK_KP_8:
|
||||
case SDLK_UP:
|
||||
new_btn = BUTTON_UP;
|
||||
break;
|
||||
case SDLK_KP2:
|
||||
case SDLK_KP_2:
|
||||
case SDLK_DOWN:
|
||||
new_btn = BUTTON_DOWN;
|
||||
break;
|
||||
|
|
@ -59,16 +59,16 @@ int key_to_button(int keyboard_button)
|
|||
new_btn = BUTTON_POWER;
|
||||
break;
|
||||
#ifdef CREATIVE_ZENXFI
|
||||
case SDLK_KP1:
|
||||
case SDLK_KP_1:
|
||||
new_btn = BUTTON_BOTTOMLEFT;
|
||||
break;
|
||||
case SDLK_KP3:
|
||||
case SDLK_KP_3:
|
||||
new_btn = BUTTON_BOTTOMRIGHT;
|
||||
break;
|
||||
case SDLK_KP7:
|
||||
case SDLK_KP_7:
|
||||
new_btn = BUTTON_TOPLEFT;
|
||||
break;
|
||||
case SDLK_KP9:
|
||||
case SDLK_KP_9:
|
||||
new_btn = BUTTON_TOPRIGHT;
|
||||
break;
|
||||
#endif
|
||||
|
|
@ -78,7 +78,7 @@ int key_to_button(int keyboard_button)
|
|||
break;
|
||||
case SDLK_KP_ENTER:
|
||||
case SDLK_RETURN:
|
||||
case SDLK_KP5:
|
||||
case SDLK_KP_5:
|
||||
new_btn = BUTTON_SELECT;
|
||||
break;
|
||||
}
|
||||
|
|
@ -106,10 +106,10 @@ struct button_map bm[] = {
|
|||
{ SDLK_UP, 426, 126, 13, "Up" },
|
||||
{ SDLK_DOWN, 426, 206, 13, "Down" },
|
||||
{ SDLK_RETURN, 426, 166, 13, "Select" },
|
||||
{ SDLK_KP7, 386, 126, 13, "Top Left" },
|
||||
{ SDLK_KP9, 466, 126, 13, "Top Right" },
|
||||
{ SDLK_KP3, 466, 166, 13, "Bottom Right" },
|
||||
{ SDLK_KP1, 386, 166, 13, "Bottom Left" },
|
||||
{ SDLK_KP_7, 386, 126, 13, "Top Left" },
|
||||
{ SDLK_KP_9, 466, 126, 13, "Top Right" },
|
||||
{ SDLK_KP_3, 466, 166, 13, "Bottom Right" },
|
||||
{ SDLK_KP_1, 386, 166, 13, "Bottom Left" },
|
||||
{ SDLK_HOME, 390, 63, 16, "Back" },
|
||||
{ SDLK_PAGEUP, 463, 63, 16, "Menu" },
|
||||
{ SDLK_END, 390, 267, 16, "Shortcut" },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue