X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fin_gp2x.c;h=81681ffa2afe2fbb4e4d67f6ff072cc75750c539;hb=2c60056042e94007286e3e0e1789f4c9a78b7731;hp=78ee92ef87e13a88a88b8101f778eef4f040fcf1;hpb=f15ca4db35a3466cc59b796c2a5d8b963721a02c;p=libpicofe.git

diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c
index 78ee92e..81681ff 100644
--- a/gp2x/in_gp2x.c
+++ b/gp2x/in_gp2x.c
@@ -8,6 +8,11 @@
 #define IN_PREFIX "gp2x:"
 #define IN_GP2X_NBUTTONS 32
 
+/* note: in_gp2x hadles combos (if 2 btns have the same bind,
+ * both must be pressed for action to happen) */
+static int in_gp2x_combo_keys = 0;
+static int in_gp2x_combo_acts = 0;
+
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
 
 enum  { BTN_UP = 0,      BTN_LEFT = 2,      BTN_DOWN = 4,  BTN_RIGHT = 6,
@@ -28,7 +33,7 @@ static const char * const in_gp2x_keys[IN_GP2X_NBUTTONS] = {
 
 static void in_gp2x_probe(void)
 {
-	in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1);
+	in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1, 1);
 }
 
 static int in_gp2x_get_bind_count(void)
@@ -59,14 +64,17 @@ static int in_gp2x_get_gpio_bits(void)
 /* returns bitfield of binds of pressed buttons */
 int in_gp2x_update(void *drv_data, int *binds)
 {
-	int i, value, ret = 0;
+	int i, keys, ret = 0;
+
+	keys = in_gp2x_get_gpio_bits();
 
-	value = in_gp2x_get_gpio_bits();
+	if (keys & in_gp2x_combo_keys)
+		return in_combos_do(keys, binds, BTN_PUSH, in_gp2x_combo_keys, in_gp2x_combo_acts);
 
-	for (i = 0; value; i++) {
-		if (value & 1)
+	for (i = 0; keys; i++) {
+		if (keys & 1)
 			ret |= binds[i];
-		value >>= 1;
+		keys >>= 1;
 	}
 
 	return ret;
@@ -172,6 +180,8 @@ static int in_gp2x_clean_binds(void *drv_data, int *binds)
 			count++;
 	}
 
+	in_combos_find(binds, BTN_PUSH, &in_gp2x_combo_keys, &in_gp2x_combo_acts);
+
 	return count;
 
 }
@@ -180,6 +190,8 @@ void in_gp2x_init(void *vdrv)
 {
 	in_drv_t *drv = vdrv;
 
+	in_gp2x_combo_keys = in_gp2x_combo_acts = 0;
+
 	drv->prefix = in_gp2x_prefix;
 	drv->probe = in_gp2x_probe;
 	drv->get_bind_count = in_gp2x_get_bind_count;