X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fin_evdev.c;h=0b73302ccef334f0b1c0dd2782fc0556b885683e;hb=b7c7cd5d463187f209ce669b77694c9c7007b223;hp=edfa6ef5f7f6dbefc65e83e17dfc01aa2defc6f3;hpb=e9b2926437ccf6b630cf79e00ed98f7934201c20;p=libpicofe.git

diff --git a/linux/in_evdev.c b/linux/in_evdev.c
index edfa6ef..0b73302 100644
--- a/linux/in_evdev.c
+++ b/linux/in_evdev.c
@@ -1,3 +1,13 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2008-2010
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -392,57 +402,60 @@ static int in_evdev_update_keycode(void *data, int *is_down)
 	struct input_event ev;
 	int rd;
 
-	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)
+	while (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
+		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 (down == *last)
+		if (ev.type == EV_KEY) {
+			if (ev.value < 0 || ev.value > 1)
+				continue;
+			ret_kc = ev.code;
+			ret_down = ev.value;
 			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;
+		}
+		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;
 			goto out;
 		}
-		ret_kc = *last = down;
-		ret_down = 1;
-		goto out;
 	}
 
 out:
@@ -517,6 +530,8 @@ static int in_evdev_menu_translate(void *drv_data, int keycode)
 	return 0;
 }
 
+/* FIXME: move to plat */
+#if 0
 static const struct {
 	short code;
 	char btype;
@@ -550,16 +565,16 @@ static const struct {
 	{ BTN_PINKIE,	IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
 	{ BTN_BASE,	IN_BINDTYPE_EMU, PEVB_MENU },
 };
-
-#define DEF_BIND_COUNT (sizeof(in_evdev_def_binds) / sizeof(in_evdev_def_binds[0]))
+#endif
 
 static void in_evdev_get_def_binds(int *binds)
 {
 	int i;
 
-	for (i = 0; i < DEF_BIND_COUNT; i++)
-		binds[IN_BIND_OFFS(in_evdev_def_binds[i].code, in_evdev_def_binds[i].btype)] =
-			1 << in_evdev_def_binds[i].bit;
+	for (i = 0; in_evdev_defbinds[i].bit != 0; i++) {
+		binds[IN_BIND_OFFS(in_evdev_defbinds[i].code, in_evdev_defbinds[i].btype)] =
+			1 << in_evdev_defbinds[i].bit;
+	}
 }
 
 /* remove binds of missing keys, count remaining ones */