Cocoa: better support for Multi Display, Merge branch 'cocoa/MultiDisplay'

lcl/interfaces/cocoa/cocoaprivate.pas

@@ -138,7 +138,6 @@ type
     // Returns the position of the view or window, in the immediate
     // parent (view or screen), relative to its client coordinates system
     // Left and Top are always returned in LCL coordinate system.
-    procedure lclRelativePos(var Left, Top: Integer); message 'lclRelativePos::';
     procedure lclLocalToScreen(var X, Y: Integer); message 'lclLocalToScreen::';
     procedure lclScreenToLocal(var X, Y: Integer); message 'lclScreenToLocal::';
     function lclParent: id; message 'lclParent';
@@ -177,7 +176,6 @@ type
     procedure lclInvalidateRect(const r: TRect); message 'lclInvalidateRect:'; reintroduce;
     procedure lclInvalidate; message 'lclInvalidate'; reintroduce;
     procedure lclUpdate; message 'lclUpdate'; reintroduce;
-    procedure lclRelativePos(var Left, Top: Integer); message 'lclRelativePos::'; reintroduce;
     procedure lclLocalToScreen(var X, Y: Integer); message 'lclLocalToScreen::'; reintroduce;
     procedure lclScreenToLocal(var X, Y: Integer); message 'lclScreenToLocal::'; reintroduce;
     function lclParent: id; message 'lclParent'; reintroduce;
@@ -1144,7 +1142,7 @@ begin
   params.isFirstCall:= not hasMarkedText();
 
   rect:= imeHandler.IMEGetTextBound( params );
-  LCLToNSRect( rect, NSGlobalScreenHeight, Result );
+  LCLToNSRect( rect, NSGlobalScreenBottom, Result );
 end;
 
 procedure TCocoaFullControlEdit.unmarkText;
@@ -1216,10 +1214,6 @@ procedure LCLObjectExtension.lclUpdate;
 begin
 end;
 
-procedure LCLObjectExtension.lclRelativePos(var Left,Top: Integer);
-begin
-end;
-
 procedure LCLObjectExtension.lclLocalToScreen(var X,Y: Integer);
 begin
 end;
@@ -1481,22 +1475,6 @@ begin
   //display;
 end;
 
-procedure LCLViewExtension.lclRelativePos(var Left, Top: Integer);
-var
-  sv : NSView;
-  fr : NSRect;
-begin
-  Left := Round(frame.origin.x);
-  sv := superview;
-  if Assigned(sv) and (not sv.isFlipped) then
-  begin
-    fr := frame;
-    Top := Round(sv.frame.size.height - fr.origin.y - fr.size.height);
-  end
-  else
-    Top := Round(frame.origin.y);
-end;
-
 procedure LCLViewExtension.lclLocalToScreen(var X, Y:Integer);
 var
   P: NSPoint;

lcl/interfaces/cocoa/cocoautils.pas

@@ -42,15 +42,20 @@ function NSRectToRect(const NS: NSRect): TRect;
 procedure NSToLCLRect(const ns: NSRect; ParentHeight: Single; out lcl: TRect);
 procedure LCLToNSRect(const lcl: TRect; ParentHeight: Single; out ns: NSRect);
 
-function IndexToHMonitor(i: NSUInteger): HMonitor;
+function ScreenPointFromLCLToNS(const lclPoint: TPoint): NSPoint;
-function HMonitorToIndex(h: HMonitor): NSUInteger;
+function ScreenPointFromNSToLCL(const cocoaPoint: NSPoint): TPoint;
-function getScreenFromHMonitor(h: HMonitor): NSScreen;
+function ScreenRectFromLCLToNS(const lclRect: TRect): NSRect;
+function ScreenRectFromNSToLCL(const cocoaRect: NSRect): TRect;
 
 function NSPrimaryScreen: NSScreen;
 function NSPrimaryScreenFrame: NSRect;
 function NSGlobalScreenFrame: NSRect;
 function NSGlobalScreenLCLFrame: NSRect;
-function NSGlobalScreenHeight: CGFloat;
+function NSGlobalScreenBottom: CGFloat;
+
+function IndexToHMonitor(i: NSUInteger): HMonitor;
+function HMonitorToIndex(h: HMonitor): NSUInteger;
+function getScreenFromHMonitor(h: HMonitor): NSScreen;
 
 function CreateParamsToNSRect(const params: TCreateParams): NSRect;
 
@@ -759,34 +764,35 @@ begin
   ns.size.height:=lcl.Bottom-lcl.Top;
 end;
 
