X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.c;h=b6df2bab74d2aefb936ae162201e4e954b759a23;hb=f9dd0a6360f6486c196d9a463dc537c7081338be;hp=1416acb2d6fd5054ef34721150c8a2d3faaeec98;hpb=2c60056042e94007286e3e0e1789f4c9a78b7731;p=libpicofe.git

diff --git a/common/input.c b/common/input.c
index 1416acb..b6df2ba 100644
--- a/common/input.c
+++ b/common/input.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
 #include "input.h"
 #include "plat.h"
 #include "../linux/in_evdev.h"
@@ -14,7 +13,8 @@ typedef struct
 	int drv_fd_hnd;
 	void *drv_data;
 	char *name;
-	int *binds;
+	int key_count;
+	int *binds;	/* total = key_count * bindtypes * 2 */
 	int probed:1;
 	int does_combos:1;
 } in_dev_t;
@@ -23,33 +23,23 @@ static in_drv_t in_drivers[IN_DRVID_COUNT];
 static in_dev_t in_devices[IN_MAX_DEVS];
 static int in_dev_count = 0;
 static int in_have_async_devs = 0;
+static int menu_key_state = 0;
+static int menu_last_used_dev = 0;
 
 #define DRV(id) in_drivers[(unsigned)(id) < IN_DRVID_COUNT ? (id) : 0]
 
 
-static int in_bind_count(int drv_id)
-{
-	int count = DRV(drv_id).get_bind_count();
-	if (count <= 0)
-		printf("input: failed to get bind count for drv %d\n", drv_id);
-
-	return count;
-}
-
-static int *in_alloc_binds(int drv_id)
+static int *in_alloc_binds(int drv_id, int key_count)
 {
-	int count, *binds;
-
-	count = in_bind_count(drv_id);
-	if (count <= 0)
-		return NULL;
+	int *binds;
 
-	binds = calloc(count * 2, sizeof(binds[0]));
+	binds = calloc(key_count * IN_BINDTYPE_COUNT * 2, sizeof(binds[0]));
 	if (binds == NULL)
 		return NULL;
 
-	DRV(drv_id).get_def_binds(binds + count);
-	memcpy(binds, binds + count, count * sizeof(binds[0]));
+	DRV(drv_id).get_def_binds(binds + key_count * IN_BINDTYPE_COUNT);
+	memcpy(binds, binds + key_count * IN_BINDTYPE_COUNT,
+		sizeof(binds[0]) * key_count * IN_BINDTYPE_COUNT);
 
 	return binds;
 }
@@ -68,7 +58,8 @@ static void in_free(in_dev_t *dev)
 
 /* to be called by drivers
  * async devices must set drv_fd_hnd to -1 */
-void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data, int combos)
+void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
+		int key_count, int combos)
 {
 	int i, ret, dupe_count = 0, *binds;
 	char name[256], *name_end, *tmp;
@@ -108,7 +99,7 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
 	if (tmp == NULL)
 		return;
 
-	binds = in_alloc_binds(drv_id);
+	binds = in_alloc_binds(drv_id, key_count);
 	if (binds == NULL) {
 		free(tmp);
 		return;
@@ -116,6 +107,7 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
 
 	in_devices[i].name = tmp;
 	in_devices[i].binds = binds;
+	in_devices[i].key_count = key_count;
 	if (i + 1 > in_dev_count)
 		in_dev_count = i + 1;
 
@@ -128,7 +120,8 @@ update:
 	in_devices[i].drv_data = drv_data;
 
 	if (in_devices[i].binds != NULL) {
-		ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds);
+		ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds,
+			in_devices[i].binds + key_count * IN_BINDTYPE_COUNT);
 		if (ret == 0) {
 			/* no useable binds */
 			free(in_devices[i].binds);
@@ -137,8 +130,9 @@ update:
 	}
 }
 
