add FG_DEFAULT/BG_DEFAULT and J to join lines

1 files changed, 41 insertions, 37 deletions

diff --git a/vui.h b/vui.h
index d0dd366..60654e3 100644
--- a/vui.h
+++ b/vui.h
@@ -38,42 +38,47 @@ typedef enum {
 	FG_MAGENTA   = 5,
 	FG_CYAN      = 6,
 	FG_WHITE     = 7,
-
-	FG_BBLACK    = FG_BLACK    + 8,
-	FG_BRED      = FG_RED      + 8,
-	FG_BGREEN    = FG_GREEN    + 8,
-	FG_BYELLOW   = FG_YELLOW   + 8,
-	FG_BBLUE     = FG_BLUE     + 8,
-	FG_BMAGENTA  = FG_MAGENTA  + 8,
-	FG_BCYAN     = FG_CYAN     + 8,
-	FG_BWHITE    = FG_WHITE    + 8,
-
-	BG_BLACK     = FG_BLACK    << 4,
-	BG_RED       = FG_RED      << 4,
-	BG_GREEN     = FG_GREEN    << 4,
-	BG_YELLOW    = FG_YELLOW   << 4,
-	BG_BLUE      = FG_BLUE     << 4,
-	BG_MAGENTA   = FG_MAGENTA  << 4,
-	BG_CYAN      = FG_CYAN     << 4,
-	BG_WHITE     = FG_WHITE    << 4,
-
-	BG_BBLACK    = FG_BBLACK   << 4,
-	BG_BRED      = FG_BRED     << 4,
-	BG_BGREEN    = FG_BGREEN   << 4,
-	BG_BYELLOW   = FG_BYELLOW  << 4,
-	BG_BBLUE     = FG_BBLUE    << 4,
-	BG_BMAGENTA  = FG_BMAGENTA << 4,
-	BG_BCYAN     = FG_BCYAN    << 4,
-	BG_BWHITE    = FG_BWHITE   << 4,
-
-	A_BOLD       = 1 << 8,
-	A_DIM        = 1 << 9,
-	A_ITALIC     = 1 << 10,
-	A_UNDERSCORE = 1 << 11,
-	A_BLINK      = 1 << 12,
-	A_REVERSE    = 1 << 13,
+	FG_DEFAULT   = 9,
+
+	FG_BBLACK    = FG_BLACK    + 9,
+	FG_BRED      = FG_RED      + 9,
+	FG_BGREEN    = FG_GREEN    + 9,
+	FG_BYELLOW   = FG_YELLOW   + 9,
+	FG_BBLUE     = FG_BLUE     + 9,
+	FG_BMAGENTA  = FG_MAGENTA  + 9,
+	FG_BCYAN     = FG_CYAN     + 9,
+	FG_BWHITE    = FG_WHITE    + 9,
+
+	BG_BLACK     = FG_BLACK    << 5,
+	BG_RED       = FG_RED      << 5,
+	BG_GREEN     = FG_GREEN    << 5,
+	BG_YELLOW    = FG_YELLOW   << 5,
+	BG_BLUE      = FG_BLUE     << 5,
+	BG_MAGENTA   = FG_MAGENTA  << 5,
+	BG_CYAN      = FG_CYAN     << 5,
+	BG_WHITE     = FG_WHITE    << 5,
+
+	BG_DEFAULT   = FG_DEFAULT  << 5,
+
+	BG_BBLACK    = FG_BBLACK   << 5,
+	BG_BRED      = FG_BRED     << 5,
+	BG_BGREEN    = FG_BGREEN   << 5,
+	BG_BYELLOW   = FG_BYELLOW  << 5,
+	BG_BBLUE     = FG_BBLUE    << 5,
+	BG_BMAGENTA  = FG_BMAGENTA << 5,
+	BG_BCYAN     = FG_BCYAN    << 5,
+	BG_BWHITE    = FG_BWHITE   << 5,
+
+	A_BOLD       = 1 << 9,
+	A_DIM        = 1 << 10,
+	A_ITALIC     = 1 << 11,
+	A_UNDERSCORE = 1 << 12,
+	A_BLINK      = 1 << 13,
+	A_REVERSE    = 1 << 14,
 } VuiAttr;
 
+#define A_DEFAULT (FG_DEFAULT | BG_DEFAULT)
+
 typedef enum {
 	VUI_CURS_BLOCK_BLINK,
 	VUI_CURS_DEFAULT,
@@ -84,10 +89,9 @@ typedef enum {
 	VUI_CURS_BAR,
 } VuiCursorShape;
 
-#define ATTR_FG(a) ((a) & 0xf)
-#define ATTR_BG(a) (((a)>>4) & 0xf)
+#define ATTR_FG(a) ((a) & 0x1f)
+#define ATTR_BG(a) (((a)>>5) & 0x1f)
 #define ATTR_A(a) ((a) & ~0xff)
-#define ATTR_DEFAULT (FG_WHITE | BG_BLACK)
 
 typedef uint32_t VuiChar;