console: implement 90 - 97 (bright fg) and 100 - 107 (bright bg)

Author: WinterMute

libogc/console.c

@@ -175,16 +175,16 @@ static void __console_drawc(int c)
 	bgcolor = currentConsole->bg;
 
 	if (!(currentConsole->flags & CONSOLE_FG_CUSTOM)) {
-		if (currentConsole->flags & CONSOLE_COLOR_BOLD) {
-			fgcolor = colorTable[fgcolor + 8];
+		if (currentConsole->flags & (CONSOLE_COLOR_BOLD | CONSOLE_COLOR_FG_BRIGHT)) {
+			fgcolor += 8;
 		} else if (currentConsole->flags & CONSOLE_COLOR_FAINT) {
-			fgcolor = colorTable[fgcolor + 16];
-		} else {
-			fgcolor = colorTable[fgcolor];
+			fgcolor += 16;
 		}
+		fgcolor = colorTable[fgcolor];
 	}
 
 	if (!(currentConsole->flags & CONSOLE_BG_CUSTOM)) {
+		if (currentConsole->flags & CONSOLE_COLOR_BG_BRIGHT) bgcolor +=8;
 		bgcolor = colorTable[bgcolor];
 	}
 
@@ -630,6 +630,18 @@ static void consoleHandleColorEsc(int code)
 					escapeSeq.color.flags &= ~CONSOLE_BG_CUSTOM;
 					escapeSeq.color.fg = 0;
 					break;
+				case 90 ... 97: // bright foreground
+					escapeSeq.color.flags &= ~CONSOLE_COLOR_FAINT;
+					escapeSeq.color.flags |= CONSOLE_COLOR_FG_BRIGHT;
+					escapeSeq.color.flags &= ~CONSOLE_BG_CUSTOM;
+					escapeSeq.color.fg = code - 90;
+					break;					
+				case 100 ... 107: // bright background
+					escapeSeq.color.flags &= ~CONSOLE_COLOR_FAINT;
+					escapeSeq.color.flags |= CONSOLE_COLOR_BG_BRIGHT;
+					escapeSeq.color.flags &= ~CONSOLE_BG_CUSTOM;
+					escapeSeq.color.bg = code - 100;
+					break;					
 			}
 		break;
 		case ESC_BUILDING_FORMAT_FG:

libogc/console_internal.h

@@ -1,17 +1,19 @@
 #ifndef __CONSOLE_INTERNAL_H__
 #define __CONSOLE_INTERNAL_H__
 
-#define CONSOLE_COLOR_BOLD    (1<<0)  ///< Bold text
-#define CONSOLE_COLOR_FAINT   (1<<1)  ///< Faint text
-#define CONSOLE_ITALIC        (1<<2)  ///< Italic text
-#define CONSOLE_UNDERLINE     (1<<3)  ///< Underlined text
-#define CONSOLE_BLINK_SLOW    (1<<4)  ///< Slow blinking text
-#define CONSOLE_BLINK_FAST    (1<<5)  ///< Fast blinking text
-#define CONSOLE_COLOR_REVERSE (1<<6)  ///< Reversed color text
-#define CONSOLE_CONCEAL       (1<<7)  ///< Concealed text
-#define CONSOLE_CROSSED_OUT   (1<<8)  ///< Crossed out text
-#define CONSOLE_FG_CUSTOM     (1<<9)  ///< Foreground custom color
-#define CONSOLE_BG_CUSTOM     (1<<10) ///< Background custom color
+#define CONSOLE_COLOR_BOLD      (1<<0)
+#define CONSOLE_COLOR_FAINT     (1<<1)
+#define CONSOLE_ITALIC          (1<<2)
+#define CONSOLE_UNDERLINE       (1<<3)
+#define CONSOLE_BLINK_SLOW      (1<<4)
+#define CONSOLE_BLINK_FAST      (1<<5)
+#define CONSOLE_COLOR_REVERSE   (1<<6)
+#define CONSOLE_CONCEAL         (1<<7)
+#define CONSOLE_CROSSED_OUT     (1<<8)
+#define CONSOLE_FG_CUSTOM       (1<<9)
+#define CONSOLE_BG_CUSTOM       (1<<10)
+#define CONSOLE_COLOR_FG_BRIGHT (1<<11)
+#define CONSOLE_COLOR_BG_BRIGHT (1<<11)
 
 #define FONT_XSIZE		8
 #define FONT_YSIZE		16