-/* key combo handling, to be called by drivers that support it */
-void in_combos_find(int *binds, int last_key, int *combo_keys, int *combo_acts)
+/* key combo handling, to be called by drivers that support it.
+ * Only care about IN_BINDTYPE_EMU */
+void in_combos_find(const int *binds, int last_key, int *combo_keys, int *combo_acts)
 {
 	int act, u;
 
@@ -147,7 +141,7 @@ void in_combos_find(int *binds, int last_key, int *combo_keys, int *combo_acts)
 	{
 		int keyc = 0;
 		for (u = 0; u <= last_key; u++)
-			if (binds[u] & (1 << act))
+			if (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & (1 << act))
 				keyc++;
 
 		if (keyc > 1)
@@ -155,7 +149,7 @@ void in_combos_find(int *binds, int last_key, int *combo_keys, int *combo_acts)
 			// loop again and mark those keys and actions as combo
 			for (u = 0; u <= last_key; u++)
 			{
-				if (binds[u] & (1 << act)) {
+				if (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & (1 << act)) {
 					*combo_keys |= 1 << u;
 					*combo_acts |= 1 << act;
 				}
@@ -164,38 +158,40 @@ void in_combos_find(int *binds, int last_key, int *combo_keys, int *combo_acts)
 	}
 }
 
-int in_combos_do(int keys, int *binds, int last_key, int combo_keys, int combo_acts)
+int in_combos_do(int keys, const int *binds, int last_key, int combo_keys, int combo_acts)
 {
 	int i, ret = 0;
 
 	for (i = 0; i <= last_key; i++)
 	{
-		int acts;
+		int acts, acts_c, u;
+
 		if (!(keys & (1 << i)))
 			continue;
 
-		acts = binds[i];
+		acts = binds[IN_BIND_OFFS(i, IN_BINDTYPE_EMU)];
 		if (!acts)
 			continue;
 
-		if (combo_keys & (1 << i))
-		{
-			int acts_c = acts & combo_acts;
-			int u = last_key;
-			if (acts_c) {
-				// let's try to find the other one
-				for (u = i + 1; u <= last_key; u++)
-					if ( (keys & (1 << u)) && (binds[u] & acts_c) ) {
-						ret |= acts_c & binds[u];
-						keys &= ~((1 << i) | (1 << u));
-						break;
-					}
-			}
-			// add non-combo actions if combo ones were not found
-			if (u >= last_key)
-				ret |= acts & ~combo_acts;
-		} else
+		if (!(combo_keys & (1 << i))) {
 			ret |= acts;
+			continue;
+		}
+
+		acts_c = acts & combo_acts;
+		u = last_key;
+		if (acts_c) {
+			// let's try to find the other one
+			for (u = i + 1; u <= last_key; u++)
+				if ( (keys & (1 << u)) && (binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)] & acts_c) ) {
+					ret |= acts_c & binds[IN_BIND_OFFS(u, IN_BINDTYPE_EMU)];
+					keys &= ~((1 << i) | (1 << u));
+					break;
+				}
+		}
+		// add non-combo actions if combo ones were not found
+		if (u >= last_key)
+			ret |= acts & ~combo_acts;
 	}
 
 	return ret;
@@ -234,9 +230,9 @@ void in_probe(void)
 }
 
 /* async update */
-int in_update(void)
+int in_update(int *result)
 {
-	int i, result = 0;
+	int i, ret = 0;
 
 	for (i = 0; i < in_dev_count; i++) {
 		in_dev_t *dev = &in_devices[i];
@@ -244,23 +240,21 @@ int in_update(void)
 			switch (dev->drv_id) {
 #ifdef IN_EVDEV
 			case IN_DRVID_EVDEV:
-				result |= in_evdev_update(dev->drv_data, dev->binds);
+				ret |= in_evdev_update(dev->drv_data, dev->binds, result);
 				break;
 #endif
 #ifdef IN_GP2X
 			case IN_DRVID_GP2X:
-				result |= in_gp2x_update(dev->drv_data, dev->binds);
+				ret |= in_gp2x_update(dev->drv_data, dev->binds, result);
 				break;
 #endif
 			}
 		}
 	}
 
-	return result;
+	return ret;
 }
 
