Fix the terminal size response returns

Author: migueldeicaza

Sources/SwiftTerm/Mac/MacTerminalView.swift

@@ -1313,10 +1313,9 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
         case .reportTextAreaPixelDimension:
             guard let cellDimension else { return nil }
             let factor = self.backingScaleFactor()
-            let h = Int(bounds.height/cellDimension.height/factor) * terminal.rows
-            let w = Int(bounds.width/cellDimension.width/factor) * terminal.cols
-
-            return terminal.cc.CSI + "5;\(h);\(w)t".utf8
+            let h = Int(round(cellDimension.height * factor * CGFloat(terminal.rows)))
+            let w = Int(round(cellDimension.width * factor * CGFloat(terminal.cols)))
+            return terminal.cc.CSI + "4;\(h);\(w)t".utf8
         case .reportSizeOfScreenInPixels:
             return nil
         case .reportTextAreaCharacters:

Sources/SwiftTerm/Terminal.swift

@@ -2756,25 +2756,30 @@ open class Terminal {
             if let r = tdel.windowCommand(source: self, command: .reportTextAreaPixelDimension) {
                 sendResponse(r)
             } else {
-                sendResponse (cc.CSI, "5;768;1024t")
+                let cellSize = tdel.cellSizeInPixels(source: self) ?? (width: 10, height: 16)
+                sendResponse(cc.CSI, "4;\(rows * cellSize.height);\(cols * cellSize.width)t")
             }
         case [14, 2]:
             if let r = tdel.windowCommand(source: self, command: .reportTerminalWindowPixelDimension) {
                 sendResponse(r)
             } else {
-                sendResponse (cc.CSI, "5;768;1024t")
+                let cellSize = tdel.cellSizeInPixels(source: self) ?? (width: 10, height: 16)
+                sendResponse(cc.CSI, "4;\(rows * cellSize.height);\(cols * cellSize.width)t")
             }
         case [15]: // Report size in pixels
             if let r = tdel.windowCommand(source: self, command: .reportSizeOfScreenInPixels) {
                 sendResponse(r)
             } else {
-                sendResponse (cc.CSI, "5;768;1024t")
+                let cellSize = tdel.cellSizeInPixels(source: self) ?? (width: 10, height: 16)
+                sendResponse(cc.CSI, "5;\(rows * cellSize.height);\(cols * cellSize.width)t")
             }
         case [16]: // Report cell size in pixels
             // If no value is returned send 16x10
             // TODO: should surface that to the UI, should not do this here
             if let r = tdel.windowCommand(source: self, command: .reportCellSizeInPixels) {
                 sendResponse(r)
+            } else if let cellSize = tdel.cellSizeInPixels(source: self) {
+                sendResponse(cc.CSI, "6;\(cellSize.height);\(cellSize.width)t")
             } else {
                 sendResponse (cc.CSI, "6;16;10t")
             }

Sources/SwiftTerm/iOS/iOSTerminalView.swift

@@ -1626,7 +1626,23 @@ open class TerminalView: UIScrollView, UITextInputTraits, UIKeyInput, UIScrollVi
 
     // Terminal.Delegate method implementation
     open func windowCommand(source: Terminal, command: Terminal.WindowManipulationCommand) -> [UInt8]? {
-        return nil
+        switch command {
+        case .reportTextAreaPixelDimension, .reportTerminalWindowPixelDimension:
+            guard let cellSize = cellSizeInPixels(source: source) else { return nil }
+            let height = cellSize.height * source.rows
+            let width = cellSize.width * source.cols
+            return source.cc.CSI + "4;\(height);\(width)t".utf8
+        case .reportSizeOfScreenInPixels:
+            guard let cellSize = cellSizeInPixels(source: source) else { return nil }
+            let height = cellSize.height * source.rows
+            let width = cellSize.width * source.cols
+            return source.cc.CSI + "5;\(height);\(width)t".utf8
+        case .reportCellSizeInPixels:
+            guard let cellSize = cellSizeInPixels(source: source) else { return nil }
+            return source.cc.CSI + "6;\(cellSize.height);\(cellSize.width)t".utf8
+        default:
+            return nil
+        }
     }
 
     public func clipboardCopy(source: Terminal, content: Data) {

Tests/SwiftTermTests/TerminalTestHarness.swift

@@ -3,6 +3,7 @@ import Testing
 
 final class TerminalTestDelegate: TerminalDelegate {
     private(set) var sentData: [[UInt8]] = []
+    var cellSizeInPixelsValue: (width: Int, height: Int)? = nil
 
     func showCursor(source: Terminal) {}
     func hideCursor(source: Terminal) {}
@@ -18,6 +19,10 @@ final class TerminalTestDelegate: TerminalDelegate {
     func send(source: Terminal, data: ArraySlice<UInt8>) {
         sentData.append(Array(data))
     }
+
+    func cellSizeInPixels(source: Terminal) -> (width: Int, height: Int)? {
+        return cellSizeInPixelsValue
+    }
 }
 
 enum TerminalTestHarness {