-// According to the documentation of NSScreen.screen It's recommended
+function ScreenPointFromLCLToNS(const lclPoint: TPoint): NSPoint;
-// not to cache NSScreen objects stored in the array. As those might change.
-// However, according to the same documentation, the objects can change
-// only with a notificatio sent out. BUT while using a macincloud (remote desktop)
-// services, it was identified that NSScreen object CAN change without any notification.
-// So, instead of passing NSScreen as HMonitor, only INDEX+1 in NSScreen.screen
-// is used.
-function IndexToHMonitor(i: NSUInteger): HMonitor;
 begin
-  if i = NSIntegerMax then Result := 0
+  Result.x:= lclPoint.x;
-  else Result := i + 1;
+  Result.y:= NSGlobalScreenBottom - lclPoint.y;
 end;
 
-function HMonitorToIndex(h: HMonitor): NSUInteger;
+function ScreenPointFromNSToLCL(const cocoaPoint: NSPoint): TPoint;
 begin
-  if h = 0 then Result := NSIntegerMax
+  Result.x:= Round( cocoaPoint.x );
-  else Result := NSUInteger(h)-1;
+  Result.y:= Round( NSGlobalScreenBottom - cocoaPoint.y );
 end;
 
-function getScreenFromHMonitor(h: HMonitor): NSScreen;
+function ScreenRectFromLCLToNS(const lclRect: TRect): NSRect;
+begin
+  Result.origin.x:= lclRect.left;
+  Result.origin.y:= NSGlobalScreenBottom - lclRect.bottom;
+  Result.size.width:= lclRect.Right - lclRect.Left;
+  Result.size.height:= lclRect.Bottom - lclRect.Top;
+end;
+
+function ScreenRectFromNSToLCL(const cocoaRect: NSRect): TRect;
 var
-  index: NSUInteger;
+  bottom: CGFloat;
 begin
-  Result:= nil;
+  bottom:= NSGlobalScreenBottom;
-  index:= HMonitorToIndex( h );
+  Result.Left:= Round( cocoaRect.origin.x );
-  if index>=NSScreen.screens.count then
+  Result.Top:= Round( bottom - NSMaxY(cocoaRect) );
-    Exit;
+  Result.Right:= Round( cocoaRect.origin.x + cocoaRect.size.width );
-  Result:= NSScreen( NSScreen.screens.objectAtIndex(index) );
+  Result.Bottom:= Round( bottom -  cocoaRect.origin.y );
 end;
 
 // primary display
@@ -821,10 +827,41 @@ begin
   Result.origin.y:= NSPrimaryScreenFrame.size.height - NSMaxY(Result);
 end;
 
-// the height of global full virtual display
+// the bottom of global full virtual display
-function NSGlobalScreenHeight: CGFloat;
+// for cocoa window/screen to lcl coordinate
+function NSGlobalScreenBottom: CGFloat;
 begin
-  Result:= NSGlobalScreenFrame.size.height;
+  Result:= NSMaxY( NSGlobalScreenFrame );
+end;
+
+// According to the documentation of NSScreen.screen It's recommended
+// not to cache NSScreen objects stored in the array. As those might change.
+// However, according to the same documentation, the objects can change
+// only with a notificatio sent out. BUT while using a macincloud (remote desktop)
+// services, it was identified that NSScreen object CAN change without any notification.
+// So, instead of passing NSScreen as HMonitor, only INDEX+1 in NSScreen.screen
+// is used.
+function IndexToHMonitor(i: NSUInteger): HMonitor;
+begin
+  if i = NSIntegerMax then Result := 0
+  else Result := i + 1;
+end;
+
+function HMonitorToIndex(h: HMonitor): NSUInteger;
+begin
+  if h = 0 then Result := NSIntegerMax
+  else Result := NSUInteger(h)-1;
+end;
+
+function getScreenFromHMonitor(h: HMonitor): NSScreen;
+var
+  index: NSUInteger;
+begin
+  Result:= nil;
+  index:= HMonitorToIndex( h );
+  if index>=NSScreen.screens.count then
+    Exit;
+  Result:= NSScreen( NSScreen.screens.objectAtIndex(index) );
 end;
 
 function CreateParamsToNSRect(const params: TCreateParams): NSRect;

lcl/interfaces/cocoa/cocoawinapi.inc

@@ -1074,7 +1074,7 @@ begin
 
   contentView := TCocoaWindowContent(Handle);
   if (not contentView.isembedded) and Assigned(contentView.window) then
-    NSToLCLRect(contentView.window.frame, NSGlobalScreenHeight, ARect)
+    ARect := ScreenRectFromNSToLCL( contentView.window.frame )
   else
     ARect := contentView.lclFrame;
   Result := 1;
