notaz.gp2x.de
/
libpicofe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
271f900
)
fix menu input handling (timeout non-working)
author
kub
<derkub@gmail.com>
Thu, 22 Oct 2020 20:34:14 +0000
(22:34 +0200)
committer
notaz
<notasas@gmail.com>
Tue, 3 Nov 2020 20:55:42 +0000
(22:55 +0200)
input.c
patch
|
blob
|
blame
|
history
diff --git
a/input.c
b/input.c
index
d0e4a4e
..
9d938ea
100644
(file)
--- a/
input.c
+++ b/
input.c
@@
-432,20
+432,12
@@
int in_menu_wait_any(char *charcode, int timeout_ms)
{
int keys_old = menu_key_state;
int ret;
{
int keys_old = menu_key_state;
int ret;
+ int is_down = 0, dev_id = 0;
- while (1)
- {
- int code, is_down = 0, dev_id = 0;
-
- code = in_update_keycode(&dev_id, &is_down, charcode, timeout_ms);
- if (code < 0)
- break;
+ in_update_keycode(&dev_id, &is_down, charcode, timeout_ms);
- if (keys_old != menu_key_state) {
- menu_last_used_dev = dev_id;
- break;
- }
- }
+ if (keys_old != menu_key_state)
+ menu_last_used_dev = dev_id;
ret = menu_key_state;
menu_key_state &= ~PBTN_CHAR;
ret = menu_key_state;
menu_key_state &= ~PBTN_CHAR;
@@
-548,13
+540,13
@@
static int in_set_blocking(int is_blocking)
}
}
}
}
- menu_key_state = 0;
-
/* flush events */
do {
ret = in_update_keycode(NULL, NULL, NULL, 0);
} while (ret >= 0);
/* flush events */
do {
ret = in_update_keycode(NULL, NULL, NULL, 0);
} while (ret >= 0);
+ menu_key_state = 0;
+
return 0;
}
return 0;
}