carbon: improve clipping operations: proper implementation of IntersectClipRect, ExcludeClipRect, SaveDC, RestoreDC functions

git-svn-id: trunk@21297 -

lcl/interfaces/carbon/carboncanvas.pp

@@ -84,7 +84,6 @@ type
     FSavedDCList: TFPObjectList;
     FTextFractional: Boolean;
 
-    fLastClipRegion : TCarbonRegion;
     isClipped : Boolean;
 
     procedure SetBkColor(AValue: TColor);
@@ -99,6 +98,7 @@ type
     function GetSize: TPoint; virtual; abstract;
     function SaveDCData: TCarbonDCData; virtual;
     procedure RestoreDCData(const AData: TCarbonDCData); virtual;
+    procedure ExcludeClipRect(Left, Top, Right, Bottom: Integer);
   public
     constructor Create;
     destructor Destroy; override;
@@ -119,7 +119,6 @@ type
     procedure DrawGrid(const ARect: TRect; DX, DY: Integer);
     
     procedure Ellipse(X1, Y1, X2, Y2: Integer);
-    procedure ExcludeClipRect(Left, Top, Right, Bottom: Integer);
     function ExtTextOut(X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean;
     procedure FillRect(Rect: TRect; Brush: TCarbonBrush);
     procedure Frame(X1, Y1, X2, Y2: Integer);
@@ -144,8 +143,6 @@ type
   public
     property Size: TPoint read GetSize;
 
-    property LastClipRegion: TCarbonRegion read fLastClipRegion;
-
     property CurrentFont: TCarbonFont read FCurrentFont write SetCurrentFont;
     property CurrentBrush: TCarbonBrush read FCurrentBrush write SetCurrentBrush;
     property CurrentPen: TCarbonPen read FCurrentPen write SetCurrentPen;
@@ -492,6 +489,8 @@ end;
  ------------------------------------------------------------------------------}
 function TCarbonDeviceContext.SaveDC: Integer;
 begin
+  if isClipped then CGContextRestoreGState(CGContext); // clip rect is on top of the state stack!
+
   Result := 0;
   if CGContext = nil then
   begin
@@ -507,6 +506,13 @@ begin
   {$IFDEF VerboseCanvas}
     DebugLn('TCarbonDeviceContext.SaveDC Result: ', DbgS(Result));
   {$ENDIF}
+  
+  if isClipped then 
+  begin
+    // should clip rect be restored?
+    isClipped:=false;
+    FClipRegion.Shape := HIShapeCreateEmpty;
+  end;
 end;
 
 {------------------------------------------------------------------------------
@@ -518,6 +524,8 @@ end;
  ------------------------------------------------------------------------------}
 function TCarbonDeviceContext.RestoreDC(ASavedDC: Integer): Boolean;
 begin
+  if isClipped then CGContextRestoreGState(CGContext);
+  
   Result := False;
   if (FSavedDCList = nil) or (ASavedDC <= 0) or (ASavedDC > FSavedDCList.Count) then
   begin
@@ -549,6 +557,14 @@ begin
   {$ENDIF}
   
   if FSavedDCList.Count = 0 then FreeAndNil(FSavedDCList);
+  
+  
+  if isClipped then 
+  begin
+    // should clip be restored?
+    isClipped:=false;
+    FClipRegion.Shape := HIShapeCreateEmpty;
+  end;
 end;
 
 {------------------------------------------------------------------------------
@@ -1468,7 +1484,6 @@ begin
     isClipped := false;
     CGContextRestoreGState(CGContext);
   end;
-  fLastClipRegion := AClipRegion;
   
   if not Assigned(AClipRegion) then
   begin

lcl/interfaces/carbon/carbongdiobjects.pp

@@ -801,6 +801,9 @@ begin
   else
   begin
     Result := LCLType.ComplexRegion;
+    if (CombineMode in [RGN_AND, RGN_OR, RGN_XOR]) and HIShapeIsEmpty(FShape) then 
+      CombineMode := RGN_COPY;
+      
     case CombineMode of
       RGN_AND: Shape:=HIShapeCreateIntersection(FShape, ARegion.Shape);
       RGN_XOR:

lcl/interfaces/carbon/carbonprivatecommon.inc

@@ -102,6 +102,10 @@ begin
     end;
     if AWidget.HasCaret then DrawCaret;
     
+    // resetting clip region for the next paint
+    TCarbonControlContext(AWidget.Context).SetClipRegion(nil, 0);
+    
+
   finally
     FreeAndNil(AWidget.Context);
     dec(IsDrawEvent);

lcl/interfaces/carbon/carbonwinapi.inc

@@ -904,18 +904,8 @@ end;
 function TCarbonWidgetSet.ExcludeClipRect(DC: HDC; Left, Top, Right,
   Bottom: Integer): Integer;
 begin
-  Result := ERROR;
+  //todo: remove, as unused
-
+  Result := inherited ExcludeClipRect(DC, Left, Top, Right, Bottom);
-  {$IFDEF VerboseWinAPI}
-    DebugLn('TCarbonWidgetSet.ExcludeClipRect DC: ' + DbgS(DC) + ' R: ' +
-      DbgS(Classes.Rect(Left, Top, Right, Bottom)));
-  {$ENDIF}
-  
-  if not CheckDC(DC, 'ExcludeClipRect') then Exit;
-  
-  TCarbonDeviceContext(DC).ExcludeClipRect(Left, Top, Right, Bottom);
-  
-  Result := COMPLEXREGION;
 end;
 
 function TCarbonWidgetSet.ExtCreatePen(dwPenStyle, dwWidth: DWord;
@@ -2249,19 +2239,8 @@ end;
 function TCarbonWidgetSet.IntersectClipRect(DC: HDC; Left, Top, Right,
   Bottom: Integer): Integer;
 begin
-  Result := ERROR;
+  //todo: remove, as not used  
-  
+  Result := inherited IntersectClipRect(DC, Left, Top, Right, Bottom);
-  {$IFDEF VerboseWinAPI}
-    DebugLn('TCarbonWidgetSet.IntersectClipRect DC: ' + DbgS(DC) + ' R: ' +
-      DbgS(Classes.Rect(Left, Top, Right, Bottom)));
-  {$ENDIF}
-  
-  if not CheckDC(DC, 'IntersectClipRect') then Exit;
-  
-  CGContextClipToRect(TCarbonContext(DC).CGContext,
-    RectToCGRect(Classes.Rect(Left, Top, Right, Bottom)));
-    
-  Result := COMPLEXREGION;
 end;
 
 {------------------------------------------------------------------------------
@@ -2461,10 +2440,10 @@ function TCarbonWidgetSet.MoveWindowOrgEx(DC: HDC; dX, dY: Integer): Boolean;
 begin
   Result := False;
 
-  {$IFDEF VerboseWinAPI}
+  {.$IFDEF VerboseWinAPI}
     DebugLn('TCarbonWidgetSet.MoveWindowOrgEx DC: ' + DbgS(DC) + ' ' + DbgS(DX)
       + ', ' + DbgS(DY));
-  {$ENDIF}
+  {.$ENDIF}
   
   if not CheckDC(DC, 'MoveWindowOrgEx') then Exit;
   
@@ -3447,7 +3426,6 @@ const
   SName = 'TCarbonWidgetSet.StretchMaskBlt';
 begin
   Result := False;
-
   {$IFDEF VerboseWinAPI}
     DebugLn('TCarbonWidgetSet.StretchMaskBlt DestDC: ' + DbgS(DestDC) + ' SrcDC: ',
       DbgS(SrcDC) + ' X: ' +  DbgS(X) + ' Y: ' + DbgS(Y),