From f890ea69bee7a431546d146b2001aadd8e144cab Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 18 Jun 2013 00:23:57 +0200 Subject: Fix gotoXY argument order gotoXY has the argument order (y, x). Change this so that usage of this function feels more natural. Signed-off-by: Sascha Hauer --- common/menu.c | 10 +++++----- include/readkey.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/menu.c b/common/menu.c index 1f0ffec53b..d516db4900 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 f134846af6..2793f3f70b 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); -- cgit v1.2.3