@@ -1138,19 +1138,13 @@ end;
 
 function TCocoaWidgetSet.GetCursorPos(var lpPoint: TPoint ): Boolean;
 begin
-  with NSEvent.mouseLocation do
+  lpPoint:= ScreenPointFromNSToLCL( NSEvent.mouseLocation );
-  begin
-    lpPoint.x := Round(x);
-    // cocoa returns cursor with inverted y coordinate
-    lpPoint.y := Round(NSGlobalScreenHeight-y);
-  end;
   //debugln('GetCursorPos='+DbgS(lpPoint));
   Result := True;
 end;
 
 function TCocoaWidgetSet.GetMonitorInfo(hMonitor: HMONITOR; lpmi: PMonitorInfo): Boolean;
 var
-  globalScreenHeight:  CGFloat;
   ScreenID: NSScreen;
 begin
   Result := (lpmi <> nil) and (lpmi^.cbSize >= SizeOf(TMonitorInfo));
@@ -1159,9 +1153,8 @@ begin
   Result := Assigned(ScreenID);
   if not Result then Exit;
 
-  globalScreenHeight := NSGlobalScreenHeight;
+  lpmi^.rcMonitor:= ScreenRectFromNSToLCL( ScreenID.frame );
-  NSToLCLRect(ScreenID.frame, globalScreenHeight, lpmi^.rcMonitor);
+  lpmi^.rcWork:= ScreenRectFromNSToLCL( ScreenID.visibleFrame );
-  NSToLCLRect(ScreenID.visibleFrame, globalScreenHeight, lpmi^.rcWork);
   // according to the documentation the primary (0,0 coord screen)
   // is always and index 0
   if HMonitorToIndex(hMonitor) = 0 then
@@ -1333,13 +1326,6 @@ begin
     Result:=0;
 end;
 
-function TCocoaWidgetSet.GetWindowRelativePosition(Handle: hwnd; var Left, Top: Integer): boolean;
-begin
-  Result := Handle <> 0;
-  if Result then
-    NSObject(handle).lclRelativePos(Left, Top);
-end;
-
 // 1. not only for Window, but also for other controls
 // 2. for a Window, according to this function specification, Width and Height
 //    should be returned. but ClientWidth and ClientHeight were returned
@@ -1477,7 +1463,7 @@ begin
     Exit;
 
   p.x:=Point.X;
-  p.y:=NSGlobalScreenHeight-Point.Y;
+  p.y:=NSGlobalScreenBottom-Point.Y;
   window := GetCocoaWindowAtPos(p);
   if Assigned(window) then
     Result:= HWND(window.contentView);
@@ -1876,7 +1862,7 @@ var
   i: Integer;
 begin
   Result:= 0;
-  point:= LCLToNSPoint( ptScreenCoords, NSGlobalScreenHeight );
+  point:= ScreenPointFromLCLToNS( ptScreenCoords );
   if point.y>=1 then         // NSPointInRect is (upper,left) inside
     point.y:= point.y-1;     // (lower,right) outside
 

lcl/interfaces/cocoa/cocoawinapih.inc

@@ -122,7 +122,6 @@ function GetViewPortOrgEx(DC: HDC; P: PPoint): Integer; override;
 {function GetWindowLong(Handle : hwnd; int: Integer): PtrInt; override;}
 function GetWindowOrgEx(dc : hdc; P : PPoint): Integer; override;
 function GetWindowRect(Handle: hwnd; var ARect: TRect): Integer; override;
-function GetWindowRelativePosition(Handle: hwnd; var Left, Top: Integer): boolean; override;
 function GetWindowSize(Handle: hwnd; var Width, Height: Integer): boolean; override;
 
 function HideCaret(Handle: HWND): Boolean; override;

lcl/interfaces/cocoa/cocoawindows.pas

@@ -47,7 +47,6 @@ type
     procedure lclInvalidateRect(const r: TRect); message 'lclInvalidateRect:'; reintroduce;
     procedure lclInvalidate; message 'lclInvalidate'; reintroduce;
     procedure lclUpdate; message 'lclUpdate'; reintroduce;
-    procedure lclRelativePos(var Left, Top: Integer); message 'lclRelativePos::'; reintroduce;
     procedure lclLocalToScreen(var X, Y: Integer); message 'lclLocalToScreen::'; reintroduce;
     procedure lclScreenToLocal(var X, Y: Integer); message 'lclScreenToLocal::'; reintroduce;
     function lclFrame: TRect; message 'lclFrame'; reintroduce;
