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

fix events loss

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@630 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-01-03 18:42:09 +00:00
parent 86883f7f8a
commit 54563d7189
1 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

79
linux/in_evdev.c
View file

@ -131,7 +131,7 @@ static void in_evdev_probe(void)
char name[64]; char name[64];
snprintf(name, sizeof(name), "/dev/input/event%d", i); snprintf(name, sizeof(name), "/dev/input/event%d", i);
fd = open(name, O_RDONLY|O_NONBLOCK); fd = open(name, O_RDONLY);
if (fd == -1) if (fd == -1)
break; break;
@ -301,7 +301,7 @@ int in_evdev_update_keycode(void **data, int dcount, int *which, int *is_down, i
struct timeval tv, *timeout = NULL; struct timeval tv, *timeout = NULL;
int i, fdmax = -1; int i, fdmax = -1;
if (timeout_ms > 0) { if (timeout_ms >= 0) {
tv.tv_sec = timeout_ms / 1000; tv.tv_sec = timeout_ms / 1000;
tv.tv_usec = (timeout_ms % 1000) * 1000; tv.tv_usec = (timeout_ms % 1000) * 1000;
timeout = &tv; timeout = &tv;
@ -315,7 +315,7 @@ int in_evdev_update_keycode(void **data, int dcount, int *which, int *is_down, i
while (1) while (1)
{ {
struct input_event ev[64]; struct input_event ev;
in_evdev_t *dev = NULL; in_evdev_t *dev = NULL;
int ret, rd; int ret, rd;
fd_set fdset; fd_set fdset;
@ -339,51 +339,48 @@ int in_evdev_update_keycode(void **data, int dcount, int *which, int *is_down, i
if (FD_ISSET(devs[i]->fd, &fdset)) if (FD_ISSET(devs[i]->fd, &fdset))
*which = i, dev = devs[i]; *which = i, dev = devs[i];
rd = read(dev->fd, ev, sizeof(ev[0]) * 64); rd = read(dev->fd, &ev, sizeof(ev));
if (rd < (int) sizeof(ev[0])) { if (rd < (int) sizeof(ev)) {
perror("in_evdev: error reading"); perror("in_evdev: error reading");
sleep(1); sleep(1);
return 0; return 0;
} }
for (i = 0; i < rd / sizeof(ev[0]); i++) if (ev.type == EV_KEY) {
if (ev.value < 0 || ev.value > 1)
continue;
if (is_down != NULL)
*is_down = ev.value;
return ev.code;
}
else if (ev.type == EV_ABS)
{ {
if (ev[i].type == EV_KEY) { int down = 0;
if (ev[i].value < 0 || ev[i].value > 1) if (dev->abs_lzone != 0 && ev.code == ABS_X) {
continue; if (ev.value < dev->abs_lzone) {
down = 1;
dev->abs_lastx = KEY_LEFT;
}
else if (ev.value > dev->abs_rzone) {
down = 1;
dev->abs_lastx = KEY_RIGHT;
}
if (is_down != NULL) if (is_down != NULL)
*is_down = ev[i].value; *is_down = down;
return ev[i].code; return dev->abs_lastx;
} }
else if (ev[i].type == EV_ABS) if (dev->abs_tzone != 0 && ev.code == ABS_Y) {
{ if (ev.value < dev->abs_tzone) {
int down = 0; down = 1;
if (dev->abs_lzone != 0 && ev[i].code == ABS_X) { dev->abs_lasty = KEY_UP;
if (ev[i].value < dev->abs_lzone) {
down = 1;
dev->abs_lastx = KEY_LEFT;
}
else if (ev[i].value > dev->abs_rzone) {
down = 1;
dev->abs_lastx = KEY_RIGHT;
}
if (is_down != NULL)
*is_down = down;
return dev->abs_lastx;
} }
if (dev->abs_tzone != 0 && ev[i].code == ABS_Y) { else if (ev.value > dev->abs_bzone) {
if (ev[i].value < dev->abs_tzone) { down = 1;
down = 1; dev->abs_lasty = KEY_DOWN;
dev->abs_lasty = KEY_UP;
}
else if (ev[i].value > dev->abs_bzone) {
down = 1;
dev->abs_lasty = KEY_DOWN;
}
if (is_down != NULL)
*is_down = down;
return dev->abs_lasty;
} }
if (is_down != NULL)
*is_down = down;
return dev->abs_lasty;
} }
} }
} }
@ -392,15 +389,15 @@ int in_evdev_update_keycode(void **data, int dcount, int *which, int *is_down, i
static int in_evdev_menu_translate(int keycode) static int in_evdev_menu_translate(int keycode)
{ {
switch (keycode) { switch (keycode) {
/* keyboards */
case KEY_UP: return PBTN_UP; case KEY_UP: return PBTN_UP;
case KEY_DOWN: return PBTN_DOWN; case KEY_DOWN: return PBTN_DOWN;
case KEY_LEFT: return PBTN_LEFT; case KEY_LEFT: return PBTN_LEFT;
case KEY_RIGHT: return PBTN_RIGHT; case KEY_RIGHT: return PBTN_RIGHT;
case KEY_ENTER: case KEY_ENTER:
case BTN_TRIGGER: return PBTN_EAST; case BTN_TRIGGER: return PBTN_MOK;
case KEY_ESC: case KEY_ESC:
case BTN_THUMB: return PBTN_SOUTH; case BTN_THUMB: return PBTN_MBACK;
case KEY_MENU: return PBTN_MENU;
default: return 0; default: return 0;
} }
} }