libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 22:33:27 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Move menu->delay to menu->input.delay

Browse Source
This commit is contained in:
twinaphex 2015-06-15 02:22:36 +02:00
parent 1831479079
commit 2553bbcd91
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/menu_driver.h
View File

@ -46,13 +46,6 @@ typedef struct
{
void *userdata;
/* Used for key repeat */
struct
{
float timer;
float count;
} delay;
size_t begin;
float scroll_y;

18
menu/menu_input.c
View File

@ -1011,11 +1011,11 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
if (!first_held)
{
first_held = true;
menu->delay.timer = initial_held ? 12 : 6;
menu->delay.count = 0;
menu->input.delay.timer = initial_held ? 12 : 6;
menu->input.delay.count = 0;
}
if (menu->delay.count >= menu->delay.timer)
if (menu->input.delay.count >= menu->input.delay.timer)
{
first_held = false;
trigger_input |= input & input_repeat;
@ -1032,7 +1032,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
nav->scroll.acceleration = 0;
}
menu->delay.count += menu->animation->delta_time / IDEAL_DT;
menu->input.delay.count += menu->animation->delta_time / IDEAL_DT;
if (driver->block_input)
trigger_input = 0;
@ -1070,13 +1070,9 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
if (settings->menu.pointer.enable)
menu_input_pointer(&ret);
if (trigger_input && menu_ctx_driver_get_ptr()->perform_action && menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret))
{
return MENU_ACTION_NOOP;
}
else
{
return ret;
}
return ret;
}

7
menu/menu_input.h
View File

@ -168,6 +168,13 @@ typedef struct menu_input
unsigned type;
unsigned idx;
} keyboard;
/* Used for key repeat */
struct
{
float timer;
float count;
} delay;
} menu_input_t;
void menu_input_key_event(bool down, unsigned keycode, uint32_t character,