From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/3] Fix gotoXY argument order
Date: Wed, 19 Jun 2013 22:53:41 +0200 [thread overview]
Message-ID: <1371675222-25433-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1371675222-25433-1-git-send-email-s.hauer@pengutronix.de>
gotoXY has the argument order (y, x). Change this so that usage of this
function feels more natural.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
| 10 +++++-----
include/readkey.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
--git a/common/menu.c b/common/menu.c
index 1f0ffec..d516db4 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -164,7 +164,7 @@ static void __print_entry(const char *str)
static void print_menu_entry(struct menu *m, struct menu_entry *me,
int selected)
{
- gotoXY(me->num + 1, 3);
+ gotoXY(3, me->num + 1);
if (me->type == MENU_ENTRY_BOX) {
if (me->box_state)
@@ -234,7 +234,7 @@ static void print_menu(struct menu *m)
struct menu_entry *me;
clear();
- gotoXY(1, 2);
+ gotoXY(2, 1);
if(m->display) {
__print_entry(m->display);
} else {
@@ -269,7 +269,7 @@ int menu_show(struct menu *m)
countdown = m->auto_select;
if (m->auto_select >= 0) {
- gotoXY(m->nb_entries + 2, 3);
+ gotoXY(3, m->nb_entries + 2);
if (!m->auto_display) {
printf("Auto Select in");
} else {
@@ -293,10 +293,10 @@ int menu_show(struct menu *m)
}
}
- gotoXY(m->nb_entries + 2, 3);
+ gotoXY(3, m->nb_entries + 2);
printf("%*c", auto_display_len + 4, ' ');
- gotoXY(m->selected->num + 1, 3);
+ gotoXY(3, m->selected->num + 1);
do {
struct menu_entry *old_selected = m->selected;
diff --git a/include/readkey.h b/include/readkey.h
index f134846..2793f3f 100644
--- a/include/readkey.h
+++ b/include/readkey.h
@@ -28,7 +28,7 @@
#define printf_reverse(fmt,args...) printf("\e[7m" fmt "\e[m",##args)
#define puts_reverse(fmt) puts("\e[7m" fmt "\e[m")
-#define gotoXY(row, col) printf("\e[%d;%dH", row, col)
+#define gotoXY(row, col) printf("\e[%d;%dH", col, row)
#define clear() puts("\e[2J")
int read_key(void);
--
1.8.3.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-06-19 20:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 20:53 Some small menu updates Sascha Hauer
2013-06-19 20:53 ` [PATCH 1/3] menu: Align entries Sascha Hauer
2013-06-19 20:53 ` Sascha Hauer [this message]
2013-06-19 20:53 ` [PATCH 3/3] menu: Make action callback optional Sascha Hauer
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=1371675222-25433-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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