-static int menu_key_state = 0;
-
 void in_set_blocking(int is_blocking)
 {
 	int i, ret;
@@ -414,6 +408,7 @@ int in_menu_wait_any(int timeout_ms)
 			break;
 		if (code < 0)
 			continue;
+		menu_last_used_dev = dev_id;
 		if (keys_old != menu_key_state)
 			break;
 	}
@@ -464,13 +459,10 @@ const int *in_get_dev_binds(int dev_id)
 
 const int *in_get_dev_def_binds(int dev_id)
 {
-	int count;
-
 	if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
 		return NULL;
 
-	count = in_bind_count(in_devices[dev_id].drv_id);
-	return in_devices[dev_id].binds + count;
+	return in_devices[dev_id].binds + in_devices[dev_id].key_count * IN_BINDTYPE_COUNT;
 }
 
 int in_get_dev_info(int dev_id, int what)
@@ -480,7 +472,7 @@ int in_get_dev_info(int dev_id, int what)
 
 	switch (what) {
 	case IN_INFO_BIND_COUNT:
-		return in_bind_count(in_devices[dev_id].drv_id);
+		return in_devices[dev_id].key_count;
 	case IN_INFO_DOES_COMBOS:
 		return in_devices[dev_id].does_combos;
 	}
@@ -516,9 +508,15 @@ const char *in_get_key_name(int dev_id, int keycode)
 	static char xname[16];
 	const char *name;
 
+	if (dev_id < 0)		/* want last used dev? */
+		dev_id = menu_last_used_dev;
+
 	if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
 		return "Unkn0";
 
+	if (keycode < 0)	/* want name for menu key? */
+		keycode = DRV(in_devices[dev_id].drv_id).menu_translate(keycode);
+
 	name = DRV(in_devices[dev_id].drv_id).get_key_name(keycode);
 	if (name != NULL)
 		return name;
@@ -532,33 +530,35 @@ const char *in_get_key_name(int dev_id, int keycode)
 	return xname;
 }
 
-int in_bind_key(int dev_id, int keycode, int mask, int force_unbind)
+int in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbind)
 {
 	int ret, count;
 	in_dev_t *dev;
 
-	if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+	if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
 		return -1;
+
 	dev = &in_devices[dev_id];
+	count = dev->key_count;
 
 	if (dev->binds == NULL) {
 		if (force_unbind)
 			return 0;
-		dev->binds = in_alloc_binds(dev->drv_id);
+		dev->binds = in_alloc_binds(dev->drv_id, count);
 		if (dev->binds == NULL)
 			return -1;
 	}
 
-	count = in_bind_count(dev->drv_id);
 	if (keycode < 0 || keycode >= count)
 		return -1;
 	
 	if (force_unbind)
-		dev->binds[keycode] &= ~mask;
+		dev->binds[IN_BIND_OFFS(keycode, bind_type)] &= ~mask;
 	else
-		dev->binds[keycode] ^=  mask;
+		dev->binds[IN_BIND_OFFS(keycode, bind_type)] ^=  mask;
 	
-	ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds);
+	ret = DRV(dev->drv_id).clean_binds(dev->drv_data, dev->binds,
+				dev->binds + count * IN_BINDTYPE_COUNT);
 	if (ret == 0) {
 		free(dev->binds);
 		dev->binds = NULL;
@@ -567,6 +567,24 @@ int in_bind_key(int dev_id, int keycode, int mask, int force_unbind)
 	return 0;
 }
 
+void in_unbind_all(int dev_id, int act_mask, int bind_type)
+{
+	int i, count;
+	in_dev_t *dev;
+
+	if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
+		return;
+
+	dev = &in_devices[dev_id];
+	count = dev->key_count;
+
+	if (dev->binds == NULL)
+		return;
+
+	for (i = 0; i < count; i++)
+		dev->binds[IN_BIND_OFFS(i, bind_type)] &= ~act_mask;
+}
+
 /* returns device id, or -1 on error */
 int in_config_parse_dev(const char *name)
 {
@@ -610,9 +628,11 @@ int in_config_parse_dev(const char *name)
 	if (in_devices[i].name == NULL)
 		return -1;
 
+	in_devices[i].key_count = DRV(drv_id).get_bind_count();
+	in_devices[i].drv_id = drv_id;
+
 	if (i + 1 > in_dev_count)
 		in_dev_count = i + 1;
-	in_devices[i].drv_id = drv_id;
 
 	return i;
 }
