Color: Extended range for color escapes

Use a double \r for color IDs 95 and beyond.

3 files changed, 12 insertions, 5 deletions

diff --git a/src/ui/color.c b/src/ui/color.c
index 870db2d0..3adf857d 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -427,8 +427,12 @@ const char *escape_Color(int color) {
     if (color >= 0 && color < (int) iElemCount(esc)) {
         return esc[color];
     }
-    iAssert(asciiBase_ColorEscape + color <= 127);
-    return format_CStr("\r%c", asciiBase_ColorEscape + color);
+    /* Double-\r is used for range extension. */
+    if (color + asciiBase_ColorEscape > 127) {
+        iAssert(color - asciiExtended_ColorEscape + asciiBase_ColorEscape <= 127);
+        return format_CStr("\r\r%c", color - asciiExtended_ColorEscape + asciiBase_ColorEscape);
+    }
+    return format_CStr("\r%c", color + asciiBase_ColorEscape);
 }
 
 iHSLColor setSat_HSLColor(iHSLColor d, float sat) {
diff --git a/src/ui/color.h b/src/ui/color.h
index 69dbe797..e2a1c95b 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -173,6 +173,7 @@ iLocalDef iBool isRegularText_ColorId(enum iColorId d) {
 #define permanent_ColorId           0x80 /* cannot be changed via escapes */
 
 #define asciiBase_ColorEscape       33
+#define asciiExtended_ColorEscape   (128 - asciiBase_ColorEscape)
 
 #define black_ColorEscape           "\r!"
 #define gray25_ColorEscape          "\r\""
diff --git a/src/ui/text.c b/src/ui/text.c
index 016aeef1..65c7a256 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -734,8 +734,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     for (const char *chPos = args->text.start; chPos != args->text.end; ) {
         iAssert(chPos < args->text.end);
         const char *currentPos = chPos;
-        if (*chPos == 0x1b) {
-            /* ANSI escape. */
+        if (*chPos == 0x1b) { /* ANSI escape. */
             chPos++;
             iRegExpMatch m;
             init_RegExpMatch(&m);
@@ -821,7 +820,10 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                 continue;
             }
             if (ch == '\r') {
-                const iChar esc = nextChar_(&chPos, args->text.end);
+                iChar esc = nextChar_(&chPos, args->text.end);
+                if (esc == '\r') { /* Extended range. */
+                    esc = nextChar_(&chPos, args->text.end) + asciiExtended_ColorEscape;
+                }
                 if (mode & draw_RunMode && ~mode & permanentColorFlag_RunMode) {
                     const iColor clr = get_Color(esc - asciiBase_ColorEscape);
                     SDL_SetTextureColorMod(text_.cache, clr.r, clr.g, clr.b);