@@ -222,7 +221,6 @@ type
     function lclOwnWindow: NSWindow; message 'lclOwnWindow';
     procedure lclSetFrame(const r: TRect); override;
     function lclFrame: TRect; override;
-    procedure lclRelativePos(var Left, Top: Integer); override;
     procedure viewDidMoveToSuperview; override;
     procedure viewDidMoveToWindow; override;
     procedure viewWillMoveToWindow(newWindow: CocoaAll.NSWindow); override;
@@ -446,19 +444,11 @@ begin
   if not isembedded then
   begin
     //Window bounds should return "client rect" in screen coordinates
-    NSToLCLRect(window.frame, NSGlobalScreenHeight, wfrm);
+    wfrm := ScreenRectFromNSToLCL(window.frame);
     Types.OffsetRect(Result, -Result.Left+wfrm.Left, -Result.Top+wfrm.Top);
   end;
 end;
 
-procedure TCocoaWindowContent.lclRelativePos(var Left, Top: Integer);
-begin
-  if isembedded then
-    inherited lclRelativePos(Left, Top)
-  else
-    window.lclRelativePos(Left, Top);
-end;
-
 procedure TCocoaWindowContent.viewDidMoveToSuperview;
 begin
   inherited viewDidMoveToSuperview;
@@ -1234,23 +1224,13 @@ begin
   contentView.lclUpdate;
 end;
 
-procedure LCLWindowExtension.lclRelativePos(var Left, Top: Integer);
-var
-  f: NSRect;
-begin
-  f:=frame;
-  Left := Round(f.origin.x);
-  Top := Round(NSGlobalScreenHeight - NSMaxY(f));
-  //debugln('Top:'+dbgs(Top));
-end;
-
 procedure LCLWindowExtension.lclLocalToScreen(var X, Y:Integer);
 var
   f: NSRect;
 begin
   f := frame;
   inc(X, Round(f.origin.x));
-  inc(Y, Round(NSGlobalScreenHeight - NSMaxY(f)));
+  inc(Y, Round(NSGlobalScreenBottom - NSMaxY(f)));
 end;
 
 procedure LCLWindowExtension.lclScreenToLocal(var X, Y: Integer);
@@ -1259,15 +1239,15 @@ var
 begin
   f := frame;
   dec(X, Round(f.origin.x));
-  dec(Y, Round(NSGlobalScreenHeight - NSMaxY(f)));
+  dec(Y, Round(NSGlobalScreenBottom - NSMaxY(f)));
 end;
 
 function LCLWindowExtension.lclFrame: TRect;
 begin
   if Assigned(contentView) then
-    Result:=contentView.lclFrame
+    Result:= contentView.lclFrame
   else
-    NSToLCLRect(frame, NSGlobalScreenHeight, Result);
+    Result:= ScreenRectFromNSToLCL( frame );
 end;
 
 function LCLWindowExtension.lclGetTopBarHeight:integer;
@@ -1288,12 +1268,12 @@ var
   ns : NSRect;
   h  : integer;
 begin
-  LCLToNSRect(r, NSGlobalScreenHeight, ns);
+  ns:= ScreenRectFromLCLToNS( r );
 
   // add topbar height
-  h:=lclGetTopBarHeight;
+  h:= lclGetTopBarHeight;
-  ns.size.height:=ns.size.height+h;
+  ns.size.height:= ns.size.height + h;
-  ns.origin.y:=ns.origin.y-h;
+  ns.origin.y:= ns.origin.y - h;
   {$ifdef BOOLFIX}
   setFrame_display_(ns, Ord(isVisible));
   {$else}

lcl/interfaces/cocoa/cocoawscommon.pas

@@ -536,8 +536,8 @@ begin
   if lWindow <> nil then
   begin
     f := lWindow.frame;
-    Point.x := Point.x+f.origin.x;
+    Point.x := Point.x + f.origin.x;
-    Point.y := lWindow.screen.frame.size.height- f.origin.y - Point.y;
+    Point.y := NSGlobalScreenBottom - ( Point.y + f.origin.y );
   end;
 end;
 

lcl/interfaces/cocoa/cocoawsmenus.pas

@@ -959,7 +959,7 @@ begin
   point:= TPoint.Create( x, y );
   screen:= getScreenFromHMonitor( CocoaWidgetSet.MonitorFromPoint(point, MONITOR_DEFAULTTONULL) );
 
-  mouseY:= NSGlobalScreenHeight - y;
+  mouseY:= NSGlobalScreenBottom - y;
   if Assigned(screen) then begin
     menuY:= screen.visibleFrame.origin.y + menu.size.height + 1;
     menuY:= max( mouseY, MenuY );