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,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;
@ -51,19 +51,19 @@ int key_to_button(int keyboard_button)
new_btn = BUTTON_HOME;
break;
case SDLK_SPACE:
case SDLK_KP5:
case SDLK_KP_5:
new_btn = BUTTON_SELECT;
break;
case SDLK_PAGEDOWN:
case SDLK_KP3:
case SDLK_KP_3:
new_btn = BUTTON_VOL_DOWN;
break;
case SDLK_PAGEUP:
case SDLK_KP9:
case SDLK_KP_9:
new_btn = BUTTON_VOL_UP;
break;
case SDLK_ESCAPE:
case SDLK_KP1:
case SDLK_KP_1:
new_btn = BUTTON_POWER;
break;
}
@ -73,26 +73,26 @@ int key_to_button(int keyboard_button)
#ifdef SANSA_CLIPZIP
struct button_map bm[] = {
{ SDLK_KP_MULTIPLY, 31, 171, 12, "Home" },
{ SDLK_KP5, 81, 211, 10, "Select" },
{ SDLK_KP8, 81, 186, 13, "Play" },
{ SDLK_KP4, 32, 211, 14, "Left" },
{ SDLK_KP6, 112, 211, 14, "Right" },
{ SDLK_KP2, 81, 231, 14, "Menu" },
{ SDLK_KP_5, 81, 211, 10, "Select" },
{ SDLK_KP_8, 81, 186, 13, "Play" },
{ SDLK_KP_4, 32, 211, 14, "Left" },
{ SDLK_KP_6, 112, 211, 14, "Right" },
{ SDLK_KP_2, 81, 231, 14, "Menu" },
{ 0, 0, 0, 0, "None" }
};
#else
struct button_map bm[] = {
{ SDLK_KP_MULTIPLY, 166, 158, 12, "Home" },
{ SDLK_KP5, 101, 233, 19, "Select" },
{ SDLK_KP_5, 101, 233, 19, "Select" },
/* multiple entries allow rectangular regions */
{ SDLK_KP8, 98, 194, 19, "Play" },
{ SDLK_KP8, 104, 194, 19, "Play" },
{ SDLK_KP4, 62, 230, 19, "Left" },
{ SDLK_KP4, 62, 236, 19, "Left" },
{ SDLK_KP6, 140, 230, 19, "Right" },
{ SDLK_KP6, 140, 236, 19, "Right" },
{ SDLK_KP2, 98, 272, 19, "Menu" },
{ SDLK_KP2, 104, 272, 19, "Menu" },
{ SDLK_KP_8, 98, 194, 19, "Play" },
{ SDLK_KP_8, 104, 194, 19, "Play" },
{ SDLK_KP_4, 62, 230, 19, "Left" },
{ SDLK_KP_4, 62, 236, 19, "Left" },
{ SDLK_KP_6, 140, 230, 19, "Right" },
{ SDLK_KP_6, 140, 236, 19, "Right" },
{ SDLK_KP_2, 98, 272, 19, "Menu" },
{ SDLK_KP_2, 104, 272, 19, "Menu" },
{ 0, 0, 0, 0, "None" }
};
#endif