RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

in_evdev: revert multi event handling from r901 to avoid unwanted blocking

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@910 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-12-09 22:21:07 +00:00
parent 143e9a87da
commit afc00cad1f
1 changed files with 50 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

101
platform/linux/in_evdev.c
View file

@ -402,60 +402,59 @@ static int in_evdev_update_keycode(void *data, int *is_down)
struct input_event ev;
int rd;
while (1)
/* do single event, the caller sometimes wants
* to do select() in blocking mode */
rd = read(dev->fd, &ev, sizeof(ev));
if (rd < (int) sizeof(ev)) {
if (errno != EAGAIN) {
perror("in_evdev: error reading");
sleep(1);
}
goto out;
}
if (ev.type == EV_KEY) {
if (ev.value < 0 || ev.value > 1)
goto out;
ret_kc = ev.code;
ret_down = ev.value;
goto out;
}
else if (ev.type == EV_ABS)
{
rd = read(dev->fd, &ev, sizeof(ev));
if (rd < (int) sizeof(ev)) {
if (errno != EAGAIN) {
perror("in_evdev: error reading");
sleep(1);
}
goto out;
}
if (ev.type == EV_KEY) {
if (ev.value < 0 || ev.value > 1)
continue;
ret_kc = ev.code;
ret_down = ev.value;
goto out;
}
else if (ev.type == EV_ABS)
{
int lzone = dev->abs_lzone, down = 0, *last;
// map absolute to up/down/left/right
if (lzone != 0 && ev.code == ABS_X) {
if (ev.value < dev->abs_min_x + lzone)
down = KEY_LEFT;
else if (ev.value > dev->abs_max_x - lzone)
down = KEY_RIGHT;
last = &dev->abs_lastx;
}
else if (lzone != 0 && ev.code == ABS_Y) {
if (ev.value < dev->abs_min_y + lzone)
down = KEY_UP;
else if (ev.value > dev->abs_max_y - lzone)
down = KEY_DOWN;
last = &dev->abs_lasty;
}
else
continue;
if (down == *last)
continue;
if (down == 0 || *last != 0) {
/* key up or direction change, return up event for old key */
ret_kc = *last;
ret_down = 0;
*last = 0;
goto out;
}
ret_kc = *last = down;
ret_down = 1;
int lzone = dev->abs_lzone, down = 0, *last;
// map absolute to up/down/left/right
if (lzone != 0 && ev.code == ABS_X) {
if (ev.value < dev->abs_min_x + lzone)
down = KEY_LEFT;
else if (ev.value > dev->abs_max_x - lzone)
down = KEY_RIGHT;
last = &dev->abs_lastx;
}
else if (lzone != 0 && ev.code == ABS_Y) {
if (ev.value < dev->abs_min_y + lzone)
down = KEY_UP;
else if (ev.value > dev->abs_max_y - lzone)
down = KEY_DOWN;
last = &dev->abs_lasty;
}
else
goto out;
if (down == *last)
goto out;
if (down == 0 || *last != 0) {
/* key up or direction change, return up event for old key */
ret_kc = *last;
ret_down = 0;
*last = 0;
goto out;
}
ret_kc = *last = down;
ret_down = 1;
goto out;
}
out: