DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use 3 intensity levels

Browse Source
This commit is contained in:
Dave Murphy 2014-12-13 02:21:50 +00:00
parent 493d7dc55a
commit 6a36d31568
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libctru/include/3ds/console.h
View File

@ -92,8 +92,9 @@ typedef struct PrintConsole
bool consoleInitialised; /*!< True if the console is initialized */ bool consoleInitialised; /*!< True if the console is initialized */
}PrintConsole; }PrintConsole;
#define CONSOLE_COLOR_BRIGHT (1<<0) #define CONSOLE_COLOR_BOLD (1<<0)
#define CONSOLE_COLOR_REVERSE (1<<1) #define CONSOLE_COLOR_FAINT (1<<1)
#define CONSOLE_COLOR_REVERSE (1<<2)
/*! \brief Loads the font into the console /*! \brief Loads the font into the console
\param console pointer to the console to update, if NULL it will update the current console \param console pointer to the console to update, if NULL it will update the current console

68
libctru/source/console.c
View File

@ -8,22 +8,32 @@
//set up the palette for color printing //set up the palette for color printing
static u16 colorTable[] = { static u16 colorTable[] = {
RGB565( 0, 0, 0), // normal black RGB8_to_565( 0, 0, 0), // black
RGB565(17, 0, 0), // normal red RGB8_to_565(128, 0, 0), // red
RGB565( 0,34, 0), // normal green RGB8_to_565( 0,128, 0), // green
RGB565(17,34, 0), // normal yellow RGB8_to_565(128,128, 0), // yellow
RGB565( 0, 0,17), // normal blue RGB8_to_565( 0, 0,128), // blue
RGB565(17, 0,17), // normal magenta RGB8_to_565(128, 0,128), // magenta
RGB565( 0,34,17), // normal cyan RGB8_to_565( 0,128,128), // cyan
RGB565(17,34,17), // normal white RGB8_to_565(192,192,192), // white
RGB565( 0, 0, 0), // bright black
RGB565(25, 0, 0), // bright red RGB8_to_565(128,128,128), // bright black
RGB565( 0,52, 0), // bright green RGB8_to_565(255, 0, 0), // bright red
RGB565(25,52, 0), // bright yellow RGB8_to_565( 0,255, 0), // bright green
RGB565( 4,18,31), // bright blue RGB8_to_565(255,255, 0), // bright yellow
RGB565(25, 0,25), // bright magenta RGB8_to_565( 0, 0,255), // bright blue
RGB565( 0,52,25), // bright cyan RGB8_to_565(255, 0,255), // bright magenta
RGB565(28,57,28) // bright white RGB8_to_565( 0,255,255), // bright cyan
RGB8_to_565(255,255,255), // bright white
RGB8_to_565( 0, 0, 0), // faint black
RGB8_to_565( 64, 0, 0), // faint red
RGB8_to_565( 0, 64, 0), // faint green
RGB8_to_565( 64, 64, 0), // faint yellow
RGB8_to_565( 0, 0, 64), // faint blue
RGB8_to_565( 64, 0, 64), // faint magenta
RGB8_to_565( 0, 64, 64), // faint cyan
RGB8_to_565( 96, 96, 96), // faint white
}; };
PrintConsole defaultConsole = PrintConsole defaultConsole =
@ -36,7 +46,7 @@ PrintConsole defaultConsole =
}, },
(u16*)NULL, (u16*)NULL,
0,0, //cursorX cursorY 0,0, //cursorX cursorY
0,0, //prevcursorX prevcursorY 0,0, //prevcursorX prevcursorY
40, //console width 40, //console width
30, //console height 30, //console height
0, //window x 0, //window x
@ -46,7 +56,7 @@ PrintConsole defaultConsole =
3, //tab size 3, //tab size
7, // foreground color 7, // foreground color
0, // background color 0, // background color
CONSOLE_COLOR_BRIGHT, // flags 0, // flags
0, //print callback 0, //print callback
false //console initialized false //console initialized
}; };
@ -290,15 +300,18 @@ ssize_t con_write(struct _reent *r,int fd,const char *ptr, size_t len) {
escapeseq += consumed; escapeseq += consumed;
escapelen -= consumed; escapelen -= consumed;
if (parameter == 0 ) { if (parameter == 0 ) { //reset
currentConsole->flags |= CONSOLE_COLOR_BRIGHT; currentConsole->flags = 0;
currentConsole->flags &= ~CONSOLE_COLOR_REVERSE; currentConsole->bg = 0;
currentConsole->bg = 0; currentConsole->fg = 7;
currentConsole->fg = 7;
} else if (parameter == 7) { // reverse video } else if (parameter == 7) { // reverse video
currentConsole->flags |= CONSOLE_COLOR_REVERSE; currentConsole->flags |= CONSOLE_COLOR_REVERSE;
} else if (parameter == 1) { // bright
currentConsole->flags |= CONSOLE_COLOR_BOLD;
currentConsole->flags &= ~CONSOLE_COLOR_FAINT;
} else if (parameter == 2) { // half bright } else if (parameter == 2) { // half bright
currentConsole->flags &= ~CONSOLE_COLOR_BRIGHT; currentConsole->flags &= ~CONSOLE_COLOR_BOLD;
currentConsole->flags |= CONSOLE_COLOR_FAINT;
} else if (parameter >= 30 && parameter <= 37) { // writing color } else if (parameter >= 30 && parameter <= 37) { // writing color
currentConsole->fg = parameter - 30; currentConsole->fg = parameter - 30;
} else if (parameter >= 40 && parameter <= 47) { // screen color } else if (parameter >= 40 && parameter <= 47) { // screen color
@ -437,9 +450,10 @@ void consoleDrawChar(int c) {
int writingColor = currentConsole->fg; int writingColor = currentConsole->fg;
int screenColor = currentConsole->bg; int screenColor = currentConsole->bg;
if (currentConsole->flags & CONSOLE_COLOR_BRIGHT) { if (currentConsole->flags & CONSOLE_COLOR_BOLD) {
writingColor |= 8; writingColor += 8;
screenColor |=8; } else if (currentConsole->flags & CONSOLE_COLOR_FAINT) {
writingColor += 16;
} }
if (currentConsole->flags & CONSOLE_COLOR_REVERSE) { if (currentConsole->flags & CONSOLE_COLOR_REVERSE) {