[app] re-add the background queue link detection thing

Author: kirb

NewTerm/Controllers/TerminalController.swift

@@ -24,6 +24,7 @@ class TerminalController: VT100 {
 	var delegate: TerminalControllerDelegate?
 
 	private var updateQueue: DispatchQueue!
+	private var secondaryUpdateQueue: DispatchQueue!
 
 	private var stringSupplier = VT100StringSupplier()
 
@@ -57,6 +58,7 @@ class TerminalController: VT100 {
 		super.init()
 
 		updateQueue = DispatchQueue(label: String(format: "au.com.hbang.NewTerm.update-queue-%p", self))
+		secondaryUpdateQueue = DispatchQueue(label: String(format: "au.com.hbang.NewTerm.update-queue-secondary-%p", self))
 
 		stringSupplier.screenBuffer = self
 
@@ -126,6 +128,14 @@ extension TerminalController {
 
 			DispatchQueue.main.async {
 				self.delegate?.refresh(attributedString: attributedString, backgroundColor: backgroundColor)
+
+				self.secondaryUpdateQueue.async {
+					self.stringSupplier.detectLinks(for: attributedString)
+
+					DispatchQueue.main.async {
+						self.delegate?.refresh(attributedString: attributedString, backgroundColor: backgroundColor)
+					}
+				}
 			}
 		}
 	}

NewTerm/UI/Keyboard/TerminalTextView.swift

@@ -16,7 +16,7 @@ class TerminalTextView: UITextView {
 		backgroundColor = .black
 		indicatorStyle = .white
 		showsHorizontalScrollIndicator = false
-		dataDetectorTypes = .link
+		dataDetectorTypes = [] // none
 		isEditable = false
 		textContainerInset = .zero
 		self.textContainer.lineFragmentPadding = 0

NewTerm/VT100/VT100StringSupplier.h

@@ -16,4 +16,6 @@
 - (NSString *)stringForLine:(int)rowIndex;
 - (NSMutableAttributedString *)attributedString;
 
+- (void)detectLinksForAttributedString:(NSMutableAttributedString *)attributedString NS_SWIFT_NAME(detectLinks(for:));
+
 @end

NewTerm/VT100/VT100StringSupplier.m

@@ -151,20 +151,17 @@ - (NSMutableAttributedString *)attributedString {
 		startOffset += width;
 	}
 
-	// if links are supported, create links in all the locations we found last time we scanned for
-	// links
-	if (IS_IOS_OR_NEWER(iOS_7_0)) {
-		for (NSValue *value in _lastLinkRanges) {
-			NSRange range = value.rangeValue;
+	// create links in all the locations we found last time we scanned for links
+	for (NSValue *value in _lastLinkRanges) {
+		NSRange range = value.rangeValue;
 
-			if (range.location + range.length <= attributedString.string.length) {
-				NSString *urlString = [attributedString.string substringWithRange:range];
-				NSURL *url = [NSURL URLWithString:urlString];
+		if (range.location + range.length <= attributedString.string.length) {
+			NSString *urlString = [attributedString.string substringWithRange:range];
+			NSURL *url = [NSURL URLWithString:urlString];
 
-				// if NSURL thinks this is a valid url, 
-				if (url) {
-					[attributedString addAttribute:NSLinkAttributeName value:url range:range];
-				}
+			// if NSURL thinks this is a valid url, it’s good enough for us
+			if (url) {
+				[attributedString addAttribute:NSLinkAttributeName value:url range:range];
 			}
 		}
 	}
@@ -173,16 +170,11 @@ - (NSMutableAttributedString *)attributedString {
 }
 
 - (void)detectLinksForAttributedString:(NSMutableAttributedString *)attributedString {
-	// links are only natively supported as of iOS 7, i probably won’t bother to add all the support
-	// needed for links on iOS 6
-	if (!IS_IOS_OR_NEWER(iOS_7_0)) {
-		return;
-	}
-
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
 		_lastLinkRanges = [NSMutableSet set];
 
+		// not exactly sure why a data detector would fail to init…
 		NSError *error = nil;
 		_linkDataDetector = [[NSDataDetector alloc] initWithTypes:NSTextCheckingTypeLink error:&error];
 		NSAssert(!error, @"%@", error.description);
@@ -224,7 +216,6 @@ - (void)detectLinksForAttributedString:(NSMutableAttributedString *)attributedSt
 		if (![_lastLinkRanges containsObject:value]) {
 			NSRange range = value.rangeValue;
 			NSURL *url = [NSURL URLWithString:[attributedString.string substringWithRange:range]];
-			HBLogDebug(@"adding2 %@ = %@", url, NSStringFromRange(range));
 			[attributedString addAttribute:NSLinkAttributeName value:url range:range];
 		}
 	}