Changeset 48 for trunk

Timestamp:

Jan 11, 2017, 9:15:33 AM (8 years ago)

Author:

chronos

Message:

• Fixed: ScrollDC function is not available under Linux. Replace by slow scrolling using BitBlt.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (3 diffs)
• ScreenTools.pas (modified) (1 diff)

trunk/LocalPlayer/Term.pas

@@ -4152 +4152 @@
 end;
 
+function ScrollDCCopy(Canvas: TCanvas; dx: longint; dy: longint; const lprcScroll:RECT; const lprcClip:RECT; hrgnUpdate:HRGN; lprcUpdate:LPRECT):WINBOOL;
+begin
+  BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+    Canvas, lprcScroll.Left, lprcScroll.Top, SRCCOPY);
+end;
+
 procedure TMainScreen.MainOffscreenPaint;
 var
@@ -4198 +4204 @@
     offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     rec := Rect(0, 0, MapWidth, MapHeight);
-{$IFDEF WINDOWS}{ TODO Linux }
+{$IFDEF WINDOWS}
     ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
       rec, rec, 0, nil);
 {$ENDIF}
+{$IFDEF LINUX}
+    // Fallback to bitblt
+    ScrollDCCopy(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+      rec, rec, 0, nil);
+{$ENDIF}
     for DoInvalidate := false to FastScrolling do
     begin
@@ -4207 +4218 @@
       begin
         rec.Bottom := MapHeight - overlap;
-{$IFDEF WINDOWS}{ TODO Linux }
+{$IFDEF WINDOWS}
         ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
           rec, 0, nil);
+{$ENDIF}
+{$IFDEF LINUX}
+        // Fallback to bitblt
+        ScrollDCCopy(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+          rec, rec, 0, nil);
 {$ENDIF}
         ProcessOptions := prInvalidate;

trunk/ScreenTools.pas

@@ -810 +810 @@
 begin
   Assert(Rop = SRCCOPY);
-  DestCanvas.CopyRect(Rect(X, X, Width, Height), SrcCanvas,
+  DestCanvas.CopyRect(Rect(X, Y, X + Width, Y + Height), SrcCanvas,
     Rect(XSrc, YSrc, XSrc + Width, YSrc + Height));
 end;