1
0
Fork 0
forked from len0rd/rockbox

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:
Solomon Peachy 2024-09-21 16:31:20 -04:00
parent d13029ebdd
commit 7927423e34
49 changed files with 709 additions and 717 deletions

View file

@ -29,33 +29,33 @@ 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;
case SDLK_KP7:
case SDLK_KP_7:
new_btn = BUTTON_PREV;
break;
case SDLK_PAGEUP:
case SDLK_KP9:
case SDLK_KP_9:
new_btn = BUTTON_NEXT;
break;
case SDLK_KP_DIVIDE:
new_btn = BUTTON_POWER;
break;
case SDLK_KP5:
case SDLK_KP_5:
case SDLK_SPACE:
case SDLK_KP_ENTER:
case SDLK_RETURN:
@ -67,12 +67,10 @@ int key_to_button(int keyboard_button)
case SDLK_KP_MINUS:
new_btn = BUTTON_VOL_DOWN;
break;
case SDL_BUTTON_WHEELDOWN:
case SDLK_KP3:
case SDLK_KP_3:
new_btn = BUTTON_SCROLL_FWD;
break;
case SDL_BUTTON_WHEELUP:
case SDLK_KP1:
case SDLK_KP_1:
new_btn = BUTTON_SCROLL_BACK;
break;
case SDLK_h:
@ -87,12 +85,12 @@ struct button_map bm[] = {
{ SDLK_DOWN, 191, 630, 18, "Down" },
{ SDLK_LEFT, 130, 568, 18, "Left" },
{ SDLK_RIGHT, 256, 568, 18, "Right" },
{ SDLK_KP7, 107, 443, 20, "Prev" },
{ SDLK_KP9, 271, 443, 20, "Next" },
{ SDLK_KP5, 191, 568, 18, "Select" },
{ SDLK_KP_7, 107, 443, 20, "Prev" },
{ SDLK_KP_9, 271, 443, 20, "Next" },
{ SDLK_KP_5, 191, 568, 18, "Select" },
{ SDLK_KP_DIVIDE, 220, 43, 15, "Power" },
{ SDLK_KP3, 231, 520, 10, "Scroll Fwd" },
{ SDLK_KP1, 149, 520, 10, "Scroll Back" },
{ SDLK_KP_3, 231, 520, 10, "Scroll Fwd" },
{ SDLK_KP_1, 149, 520, 10, "Scroll Back" },
{ SDLK_KP_MINUS, 3, 277, 25, "Volume -" },
{ SDLK_KP_PLUS, 6, 175, 25, "Volume +" },
{ SDLK_h, 300, 42, 20, "Hold" },