X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Finput.c;h=920d11da84ede2010a6408bbba210a18c5e5a38d;hb=82abf46f3db8ade517881c03327bdbc0de848eb2;hp=81f6e169af33d1aeb2d9112fe3f887e64b7f388a;hpb=7fd581f40bb5273e81dc08afdd55224c26c8fb9e;p=libpicofe.git

diff --git a/common/input.c b/common/input.c
index 81f6e16..920d11d 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"
@@ -16,12 +15,15 @@ typedef struct
 	char *name;
 	int *binds;
 	int probed:1;
+	int does_combos:1;
 } in_dev_t;
 
 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]
 
@@ -67,7 +69,7 @@ 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)
+void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data, int combos)
 {
 	int i, ret, dupe_count = 0, *binds;
 	char name[256], *name_end, *tmp;
@@ -121,6 +123,7 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data)
 	printf("input: new device #%d \"%s\"\n", i, name);
 update:
 	in_devices[i].probed = 1;
+	in_devices[i].does_combos = combos;
 	in_devices[i].drv_id = drv_id;
 	in_devices[i].drv_fd_hnd = drv_fd_hnd;
 	in_devices[i].drv_data = drv_data;
@@ -135,6 +138,70 @@ 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)
+{
+	int act, u;
+
+	*combo_keys = *combo_acts = 0;
+	for (act = 0; act < sizeof(binds[0]) * 8; act++)
+	{
+		int keyc = 0;
+		for (u = 0; u <= last_key; u++)
+			if (binds[u] & (1 << act))
+				keyc++;
+
+		if (keyc > 1)
+		{
+			// loop again and mark those keys and actions as combo
+			for (u = 0; u <= last_key; u++)
+			{
+				if (binds[u] & (1 << act)) {
+					*combo_keys |= 1 << u;
+					*combo_acts |= 1 << act;
+				}
+			}
+		}
+	}
+}
+
+int in_combos_do(int keys, int *binds, int last_key, int combo_keys, int combo_acts)
+{
+	int i, ret = 0;
+
+	for (i = 0; i <= last_key; i++)
+	{
+		int acts;
+		if (!(keys & (1 << i)))
+			continue;
+
+		acts = binds[i];
+		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
+			ret |= acts;
+	}
+
+	return ret;
+}
+
 void in_probe(void)
 {
 	int i;
@@ -193,8 +260,6 @@ int in_update(void)
 	return result;
 }
 
-static int menu_key_state = 0;
-
 void in_set_blocking(int is_blocking)
 {
 	int i, ret;
@@ -348,6 +413,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;
 	}
@@ -360,7 +426,7 @@ int in_menu_wait(int interesting, int autorep_delay_ms)
 {
 	static int inp_prev = 0;
 	static int repeats = 0;
-	int ret, release = 0, wait = 666;
+	int ret, release = 0, wait = 450;
 
 	if (repeats)
 		wait = autorep_delay_ms;
@@ -407,12 +473,19 @@ const int *in_get_dev_def_binds(int dev_id)
 	return in_devices[dev_id].binds + count;
 }
 
-int in_get_dev_bind_count(int dev_id)
+int in_get_dev_info(int dev_id, int what)
 {
 	if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
 		return 0;
 
-	return in_bind_count(in_devices[dev_id].drv_id);
+	switch (what) {
+	case IN_INFO_BIND_COUNT:
+		return in_bind_count(in_devices[dev_id].drv_id);
+	case IN_INFO_DOES_COMBOS:
+		return in_devices[dev_id].does_combos;
+	}
+
+	return 0;
 }
 
 const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix)
@@ -443,9 +516,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;