Commit Diff

Commit:
1f4c5744402856329d9a2cb5bd982462041329b5
From:
David Jeannot <djeannot24@gmail.com>
Via:
Russ Cox <rsc@swtch.com>
Date:
Message:
devdraw: fix mouse warping with multi-monitor on OS X R=rsc CC=plan9port.codebot http://codereview.appspot.com/5748043
Actions:
Patch | Tree
commit - 4a000a28d30ea9a7df06088bcd4bed0ab431f0ad
commit + 1f4c5744402856329d9a2cb5bd982462041329b5
blob - 9cc0e1341b044d028fcfee3773aed9f2fde185c0
blob + 81ee0398a88ce03ed9f72b0098497579b9e39372
--- src/cmd/devdraw/cocoa-screen.m
+++ src/cmd/devdraw/cocoa-screen.m
@@ -1034,12 +1034,12 @@ setmouse(Point p)
 		return;
 
 	in.mpos = NSMakePoint(p.x, p.y);	// race condition
-
-	r = [[WIN screen] frame];
 
 	q = [win.content convertPoint:in.mpos toView:nil];
 	q = [WIN convertBaseToScreen:q];
-	q.y = r.size.height - q.y;
+
+	r = [[[NSScreen screens] objectAtIndex:0] frame];
+	q.y = r.size.height - q.y;	/* Quartz is top-left-based here */
 
 	CGWarpMouseCursorPosition(NSPointToCGPoint(q));
 }