From: notaz <notasas@gmail.com>
Date: Thu, 26 Jun 2008 20:27:33 +0000 (+0000)
Subject: improved autorepeat behavior in menus
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6af8fee5348a8f90be23eb8f74fcfe2b5b28e60e;p=libpicofe.git

improved autorepeat behavior in menus

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

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 05d0903..db4c9fa 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -46,7 +46,7 @@ static int inp_prevjoy = 0;
 static unsigned long wait_for_input(unsigned long interesting)
 {
 	unsigned long ret;
-	static int repeats = 0, wait = 6;
+	static int repeats = 0, wait = 20;
 	int release = 0, i;
 
 	if      (repeats == 2) wait = 3;
@@ -65,8 +65,10 @@ static unsigned long wait_for_input(unsigned long interesting)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 6;
+		wait = 20;
 	}
+	if (wait > 6 && (ret&(GP2X_UP|GP2X_LEFT|GP2X_DOWN|GP2X_RIGHT)))
+		wait = 6;
 	inp_prev = ret;
 	inp_prevjoy = 0;
 
diff --git a/psp/menu.c b/psp/menu.c
index 744c99d..85669ae 100644
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -52,7 +52,7 @@ static unsigned int inp_prev = 0;
 static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
 {
 	unsigned int ret;
-	static int repeats = 0, wait = 6;
+	static int repeats = 0, wait = 20;
 	int release = 0, count, i;
 
 	if (!is_key_config)
@@ -76,12 +76,14 @@ static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 6;
+		wait = 20;
 	}
 	inp_prev = ret;
 
 	if (!is_key_config)
 		ret |= (ret & 0xf0000000) >> 24; // use analog as d-pad
+	if (wait > 6 && (ret&(BTN_UP|BTN_LEFT|BTN_DOWN|BTN_RIGHT)))
+		wait = 6;
 
 	// we don't need diagonals in menus
 	if ((ret&BTN_UP)   && (ret&BTN_LEFT))  ret &= ~BTN_LEFT;