From: notaz <notasas@gmail.com>
Date: Tue, 3 Feb 2009 10:45:56 +0000 (+0000)
Subject: improve menu autorepeat
X-Git-Tag: v1.85~366
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299acadc74705b64b8663f333b52ac405e5a4efa;p=picodrive.git

improve menu autorepeat

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@634 be3aeb3a-fb24-0410-a615-afba39da0efa
---

diff --git a/platform/common/input.c b/platform/common/input.c
index 8262e21c..19912444 100644
--- a/platform/common/input.c
+++ b/platform/common/input.c
@@ -273,33 +273,27 @@ int in_menu_wait_any(int timeout_ms)
 int in_menu_wait(int interesting)
 {
 	static int inp_prev = 0;
-	static int repeats = 0, wait = 20;
-	int ret = 0, release = 0, i;
+	static int repeats = 0;
+	int ret, release = 0, wait = 666;
 
-	if      (repeats == 2) wait = 3;
-	else if (repeats == 4) wait = 2;
-	else if (repeats == 6) wait = 1;
+	if (repeats)
+		wait = 33;
 
-	for (i = 0; i < wait; i++) {
-		ret = in_menu_wait_any(30);
-		if (ret != inp_prev) break;
-		if (i == 0) repeats++;
-	}
+	ret = in_menu_wait_any(wait);
+	if (ret == inp_prev)
+		repeats++;
 
 	while (!(ret & interesting)) {
 		ret = in_menu_wait_any(-1);
 		release = 1;
 	}
 
-	if (release || ret != inp_prev) {
+	if (release || ret != inp_prev)
 		repeats = 0;
-		wait = 20;
-	}
-	if (wait > 6 && (ret & (PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT)))
-		wait = 6;
+
 	inp_prev = ret;
 
-	// we don't need diagonals in menus
+	/* we don't need diagonals in menus */
 	if ((ret & PBTN_UP)   && (ret & PBTN_LEFT))  ret &= ~PBTN_LEFT;
 	if ((ret & PBTN_UP)   && (ret & PBTN_RIGHT)) ret &= ~PBTN_RIGHT;
 	if ((ret & PBTN_DOWN) && (ret & PBTN_LEFT))  ret &= ~PBTN_LEFT;
@@ -452,6 +446,11 @@ int in_config_parse_dev(const char *name)
 	return i;
 }
 
+/*
+ * To reduce size of game specific configs, default binds are not saved.
+ * So we mark default binds in in_config_start(), override them in in_config_bind_key(),
+ * and restore whatever default binds are left in in_config_end().
+ */
 void in_config_start(void)
 {
 	int i;