Merge pull request #324 from iOSappssolutions/main

changes for visionos
migueldeicaza · Sep 10, 2023 · 495c7c1 · 495c7c1
2 parents 4df9211 + 6c7dac9
commit 495c7c1
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 18 deletions.
diff --git a/Sources/SwiftTerm/Apple/AppleTerminalView.swift b/Sources/SwiftTerm/Apple/AppleTerminalView.swift
@@ -5,12 +5,12 @@
 //
 //  Created by Miguel de Icaza on 4/21/20.
 //
-#if os(macOS) || os(iOS)
+#if os(macOS) || os(iOS) || os(visionOS)
 import Foundation
 import CoreGraphics
 import CoreText
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import UIKit
 typealias TTColor = UIColor
 typealias TTFont = UIFont
@@ -541,7 +541,7 @@ extension TerminalView {
         }
 
         // draw lines
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         // On iOS, we are drawing the exposed region
         let cellHeight = cellDimension.height
         let firstRow = Int (dirtyRect.minY/cellHeight)
@@ -745,7 +745,7 @@ extension TerminalView {
         }
 #endif
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
         if selection.active {
             let start, end: Position
 
@@ -859,7 +859,7 @@ extension TerminalView {
             addSubview(caretView)
         }
         let doublePosition = buffer.lines [vy].renderMode == .single ? 1.0 : 2.0
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         let offset = (cellDimension.height * (CGFloat(buffer.y+(buffer.yBase))))
         let lineOrigin = CGPoint(x: 0, y: offset)
         #else
@@ -1228,7 +1228,7 @@ extension TerminalView {
         let rows = Int (ceil (height/cellDimension.height))
 
         let stripeSize = CGSize (width: width, height: cellDimension.height)
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         var srcY: CGFloat = 0
         #else
         var srcY: CGFloat = img.size.height
@@ -1242,7 +1242,7 @@ extension TerminalView {
             guard let stripe = drawImageInStripe (image: img, srcY: srcY, width: width, srcHeight: cellDimension.height * heightRatio, dstHeight: cellDimension.height, size: stripeSize) else {
                 continue
             }
-            #if os(iOS)
+            #if os(iOS) || os(visionOS)
             srcY += cellDimension.height * heightRatio
             #endif
 

diff --git a/Sources/SwiftTerm/Apple/Extensions.swift b/Sources/SwiftTerm/Apple/Extensions.swift
@@ -4,7 +4,7 @@
 //
 //  Created by Miguel de Icaza on 4/15/20.
 //
-#if os(macOS) || os(iOS)
+#if os(macOS) || os(iOS) || os(visionOS)
 import Foundation
 
 extension NSAttributedString.Key {

diff --git a/Sources/SwiftTerm/Apple/TerminalViewDelegate.swift b/Sources/SwiftTerm/Apple/TerminalViewDelegate.swift
@@ -4,7 +4,7 @@
 //
 //  Created by Miguel de Icaza on 4/15/20.
 //
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(visionOS) || os(macOS)
 import Foundation
 
 /// Delegate used by ``TerminalView`` to notify the user of events happening

diff --git a/Sources/SwiftTerm/iOS/iOSAccessoryView.swift b/Sources/SwiftTerm/iOS/iOSAccessoryView.swift
@@ -5,7 +5,7 @@
 //
 //  Created by Miguel de Icaza on 5/9/20.
 //
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 
 import Foundation
 import UIKit
@@ -53,12 +53,16 @@ public class TerminalAccessory: UIInputView, UIInputViewAudioFeedback {
         fatalError("init(coder:) has not been implemented")
     }
 
+    #if os(iOS)
     // Override for UIInputViewAudioFeedback
     public var enableInputClicksWhenVisible: Bool { true }
-
+    #endif
+
     func clickAndSend (_ data: [UInt8])
     {
+        #if os(iOS)
         UIDevice.current.playInputClick()
+        #endif
         terminalView?.send (data)
     }
 
@@ -139,12 +143,19 @@ public class TerminalAccessory: UIInputView, UIInputViewAudioFeedback {
         guard let tv = terminalView else { return }
         let wasResponder = tv.isFirstResponder
         if wasResponder { _ = tv.resignFirstResponder() }
-
+        
         if tv.inputView == nil {
+            #if os(visionOS)
+            tv.inputView = KeyboardView (frame: CGRect (origin: CGPoint.zero,
+                                                        size: CGSize (width: 300,
+                                                                      height: 400)),
+                                         terminalView: terminalView)
+            #else
             tv.inputView = KeyboardView (frame: CGRect (origin: CGPoint.zero,
                                                         size: CGSize (width: UIScreen.main.bounds.width,
                                                                       height: max((UIScreen.main.bounds.height / 5),140))),
                                          terminalView: terminalView)
+            #endif
         } else {
             tv.inputView = nil
         }

diff --git a/Sources/SwiftTerm/iOS/iOSCaretView.swift b/Sources/SwiftTerm/iOS/iOSCaretView.swift
@@ -6,7 +6,7 @@
 //  Created by Miguel de Icaza on 3/20/20.
 //
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import Foundation
 import UIKit
 import CoreText

diff --git a/Sources/SwiftTerm/iOS/iOSDoubleButton.swift b/Sources/SwiftTerm/iOS/iOSDoubleButton.swift
@@ -4,7 +4,7 @@
 //
 //  Created by Miguel de Icaza on 7/13/21.
 //
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 
 import Foundation
 import UIKit

diff --git a/Sources/SwiftTerm/iOS/iOSExtensions.swift b/Sources/SwiftTerm/iOS/iOSExtensions.swift
@@ -4,7 +4,7 @@
 //
 //  Created by Miguel de Icaza on 6/29/21.
 //
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import Foundation
 import UIKit
 

diff --git a/Sources/SwiftTerm/iOS/iOSKeyboardView.swift b/Sources/SwiftTerm/iOS/iOSKeyboardView.swift
@@ -4,7 +4,7 @@
 //
 //  Created by Miguel de Icaza on 7/15/21.
 //
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import Foundation
 import UIKit
 
@@ -22,7 +22,9 @@ class KeyboardView: UIView {
 
     func clickAndSend (_ data: [UInt8])
     {
+        #if os(iOS)
         UIDevice.current.playInputClick()
+        #endif
         terminalView?.send (data)
     }
 

diff --git a/Sources/SwiftTerm/iOS/iOSTerminalView.swift b/Sources/SwiftTerm/iOS/iOSTerminalView.swift
@@ -11,7 +11,7 @@
 //  Created by Miguel de Icaza on 3/4/20.
 //
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import Foundation
 import UIKit
 import CoreText
@@ -964,7 +964,11 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
 
     func backingScaleFactor () -> CGFloat
     {
+        #if os(visionOS)
+        1.0
+        #else
         UIScreen.main.scale
+        #endif
     }
 
     override public func draw (_ dirtyRect: CGRect) {
@@ -1409,8 +1413,10 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
 extension TerminalViewDelegate {    
     public func bell (source: TerminalView)
     {
+        #if os(iOS)
         let generator = UINotificationFeedbackGenerator()
         generator.notificationOccurred(.warning)
+        #endif
     }
 
     public func iTermContent (source: TerminalView, content: ArraySlice<UInt8>) {

diff --git a/Sources/SwiftTerm/iOS/iOSTextInput.swift b/Sources/SwiftTerm/iOS/iOSTextInput.swift
@@ -42,7 +42,7 @@
 //  Created by Miguel de Icaza on 1/28/21.
 //
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import Foundation
 import UIKit
 import CoreText