sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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 <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-06-18 00:23:57 +02:00
parent 1679063e40
commit f890ea69be
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/menu.c
View File

@ -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;

2
include/readkey.h
View File

@ -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);