Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

puzzles: polish mouse mode

Browse source 
Reduces lag when dragging. Also throws some comments in.

Change-Id: Ibd0d95e94200ae6de8258ce8d2e001c931161385
This commit is contained in:
Franklin Wei 2017-11-21 21:41:50 -05:00
parent ab6e40b977
commit f51544a0e5
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
apps/plugins/puzzles/rockbox.c
View file

@ -1585,6 +1585,8 @@ static int process_input(int tmo, bool do_pausemenu)
* following code is needed for mouse mode. */ * following code is needed for mouse mode. */
if(mouse_mode) if(mouse_mode)
{ {
static int last_mousedir = 0, held_count = 0, v = 1;
if(button & BTN_UP) if(button & BTN_UP)
state = CURSOR_UP; state = CURSOR_UP;
else if(button & BTN_DOWN) else if(button & BTN_DOWN)
@ -1599,6 +1601,32 @@ static int process_input(int tmo, bool do_pausemenu)
last_keystate = button; last_keystate = button;
/* move */
/* get the direction vector the cursor is moving in. */
int new_x = mouse_x, new_y = mouse_y;
/* in src/misc.c */
move_cursor(state, &new_x, &new_y, LCD_WIDTH, LCD_HEIGHT, FALSE);
int dx = new_x - mouse_x, dy = new_y - mouse_y;
mouse_x += dx * v;
mouse_y += dy * v;
/* clamp */
/* The % operator with negative operands is messy; this is much
* simpler. */
if(mouse_x < 0)
mouse_x = 0;
if(mouse_y < 0)
mouse_y = 0;
if(mouse_x >= LCD_WIDTH)
mouse_x = LCD_WIDTH - 1;
if(mouse_y >= LCD_HEIGHT)
mouse_y = LCD_HEIGHT - 1;
/* clicking/dragging */
/* rclick on hold requires that we fire left-click on a /* rclick on hold requires that we fire left-click on a
* release, otherwise it's impossible to distinguish the * release, otherwise it's impossible to distinguish the
* two. */ * two. */
@ -1620,8 +1648,6 @@ static int process_input(int tmo, bool do_pausemenu)
send_click(LEFT_DRAG, false); send_click(LEFT_DRAG, false);
} }
static int last_mousedir = 0, held_count = 0, v = 0;
/* acceleration */ /* acceleration */
if(state && state == last_mousedir) if(state && state == last_mousedir)
{ {
@ -1640,29 +1666,6 @@ static int process_input(int tmo, bool do_pausemenu)
held_count = 0; held_count = 0;
} }
/* get the direction vector the cursor is moving in. */
int new_x = mouse_x, new_y = mouse_y;
/* in src/misc.c */
move_cursor(state, &new_x, &new_y, LCD_WIDTH, LCD_HEIGHT, FALSE);
int dx = new_x - mouse_x, dy = new_y - mouse_y;
mouse_x += dx * v;
mouse_y += dy * v;
/* The % operator with negative operands is messy; this is much
* simpler. */
if(mouse_x < 0)
mouse_x = 0;
if(mouse_y < 0)
mouse_y = 0;
if(mouse_x >= LCD_WIDTH)
mouse_x = LCD_WIDTH - 1;
if(mouse_y >= LCD_HEIGHT)
mouse_y = LCD_HEIGHT - 1;
/* no buttons are sent to the midend in mouse mode */ /* no buttons are sent to the midend in mouse mode */
return 0; return 0;
} }