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

merge multiterm gfxmenu+multiterm

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-27 22:38:22 +01:00
commit 7f1f423cda
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/any-emu.rmk
View file

@ -28,6 +28,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
normal/completion.c normal/main.c normal/color.c \ normal/completion.c normal/main.c normal/color.c \
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \ normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
normal/menu_text.c normal/crypto.c normal/term.c \ normal/menu_text.c normal/crypto.c normal/term.c \
commands/terminal.c lib/charset.c \
script/main.c script/execute.c script/function.c \ script/main.c script/execute.c script/function.c \
script/lexer.c script/script.c grub_script.tab.c \ script/lexer.c script/script.c grub_script.tab.c \
partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \ partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c \

2
kern/term.c
View file

@ -45,9 +45,9 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
return; return;
} }
(term->putchar) (code);
if (code == '\n') if (code == '\n')
(term->putchar) ('\r'); (term->putchar) ('\r');
(term->putchar) (code);
} }
/* Put a character. C is one byte of a UTF-8 stream. /* Put a character. C is one byte of a UTF-8 stream.

2
normal/term.c
View file

@ -167,7 +167,7 @@ read_terminal_list (void)
return; return;
} }
filename = grub_malloc (grub_strlen (prefix) + sizeof ("/crypto.lst")); filename = grub_malloc (grub_strlen (prefix) + sizeof ("/terminal.lst"));
if (!filename) if (!filename)
{ {
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;

16
util/console.c
View file

@ -19,14 +19,6 @@
#include <config.h> #include <config.h>
#if defined(HAVE_NCURSES_CURSES_H)
# include <ncurses/curses.h>
#elif defined(HAVE_NCURSES_H)
# include <ncurses.h>
#elif defined(HAVE_CURSES_H)
# include <curses.h>
#endif
/* For compatibility. */ /* For compatibility. */
#ifndef A_NORMAL #ifndef A_NORMAL
# define A_NORMAL 0 # define A_NORMAL 0
@ -39,6 +31,14 @@
#include <grub/term.h> #include <grub/term.h>
#include <grub/types.h> #include <grub/types.h>
#if defined(HAVE_NCURSES_CURSES_H)
# include <ncurses/curses.h>
#elif defined(HAVE_NCURSES_H)
# include <ncurses.h>
#elif defined(HAVE_CURSES_H)
# include <curses.h>
#endif
static int grub_console_attr = A_NORMAL; static int grub_console_attr = A_NORMAL;
grub_uint8_t grub_console_cur_color = 7; grub_uint8_t grub_console_cur_color = 7;