Integate changes from main

Author: migueldeicaza

Sources/SwiftTerm/Apple/AppleTerminalView.swift

@@ -735,9 +735,6 @@ extension TerminalView {
                     let runFont = runAttributes[.font] as! TTFont
                     let startColumn = segment.column + (processedGlyphs * segment.columnWidth)
                     let endColumn = startColumn + (runGlyphsCount * segment.columnWidth)
-                    if row == 0 {
-                        print(run)
-                    }
                     var backgroundColor: TTColor?
                     if runAttributes.keys.contains(.selectionBackgroundColor) {
                         backgroundColor = runAttributes[.selectionBackgroundColor] as? TTColor
@@ -1116,7 +1113,6 @@ extension TerminalView {
         let oldPosition = displayBuffer.yDisp
 
         let maxScrollback = displayBuffer.lines.count - displayBuffer.rows
-        print ("maxScrollBack: \(maxScrollback)")
         var newScrollPosition = Int (Double (maxScrollback) * toPosition)
 
         if newScrollPosition < 0 {
@@ -1125,8 +1121,7 @@ extension TerminalView {
         if newScrollPosition > maxScrollback {
             newScrollPosition = maxScrollback
         }
-        print ("newScrollpsitin: \(newScrollPosition)")
-        
+
         if newScrollPosition != oldPosition {
             scrollTo(row: newScrollPosition)
         }
@@ -1232,6 +1227,13 @@ extension TerminalView {
     public func send(data: ArraySlice<UInt8>)
     {
         ensureCaretIsVisible ()
+        #if os(iOS) || os(visionOS)
+        if TerminalView.textInputDebugEnabled {
+            let previewBytes = data.prefix(32).map { String(format: "%02X", $0) }.joined(separator: " ")
+            print("UITextInput[\(TerminalView.textInputLogCounter + 1)]: send bytes=\(data.count) [\(previewBytes)]")
+            TerminalView.textInputLogCounter += 1
+        }
+        #endif
         terminalDelegate?.send (source: self, data: data)
     }
 
@@ -1240,6 +1242,12 @@ extension TerminalView {
      * - Parameter txt: the string to send to the client
      */
     public func send (txt: String) {
+        #if os(iOS) || os(visionOS)
+        if TerminalView.textInputDebugEnabled {
+            print("UITextInput[\(TerminalView.textInputLogCounter + 1)]: send txt=\(txt.debugDescription)")
+            TerminalView.textInputLogCounter += 1
+        }
+        #endif
         let array = [UInt8] (txt.utf8)
         send (data: array[...])
     }

Sources/SwiftTerm/Mac/MacLocalTerminalView.swift

@@ -156,10 +156,11 @@ open class LocalProcessTerminalView: TerminalView, TerminalViewDelegate, LocalPr
      * - Parameter args: an array of strings that is passed as the arguments to the underlying process
      * - Parameter environment: an array of environment variables to pass to the child process, if this is null, this picks a good set of defaults from `Terminal.getEnvironmentVariables`.
      * - Parameter execName: If provided, this is used as the Unix argv[0] parameter, otherwise, the executable is used as the args [0], this is used when the intent is to set a different process name than the file that backs it.
+     * - Parameter currentDirectory: If provided, the process will be launched with this as the current working directory.
      */
-    public func startProcess(executable: String = "/bin/bash", args: [String] = [], environment: [String]? = nil, execName: String? = nil)
+    public func startProcess(executable: String = "/bin/bash", args: [String] = [], environment: [String]? = nil, execName: String? = nil, currentDirectory: String? = nil)
     {
-        process.startProcess(executable: executable, args: args, environment: environment, execName: execName)
+        process.startProcess(executable: executable, args: args, environment: environment, execName: execName, currentDirectory: currentDirectory)
     }
 
     /**

Sources/SwiftTerm/Mac/MacTerminalView.swift

@@ -907,19 +907,23 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
             let y = min (max (p.y, 0), bounds.height)
             return Position (col: Int (x), row: Int (bounds.height-y))
         }
+        let displayBuffer = terminal.displayBuffer
         let col = Int (point.x / cellDimension.width)
         let row = Int ((frame.height-point.y) / cellDimension.height)
-        if row < 0 {
-            return (Position(col: 0, row: 0), toInt (point))
-        }
-        return (Position(col: min (max (0, col), terminal.cols-1), row: row), toInt (point))
+        let colValue = min (max (0, col), terminal.cols-1)
+        let bufferRow = row + displayBuffer.yDisp
+        let maxRow = max (0, displayBuffer.lines.count - 1)
+        let rowValue = min (max (0, bufferRow), maxRow)
+        return (Position(col: colValue, row: rowValue), toInt (point))
     }
 
     private func sharedMouseEvent (with event: NSEvent)
     {
+        let displayBuffer = terminal.displayBuffer
         let hit = calculateMouseHit(with: event)
         let buttonFlags = encodeMouseEvent(with: event)
-        terminal.sendEvent(buttonFlags: buttonFlags, x: hit.grid.col, y: hit.grid.row, pixelX: hit.pixels.col, pixelY: hit.pixels.row)
+        let screenRow = max (0, min (displayBuffer.rows - 1, hit.grid.row - displayBuffer.yDisp))
+        terminal.sendEvent(buttonFlags: buttonFlags, x: hit.grid.col, y: screenRow, pixelX: hit.pixels.col, pixelY: hit.pixels.row)
     }
 
     private var autoScrollDelta = 0
@@ -948,19 +952,19 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
         case 1:
             if selection.active == true {
                 if event.modifierFlags.contains(.shift) {
-                    selection.shiftExtend(row: hit.row, col: hit.col)
+                    selection.shiftExtend(bufferPosition: Position(col: hit.col, row: hit.row))
                 } else {
                     selection.active = false
                 }
             }
         case 2:
             let displayBuffer = terminal.displayBuffer
-            selection.selectWordOrExpression(at: Position(col: hit.col, row: hit.row + displayBuffer.yDisp), in: displayBuffer)
+            selection.selectWordOrExpression(at: Position(col: hit.col, row: hit.row), in: displayBuffer)
 
         default:
             // 3 and higher
 
-            selection.select(row: hit.row + terminal.displayBuffer.yDisp)
+            selection.select(row: hit.row)
         }
         setNeedsDisplay(bounds)
     }
@@ -969,7 +973,7 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
     {
         let hit = calculateMouseHit(with: event).grid
         let displayBuffer = terminal.displayBuffer
-        let cd = displayBuffer.lines [displayBuffer.yDisp+hit.row][hit.col]
+        let cd = displayBuffer.lines [hit.row][hit.col]
         return cd.getPayload()
     }
 
@@ -997,13 +1001,14 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
     }
 
     public override func mouseDragged(with event: NSEvent) {
+        let displayBuffer = terminal.displayBuffer
         let mouseHit = calculateMouseHit(with: event)
         let hit = mouseHit.grid
         if allowMouseReporting {
             if terminal.mouseMode.sendMotionEvent() {
                 let flags = encodeMouseEvent(with: event)
-            
-                terminal.sendMotion(buttonFlags: flags, x: hit.col, y: hit.row, pixelX: mouseHit.pixels.col, pixelY: mouseHit.pixels.row)
+                let screenRow = max (0, min (displayBuffer.rows - 1, hit.row - displayBuffer.yDisp))
+                terminal.sendMotion(buttonFlags: flags, x: hit.col, y: screenRow, pixelX: mouseHit.pixels.col, pixelY: mouseHit.pixels.row)
 
                 return
             }
@@ -1013,17 +1018,19 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
         }
 
         if selection.active {
-            selection.dragExtend(row: hit.row, col: hit.col)
+            selection.dragExtend(bufferPosition: Position(col: hit.col, row: hit.row))
         } else {
-            selection.startSelection(row: hit.row, col: hit.col)
+            selection.setSoftStart(bufferPosition: Position(col: hit.col, row: hit.row))
+            selection.startSelection()
         }
         didSelectionDrag = true
         autoScrollDelta = 0
+        let screenRow = hit.row - displayBuffer.yDisp
         if selection.active {
-            if hit.row <= 0 {
-                autoScrollDelta = calcScrollingVelocity(delta: hit.row * -1) * -1
-            } else if hit.row >= terminal.rows {
-                autoScrollDelta = calcScrollingVelocity(delta: hit.row - terminal.rows)
+            if screenRow <= 0 {
+                autoScrollDelta = calcScrollingVelocity(delta: screenRow * -1) * -1
+            } else if screenRow >= displayBuffer.rows {
+                autoScrollDelta = calcScrollingVelocity(delta: screenRow - displayBuffer.rows)
             }
         }
         setNeedsDisplay(bounds)

Sources/SwiftTerm/iOS/iOSTerminalView.swift

@@ -42,6 +42,9 @@ internal var log: Logger = Logger(subsystem: "org.tirania.SwiftTerm", category:
  * defaults, otherwise, this uses its own set of defaults colors.
  */
 open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollViewDelegate, TerminalDelegate {
+    public static var textInputDebugEnabled: Bool = false
+    internal static var textInputLogCounter: Int = 0
+
     struct FontSet {
         public let normal: UIFont
         let bold: UIFont
@@ -1086,14 +1089,20 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
     }
 
     public var hasText: Bool {
-        return true
+        return !textInputStorage.isEmpty
     }
 
     /*
-        Soft keyboard input. Hardware keyboard input is handled in pressesBegan.
+        Soft keyboard input. Hardware keyboard text input is delivered here; special keys are handled in pressesBegan.
     */
     open func insertText(_ text: String) {
-        uitiLog("insertText(\"\(text)\") textInputStorage:\"\(textInputStorage)\"")
+        //uitiLog("insertText(\(text.debugDescription)) \(textInputStateDescription())")
+
+        if tryComposeKoreanFinal(text) {
+            return
+        }
+
+        beginTextInputEdit()
 
         let rangeToReplace = _markedTextRange ?? _selectedTextRange
         let rangeStartIndex = rangeToReplace.startPosition.offset
@@ -1102,6 +1111,8 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
         let insertedPosition = TextPosition(offset: rangeStartIndex + text.count)
         _selectedTextRange = TextRange(from: insertedPosition, to: insertedPosition)
 
+        endTextInputEdit()
+
         if terminalAccessory?.controlModifier ?? false {
             self.send(applyControlToEventCharacters(text))
             terminalAccessory?.controlModifier = false
@@ -1117,15 +1128,78 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
         queuePendingDisplay()
     }
 
+    // this is necessary because something in the iOS IME seems to prevent
+    // the sequence  "ㅇ", "ㅜ", "ㅇ" from becoming "웅", and instead
+    // it becomes "우" followed by "ㅇ"
+    private func tryComposeKoreanFinal(_ text: String) -> Bool {
+        guard let language = textInputMode?.primaryLanguage, language.hasPrefix("ko") else { return false }
+        guard _markedTextRange == nil else { return false }
+        guard _selectedTextRange.isEmpty, _selectedTextRange.endPosition.offset == textInputStorage.count else { return false }
+        guard text.count == 1, let jamo = text.first else { return false }
+        guard let finalIndex = koreanFinalIndex[jamo] else { return false }
+        guard let lastChar = textInputStorage.last else { return false }
+        guard let composed = composeHangulSyllable(base: lastChar, finalIndex: finalIndex) else { return false }
+
+        uitiLog("koreanComposeFinal base:\(lastChar) jamo:\(jamo) -> \(composed)")
+
+        beginTextInputEdit()
+        textInputStorage.removeLast()
+        textInputStorage.append(composed)
+        let newOffset = textInputStorage.count
+        _markedTextRange = nil
+        _selectedTextRange = TextRange(from: TextPosition(offset: newOffset), to: TextPosition(offset: newOffset))
+        endTextInputEdit()
+
+        send([backspaceSendsControlH ? 8 : 0x7f])
+        send(txt: String(composed))
+        queuePendingDisplay()
+        return true
+    }
+
+    private let koreanFinalIndex: [Character: Int] = [
+        "ㄱ": 1, "ㄲ": 2, "ㄳ": 3,
+        "ㄴ": 4, "ㄵ": 5, "ㄶ": 6,
+        "ㄷ": 7,
+        "ㄹ": 8, "ㄺ": 9, "ㄻ": 10, "ㄼ": 11, "ㄽ": 12, "ㄾ": 13, "ㄿ": 14, "ㅀ": 15,
+        "ㅁ": 16,
+        "ㅂ": 17, "ㅄ": 18,
+        "ㅅ": 19, "ㅆ": 20,
+        "ㅇ": 21,
+        "ㅈ": 22,
+        "ㅊ": 23,
+        "ㅋ": 24,
+        "ㅌ": 25,
+        "ㅍ": 26,
+        "ㅎ": 27
+    ]
+
+    private func composeHangulSyllable(base: Character, finalIndex: Int) -> Character? {
+        guard finalIndex > 0 && finalIndex < 28 else { return nil }
+        guard let scalar = base.unicodeScalars.first, base.unicodeScalars.count == 1 else { return nil }
+        let scalarValue = Int(scalar.value)
+        let sBase = 0xAC00
+        let sEnd = 0xD7A3
+        guard scalarValue >= sBase && scalarValue <= sEnd else { return nil }
+        let vCount = 21
+        let tCount = 28
+        let sIndex = scalarValue - sBase
+        let lIndex = sIndex / (vCount * tCount)
+        let vIndex = (sIndex % (vCount * tCount)) / tCount
+        let tIndex = sIndex % tCount
+        guard tIndex == 0 else { return nil }
+        let newScalarValue = sBase + (lIndex * vCount + vIndex) * tCount + finalIndex
+        guard let newScalar = UnicodeScalar(newScalarValue) else { return nil }
+        return Character(newScalar)
+    }
+
     func ensureCaretIsVisible ()
     {
         let displayBuffer = terminal.displayBuffer
         contentOffset = CGPoint (x: 0, y: CGFloat (displayBuffer.lines.count-displayBuffer.rows)*cellDimension.height)
     }
 
     public func deleteBackward() {
-        uitiLog("deleteBackward() textInputStorage:\"\(textInputStorage)\" markedTextRange:\"\(_markedTextRange)\" selectedTextRange:\"\(_selectedTextRange)\"")
-        inputDelegate?.selectionWillChange(self)
+        uitiLog("deleteBackward() \(textInputStateDescription())")
 
         // after backward deletion, marked range is always cleared, and length of selected range is always zero
         let rangeToDelete = _markedTextRange ?? _selectedTextRange
@@ -1143,12 +1217,15 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
                 return
             }
 
+            beginTextInputEdit()
+
             rangeStartIndex -= 1
             textInputStorage.remove(at: textInputStorage.index(textInputStorage.startIndex, offsetBy: rangeStartIndex))
             rangeStartPosition = TextPosition(offset: rangeStartIndex)
 
             self.send ([backspaceSendsControlH ? 8 : 0x7f])
         } else {
+            beginTextInputEdit()
             // Send as many backspaces that are in the range to delete. When on auto-repeat, after a some time
             // pressing the backspace, it will delete chunks of text at a time.
             let oldText = textInputStorage[rangeToDelete.fullRange(in: textInputStorage)]
@@ -1163,7 +1240,7 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
         _markedTextRange = nil
         _selectedTextRange = TextRange(from: rangeStartPosition, to: rangeStartPosition)
 
-        inputDelegate?.selectionDidChange(self)
+        endTextInputEdit()
     }
 
     enum SendData {
@@ -1214,9 +1291,15 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
 
     public override func pressesBegan(_ presses: Set<UIPress>, with event: UIPressesEvent?) {
         var didHandleEvent = false
+
+        if _markedTextRange != nil {
+            super.pressesBegan(presses, with: event)
+            return
+        }
 
         for press in presses {
             guard let key = press.key else { continue }
+            uitiLog("pressesBegan keyCode:\(key.keyCode) chars:\(key.characters.debugDescription) ignoring:\(key.charactersIgnoringModifiers.debugDescription) modifiers:\(key.modifierFlags)")
 
             var data: SendData? = nil
 
@@ -1284,19 +1367,13 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
             case .keyboardDeleteForward:
                 data = .bytes (EscapeSequences.cmdDelKey)
 
-            case .keyboardDeleteOrBackspace:
-                data = .bytes ([backspaceSendsControlH ? 8 : 0x7f])
-                
             case .keyboardEscape:
                 data = .bytes ([0x1b])
 
             case .keyboardInsert:
                 print (".keyboardInsert ignored")
                 break
 
-            case .keyboardReturn:
-                data = .bytes (returnByteSequence)
-                
             case .keyboardTab:
                 data = .bytes ([9])
 
@@ -1334,16 +1411,6 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
                     optionAsMetaKey.toggle()
                 } else if key.modifierFlags.contains (.alternate) && optionAsMetaKey {
                     data = .text("\u{1b}\(key.charactersIgnoringModifiers)")
-                } else if !key.modifierFlags.contains (.command){
-                    if let keyboardLanguage = self.textInputMode?.primaryLanguage {
-                        // Is the keyboard language one of the multi-input languages? Chinese, Japanese, Korean and Hindi-Transliteration
-                        // If so, do not process the input yet (we'll do it later in unmarkText())
-                        if (!keyboardLanguage.hasPrefix("hi") && !keyboardLanguage.hasPrefix("zh") && !keyboardLanguage.hasPrefix("ja") && !keyboardLanguage.hasPrefix("ko")) {
-                            if key.characters.count > 0 {
-                                data = .text (key.characters)
-                            }
-                        }
-                    }
                 }
             }
             if let sendableData = data {