minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 19:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix video console newline and carriage return handling

Browse Source 
Lines of the lenght CONSOLE_COLS or greater than CONSOLE_COLS
are not displayed correctly. This is an attempt to fix
this issue. Also add carriage return handling.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Rodolfo Giometti <giometti@linux.it>
This commit is contained in:
Anatolij Gustschin 2008-01-11 02:39:47 +01:00 committed by Rodolfo Giometti
parent 422b1a0160
commit 20c450ef61
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/video/cfb_console.c
View File

@ -647,7 +647,14 @@ static void console_back (void)
static void console_newline (void) static void console_newline (void)
{ {
CURSOR_OFF console_row++; /* Check if last character in the line was just drawn. If so, cursor was
overwriten and need not to be cleared. Cursor clearing without this
check causes overwriting the 1st character of the line if line lenght
is >= CONSOLE_COLS
*/
if (console_col < CONSOLE_COLS)
CURSOR_OFF
console_row++;
console_col = 0; console_col = 0;
/* Check if we need to scroll the terminal */ /* Check if we need to scroll the terminal */
@ -660,16 +667,26 @@ static void console_newline (void)
} }
} }
static void console_cr (void)
{
CURSOR_OFF console_col = 0;
}
/*****************************************************************************/ /*****************************************************************************/
void video_putc (const char c) void video_putc (const char c)
{ {
static int nl = 1;
switch (c) { switch (c) {
case 13: /* ignore */ case 13: /* back to first column */
console_cr ();
break; break;
case '\n': /* next line */ case '\n': /* next line */
console_newline (); if (console_col || (!console_col && nl))
console_newline ();
nl = 1;
break; break;
case 9: /* tab 8 */ case 9: /* tab 8 */
@ -691,8 +708,10 @@ void video_putc (const char c)
console_col++; console_col++;
/* check for newline */ /* check for newline */
if (console_col >= CONSOLE_COLS) if (console_col >= CONSOLE_COLS) {
console_newline (); console_newline ();
nl = 0;
}
} }
CURSOR_SET} CURSOR_SET}