devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

SDL: Migrate to SDL2

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

22
uisimulator/buttonmap/erosq.c
View file

@ -28,19 +28,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_PREV;
break;
case SDLK_KP6:
case SDLK_KP_6:
case SDLK_RIGHT:
new_btn = BUTTON_NEXT;
break;
case SDLK_KP8:
case SDLK_KP_8:
case SDLK_UP:
new_btn = BUTTON_SCROLL_BACK;
break;
case SDLK_KP2:
case SDLK_KP_2:
case SDLK_DOWN:
new_btn = BUTTON_SCROLL_FWD;
break;
@ -58,12 +58,6 @@ int key_to_button(int keyboard_button)
case SDLK_INSERT:
new_btn = BUTTON_MENU;
break;
case SDL_BUTTON_WHEELUP:
new_btn = BUTTON_SCROLL_BACK;
break;
case SDL_BUTTON_WHEELDOWN:
new_btn = BUTTON_SCROLL_FWD;
break;
case SDLK_KP_MINUS:
case SDLK_PAGEUP:
new_btn = BUTTON_VOL_UP;
@ -78,10 +72,10 @@ int key_to_button(int keyboard_button)
struct button_map bm[] = {
{ SDLK_KP_PERIOD, 60, 599, 25, "Menu" },
{ SDLK_KP8, 213, 473, 20, "Scroll Back" },
{ SDLK_KP2, 50, 473, 20, "Scroll Fwd" },
{ SDLK_KP4, 323, 384, 30, "Prev" },
{ SDLK_KP6, 323, 465, 30, "Next" },
{ SDLK_KP_8, 213, 473, 20, "Scroll Back" },
{ SDLK_KP_2, 50, 473, 20, "Scroll Fwd" },
{ SDLK_KP_4, 323, 384, 30, "Prev" },
{ SDLK_KP_6, 323, 465, 30, "Next" },
{ SDLK_BACKSPACE, 323, 578, 25, "Back" },
{ SDLK_KP_PLUS, 397, 91, 30, "Vol Up" },
{ SDLK_KP_MINUS, 397, 185, 43, "Vol Dn" },