Add support for html style colors in OSC 4 and friends

Author: gnachman

sources/NSColor+iTerm.m

@@ -458,28 +458,11 @@ - (NSString *)hexString {
 }
 
 + (instancetype)colorFromHexString:(NSString *)hexString {
-    if (![hexString hasPrefix:@"#"]) {
+    int red, green, blue;
+    if (![hexString getHashColorRed:&red green:&green blue:&blue]) {
         return nil;
     }
-    if (hexString.length == 4) {
-        NSString *first = [hexString substringWithRange:NSMakeRange(1, 1)];
-        NSString *second = [hexString substringWithRange:NSMakeRange(2, 1)];
-        NSString *third = [hexString substringWithRange:NSMakeRange(3, 1)];
-        hexString = [NSString stringWithFormat:@"#%@%@%@%@%@%@", first, first, second, second, third, third];
-    }
-    if (hexString.length != 7) {
-        return nil;
-    }
-
-    NSScanner *scanner = [NSScanner scannerWithString:[hexString substringFromIndex:1]];
-    unsigned long long ll;
-    if (![scanner scanHexLongLong:&ll]) {
-        return nil;
-    }
-    CGFloat red = (ll >> 16) & 0xff;
-    CGFloat green = (ll >> 8) & 0xff;
-    CGFloat blue = (ll >> 0) & 0xff;
-    return [NSColor colorWithSRGBRed:red/255.0 green:green/255.0 blue:blue/255.0 alpha:1];
+    return [NSColor colorWithSRGBRed:red / 255.0 green:green / 255.0 blue:blue / 255.0 alpha:1];
 }
 
 - (NSColor *)it_colorByDimmingByAmount:(double)dimmingAmount {

sources/NSStringITerm.h

@@ -341,6 +341,7 @@ int decode_utf8_char(const unsigned char * restrict datap,
 - (NSString *)removingHTMLFromTabTitleIfNeeded;
 // nil if this is not scannable as an integer.
 - (NSNumber *)integerNumber;
+- (BOOL)getHashColorRed:(int *)red green:(int *)green blue:(int *)blue;
 
 @end
 

sources/NSStringITerm.m

@@ -2230,6 +2230,32 @@ - (NSNumber *)integerNumber {
     return @(value);
 }
 
+- (BOOL)getHashColorRed:(int *)red green:(int *)green blue:(int *)blue {
+    if (![self hasPrefix:@"#"]) {
+        return NO;
+    }
+    if (self.length == 4) {
+        NSString *first = [self substringWithRange:NSMakeRange(1, 1)];
+        NSString *second = [self substringWithRange:NSMakeRange(2, 1)];
+        NSString *third = [self substringWithRange:NSMakeRange(3, 1)];
+        NSString *extended = [NSString stringWithFormat:@"#%@%@%@%@%@%@", first, first, second, second, third, third];
+        return [extended getHashColorRed:red green:green blue:blue];
+    }
+    if (self.length != 7) {
+        return NO;
+    }
+
+    NSScanner *scanner = [NSScanner scannerWithString:[self substringFromIndex:1]];
+    unsigned long long ll;
+    if (![scanner scanHexLongLong:&ll]) {
+        return NO;
+    }
+    *red = (ll >> 16) & 0xff;
+    *green = (ll >> 8) & 0xff;
+    *blue = (ll >> 0) & 0xff;
+    return YES;
+}
+
 @end
 
 @implementation NSMutableString (iTerm)

sources/VT100Terminal.m

@@ -2733,6 +2733,13 @@ - (NSString *)decrqssPayload:(NSString *)pt {
             }
         }
     }
+    if ([part hasPrefix:@"#"]) {
+        int red, green, blue;
+        if (![part getHashColorRed:&red green:&green blue:&blue]) {
+            return nil;
+        }
+        return @[ @(red / 255.0), @(green / 255.0), @(blue / 255.0) ];
+    }
     return nil;
 }
 

tests/osc4-and-friends.py

@@ -12,8 +12,8 @@ def hex2(n):
   return "{:02x}".format(n)
 
 def rgb(r,g,b):
-  #return "#" + hex2(r) + hex2(g) + hex2(b)
-  return "rgb:" + "/".join([hex2(r), hex2(g), hex2(b)])
+  return "#" + hex2(r) + hex2(g) + hex2(b)
+  #return "rgb:" + "/".join([hex2(r), hex2(g), hex2(b)])
 
 class DynamicColor(enum.Enum):
   # Values are (reset OSC, set OSC)