X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=libpicofe.git;a=blobdiff_plain;f=linux%2Fin_evdev.c;h=fed27f778902649b0edf7170b1ae0e4e9d31e42b;hp=f88d74c853d8d42aed172950e385e434a1d520a5;hb=cab9194354b6340b4bf0c5154fecc4018a4f2a33;hpb=f35e50efad7436d3fe2b50a5aa9e78d47868de0e

diff --git a/linux/in_evdev.c b/linux/in_evdev.c
index f88d74c..fed27f7 100644
--- a/linux/in_evdev.c
+++ b/linux/in_evdev.c
@@ -1,10 +1,11 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2008-2010
+ * (C) Gražvydas "notaz" Ignotas, 2008-2012
  *
  * 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.
+ *  - MAME license.
  * See the COPYING file in the top-level directory.
  */
 
@@ -19,13 +20,15 @@
 #include <linux/input.h>
 #include <errno.h>
 
-#include "../common/input.h"
+#include "../input.h"
 #include "in_evdev.h"
 
+#define MAX_ABS_DEVS 8
+
 typedef struct {
 	int fd;
 	int *kbits;
-	int abs_min_x;
+	int abs_min_x; /* abs->digital mapping */
 	int abs_max_x;
 	int abs_min_y;
 	int abs_max_y;
@@ -34,6 +37,10 @@ typedef struct {
 	int abs_lasty;
 	int kc_first;
 	int kc_last;
+	unsigned int abs_count;
+	int abs_mult[MAX_ABS_DEVS]; /* 16.16 multiplier to IN_ABS_RANGE */
+	int abs_adj[MAX_ABS_DEVS];  /* adjust for centering */
+	unsigned int abs_to_digital:1;
 } in_evdev_t;
 
 #ifndef KEY_CNT
@@ -51,9 +58,10 @@ typedef struct {
 
 int in_evdev_allow_abs_only;
 
-static const char * const in_evdev_prefix = "evdev:";
+#define IN_EVDEV_PREFIX "evdev:"
+
 static const char * const in_evdev_keys[KEY_CNT] = {
-	[0 ... KEY_MAX] = NULL,
+	// [0 ... KEY_MAX] = NULL, // not necessary
 	[KEY_RESERVED] = "Reserved",		[KEY_ESC] = "Esc",
 	[KEY_1] = "1",				[KEY_2] = "2",
 	[KEY_3] = "3",				[KEY_4] = "4",
@@ -153,7 +161,7 @@ static void in_evdev_probe(void)
 	for (i = 0;; i++)
 	{
 		int support = 0, count = 0;
-		int u, ret, fd, kc_first = KEY_MAX, kc_last = 0;
+		int u, ret, fd, kc_first = KEY_MAX, kc_last = 0, have_abs = 0;
 		in_evdev_t *dev;
 		char name[64];
 
@@ -194,9 +202,6 @@ static void in_evdev_probe(void)
 			}
 		}
 
-		if (count == 0 && !in_evdev_allow_abs_only)
-			goto skip;
-
 		dev = calloc(1, sizeof(*dev));
 		if (dev == NULL)
 			goto skip;
@@ -235,10 +240,21 @@ static void in_evdev_probe(void)
 				dev->abs_min_y = ainfo.minimum;
 				dev->abs_max_y = ainfo.maximum;
 			}
+			for (u = 0; u < MAX_ABS_DEVS; u++) {
+				ret = ioctl(fd, EVIOCGABS(u), &ainfo);
+				if (ret == -1)
+					break;
+				dist = ainfo.maximum - ainfo.minimum;
+				if (dist != 0)
+					dev->abs_mult[u] = IN_ABS_RANGE * 2 * 65536 / dist;
+				dev->abs_adj[u] = -(ainfo.maximum + ainfo.minimum + 1) / 2;
+				have_abs = 1;
+			}
+			dev->abs_count = u;
 		}
 
 no_abs:
