Changeset 50 for trunk/LocalPlayer/Term.pas

Timestamp:

Jan 11, 2017, 5:26:09 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Deallocation of TPVScrollBar structure. Changed to class and added initialization and finalization.

File:

• trunk/LocalPlayer/Term.pas (modified) (5 diffs)

trunk/LocalPlayer/Term.pas

@@ -3455 +3455 @@
   i, j: integer;
 begin
+  sb := TPVScrollbar.Create;
 {$IFDEF WINDOWS}{ TODO }
   Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
@@ -3529 +3530 @@
   i: integer;
 begin
-  TopBar.free;
-  Mini.free;
-  Buffer.free;
-  Panel.free;
+  FreeAndNil(sb);
+  FreeAndNil(TopBar);
+  FreeAndNil(Mini);
+  FreeAndNil(Buffer);
+  FreeAndNil(Panel);
   for i := 0 to nPl - 1 do
     if AILogo[i] <> nil then
-      AILogo[i].free;
+      FreeAndNil(AILogo[i]);
 end;
 
@@ -4155 +4157 @@
 end;
 
-function ScrollDCCopy(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
+{$IFDEF LINUX}
+// Can't do scrolling of DC under Linux, then fallback into BitBlt.
+function ScrollDC(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
 begin
   BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     Canvas, lprcScroll.Left, lprcScroll.Top, SRCCOPY);
 end;
+{$ENDIF}
 
 procedure TMainScreen.MainOffscreenPaint;
@@ -4212 +4217 @@
 {$ENDIF}
 {$IFDEF LINUX}
-    // Fallback to bitblt
-    ScrollDCCopy(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+    ScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
       rec, rec, 0, nil);
 {$ENDIF}
@@ -4226 +4230 @@
 {$ENDIF}
 {$IFDEF LINUX}
-        // Fallback to bitblt
-        ScrollDCCopy(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+        ScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
           rec, rec, 0, nil);
 {$ENDIF}