From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 1/2] menu: fix support for "\n", "\n\r" and "\r"
Date: Mon, 23 Apr 2012 13:24:50 +0200 [thread overview]
Message-ID: <1335180291-26991-1-git-send-email-plagnioj@jcrosoft.com> (raw)
If "\n\r" or "\r\n" is ignore one.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
| 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
--git a/common/menu.c b/common/menu.c
index 83821ec..6c530b6 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -296,7 +296,7 @@ static int menu_alloc_display_buffer(struct menu *m)
int menu_show(struct menu *m)
{
- int ch;
+ int ch, ch_previous = 0;
int escape = 0;
int countdown;
int auto_display_len = 16;
@@ -388,7 +388,12 @@ int menu_show(struct menu *m)
m->selected->action(m, m->selected);
print_menu_entry(m, m->selected, 1);
break;
+ case KEY_ENTER:
+ if (ch_previous == KEY_RETURN)
+ break;
case KEY_RETURN:
+ if (ch_previous == KEY_ENTER)
+ break;
clear();
gotoXY(1,1);
m->selected->action(m, m->selected);
@@ -399,6 +404,7 @@ int menu_show(struct menu *m)
default:
break;
}
+ ch_previous = ch;
} while(1);
return 0;
--
1.7.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2012-04-23 11:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 11:24 Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-04-23 11:24 ` [PATCH 2/2] menu: fix menu alloc init Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335180291-26991-1-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox