X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fin_evdev.c;h=8a002960c17f74f80ef75cb8d6f7ca11fa63b420;hb=f6eaae4f09c6abab99692900a31c1df2a06b99af;hp=c2589a9bc2941f837a983881923e18fa563c18ff;hpb=82abf46f3db8ade517881c03327bdbc0de848eb2;p=libpicofe.git

diff --git a/linux/in_evdev.c b/linux/in_evdev.c
index c2589a9..8a00296 100644
--- a/linux/in_evdev.c
+++ b/linux/in_evdev.c
@@ -14,7 +14,7 @@
 
 typedef struct {
 	int fd;
-	int prev_update;
+	int *kbits;
 	int abs_lzone;
 	int abs_rzone;
 	int abs_tzone;
@@ -23,14 +23,21 @@ typedef struct {
 	int abs_lasty;
 } in_evdev_t;
 
+#ifndef KEY_CNT
+#define KEY_CNT (KEY_MAX + 1)
+#endif
+
 #define KEYBITS_BIT(x) (keybits[(x)/sizeof(keybits[0])/8] & \
 	(1 << ((x) & (sizeof(keybits[0])*8-1))))
 
 #define KEYBITS_BIT_SET(x) (keybits[(x)/sizeof(keybits[0])/8] |= \
 	(1 << ((x) & (sizeof(keybits[0])*8-1))))
 
+#define KEYBITS_BIT_CLEAR(x) (keybits[(x)/sizeof(keybits[0])/8] &= \
+	~(1 << ((x) & (sizeof(keybits[0])*8-1))))
+
 static const char * const in_evdev_prefix = "evdev:";
