Introduced a way of setting the selection color foreground,

as it is possible to end up in cases where it is difficult
to see the text.

And changed the defaults for the terminal.

Fixes: #588

Author: migueldeicaza

Sources/SwiftTerm/Apple/AppleTerminalView.swift

@@ -749,6 +749,13 @@ extension TerminalView {
             if isSelected {
                 var mutable = attributes
                 mutable[.selectionBackgroundColor] = selectedTextBackgroundColor
+                mutable[.foregroundColor] = selectedTextForegroundColor
+                if mutable[.underlineColor] != nil {
+                    mutable[.underlineColor] = selectedTextForegroundColor
+                }
+                if mutable[.strikethroughColor] != nil {
+                    mutable[.strikethroughColor] = selectedTextForegroundColor
+                }
                 currentAttributes = mutable
             } else {
                 currentAttributes = attributes

Sources/SwiftTerm/Mac/MacTerminalView.swift

@@ -727,14 +727,29 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
         set { caretView.caretTextColor = newValue }
     }
 
-    var _selectedTextBackgroundColor = NSColor.selectedTextBackgroundColor
-    /// The color used to render the selection
+    var _selectedTextBackgroundColor = NSColor(srgbRed: 0, green: 166.0 / 255.0, blue: 178.0 / 255.0, alpha: 1.0)
+    /// The background color used to render the selection.
     public var selectedTextBackgroundColor: NSColor {
         get {
             return _selectedTextBackgroundColor
         }
         set {
             _selectedTextBackgroundColor = newValue
+            terminal.updateFullScreen()
+            queuePendingDisplay()
+        }
+    }
+
+    var _selectedTextForegroundColor = NSColor.black
+    /// The foreground color used to render selected text.
+    public var selectedTextForegroundColor: NSColor {
+        get {
+            return _selectedTextForegroundColor
+        }
+        set {
+            _selectedTextForegroundColor = newValue
+            terminal.updateFullScreen()
+            queuePendingDisplay()
         }
     }
 

Sources/SwiftTerm/iOS/iOSTerminalView.swift

@@ -1297,14 +1297,29 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
         }
     }
 
-    var _selectedTextBackgroundColor = UIColor (red: 204.0/255.0, green: 221.0/255.0, blue: 237.0/255.0, alpha: 1.0)
-    /// The color used to render the selection
+    var _selectedTextBackgroundColor = UIColor(red: 0, green: 166.0 / 255.0, blue: 178.0 / 255.0, alpha: 1.0)
+    /// The background color used to render the selection.
     public var selectedTextBackgroundColor: UIColor {
         get {
             return _selectedTextBackgroundColor
         }
         set {
             _selectedTextBackgroundColor = newValue
+            terminal.updateFullScreen()
+            queuePendingDisplay()
+        }
+    }
+
+    var _selectedTextForegroundColor = UIColor.black
+    /// The foreground color used to render selected text.
+    public var selectedTextForegroundColor: UIColor {
+        get {
+            return _selectedTextForegroundColor
+        }
+        set {
+            _selectedTextForegroundColor = newValue
+            terminal.updateFullScreen()
+            queuePendingDisplay()
         }
     }
 

TerminalApp/MacTerminal/ViewController.swift

@@ -123,9 +123,9 @@ class ViewController: NSViewController, LocalProcessTerminalViewDelegate, NSUser
             print("METAL DISABLED: \(error)")
         }
         let defaultForegroundColor = NSColor(
-            calibratedRed: CGFloat(0xcc) / 255.0,
-            green: CGFloat(0xcc) / 255.0,
-            blue: CGFloat(0xcc) / 255.0,
+            calibratedRed: 1.0,
+            green: 1.0,
+            blue: 1.0,
             alpha: 1.0
         )
         let defaultBackgroundColor = NSColor(

Tests/SwiftTermTests/SelectionTests.swift

@@ -8,6 +8,10 @@
 import Foundation
 import Testing
 
+#if os(macOS)
+import AppKit
+#endif
+
 @testable import SwiftTerm
 
 final class SelectionTests: TerminalDelegate {
@@ -107,6 +111,30 @@ final class SelectionTests: TerminalDelegate {
         #expect(view.terminal.cols == originalCols)
         #expect(view.terminal.rows == originalRows)
     }
+
+    @Test func testSelectionColorsOverrideCellAndDecorationColors() {
+        let view = TerminalView(frame: CGRect(origin: .zero, size: .init(width: 320, height: 160)))
+        let selectionBackground = NSColor(srgbRed: 0, green: 166.0 / 255.0, blue: 178.0 / 255.0, alpha: 1.0)
+        let selectionForeground = NSColor.black
+
+        #expect(view.selectedTextBackgroundColor.isEqual(selectionBackground))
+        #expect(view.selectedTextForegroundColor.isEqual(selectionForeground))
+
+        view.terminal.feed(text: "\u{001B}[31;44;4;9mX")
+        view.selection.setSelection(start: Position(col: 0, row: 0), end: Position(col: 1, row: 0))
+
+        let renderedLine = view.buildAttributedString(
+            row: 0,
+            line: view.terminal.displayBuffer.lines[0],
+            cols: view.terminal.cols
+        )
+        let attributes = renderedLine.segments[0].attributedString.attributes(at: 0, effectiveRange: nil)
+
+        #expect((attributes[.selectionBackgroundColor] as? NSColor)?.isEqual(selectionBackground) == true)
+        #expect((attributes[.foregroundColor] as? NSColor)?.isEqual(selectionForeground) == true)
+        #expect((attributes[.underlineColor] as? NSColor)?.isEqual(selectionForeground) == true)
+        #expect((attributes[.strikethroughColor] as? NSColor)?.isEqual(selectionForeground) == true)
+    }
 #endif
 
     // MARK: - Selection Tests Ported from Ghostty