mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-30 23:13:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] Add variable for default text color

Browse Source 
On PC/AT-compatible machines it's Gray, and on NEC PC-98 series it's White.
This commit is contained in:
Stanislav Motylkov 2020-10-17 00:46:06 +03:00
parent db1b04340f
commit 8a4273b6ee
No known key found for this signature in database
GPG Key ID: AFE513258CBA9E92
10 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/setup/lib/utils/bldrsup.c
View File

@ -277,7 +277,7 @@ CreateCommonFreeLdrSections(
/* MenuTextColor=White */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
L"MenuTextColor", L"Gray");
L"MenuTextColor", L"Default");
/* MenuColor=Blue */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
@ -285,15 +285,15 @@ CreateCommonFreeLdrSections(
/* TextColor=Yellow */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
L"TextColor", L"Gray");
L"TextColor", L"Default");
/* SelectedTextColor=Black */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
L"SelectedTextColor", L"Black");
/* SelectedColor=Gray */
/* SelectedColor=Default */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
L"SelectedColor", L"Gray");
L"SelectedColor", L"Default");
/* ShowTime=Yes */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,

6
boot/bootdata/bootcd.ini
View File

@ -13,11 +13,11 @@ TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuTextColor=Default
MenuColor=Black
TextColor=Gray
TextColor=Default
SelectedTextColor=Black
SelectedColor=Gray
SelectedColor=Default
ShowTime=No
MenuBox=No
CenterMenu=No

6
boot/bootdata/floppy_pc98.ini
View File

@ -13,11 +13,11 @@ TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuTextColor=Default
MenuColor=Black
TextColor=Gray
TextColor=Default
SelectedTextColor=Black
SelectedColor=Gray
SelectedColor=Default
ShowTime=No
MenuBox=No
CenterMenu=No

6
boot/bootdata/hybridcd.ini
View File

@ -13,11 +13,11 @@ TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuTextColor=Default
MenuColor=Black
TextColor=Gray
TextColor=Default
SelectedTextColor=Black
SelectedColor=Gray
SelectedColor=Default
ShowTime=No
MenuBox=No
CenterMenu=No

6
boot/bootdata/livecd.ini
View File

@ -13,11 +13,11 @@ TitleBoxTextColor=White
TitleBoxColor=Red
MessageBoxTextColor=White
MessageBoxColor=Blue
MenuTextColor=Gray
MenuTextColor=Default
MenuColor=Black
TextColor=Gray
TextColor=Default
SelectedTextColor=Black
SelectedColor=Gray
SelectedColor=Default
ShowTime=No
MenuBox=No
CenterMenu=No

5
boot/freeldr/FREELDR.INI
View File

@ -50,7 +50,10 @@
;
; Text colors can be any one of the background colors and any of the following:
; DarkGray, LightBlue, LightGreen, LightCyan, LightRed, LightMagenta,
; Yellow, White.
; Yellow, White, Default.
;
; Default color is the one that is being used by BIOS firmware by default.
; On PC/AT-compatible machines it's Gray, and on NEC PC-98 series it's White.
; [OS-General] Section Commands:
;

2
boot/freeldr/freeldr/arch/i386/pc/pcvideo.c
View File

@ -108,6 +108,8 @@ typedef struct
} SVGA_MODE_INFORMATION, *PSVGA_MODE_INFORMATION;
#include <poppack.h>
UCHAR MachDefaultTextColor = COLOR_GRAY;
static USHORT BiosVideoMode; /* Current video mode as known by BIOS */
static ULONG ScreenWidth = 80; /* Screen Width in characters */
static ULONG ScreenHeight = 25; /* Screen Height in characters */

2
boot/freeldr/freeldr/arch/i386/pc98/pc98video.c
View File

@ -35,6 +35,8 @@ static BOOLEAN UseCGFont = TRUE;
* This option is possible only with BIOS fonts enabled. */
static BOOLEAN CGAccelDraw = TRUE;
UCHAR MachDefaultTextColor = COLOR_WHITE;
ULONG VramText;
static ULONG VramPlaneB;
static ULONG VramPlaneG;

2
boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c
View File

@ -33,6 +33,8 @@ static ULONG BytesPerPixel;
static ULONG Delta;
extern multiboot_info_t * MultibootInfoPtr;
UCHAR MachDefaultTextColor = COLOR_GRAY;
#define CHAR_WIDTH 8
#define CHAR_HEIGHT 16

4
boot/freeldr/freeldr/ui/tui.c
View File

@ -23,6 +23,7 @@
#define TAG_TAG_TUI_PALETTE 'PiuT'
PVOID TextVideoBuffer = NULL;
extern UCHAR MachDefaultTextColor;
/*
* TuiPrintf()
@ -724,6 +725,9 @@ UCHAR TuiTextToColor(PCSTR ColorText)
};
ULONG i;
if (_stricmp(ColorText, "Default") == 0)
return MachDefaultTextColor;
for (i = 0; i < sizeof(Colors)/sizeof(Colors[0]); ++i)
{
if (_stricmp(ColorText, Colors[i].ColorName) == 0)