-static const char * const in_evdev_keys[KEY_MAX + 1] = {
+static const char * const in_evdev_keys[KEY_CNT] = {
 	[0 ... KEY_MAX] = NULL,
 	[KEY_RESERVED] = "Reserved",		[KEY_ESC] = "Esc",
 	[KEY_1] = "1",				[KEY_2] = "2",
@@ -119,11 +126,17 @@ static const char * const in_evdev_keys[KEY_MAX + 1] = {
 
 static void in_evdev_probe(void)
 {
+	long keybits[KEY_CNT / sizeof(long) / 8];
+	long absbits[(ABS_MAX+1) / sizeof(long) / 8];
 	int i;
 
+	// the kernel might support and return less keys then we know about,
+	// so make sure the buffers are clear.
+	memset(keybits, 0, sizeof(keybits));
+	memset(absbits, 0, sizeof(absbits));
+
 	for (i = 0;; i++)
 	{
-		int keybits[(KEY_MAX+1)/sizeof(int)], absbits[(ABS_MAX+1)/sizeof(int)];
 		int support = 0, count = 0;
 		in_evdev_t *dev;
 		int u, ret, fd;
@@ -131,8 +144,11 @@ static void in_evdev_probe(void)
 
 		snprintf(name, sizeof(name), "/dev/input/event%d", i);
 		fd = open(name, O_RDONLY|O_NONBLOCK);
-		if (fd == -1)
+		if (fd == -1) {
+			if (errno == EACCES)
+				continue;	/* maybe we can access next one */
 			break;
+		}
 
 		/* check supported events */
 		ret = ioctl(fd, EVIOCGBIT(0, sizeof(support)), &support);
@@ -151,8 +167,9 @@ static void in_evdev_probe(void)
 		}
 
 		/* check for interesting keys */
-		for (u = 0; u < KEY_MAX + 1; u++) {
-			if (KEYBITS_BIT(u) && u != KEY_POWER && u != KEY_SLEEP)
+		for (u = 0; u < KEY_CNT; u++) {
+			if (KEYBITS_BIT(u) && u != KEY_POWER &&
+					u != KEY_SLEEP && u != BTN_TOUCH)
 				count++;
 		}
 
@@ -163,6 +180,16 @@ static void in_evdev_probe(void)
 		if (dev == NULL)
 			goto skip;
 
+		ret = ioctl(fd, EVIOCGKEY(sizeof(keybits)), keybits);
+		if (ret == -1) {
+			printf("Warning: EVIOCGKEY not supported, will have to track state\n");
+			dev->kbits = calloc(KEY_CNT, sizeof(int));
+			if (dev->kbits == NULL) {
+				free(dev);
+				goto skip;
+			}
+		}
+
 		/* check for abs too */
 		if (support & (1 << EV_ABS)) {
 			struct input_absinfo ainfo;
@@ -194,7 +221,7 @@ no_abs:
 		ioctl(fd, EVIOCGNAME(sizeof(name)-6), name+6);
 		printf("in_evdev: found \"%s\" with %d events (type %08x)\n",
 			name+6, count, support);
-		in_register(name, IN_DRVID_EVDEV, fd, dev, 0);
+		in_register(name, IN_DRVID_EVDEV, fd, dev, KEY_CNT, 0);
 		continue;
 
 skip:
@@ -213,63 +240,76 @@ static void in_evdev_free(void *drv_data)
 
 static int in_evdev_get_bind_count(void)
 {
-	return KEY_MAX + 1;
+	return KEY_CNT;
 }
 
-/* returns bitfield of binds of pressed buttons */
-int in_evdev_update(void *drv_data, int *binds)
+static void or_binds(const int *binds, int key, int *result)
+{
+	int t;
+	for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+		result[t] |= binds[IN_BIND_OFFS(key, t)];
+}
+
+/* ORs result with binds of pressed buttons
+ * XXX: should measure performance hit of this func, might need to optimize */
+int in_evdev_update(void *drv_data, const int *binds, int *result)
 {
 	struct input_event ev[16];
 	struct input_absinfo ainfo;
-	int keybits[(KEY_MAX+1)/sizeof(int)];
+	int keybits_[KEY_CNT / sizeof(int)];
+	int *keybits = keybits_;
 	in_evdev_t *dev = drv_data;
-	int result = 0, changed = 0;
 	int rd, ret, u;
 
-	while (1) {
-		rd = read(dev->fd, ev, sizeof(ev));
-		if (rd < (int)sizeof(ev[0])) {
-			if (errno != EAGAIN)
-				perror("in_evdev: read failed");
-			break;
+	if (dev->kbits == NULL) {
+		ret = ioctl(dev->fd, EVIOCGKEY(sizeof(keybits_)), keybits_);
+		if (ret == -1) {
+			perror("in_evdev: ioctl failed");
+			return -1;
 		}
-
-		changed = 1;
 	}
-
-	if (!changed)
-		return dev->prev_update;
-
-	ret = ioctl(dev->fd, EVIOCGKEY(sizeof(keybits)), keybits);
-	if (ret == -1) {
-		perror("in_evdev: ioctl failed");
-		return 0;
+	else {
+		keybits = dev->kbits;
+		while (1) {
+			rd = read(dev->fd, ev, sizeof(ev));
+			if (rd < (int)sizeof(ev[0])) {
+				if (errno != EAGAIN)
+					perror("in_evdev: read failed");
+				break;
+			}
+			for (u = 0; u < rd / sizeof(ev[0]); u++) {
+				if (ev[u].type != EV_KEY)
+					continue;
+				else if (ev[u].value == 1)
+					KEYBITS_BIT_SET(ev[u].code);
+				else if (ev[u].value == 0)
+					KEYBITS_BIT_CLEAR(ev[u].code);
+			}
+		}
 	}
 
-	for (u = 0; u < KEY_MAX + 1; u++) {
-		if (KEYBITS_BIT(u)) {
-			result |= binds[u];
-		}
+	for (u = 0; u < KEY_CNT; u++) {
+		if (KEYBITS_BIT(u))
+			or_binds(binds, u, result);
 	}
 
 	/* map X and Y absolute to UDLR */
 	if (dev->abs_lzone != 0) {
 		ret = ioctl(dev->fd, EVIOCGABS(ABS_X), &ainfo);
 		if (ret != -1) {
-			if (ainfo.value < dev->abs_lzone) result |= binds[KEY_LEFT];
-			if (ainfo.value > dev->abs_rzone) result |= binds[KEY_RIGHT];
+			if (ainfo.value < dev->abs_lzone) or_binds(binds, KEY_LEFT, result);
+			if (ainfo.value > dev->abs_rzone) or_binds(binds, KEY_RIGHT, result);
 		}
 	}
 	if (dev->abs_tzone != 0) {
 		ret = ioctl(dev->fd, EVIOCGABS(ABS_Y), &ainfo);
 		if (ret != -1) {
-			if (ainfo.value < dev->abs_tzone) result |= binds[KEY_UP];
-			if (ainfo.value > dev->abs_bzone) result |= binds[KEY_DOWN];
+			if (ainfo.value < dev->abs_tzone) or_binds(binds, KEY_UP, result);
+			if (ainfo.value > dev->abs_bzone) or_binds(binds, KEY_DOWN, result);
 		}
 	}
 
-	dev->prev_update = result;
-	return result;
+	return 0;
 }
 
 static void in_evdev_set_blocking(void *drv_data, int y)
@@ -278,13 +318,21 @@ static void in_evdev_set_blocking(void *drv_data, int y)
 	long flags;
 	int ret;
 
-	dev->prev_update = 0;
-
 	flags = (long)fcntl(dev->fd, F_GETFL);
 	if ((int)flags == -1) {
 		perror("in_evdev: F_GETFL fcntl failed");
 		return;
 	}
+
+	if (flags & O_NONBLOCK) {
+		/* flush the event queue */
+		struct input_event ev;
+		do {
+			ret = read(dev->fd, &ev, sizeof(ev));
+		}
+		while (ret == sizeof(ev));
+	}
+
 	if (y)
 		flags &= ~O_NONBLOCK;
 	else
@@ -363,16 +411,20 @@ static const struct {
 	{ KEY_LEFT,	PBTN_LEFT },
 	{ KEY_RIGHT,	PBTN_RIGHT },
 	{ KEY_ENTER,	PBTN_MOK },
-	{ BTN_A,	PBTN_MOK },
+	{ KEY_END,	PBTN_MOK },
 	{ BTN_TRIGGER,	PBTN_MOK },
 	{ KEY_ESC,	PBTN_MBACK },
-	{ BTN_B,	PBTN_MBACK },
+	{ KEY_PAGEDOWN,	PBTN_MBACK },
 	{ BTN_THUMB,	PBTN_MBACK },
 	{ KEY_A,	PBTN_MA2 },
+	{ KEY_HOME,	PBTN_MA2 },
 	{ KEY_S,	PBTN_MA3 },
+	{ KEY_PAGEUP,	PBTN_MA3 },
 	{ KEY_BACKSLASH,  PBTN_MENU },
-	{ KEY_MENU,	  PBTN_MENU },
+	{ KEY_LEFTCTRL,   PBTN_MENU },
+	{ KEY_RIGHTSHIFT, PBTN_L },
 	{ KEY_LEFTBRACE,  PBTN_L },
+	{ KEY_RIGHTCTRL,  PBTN_R },
 	{ KEY_RIGHTBRACE, PBTN_R },
 };
 
@@ -403,7 +455,7 @@ static int in_evdev_get_key_code(const char *key_name)
 {
 	int i;
 
-	for (i = 0; i < KEY_MAX + 1; i++) {
+	for (i = 0; i < KEY_CNT; i++) {
 		const char *k = in_evdev_keys[i];
 		if (k != NULL && strcasecmp(k, key_name) == 0)
 			return i;
@@ -425,24 +477,26 @@ static const char *in_evdev_get_key_name(int keycode)
 
 static const struct {
 	short code;
-	short bit;
+	char btype;
+	char bit;
 } in_evdev_def_binds[] =
 {
 	/* MXYZ SACB RLDU */
-	{ KEY_UP,	0 },
-	{ KEY_DOWN,	1 },
-	{ KEY_LEFT,	2 },
-	{ KEY_RIGHT,	3 },
-	{ KEY_S,	4 },	/* B */
-	{ BTN_B,	4 },
-	{ KEY_D,	5 },	/* C */
-	{ BTN_A,	5 },
-	{ KEY_A,	6 },	/* A */
-	{ BTN_Y,	6 },
-	{ KEY_ENTER,	7 },
-	{ BTN_START,	7 },
-	{ BTN_TL,	27 },	/* save state */
-	{ BTN_TR,	28 },	/* load state */
+	{ KEY_UP,	IN_BINDTYPE_PLAYER12, 0 },
+	{ KEY_DOWN,	IN_BINDTYPE_PLAYER12, 1 },
+	{ KEY_LEFT,	IN_BINDTYPE_PLAYER12, 2 },
+	{ KEY_RIGHT,	IN_BINDTYPE_PLAYER12, 3 },
+	{ KEY_S,	IN_BINDTYPE_PLAYER12, 4 },	/* B */
+	{ KEY_PAGEDOWN,	IN_BINDTYPE_PLAYER12, 4 },
+	{ KEY_D,	IN_BINDTYPE_PLAYER12, 5 },	/* C */
+	{ KEY_END,	IN_BINDTYPE_PLAYER12, 5 },
+	{ KEY_A,	IN_BINDTYPE_PLAYER12, 6 },	/* A */
+	{ KEY_HOME,	IN_BINDTYPE_PLAYER12, 6 },
+	{ KEY_ENTER,	IN_BINDTYPE_PLAYER12, 7 },
+	{ KEY_LEFTALT,	IN_BINDTYPE_PLAYER12, 7 },
+	{ KEY_RIGHTSHIFT,IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
+	{ KEY_RIGHTCTRL, IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
+	{ KEY_LEFTCTRL,	 IN_BINDTYPE_EMU, PEVB_MENU },
 };
 
 #define DEF_BIND_COUNT (sizeof(in_evdev_def_binds) / sizeof(in_evdev_def_binds[0]))
@@ -452,15 +506,16 @@ static void in_evdev_get_def_binds(int *binds)
 	int i;
 
 	for (i = 0; i < DEF_BIND_COUNT; i++)
-		binds[in_evdev_def_binds[i].code] = 1 << in_evdev_def_binds[i].bit;
+		binds[IN_BIND_OFFS(in_evdev_def_binds[i].code, in_evdev_def_binds[i].btype)] =
+			1 << in_evdev_def_binds[i].bit;
 }
 
 /* remove binds of missing keys, count remaining ones */
-static int in_evdev_clean_binds(void *drv_data, int *binds)
+static int in_evdev_clean_binds(void *drv_data, int *binds, int *def_binds)
 {
-	int keybits[(KEY_MAX+1)/sizeof(int)];
+	int keybits[KEY_CNT / sizeof(int)];
 	in_evdev_t *dev = drv_data;
-	int i, ret, count = 0;
+	int i, t, ret, offs, count = 0;
 
 	ret = ioctl(dev->fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits);
 	if (ret == -1) {
@@ -477,11 +532,14 @@ static int in_evdev_clean_binds(void *drv_data, int *binds)
 		KEYBITS_BIT_SET(KEY_DOWN);
 	}
 
-	for (i = 0; i < KEY_MAX + 1; i++) {
-		if (!KEYBITS_BIT(i))
-			binds[i] = binds[i + KEY_MAX + 1] = 0;
-		if (binds[i])
-			count++;
+	for (i = 0; i < KEY_CNT; i++) {
+		for (t = 0; t < IN_BINDTYPE_COUNT; t++) {
+			offs = IN_BIND_OFFS(i, t);
+			if (!KEYBITS_BIT(i))
+				binds[offs] = def_binds[offs] = 0;
+			if (binds[offs])
+				count++;
+		}
 	}
 
 	return count;