__nonnull changes

[people/xl0/gpxe.git] / src / hci / mucurses / ansi_screen.c

diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c
index 01fbb8b..0742a7d 100644 (file)
--- a/src/hci/mucurses/ansi_screen.c
+++ b/src/hci/mucurses/ansi_screen.c
@@ -1,21 +1,31 @@
+#include <stdio.h>
 #include <curses.h>
 #include <console.h>
 
+static void ansiscr_reset(struct _curses_screen *scr) __nonnull;
+static void ansiscr_movetoyx(struct _curses_screen *scr,
+                               unsigned int y, unsigned int x) __nonnull;
+static void ansiscr_putc(struct _curses_screen *scr, chtype c) __nonnull;
+
 unsigned short _COLS = 80;
-unsigned short _LINES = 25;
+unsigned short _LINES = 24;
 
-static void ansiscr_init ( struct _curses_screen *scr __unused ) {
+static void ansiscr_reset ( struct _curses_screen *scr ) {
        /* Reset terminal attributes and clear screen */
-       printf ( "\033[0m\033[2J" );
-}
-
-static void ansiscr_exit ( struct _curses_screen *scr __unused ) {
+       scr->attrs = 0;
+       scr->curs_x = 0;
+       scr->curs_y = 0;
+       printf ( "\033[0m\033[2J\033[1;1H" );
 }
 
-static void ansiscr_movetoyx ( struct _curses_screen *scr __unused,
+static void ansiscr_movetoyx ( struct _curses_screen *scr,
                               unsigned int y, unsigned int x ) {
-       /* ANSI escape sequence to update cursor position */
-       printf ( "\033[%d;%dH", ( y + 1 ), ( x + 1 ) );
+       if ( ( x != scr->curs_x ) || ( y != scr->curs_y ) ) {
+               /* ANSI escape sequence to update cursor position */
+               printf ( "\033[%d;%dH", ( y + 1 ), ( x + 1 ) );
+               scr->curs_x = x;
+               scr->curs_y = y;
+       }
 }
 
 static void ansiscr_putc ( struct _curses_screen *scr, chtype c ) {
@@ -26,13 +36,22 @@ static void ansiscr_putc ( struct _curses_screen *scr, chtype c ) {
        short fcol;
        short bcol;
 
+       /* Update attributes if changed */
        if ( attrs != scr->attrs ) {
                scr->attrs = attrs;
                pair_content ( cpair, &fcol, &bcol );
                /* ANSI escape sequence to update character attributes */
                printf ( "\033[0;%d;3%d;4%dm", ( bold ? 1 : 22 ), fcol, bcol );
        }
+
+       /* Print the actual character */
        putchar ( character );
+
+       /* Update expected cursor position */
+       if ( ++(scr->curs_x) == _COLS ) {
+               scr->curs_x = 0;
+               ++scr->curs_y;
+       }
 }
 
 static int ansiscr_getc ( struct _curses_screen *scr __unused ) {
@@ -44,8 +63,8 @@ static bool ansiscr_peek ( struct _curses_screen *scr __unused ) {
 }
 
 SCREEN _ansi_screen = {
-       .init           = ansiscr_init,
-       .exit           = ansiscr_exit,
+       .init           = ansiscr_reset,
+       .exit           = ansiscr_reset,
        .movetoyx       = ansiscr_movetoyx,
        .putc           = ansiscr_putc,
        .getc           = ansiscr_getc,