@@ -634,26 +654,24 @@ void in_config_start(void)
 		if (binds == NULL)
 			continue;
 
-		count = in_bind_count(in_devices[i].drv_id);
-		def_binds = binds + count;
+		count = in_devices[i].key_count;
+		def_binds = binds + count * IN_BINDTYPE_COUNT;
 
-		for (n = 0; n < count; n++)
+		for (n = 0; n < count * IN_BINDTYPE_COUNT; n++)
 			if (binds[n] == def_binds[n])
 				binds[n] = -1;
 	}
 }
 
-int in_config_bind_key(int dev_id, const char *key, int binds)
+int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type)
 {
-	int count, kc;
 	in_dev_t *dev;
+	int i, offs, kc;
 
-	if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+	if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
 		return -1;
 	dev = &in_devices[dev_id];
 
-	count = in_bind_count(dev->drv_id);
-
 	/* maybe a raw code? */
 	if (key[0] == '\\' && key[1] == 'x') {
 		char *p = NULL;
@@ -664,7 +682,7 @@ int in_config_bind_key(int dev_id, const char *key, int binds)
 	else {
 		/* device specific key name */
 		if (dev->binds == NULL) {
-			dev->binds = in_alloc_binds(dev->drv_id);
+			dev->binds = in_alloc_binds(dev->drv_id, dev->key_count);
 			if (dev->binds == NULL)
 				return -1;
 			in_config_start();
@@ -677,15 +695,21 @@ int in_config_bind_key(int dev_id, const char *key, int binds)
 		}
 	}
 
-	if (kc < 0 || kc >= count) {
+	if (kc < 0 || kc >= dev->key_count) {
 		printf("input: bad key: %s\n", key);
 		return -1;
 	}
 
-	if (dev->binds[kc] == -1)
-		dev->binds[kc] = 0;
-	dev->binds[kc] |= binds;
+	if (bind_type == IN_BINDTYPE_NONE) {
+		for (i = 0; i < IN_BINDTYPE_COUNT; i++)
+			dev->binds[IN_BIND_OFFS(kc, i)] = 0;
+		return 0;
+	}
 
+	offs = IN_BIND_OFFS(kc, bind_type);
+	if (dev->binds[offs] == -1)
+		dev->binds[offs] = 0;
+	dev->binds[offs] |= acts;
 	return 0;
 }
 
@@ -700,18 +724,18 @@ void in_config_end(void)
 		if (dev->binds == NULL)
 			continue;
 
-		count = in_bind_count(dev->drv_id);
+		count = dev->key_count;
 		binds = dev->binds;
-		def_binds = binds + count;
+		def_binds = binds + count * IN_BINDTYPE_COUNT;
 
-		for (n = 0; n < count; n++)
+		for (n = 0; n < count * IN_BINDTYPE_COUNT; n++)
 			if (binds[n] == -1)
 				binds[n] = def_binds[n];
 
 		if (dev->drv_data == NULL)
 			continue;
 
-		ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds);
+		ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds, def_binds);
 		if (ret == 0) {
 			/* no useable binds */
 			free(dev->binds);
@@ -740,7 +764,7 @@ static void in_def_probe(void) {}
 static void in_def_free(void *drv_data) {}
 static int  in_def_get_bind_count(void) { return 0; }
 static void in_def_get_def_binds(int *binds) {}
-static int  in_def_clean_binds(void *drv_data, int *binds) { return 0; }
+static int  in_def_clean_binds(void *drv_data, int *b, int *db) { return 0; }
 static void in_def_set_blocking(void *data, int y) {}
 static int  in_def_update_keycode(void *drv_data, int *is_down) { return 0; }
 static int  in_def_menu_translate(int keycode) { return keycode; }