X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=input.c;h=8d2d552275fdfb35a89bb7c5207a1cfe174c3682;hb=17def48f1f0eeedb1f97f9392c0f5c82cb838e65;hp=8030e1f944dc9fa5572d571c3b6431b3ac71960c;hpb=afdbb7c87325a4a6280943564da2e9e19cefc55b;p=libpicofe.git

diff --git a/input.c b/input.c
index 8030e1f..8d2d552 100644
--- a/input.c
+++ b/input.c
@@ -60,7 +60,8 @@ static int *in_alloc_binds(int drv_id, int key_count)
 	defbinds = DRV(drv_id).defbinds;
 	if (defbinds != NULL) {
 		for (i = 0; ; i++) {
-			if (defbinds[i].bit == 0 && defbinds[i].code == 0)
+			if (defbinds[i].bit == 0 && defbinds[i].btype == 0
+			    && defbinds[i].bit == 0)
 				break;
 			binds[IN_BIND_OFFS(defbinds[i].code, defbinds[i].btype)] =
 				1 << defbinds[i].bit;
@@ -427,6 +428,7 @@ finish:
 int in_menu_wait_any(char *charcode, int timeout_ms)
 {
 	int keys_old = menu_key_state;
+	int ret;
 
 	while (1)
 	{
@@ -442,7 +444,9 @@ int in_menu_wait_any(char *charcode, int timeout_ms)
 		}
 	}
 
-	return menu_key_state;
+	ret = menu_key_state;
+	menu_key_state &= ~PBTN_CHAR;
+	return ret;
 }
 
 /* wait for menu input, do autorepeat */
@@ -514,6 +518,9 @@ int in_get_config(int dev_id, int what, void *val)
 	case IN_CFG_KEY_NAMES:
 		return -1; /* not implemented */
 	default:
+		if (!dev->probed)
+			return -1;
+
 		return DRV(dev->drv_id).get_config(dev->drv_data, what, ival);
 	}
 
@@ -527,9 +534,12 @@ static int in_set_blocking(int is_blocking)
 	/* have_async_devs means we will have to do all reads async anyway.. */
 	if (!in_have_async_devs) {
 		for (i = 0; i < in_dev_count; i++) {
-			if (in_devices[i].probed)
-				DRV(in_devices[i].drv_id).set_config(in_devices[i].drv_data,
-								     IN_CFG_BLOCKING, is_blocking);
+			if (!in_devices[i].probed)
+				continue;
+
+			DRV(in_devices[i].drv_id).set_config(
+				in_devices[i].drv_data, IN_CFG_BLOCKING,
+				is_blocking);
 		}
 	}
 
@@ -876,7 +886,7 @@ void in_clean_binds(void)
 		int ret, count, *binds, *def_binds;
 		in_dev_t *dev = &in_devices[i];
 
-		if (dev->binds == NULL || dev->drv_data == NULL)
+		if (dev->binds == NULL || !dev->probed)
 			continue;
 
 		count = dev->key_count;