Added color versions of all uzebox Print functions

Author: charliegreen

NOTES.MD

@@ -223,19 +223,6 @@ scratch or locals:
 
 # colors
 
-TODO: come up with good color values simulating the 8 terminal ANSI colors:
-
-| num | color   | hex |
-|-----+---------+-----|
-|   0 | black   | 00  |
-|   1 | red     |     |
-|   2 | green   |     |
-|   3 | yellow  |     |
-|   4 | blue    |     |
-|   5 | magenta |     |
-|   6 | cyan    |     |
-|   7 | white   | ff  |
-
 Looking at the ANSI VGA RGB values:
 
 	255 -> 7 for 3-bit, 3 for 2-bit

library.s

@@ -3,7 +3,6 @@
 #include "common.def.h"
 
 ;;; TODO:
-;;;   * add all the usual Print functions, but that take color options
 ;;;   * for SetTile/GetTile*, do bounds checking?
 
 	.global ClearVram
@@ -12,8 +11,9 @@
 	.global SetTileColor
 	.global GetTileColor
 	.global SetTileBoth
-
 	.global SetFont
+	.global	FillColor
+
 	.global SetTileTable
 	.global InitializeVideoMode
 	.global DisplayLogo
@@ -39,6 +39,30 @@ ClearVram:
 
 	ret
 
+;;; ========================================
+;;; FillColor
+;;; r24: X pos (8-bit)
+;;; r22: Y pos (8-bit)
+;;; r20: number of cells to set the color of (8-bit)
+;;; r18: color palette index (4-bit)
+FillColor:
+	push	r16
+
+	mov	r16, r20
+	movw	r20, r18
+
+0:
+	rcall	SetTileColor
+	inc	r24
+	dec	r16
+	brne	0b
+
+	pop	r16
+	ret
+
+;;; ================================================================================
+;;; Tile getter and setter functions
+
 ;;; ========================================
 ;;; get_tile_addr_text
 ;;; A helper function, not intended for use outside this library

main.c

@@ -13,7 +13,7 @@
  * 3: scramble VRAM
  * 4: fake terminal output (TODO, NYI)
  */
-#define EXAMPLE 4
+#define EXAMPLE 0
 
 ColorCombo m96_palette[16] = {
 #if EXAMPLE >= 0 && EXAMPLE < 4
@@ -69,7 +69,7 @@ void button_update() {
     _btn.prev = _btn.down;
 }
 
-#if EXAMPLE < 4
+#if EXAMPLE > 0 && EXAMPLE < 4
 static void palette_randomize() {
     for (u8 i = 0; i < 16; i++) {
 	m96_palette[i].fg = GetPrngNumber(0);
@@ -115,7 +115,29 @@ int main() {
     SetTile(SCREEN_TILES_H-1, SCREEN_TILES_V-1, '2'-32);
     SetTile(0, SCREEN_TILES_V-1, '3'-32);
 
-    Print(4, 0, PSTR("foo bar baz"));
+    PrintColor(32, 2, PSTR("hurg nurg wurg"), 1);
+
+    u8 x = 10;
+    u8 line = 4;
+    PrintRamColor(x, line++, "foo bar baz", 1);
+    PrintBinaryByteColor(x, line++, 0x7f, 1);
+    PrintHexByteColor(x, line++, 0x7f, 1);
+    PrintHexIntColor(x, line++, 0x03f2, 1);
+    PrintHexLongColor(x, line++, 0xdeadbeef, 1);
+    PrintHexLongColor(x, line++, 0x0000beef, 1);
+
+    PrintLongColor(x, line++, 0xdeadbeef, 1);
+    PrintLongColor(x, line++, 0x00adbeef, 1);
+
+    PrintByteColor(x, line++, 0x7f, false, 1);
+    PrintByteColor(x, line++, 0x7f, true, 1);
+
+    PrintIntColor(x, line++, 5234, false, 1);
+    PrintIntColor(x, line++, 65234, false, 1);
+    PrintIntColor(x, line++, 5234, true, 1);
+    PrintIntColor(x, line++, 65234, true, 1);
+
+    PrintCharColor(x, line++, 'A', 1);
 
     while (true)
 	WaitVsync(1);

print_functions.c

@@ -0,0 +1,67 @@
+#include <uzebox.h>
+#include <avr/pgmspace.h>
+#include <string.h>
+
+#include "video.h"
+
+static u8 ilen(unsigned long val) {
+    u8 ret = 0;
+    while (val) {
+	val /= 10;
+	ret++;
+    }
+    return ret;
+}
+
+void PrintColor(int x,int y,const char *string,int color) {
+    Print(x, y, string);
+    FillColor(x, y, strlen_P(string), color);
+}
+
+void PrintRamColor(int x,int y,char *string,int color) {
+    PrintRam(x, y, (unsigned char*)string);
+    FillColor(x, y, strlen(string), color);
+}
+
+void PrintBinaryByteColor(char x,char y,unsigned char byte,int color) {
+    PrintBinaryByte(x, y, byte);
+    FillColor(x, y, 8, color);
+}
+
+void PrintHexByteColor(char x,char y,unsigned char byte,int color) {
+    PrintHexByte(x, y, byte);
+    FillColor(x, y, 2, color);
+}
+
+void PrintHexIntColor(char x,char y,int byte,int color) {
+    PrintHexInt(x, y, byte);
+    FillColor(x, y, 4, color);
+}
+
+void PrintHexLongColor(char x,char y, uint32_t value,int color) {
+    PrintHexLong(x, y, value);
+    FillColor(x, y, 8, color);
+}
+
+void PrintLongColor(int x,int y, unsigned long val,int color) {
+    PrintLong(x, y, val);
+    u8 l = ilen(val);
+    FillColor(x-l+1, y, l, color);
+}
+
+void PrintByteColor(int x,int y, unsigned char val,bool zeropad,int color) {
+    PrintByte(x, y, val, zeropad);
+    u8 l = ilen(val);
+    FillColor(x-l+1, y, l, color);
+}
+
+void PrintCharColor(int x,int y,char c,int color) {
+    PrintChar(x, y, c);
+    SetTileColor(x, y, color);
+}
+
+void PrintIntColor(int x,int y, unsigned int i,bool zeropad,int color) {
+    PrintInt(x, y, i, zeropad);
+    u8 l = zeropad ? 5 : ilen(i);
+    FillColor(x-l+1, y, l, color);
+}

video.h

@@ -12,4 +12,17 @@ extern void SetTileColor(u8 x, u8 y, u8 index);
 extern u8 GetTileColor(u8 x, u8 y);
 extern void SetTileBoth(u8 x, u8 y, u8 tile, u8 index);
 
+extern void FillColor(u8 x, u8 y, u8 length, u8 index);
+
+void PrintColor(int x,int y,const char *string,int color);
+void PrintRamColor(int x,int y,char *string,int color);
+void PrintBinaryByteColor(char x,char y,unsigned char byte,int color);
+void PrintHexByteColor(char x,char y,unsigned char byte,int color);
+void PrintHexIntColor(char x,char y,int byte,int color);
+void PrintHexLongColor(char x,char y, uint32_t value,int color);
+void PrintLongColor(int x,int y, unsigned long val,int color);
+void PrintByteColor(int x,int y, unsigned char val,bool zeropad,int color);
+void PrintCharColor(int x,int y,char c,int color);
+void PrintIntColor(int x,int y, unsigned int,bool zeropad,int color);
+
 #endif