This commit is contained in:
timerix 2022-11-05 13:10:06 +06:00
commit b09f6b802c
4 changed files with 14 additions and 14 deletions

View File

@ -84,7 +84,7 @@ DWORD kprint_fgColor_toWin(kprint_fgColor f){
case kprint_fgDarkGreen: return FOREGROUND_GREEN; case kprint_fgDarkGreen: return FOREGROUND_GREEN;
case kprint_fgDarkYellow: return FOREGROUND_GREEN | FOREGROUND_RED; case kprint_fgDarkYellow: return FOREGROUND_GREEN | FOREGROUND_RED;
case kprint_fgDarkBlue: return FOREGROUND_BLUE; case kprint_fgDarkBlue: return FOREGROUND_BLUE;
case kprint_fgDarkMagneta: return FOREGROUND_RED | FOREGROUND_BLUE; case kprint_fgDarkMagenta: return FOREGROUND_RED | FOREGROUND_BLUE;
case kprint_fgDarkCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN; case kprint_fgDarkCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN;
case kprint_fgGray: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; case kprint_fgGray: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
case kprint_fgDarkGray: return FOREGROUND_INTENSITY; case kprint_fgDarkGray: return FOREGROUND_INTENSITY;
@ -92,7 +92,7 @@ DWORD kprint_fgColor_toWin(kprint_fgColor f){
case kprint_fgGreen: return FOREGROUND_GREEN | FOREGROUND_INTENSITY; case kprint_fgGreen: return FOREGROUND_GREEN | FOREGROUND_INTENSITY;
case kprint_fgYellow: return FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY; case kprint_fgYellow: return FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
case kprint_fgBlue: return FOREGROUND_BLUE | FOREGROUND_INTENSITY; case kprint_fgBlue: return FOREGROUND_BLUE | FOREGROUND_INTENSITY;
case kprint_fgMagneta: return FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_INTENSITY; case kprint_fgMagenta: return FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_INTENSITY;
case kprint_fgCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY; case kprint_fgCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
case kprint_fgWhite: return FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY; case kprint_fgWhite: return FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
default: throw(ERR_FORMAT); default: throw(ERR_FORMAT);
@ -107,7 +107,7 @@ DWORD kprint_bgColor_toWin(kprint_bgColor f){
case kprint_bgDarkGreen: return BACKGROUND_GREEN; case kprint_bgDarkGreen: return BACKGROUND_GREEN;
case kprint_bgDarkYellow: return BACKGROUND_GREEN | BACKGROUND_RED; case kprint_bgDarkYellow: return BACKGROUND_GREEN | BACKGROUND_RED;
case kprint_bgDarkBlue: return BACKGROUND_BLUE; case kprint_bgDarkBlue: return BACKGROUND_BLUE;
case kprint_bgDarkMagneta: return BACKGROUND_RED | BACKGROUND_BLUE; case kprint_bgDarkMagenta: return BACKGROUND_RED | BACKGROUND_BLUE;
case kprint_bgDarkCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN; case kprint_bgDarkCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN;
case kprint_bgGray: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED; case kprint_bgGray: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
case kprint_bgDarkGray: return BACKGROUND_INTENSITY; case kprint_bgDarkGray: return BACKGROUND_INTENSITY;
@ -115,7 +115,7 @@ DWORD kprint_bgColor_toWin(kprint_bgColor f){
case kprint_bgGreen: return BACKGROUND_GREEN | BACKGROUND_INTENSITY; case kprint_bgGreen: return BACKGROUND_GREEN | BACKGROUND_INTENSITY;
case kprint_bgYellow: return BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY; case kprint_bgYellow: return BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY;
case kprint_bgBlue: return BACKGROUND_BLUE | BACKGROUND_INTENSITY; case kprint_bgBlue: return BACKGROUND_BLUE | BACKGROUND_INTENSITY;
case kprint_bgMagneta: return BACKGROUND_BLUE | BACKGROUND_RED | BACKGROUND_INTENSITY; case kprint_bgMagenta: return BACKGROUND_BLUE | BACKGROUND_RED | BACKGROUND_INTENSITY;
case kprint_bgCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY; case kprint_bgCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY;
case kprint_bgWhite: return BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY; case kprint_bgWhite: return BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY;
default: throw(ERR_FORMAT); default: throw(ERR_FORMAT);

View File

@ -15,7 +15,7 @@ typedef enum kprint_fgColor{
kprint_fgDarkGreen = 0x82000000, kprint_fgDarkGreen = 0x82000000,
kprint_fgDarkYellow = 0x83000000, kprint_fgDarkYellow = 0x83000000,
kprint_fgDarkBlue = 0x84000000, kprint_fgDarkBlue = 0x84000000,
kprint_fgDarkMagneta= 0x85000000, kprint_fgDarkMagenta= 0x85000000,
kprint_fgDarkCyan = 0x86000000, kprint_fgDarkCyan = 0x86000000,
kprint_fgGray = 0x87000000, kprint_fgGray = 0x87000000,
kprint_fgDarkGray = 0x88000000, kprint_fgDarkGray = 0x88000000,
@ -23,7 +23,7 @@ typedef enum kprint_fgColor{
kprint_fgGreen = 0x8a000000, kprint_fgGreen = 0x8a000000,
kprint_fgYellow = 0x8b000000, kprint_fgYellow = 0x8b000000,
kprint_fgBlue = 0x8c000000, kprint_fgBlue = 0x8c000000,
kprint_fgMagneta = 0x8d000000, kprint_fgMagenta = 0x8d000000,
kprint_fgCyan = 0x8e000000, kprint_fgCyan = 0x8e000000,
kprint_fgWhite = 0x8f000000 kprint_fgWhite = 0x8f000000
} kprint_fgColor; } kprint_fgColor;
@ -37,7 +37,7 @@ typedef enum kprint_bgColor{
kprint_bgDarkGreen = 0x40200000, kprint_bgDarkGreen = 0x40200000,
kprint_bgDarkYellow = 0x40300000, kprint_bgDarkYellow = 0x40300000,
kprint_bgDarkBlue = 0x40400000, kprint_bgDarkBlue = 0x40400000,
kprint_bgDarkMagneta= 0x40500000, kprint_bgDarkMagenta= 0x40500000,
kprint_bgDarkCyan = 0x40600000, kprint_bgDarkCyan = 0x40600000,
kprint_bgGray = 0x40700000, kprint_bgGray = 0x40700000,
kprint_bgDarkGray = 0x40800000, kprint_bgDarkGray = 0x40800000,
@ -45,7 +45,7 @@ typedef enum kprint_bgColor{
kprint_bgGreen = 0x40a00000, kprint_bgGreen = 0x40a00000,
kprint_bgYellow = 0x40b00000, kprint_bgYellow = 0x40b00000,
kprint_bgBlue = 0x40c00000, kprint_bgBlue = 0x40c00000,
kprint_bgMagneta = 0x40d00000, kprint_bgMagenta = 0x40d00000,
kprint_bgCyan = 0x40e00000, kprint_bgCyan = 0x40e00000,
kprint_bgWhite = 0x40f00000 kprint_bgWhite = 0x40f00000
} kprint_bgColor; } kprint_bgColor;

View File

@ -19,7 +19,7 @@ bgColorSet─┘││ │ bgColor └data format
| DarkGreen | 0x82000000 | 10000010 00000000... | | DarkGreen | 0x82000000 | 10000010 00000000... |
| DarkYellow | 0x83000000 | 10000011 00000000... | | DarkYellow | 0x83000000 | 10000011 00000000... |
| DarkBlue | 0x84000000 | 10000100 00000000... | | DarkBlue | 0x84000000 | 10000100 00000000... |
| DarkMagneta | 0x85000000 | 10000101 00000000... | | DarkMagenta | 0x85000000 | 10000101 00000000... |
| DarkCyan | 0x86000000 | 10000110 00000000... | | DarkCyan | 0x86000000 | 10000110 00000000... |
| Gray | 0x87000000 | 10000111 00000000... | | Gray | 0x87000000 | 10000111 00000000... |
| DarkGray | 0x88000000 | 10001000 00000000... | | DarkGray | 0x88000000 | 10001000 00000000... |
@ -27,7 +27,7 @@ bgColorSet─┘││ │ bgColor └data format
| Green | 0x8a000000 | 10001010 00000000... | | Green | 0x8a000000 | 10001010 00000000... |
| Yellow | 0x8b000000 | 10001011 00000000... | | Yellow | 0x8b000000 | 10001011 00000000... |
| Blue | 0x8c000000 | 10001100 00000000... | | Blue | 0x8c000000 | 10001100 00000000... |
| Magneta | 0x8d000000 | 10001101 00000000... | | Magenta | 0x8d000000 | 10001101 00000000... |
| Cyan | 0x8e000000 | 10001110 00000000... | | Cyan | 0x8e000000 | 10001110 00000000... |
| White | 0x8f000000 | 10001111 00000000... | | White | 0x8f000000 | 10001111 00000000... |
@ -39,7 +39,7 @@ bgColorSet─┘││ │ bgColor └data format
| DarkGreen | 0x40200000 | 01000000 00100000... | | DarkGreen | 0x40200000 | 01000000 00100000... |
| DarkYellow | 0x40300000 | 01000000 00110000... | | DarkYellow | 0x40300000 | 01000000 00110000... |
| DarkBlue | 0x40400000 | 01000000 01000000... | | DarkBlue | 0x40400000 | 01000000 01000000... |
| DarkMagneta | 0x40500000 | 01000000 01010000... | | DarkMagenta | 0x40500000 | 01000000 01010000... |
| DarkCyan | 0x40600000 | 01000000 01100000... | | DarkCyan | 0x40600000 | 01000000 01100000... |
| Gray | 0x40700000 | 01000000 01110000... | | Gray | 0x40700000 | 01000000 01110000... |
| DarkGray | 0x40800000 | 01000000 10000000... | | DarkGray | 0x40800000 | 01000000 10000000... |
@ -47,7 +47,7 @@ bgColorSet─┘││ │ bgColor └data format
| Green | 0x40a00000 | 01000000 10100000... | | Green | 0x40a00000 | 01000000 10100000... |
| Yellow | 0x40b00000 | 01000000 10110000... | | Yellow | 0x40b00000 | 01000000 10110000... |
| Blue | 0x40c00000 | 01000000 11000000... | | Blue | 0x40c00000 | 01000000 11000000... |
| Magneta | 0x40d00000 | 01000000 11010000... | | Magenta | 0x40d00000 | 01000000 11010000... |
| Cyan | 0x40e00000 | 01000000 11100000... | | Cyan | 0x40e00000 | 01000000 11100000... |
| White | 0x40f00000 | 01000000 11110000... | | White | 0x40f00000 | 01000000 11110000... |

View File

@ -33,7 +33,7 @@ void test_kprint_colors(){
testColor(DarkGreen); testColor(DarkGreen);
testColor(DarkYellow); testColor(DarkYellow);
testColor(DarkBlue); testColor(DarkBlue);
testColor(DarkMagneta); testColor(DarkMagenta);
testColor(DarkCyan); testColor(DarkCyan);
testColor(Gray); testColor(Gray);
testColor(DarkGray); testColor(DarkGray);
@ -41,7 +41,7 @@ void test_kprint_colors(){
testColor(Green); testColor(Green);
testColor(Yellow); testColor(Yellow);
testColor(Blue); testColor(Blue);
testColor(Magneta); testColor(Magenta);
testColor(Cyan); testColor(Cyan);
testColor(White); testColor(White);
kprint_setColor(kprint_bgBlack | kprint_fgGray); kprint_setColor(kprint_bgBlack | kprint_fgGray);