-		if (count == 0 && dev->abs_lzone == 0) {
+		if (count == 0 && !have_abs) {
 			free(dev);
 			goto skip;
 		}
@@ -246,11 +262,13 @@ no_abs:
 		dev->fd = fd;
 		dev->kc_first = kc_first;
 		dev->kc_last = kc_last;
-		strcpy(name, in_evdev_prefix);
+		if (count > 0 || in_evdev_allow_abs_only)
+			dev->abs_to_digital = 1;
+		strcpy(name, IN_EVDEV_PREFIX);
 		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, KEY_CNT, in_evdev_keys, 0);
+		in_register(name, fd, dev, KEY_CNT, in_evdev_keys, 0);
 		continue;
 
 skip:
@@ -283,7 +301,7 @@ static void or_binds(const int *binds, int key, int *result)
 
 /* 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)
+static int in_evdev_update(void *drv_data, const int *binds, int *result)
 {
 	struct input_event ev[16];
 	struct input_absinfo ainfo;
@@ -326,14 +344,12 @@ int in_evdev_update(void *drv_data, const int *binds, int *result)
 
 	/* map X and Y absolute to UDLR */
 	lzone = dev->abs_lzone;
-	if (lzone != 0) {
+	if (dev->abs_to_digital && lzone != 0) {
 		ret = ioctl(dev->fd, EVIOCGABS(ABS_X), &ainfo);
 		if (ret != -1) {
 			if (ainfo.value < dev->abs_min_x + lzone) or_binds(binds, KEY_LEFT, result);
 			if (ainfo.value > dev->abs_max_x - lzone) or_binds(binds, KEY_RIGHT, result);
 		}
-	}
-	if (lzone != 0) {
 		ret = ioctl(dev->fd, EVIOCGABS(ABS_Y), &ainfo);
 		if (ret != -1) {
 			if (ainfo.value < dev->abs_min_y + lzone) or_binds(binds, KEY_UP, result);
@@ -344,6 +360,24 @@ int in_evdev_update(void *drv_data, const int *binds, int *result)
 	return 0;
 }
 
+static int in_evdev_update_analog(void *drv_data, int axis_id, int *result)
+{
+	struct input_absinfo ainfo;
+	in_evdev_t *dev = drv_data;
+	int ret;
+
+	if ((unsigned int)axis_id >= MAX_ABS_DEVS)
+		return -1;
+
+	ret = ioctl(dev->fd, EVIOCGABS(axis_id), &ainfo);
+	if (ret != 0)
+		return ret;
+
+	*result = (ainfo.value + dev->abs_adj[axis_id]) * dev->abs_mult[axis_id];
+	*result >>= 16;
+	return 0;
+}
+
 static int in_evdev_set_blocking(in_evdev_t *dev, int y)
 {
 	long flags;
@@ -377,6 +411,21 @@ static int in_evdev_set_blocking(in_evdev_t *dev, int y)
 	return 0;
 }
 
+static int in_evdev_get_config(void *drv_data, int what, int *val)
+{
+	in_evdev_t *dev = drv_data;
+
+	switch (what) {
+	case IN_CFG_ABS_AXIS_COUNT:
+		*val = dev->abs_count;
+		break;
+	default:
+		return -1;
+	}
+
+	return 0;
+}
+
 static int in_evdev_set_config(void *drv_data, int what, int val)
 {
 	in_evdev_t *dev = drv_data;
@@ -429,7 +478,7 @@ static int in_evdev_update_keycode(void *data, int *is_down)
 		ret_down = ev.value;
 		goto out;
 	}
-	else if (ev.type == EV_ABS)
+	else if (ev.type == EV_ABS && dev->abs_to_digital)
 	{
 		int lzone = dev->abs_lzone, down = 0, *last;
 
@@ -511,9 +560,10 @@ static const struct {
 
 #define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
 
-static int in_evdev_menu_translate(void *drv_data, int keycode)
+static int in_evdev_menu_translate(void *drv_data, int keycode, char *charcode)
 {
 	in_evdev_t *dev = drv_data;
+	int ret = 0;
 	int i;
 
 	if (keycode < 0)
@@ -530,24 +580,25 @@ static int in_evdev_menu_translate(void *drv_data, int keycode)
 	}
 	else
 	{
-		for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
-			if (key_pbtn_map[i].key == keycode)
-				return key_pbtn_map[i].pbtn;
-	}
-
-	return 0;
-}
-
-static void in_evdev_get_def_binds(int *binds)
-{
-	int i;
+		for (i = 0; i < KEY_PBTN_MAP_SIZE; i++) {
+			if (key_pbtn_map[i].key == keycode) {
+				ret = key_pbtn_map[i].pbtn;
+				break;
+			}
+		}
 
-	for (i = 0; ; i++) {
-		if (in_evdev_defbinds[i].bit == 0 && in_evdev_defbinds[i].code == 0)
-			break;
-		binds[IN_BIND_OFFS(in_evdev_defbinds[i].code, in_evdev_defbinds[i].btype)] =
-			1 << in_evdev_defbinds[i].bit;
+		if (charcode != NULL && (unsigned int)keycode < KEY_CNT &&
+		    in_evdev_keys[keycode] != NULL && in_evdev_keys[keycode][1] == 0)
+		{
+			char c = in_evdev_keys[keycode][0];
+			if ('A' <= c && c <= 'Z')
+				c = 'a' + c - 'A';
+			ret |= PBTN_CHAR;
+			*charcode = c;
+		}
 	}
+
+	return ret;
 }
 
 /* remove binds of missing keys, count remaining ones */
@@ -564,11 +615,9 @@ static int in_evdev_clean_binds(void *drv_data, int *binds, int *def_binds)
 		// memset(keybits, 0xff, sizeof(keybits)); /* mark all as good */
 	}
 
-	if (dev->abs_lzone != 0) {
+	if (dev->abs_to_digital && dev->abs_lzone != 0) {
 		KEYBITS_BIT_SET(KEY_LEFT);
 		KEYBITS_BIT_SET(KEY_RIGHT);
-	}
-	if (dev->abs_lzone != 0) {
 		KEYBITS_BIT_SET(KEY_UP);
 		KEYBITS_BIT_SET(KEY_DOWN);
 	}
@@ -586,18 +635,22 @@ static int in_evdev_clean_binds(void *drv_data, int *binds, int *def_binds)
 	return count;
 }
 
-void in_evdev_init(void *vdrv)
+static const in_drv_t in_evdev_drv = {
+	.prefix         = IN_EVDEV_PREFIX,
+	.probe          = in_evdev_probe,
+	.free           = in_evdev_free,
+	.get_key_names  = in_evdev_get_key_names,
+	.clean_binds    = in_evdev_clean_binds,
+	.get_config     = in_evdev_get_config,
+	.set_config     = in_evdev_set_config,
+	.update         = in_evdev_update,
+	.update_analog  = in_evdev_update_analog,
+	.update_keycode = in_evdev_update_keycode,
+	.menu_translate = in_evdev_menu_translate,
+};
+
+void in_evdev_init(const struct in_default_bind *defbinds)
 {
-	in_drv_t *drv = vdrv;
-
-	drv->prefix = in_evdev_prefix;
-	drv->probe = in_evdev_probe;
-	drv->free = in_evdev_free;
-	drv->get_key_names = in_evdev_get_key_names;
-	drv->get_def_binds = in_evdev_get_def_binds;
-	drv->clean_binds = in_evdev_clean_binds;
-	drv->set_config = in_evdev_set_config;
-	drv->update_keycode = in_evdev_update_keycode;
-	drv->menu_translate = in_evdev_menu_translate;
+	in_register_driver(&in_evdev_drv, defbinds);
 }