Merge pull request #381 from thecoolwinter/fix/selection-ignores-display-offset

Consider Buffer Y Offset In Mouse Hit

Author: migueldeicaza

Sources/SwiftTerm/Mac/MacTerminalView.swift

@@ -880,20 +880,25 @@ open class TerminalView: NSView, NSTextInputClient, NSUserInterfaceValidations,
     }
 
     func calculateMouseHit (with event: NSEvent) -> (grid: Position, pixels: Position)
+    {
+        let point = convert(event.locationInWindow, from: nil)
+        return calculateMouseHit(at: point)
+    }
+
+    func calculateMouseHit (at point: CGPoint) -> (grid: Position, pixels: Position)
     {
         func toInt (_ p: NSPoint) -> Position {
-            
+
             let x = min (max (p.x, 0), bounds.width)
             let y = min (max (p.y, 0), bounds.height)
             return Position (col: Int (x), row: Int (bounds.height-y))
         }
-        let point = convert(event.locationInWindow, from: nil)
         let col = Int (point.x / cellDimension.width)
-        let row = Int ((frame.height-point.y) / cellDimension.height)
+        let row = Int ((frame.height-point.y) / cellDimension.height) + terminal.buffer.yDisp
         if row < 0 {
             return (Position(col: 0, row: 0), toInt (point))
         }
-        return (Position(col: min (max (0, col), terminal.cols-1), row: min (row, terminal.rows-1)), toInt (point))
+        return (Position(col: min (max (0, col), terminal.cols-1), row: row), toInt (point))
     }
 
     private func sharedMouseEvent (with event: NSEvent)

Tests/SwiftTermTests/SelectionTests.swift

@@ -38,4 +38,24 @@ final class SelectionTests: XCTestCase, TerminalDelegate {
         selection.selectWordOrExpression(at: Position (col: 0, row: -1), in: terminal.buffer)
 
     }
+
+#if os(macOS)
+    // Test only on macOS due to differences in how frames are handled on mac and iOS
+    func testMouseHitCorrectWhenScrolled()
+    {
+        let view = TerminalView(frame: CGRect(origin: .zero, size: .init(width: 10, height: 10)))
+
+        for _ in 0..<100 {
+            view.terminal.feed (text: "12345")
+        }
+
+        // Scroll all the way down, check the bottom-left corner
+        view.scrollTo(row: 100)
+        XCTAssertEqual(view.calculateMouseHit(at: CGPoint(x: 0, y: 0)).grid.row, 100)
+
+        // Scroll all the way back up, check the top-left corner
+        view.scrollTo(row: 1)
+        XCTAssertEqual(view.calculateMouseHit(at: CGPoint(x: 0, y: 10)).grid.row, 1)
+    }
+#endif
 }