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

Fix android hardware button handling so it actually works.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28345 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-10-24 12:35:53 +00:00
parent 7da04a0819
commit 48e900ffe2
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/target/hosted/android/button-android.c
View file

@ -31,12 +31,13 @@
static int last_y, last_x; static int last_y, last_x;
static int last_btns; static int last_btns;
static long last_button_tick;
static enum { static enum {
STATE_UNKNOWN, STATE_UNKNOWN,
STATE_UP, STATE_UP,
STATE_DOWN, STATE_DOWN,
} last_state = STATE_UNKNOWN; } last_touch_state = STATE_UNKNOWN;
/* /*
* this notifies us in an interrupt-like fashion whether the user just * this notifies us in an interrupt-like fashion whether the user just
@ -49,9 +50,9 @@ Java_org_rockbox_RockboxFramebuffer_touchHandler(JNIEnv*env, jobject this,
(void)this; (void)this;
if (down) if (down)
last_state = STATE_DOWN; last_touch_state = STATE_DOWN;
else else
last_state = STATE_UP; last_touch_state = STATE_UP;
last_x = x; last_x = x;
last_y = y; last_y = y;
@ -73,15 +74,16 @@ Java_org_rockbox_RockboxFramebuffer_buttonHandler(JNIEnv*env, jobject this,
return false; return false;
if (state) if (state)
{
last_btns |= button; last_btns |= button;
else last_button_tick = current_tick;
last_btns &= ~button; }
return true; return true;
} }
void button_init_device(void) void button_init_device(void)
{ {
last_button_tick = 0;
} }
int button_read_device(int *data) int button_read_device(int *data)
@ -94,8 +96,10 @@ int button_read_device(int *data)
* touchscreen_to_pixels() */ * touchscreen_to_pixels() */
int touch = touchscreen_to_pixels(last_x, last_y, data); int touch = touchscreen_to_pixels(last_x, last_y, data);
if (last_state == STATE_DOWN) if (last_touch_state == STATE_DOWN)
btn |= touch; btn |= touch;
if (TIME_AFTER(current_tick, last_button_tick+5))
last_btns = 0;
return btn; return btn;
} }