vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/term/i386/pc/console.c: Fix cursor moving algorithm.

Browse source
This commit is contained in:
Andrey Borzenkov 2013-04-08 19:51:33 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent d4c4b8e1a0
commit ca53deb88f
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-08 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/term/i386/pc/console.c: Fix cursor moving algorithm.
2013-04-08 Bryan Hundven <bryanhundven@gmail.com> 2013-04-08 Bryan Hundven <bryanhundven@gmail.com>
* docs/grub-dev.texi: Move @itemize after @subsection to satisfy * docs/grub-dev.texi: Move @itemize after @subsection to satisfy

24
grub-core/term/i386/pc/console.c
View file

@ -86,13 +86,9 @@ grub_console_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
* Put the character C on the console. Because GRUB wants to write a * Put the character C on the console. Because GRUB wants to write a
* character with an attribute, this implementation is a bit tricky. * character with an attribute, this implementation is a bit tricky.
* If C is a control character (CR, LF, BEL, BS), use INT 10, AH = 0Eh * If C is a control character (CR, LF, BEL, BS), use INT 10, AH = 0Eh
* (TELETYPE OUTPUT). Otherwise, save the original position, put a space, * (TELETYPE OUTPUT). Otherwise, use INT 10, AH = 9 to write character
* save the current position, restore the original position, write the * with attributes and advance cursor. If we are on the last column,
* character and the attribute, and restore the current position. * let BIOS to wrap line correctly.
*
* The reason why this is so complicated is that there is no easy way to
* get the height of the screen, and the TELETYPE OUTPUT BIOS call doesn't
* support setting a background attribute.
*/ */
static void static void
grub_console_putchar_real (grub_uint8_t c) grub_console_putchar_real (grub_uint8_t c)
@ -112,19 +108,18 @@ grub_console_putchar_real (grub_uint8_t c)
/* get the current position */ /* get the current position */
pos = grub_console_getxy (NULL); pos = grub_console_getxy (NULL);
/* write the character with the attribute */
int10_9 (c, 1);
/* check the column with the width */ /* check the column with the width */
if ((pos & 0xff00) >= (79 << 8)) if ((pos & 0xff00) >= (79 << 8))
{ {
grub_console_putchar_real (0x0d); grub_console_putchar_real (0x0d);
grub_console_putchar_real (0x0a); grub_console_putchar_real (0x0a);
/* get the current position */
pos = grub_console_getxy (NULL);
} }
else
grub_console_gotoxy (NULL, ((pos & 0xff00) >> 8) + 1, (pos & 0xff));
/* write the character with the attribute */
int10_9 (c, 1);
grub_console_gotoxy (NULL, ((pos & 0xff00) >> 8) + 1, (pos & 0xff));
} }
static void static void
@ -255,8 +250,7 @@ grub_console_getkeystatus (struct grub_term_input *term __attribute__ ((unused))
static grub_uint16_t static grub_uint16_t
grub_console_getwh (struct grub_term_output *term __attribute__ ((unused))) grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
{ {
/* Due to current cursor moving algorithm we lost the last column. */ return (80 << 8) | 25;
return (79 << 8) | 25;
} }
static void static void