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

Clear out 0x80 color bit on EFI.

Browse source 
Tested by: decoder
	Reported by: decoder and meta tech.

	* grub-core/term/efi/console.c (grub_console_standard_color): Removed.
	(grub_console_setcolorstate): Clear out 0x80 bit.
	Use GRUB_TERM_DEFAULT_STANDARD_COLOR.
	(grub_console_output): Use GRUB_TERM_DEFAULT_NORMAL_COLOR.
	Use GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-10-01 16:54:38 +02:00
parent bf26bcc435
commit 441cfe65c0
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2010-10-01 Vladimir Serbinenko <phcoder@gmail.com>
Clear out 0x80 color bit on EFI.
Tested by: decoder
Reported by: decoder and meta tech.
* grub-core/term/efi/console.c (grub_console_standard_color): Removed.
(grub_console_setcolorstate): Clear out 0x80 bit.
Use GRUB_TERM_DEFAULT_STANDARD_COLOR.
(grub_console_output): Use GRUB_TERM_DEFAULT_NORMAL_COLOR.
Use GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR.
2010-10-01 Vladimir Serbinenko <phcoder@gmail.com> 2010-10-01 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (DEFAULT_VIDEO_MODE) [GRUB_MACHINE_EFI]: * grub-core/loader/i386/linux.c (DEFAULT_VIDEO_MODE) [GRUB_MACHINE_EFI]:

17
grub-core/term/efi/console.c
View file

@ -24,10 +24,6 @@
#include <grub/efi/api.h> #include <grub/efi/api.h>
#include <grub/efi/console.h> #include <grub/efi/console.h>
static const grub_uint8_t
grub_console_standard_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_YELLOW,
GRUB_EFI_BACKGROUND_BLACK);
static grub_uint32_t static grub_uint32_t
map_char (grub_uint32_t c) map_char (grub_uint32_t c)
{ {
@ -208,13 +204,14 @@ grub_console_setcolorstate (struct grub_term_output *term,
switch (state) { switch (state) {
case GRUB_TERM_COLOR_STANDARD: case GRUB_TERM_COLOR_STANDARD:
efi_call_2 (o->set_attributes, o, grub_console_standard_color); efi_call_2 (o->set_attributes, o, GRUB_TERM_DEFAULT_STANDARD_COLOR
& 0x7f);
break; break;
case GRUB_TERM_COLOR_NORMAL: case GRUB_TERM_COLOR_NORMAL:
efi_call_2 (o->set_attributes, o, term->normal_color); efi_call_2 (o->set_attributes, o, term->normal_color & 0x7f);
break; break;
case GRUB_TERM_COLOR_HIGHLIGHT: case GRUB_TERM_COLOR_HIGHLIGHT:
efi_call_2 (o->set_attributes, o, term->highlight_color); efi_call_2 (o->set_attributes, o, term->highlight_color & 0x7f);
break; break;
default: default:
break; break;
@ -266,10 +263,8 @@ static struct grub_term_output grub_console_term_output =
.cls = grub_console_cls, .cls = grub_console_cls,
.setcolorstate = grub_console_setcolorstate, .setcolorstate = grub_console_setcolorstate,
.setcursor = grub_console_setcursor, .setcursor = grub_console_setcursor,
.normal_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_LIGHTGRAY, .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
GRUB_EFI_BACKGROUND_BLACK), .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
.highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
GRUB_EFI_BACKGROUND_LIGHTGRAY),
.flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
}; };