VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-24 07:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make init_color() work on more recent versions of Windows (console).

Browse Source 
Patch by "Didrole".
This commit is contained in:
William McBrine
2016-01-02 00:00:37 -05:00
parent 21ae8db499
commit 8670794cfb
1 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
win32/pdcscrn.c
View File

@@ -602,17 +602,60 @@ int PDC_color_content(short color, short *red, short *green, short *blue)
return OK;
}
typedef BOOL (WINAPI *SetConsoleScreenBufferInfoExFn)(HANDLE hConsoleOutput,
PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx);
typedef BOOL (WINAPI *GetConsoleScreenBufferInfoExFn)(HANDLE hConsoleOutput,
PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx);
int PDC_init_color(short color, short red, short green, short blue)
{
if (!console_info.Hwnd)
_init_console_info();
static SetConsoleScreenBufferInfoExFn pSetConsoleScreenBufferInfoEx = NULL;
static GetConsoleScreenBufferInfoExFn pGetConsoleScreenBufferInfoEx = NULL;
static BOOL bOnce = TRUE;
console_info.ColorTable[curstoreal[color]] =
if (bOnce)
{
HMODULE hKernel = GetModuleHandleA("kernel32.dll");
pGetConsoleScreenBufferInfoEx =
(GetConsoleScreenBufferInfoExFn)GetProcAddress(hKernel,
"GetConsoleScreenBufferInfoEx");
pSetConsoleScreenBufferInfoEx =
(SetConsoleScreenBufferInfoExFn)GetProcAddress(hKernel,
"SetConsoleScreenBufferInfoEx");
bOnce = FALSE;
}
if (pGetConsoleScreenBufferInfoEx && pSetConsoleScreenBufferInfoEx)
{
CONSOLE_SCREEN_BUFFER_INFOEX screenBufferInfo;
screenBufferInfo.cbSize = sizeof(screenBufferInfo);
if (!pGetConsoleScreenBufferInfoEx(pdc_con_out, &screenBufferInfo))
return ERR;
screenBufferInfo.srWindow.Right++;
screenBufferInfo.srWindow.Bottom++;
screenBufferInfo.ColorTable[curstoreal[color]] =
RGB(DIVROUND(red * 255, 1000),
DIVROUND(green * 255, 1000),
DIVROUND(blue * 255, 1000));
_set_console_info();
if (!pSetConsoleScreenBufferInfoEx(pdc_con_out, &screenBufferInfo))
return ERR;
}
else
{
if (!console_info.Hwnd)
_init_console_info();
console_info.ColorTable[curstoreal[color]] =
RGB(DIVROUND(red * 255, 1000),
DIVROUND(green * 255, 1000),
DIVROUND(blue * 255, 1000));
_set_console_info();
}
return OK;
}