mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 05:05:20 -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_SCROLL_UP;
|
||||
break;
|
||||
case SDLK_KP2:
|
||||
case SDLK_KP_2:
|
||||
case SDLK_DOWN:
|
||||
new_btn = BUTTON_SCROLL_DOWN;
|
||||
break;
|
||||
|
|
@ -60,7 +60,7 @@ int key_to_button(int keyboard_button)
|
|||
case SDLK_F2:
|
||||
new_btn = BUTTON_FF;
|
||||
break;
|
||||
case SDLK_KP5:
|
||||
case SDLK_KP_5:
|
||||
case SDLK_SPACE:
|
||||
new_btn = BUTTON_PLAY;
|
||||
break;
|
||||
|
|
@ -71,21 +71,21 @@ int key_to_button(int keyboard_button)
|
|||
struct button_map bm[] = {
|
||||
#if defined (IRIVER_H10)
|
||||
{ SDLK_KP_PLUS, 38, 70, 37, "Power" },
|
||||
{ SDLK_KP4, 123, 194, 26, "Cancel" },
|
||||
{ SDLK_KP6, 257, 195, 34, "Select" },
|
||||
{ SDLK_KP8, 190, 221, 28, "Up" },
|
||||
{ SDLK_KP2, 192, 320, 27, "Down" },
|
||||
{ SDLK_KP_4, 123, 194, 26, "Cancel" },
|
||||
{ SDLK_KP_6, 257, 195, 34, "Select" },
|
||||
{ SDLK_KP_8, 190, 221, 28, "Up" },
|
||||
{ SDLK_KP_2, 192, 320, 27, "Down" },
|
||||
{ SDLK_KP_DIVIDE, 349, 49, 20, "Rew" },
|
||||
{ SDLK_KP5, 349, 96, 20, "Play" },
|
||||
{ SDLK_KP_5, 349, 96, 20, "Play" },
|
||||
{ SDLK_KP_MULTIPLY, 350, 141, 23, "FF" },
|
||||
#elif defined (IRIVER_H10_5GB)
|
||||
{ SDLK_KP_PLUS, 34, 76, 23, "Power" },
|
||||
{ SDLK_KP4, 106, 222, 28, "Cancel" },
|
||||
{ SDLK_KP6, 243, 220, 31, "Select" },
|
||||
{ SDLK_KP8, 176, 254, 34, "Up" },
|
||||
{ SDLK_KP2, 175, 371, 35, "Down" },
|
||||
{ SDLK_KP_4, 106, 222, 28, "Cancel" },
|
||||
{ SDLK_KP_6, 243, 220, 31, "Select" },
|
||||
{ SDLK_KP_8, 176, 254, 34, "Up" },
|
||||
{ SDLK_KP_2, 175, 371, 35, "Down" },
|
||||
{ SDLK_KP_DIVIDE, 319, 63, 26, "Rew" },
|
||||
{ SDLK_KP5, 320, 124, 26, "Play" },
|
||||
{ SDLK_KP_5, 320, 124, 26, "Play" },
|
||||
{ SDLK_KP_MULTIPLY, 320, 181, 32, "FF" },
|
||||
#endif
|
||||
{ 0, 0, 0, 0, "None" }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue