Improve support for OSC 4 by cleaning up parsing code and adding support for reporting 8-bit color rgb values. Issue 3007

Author: gnachman

VT100Output.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 #import "VT100GridTypes.h"
 
 typedef enum {
@@ -49,6 +49,7 @@ typedef enum {
 - (NSData *)reportStatus;
 - (NSData *)reportDeviceAttribute;
 - (NSData *)reportSecondaryDeviceAttribute;
+- (NSData *)reportColor:(NSColor *)color atIndex:(int)index;
 
 - (void)setTermTypeIsValid:(BOOL)termTypeIsValid;
 

VT100Output.m

@@ -1,5 +1,4 @@
 #import "VT100Output.h"
-#import <Cocoa/Cocoa.h>
 #include <term.h>
 
 // Indexes into _keyStrings.
@@ -544,6 +543,16 @@ - (NSData *)reportSecondaryDeviceAttribute
                           length:STATIC_STRLEN(REPORT_SDA)];
 }
 
+- (NSData *)reportColor:(NSColor *)color atIndex:(int)index {
+    NSString *string = [NSString stringWithFormat:@"%c]4;%d;rgb:%02x/%02x/%02x%c",
+                           ESC, index,
+                           (int) ([color redComponent] * 255.0),
+                           (int) ([color greenComponent] * 255.0),
+                           (int) ([color blueComponent] * 255.0),
+                           7];
+    return [string dataUsingEncoding:NSUTF8StringEncoding];
+}
+
 #pragma mark - Private
 
 - (NSData *)specialKey:(int)terminfo

VT100Screen.m

@@ -3109,6 +3109,13 @@ - (void)terminalSetTabColorBlueComponentTo:(CGFloat)color {
     [delegate_ screenSetTabColorBlueComponentTo:color];
 }
 
+- (NSColor *)terminalColorForIndex:(int)index {
+    if (index < 0 || index > 255) {
+        return nil;
+    }
+    return [[delegate_ screenColorMap] colorForKey:kColorMap8bitBase + index];
+}
+
 - (int)terminalCursorX {
     return MIN([self cursorX], [self width]);
 }

VT100Terminal.m

@@ -1593,53 +1593,49 @@ - (void)executeToken:(VT100Token *)token {
 }
 
 - (void)executeXtermSetRgb:(VT100Token *)token {
-    // The format of this command is "<index>;rgb:<redhex>/<greenhex>/<bluehex>", e.g. "105;rgb:00/cc/ff"
-    // TODO(georgen): xterm has extended this quite a bit and we're behind. Catch up.
-    const char *s = [token.string UTF8String];
-    int theIndex = 0;
-    while (isdigit(*s)) {
-        theIndex = 10*theIndex + *s++ - '0';
-    }
-    if (*s++ != ';') {
-        return;
-    }
-    if (*s++ != 'r') {
-        return;
-    }
-    if (*s++ != 'g') {
-        return;
-    }
-    if (*s++ != 'b') {
-        return;
-    }
-    if (*s++ != ':') {
-        return;
-    }
-    int r = 0, g = 0, b = 0;
-    
-    while (isxdigit(*s)) {
-        r = 16*r + (*s>='a' ? *s++ - 'a' + 10 : *s>='A' ? *s++ - 'A' + 10 : *s++ - '0');
-    }
-    if (*s++ != '/') {
-        return;
-    }
-    while (isxdigit(*s)) {
-        g = 16*g + (*s>='a' ? *s++ - 'a' + 10 : *s>='A' ? *s++ - 'A' + 10 : *s++ - '0');
-    }
-    if (*s++ != '/') {
-        return;
-    }
-    while (isxdigit(*s)) {
-        b = 16*b + (*s>='a' ? *s++ - 'a' + 10 : *s>='A' ? *s++ - 'A' + 10 : *s++ - '0');
-    }
-    if (theIndex >= 0 && theIndex <= 255 &&
-        r >= 0 && r <= 255 &&
-        g >= 0 && g <= 255 &&
-        b >= 0 && b <= 255) {
-        [delegate_ terminalSetColorTableEntryAtIndex:theIndex
-                                               color:[NSColor colorWith8BitRed:r
-                                                                         green:g
-                                                                          blue:b]];
+    NSArray *parts = [token.string componentsSeparatedByString:@";"];
+    int theIndex;
+    for (int i = 0; i < parts.count; i++) {
+        NSString *part = parts[i];
+        if ((i % 2) == 0 ) {
+            theIndex = [part intValue];
+        } else {
+            if ([part hasPrefix:@"rgb:"]) {
+                // The format of this command is "<index>;rgb:<redhex>/<greenhex>/<bluehex>", e.g. "105;rgb:00/cc/ff"
+                NSString *componentsString = [part substringFromIndex:4];
+                NSArray *components = [componentsString componentsSeparatedByString:@"/"];
+                if (components.count == 3) {
+                    CGFloat colors[3];
+                    BOOL ok = YES;
+                    for (int j = 0; j < 3; j++) {
+                        NSScanner *scanner = [NSScanner scannerWithString:components[j]];
+                        unsigned int intValue;
+                        if (![scanner scanHexInt:&intValue]) {
+                            ok = NO;
+                        } else {
+                            ok = (intValue <= 255);
+                        }
+                        if (ok) {
+                            int limit = 1 << ((4 * [components[j] length]) - 1);
+                            colors[j] = (CGFloat)intValue / (CGFloat)limit;
+                        } else {
+                            break;
+                        }
+                    }
+                    if (ok) {
+                        NSColor *theColor = [NSColor colorWithCalibratedRed:colors[0]
+                                                                      green:colors[1]
+                                                                       blue:colors[2]
+                                                                      alpha:1];
+                        [delegate_ terminalSetColorTableEntryAtIndex:theIndex
+                                                               color:theColor];
+                    }
+                }
+            } else if ([part isEqualToString:@"?"]) {
+                NSColor *theColor = [delegate_ terminalColorForIndex:theIndex];
+                [delegate_ terminalSendReport:[self.output reportColor:theColor atIndex:theIndex]];
+            }
+        }
     }
 }
 

VT100TerminalDelegate.h

@@ -332,6 +332,8 @@ typedef enum {
 - (void)terminalSetTabColorGreenComponentTo:(CGFloat)color;
 - (void)terminalSetTabColorBlueComponentTo:(CGFloat)color;
 
+- (NSColor *)terminalColorForIndex:(int)index;
+
 // Returns the current cursor position.
 - (int)terminalCursorX;
 - (int)terminalCursorY;

tests/query_color_105_and_106

@@ -0,0 +1,3 @@
+This should output:
+^[]4;105;rgb:87/87/ff^G^[]4;106;rgb:87/af/00^G
+]4;105;?;106;?