Changeset 178 for branches/highdpi/LocalPlayer/Term.pas

Timestamp:

Jun 23, 2019, 3:15:29 PM (5 years ago)

Author:

chronos

Message:

• Modified: Use DpiControls package for High DPI support.

File:

• branches/highdpi/LocalPlayer/Term.pas (modified) (26 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -13 +13 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
-  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area;
+  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
+  UDpiControls;
 
 const
@@ -228 +229 @@
     BrushType: Cardinal;
     trix: array [0 .. 63] of integer;
-    AILogo: array [0 .. nPl - 1] of TBitmap;
-    Mini, Panel, TopBar: TBitmap;
+    AILogo: array [0 .. nPl - 1] of TDpiBitmap;
+    Mini, Panel, TopBar: TDpiBitmap;
     sb: TPVScrollbar;
     Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
@@ -276 +277 @@
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
-    Offscreen: TBitmap;
-    OffscreenUser: TForm;
+    Offscreen: TDpiBitmap;
+    OffscreenUser: TDpiForm;
     procedure CreateParams(var p: TCreateParams); override;
     procedure Client(Command, NewPlayer: integer; var Data);
@@ -428 +429 @@
   CityRepMask: Cardinal;
   ReceivedOffer: TOffer;
-  Buffer: TBitmap;
-  SmallImp: TBitmap;
+  Buffer: TDpiBitmap;
+  SmallImp: TDpiBitmap;
   BlinkON: Boolean;
   DestinationMarkON: Boolean;
@@ -455 +456 @@
 procedure InitMyModel(mix: integer; final: boolean);
 
-procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer = -1;
+procedure ImpImage(ca: TDpiCanvas; x, y, iix: integer; Government: integer = -1;
   IsControl: boolean = false);
 procedure HelpOnTerrain(Loc, NewMode: integer);
 
-
 implementation
 
 uses
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer, Sound,
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego,
   Battle, Rates, TechTree, Registry;
 
@@ -620 +620 @@
 end;
 
-procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer;
+procedure ImpImage(ca: TDpiCanvas; x, y, iix: integer; Government: integer;
   IsControl: boolean);
 begin
@@ -859 +859 @@
 end;
 
-procedure PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
+procedure PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
 
   procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
@@ -1088 +1088 @@
     if G.RO[DipMem[me].pContact] <> nil then
     begin // close windows for next player
-      for i := 0 to Screen.FormCount - 1 do
-        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+      for i := 0 to DpiScreen.FormCount - 1 do
+        if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
         then
-          Screen.Forms[i].Close;
+          DpiScreen.Forms[i].Close;
     end
     else
@@ -1116 +1116 @@
     if G.RO[DipMem[me].pContact] <> nil then
     begin // close windows for next player
-      for i := 0 to Screen.FormCount - 1 do
-        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+      for i := 0 to DpiScreen.FormCount - 1 do
+        if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
         then
-          Screen.Forms[i].Close;
+          DpiScreen.Forms[i].Close;
     end
     else
@@ -1231 +1231 @@
   begin
     if AILogo[p] = nil then
-      AILogo[p] := TBitmap.Create;
+      AILogo[p] := TDpiBitmap.Create;
     if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', gfNoError) then
     begin
@@ -1497 +1497 @@
 
     HGrStdUnits := LoadGraphicSet('StdUnits.png');
-    SmallImp := TBitmap.Create;
+    SmallImp := TDpiBitmap.Create;
     SmallImp.PixelFormat := pf24bit;
     InitSmallImp;
@@ -1811 +1811 @@
     end;
 
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i] is TBufferedDrawDlg then
-        Screen.Forms[i].Enabled := true;
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i] is TBufferedDrawDlg then
+        DpiScreen.Forms[i].Enabled := true;
 
     if ClientMode <> cResume then
@@ -1824 +1824 @@
       // first turn after anarchy -- don't show despotism palace!
       Update;
-      for i := 0 to Screen.FormCount - 1 do
-        if (Screen.Forms[i].Visible) and (Screen.Forms[i] is TBufferedDrawDlg)
+      for i := 0 to DpiScreen.FormCount - 1 do
+        if (DpiScreen.Forms[i].Visible) and (DpiScreen.Forms[i] is TBufferedDrawDlg)
         then
         begin
-          if @Screen.Forms[i].OnShow <> nil then
-            Screen.Forms[i].OnShow(nil);
-          Screen.Forms[i].Invalidate;
-          Screen.Forms[i].Update;
+          if @DpiScreen.Forms[i].OnShow <> nil then
+            DpiScreen.Forms[i].OnShow(nil);
+          DpiScreen.Forms[i].Invalidate;
+          DpiScreen.Forms[i].Update;
         end;
 
@@ -2665 +2665 @@
         SaveSettings;
         CityDlg.CloseAction := None;
-        for i := 0 to Screen.FormCount - 1 do
-          if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
+        for i := 0 to DpiScreen.FormCount - 1 do
+          if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
           then
-            Screen.Forms[i].Close;
+            DpiScreen.Forms[i].Close;
         if LogDlg.Visible then
           LogDlg.Close;
@@ -3409 +3409 @@
   i, j: integer;
 begin
-  MainFormKeyDown := FormKeyDown;
   BaseWin.CreateOffscreen(Offscreen);
 
@@ -3508 +3507 @@
   end;
 
-  Mini := TBitmap.Create;
+  Mini := TDpiBitmap.Create;
   Mini.PixelFormat := pf24bit;
-  Panel := TBitmap.Create;
+  Panel := TDpiBitmap.Create;
   Panel.PixelFormat := pf24bit;
   Panel.Canvas.Font.Assign(UniFont[ftSmall]);
   Panel.Canvas.Brush.Style := bsClear;
-  TopBar := TBitmap.Create;
+  TopBar := TDpiBitmap.Create;
   TopBar.PixelFormat := pf24bit;
   TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
   TopBar.Canvas.Brush.Style := bsClear;
-  Buffer := TBitmap.Create;
+  Buffer := TDpiBitmap.Create;
   Buffer.PixelFormat := pf24bit;
   if 2 * lxmax > 3 * xSizeBig then
@@ -3538 +3537 @@
 procedure TMainScreen.FormDestroy(Sender: TObject);
 var
-  I: Integer;
-begin
-  MainFormKeyDown := nil;
+  i: integer;
+begin
   FreeAndNil(sb);
   FreeAndNil(TopBar);
@@ -3546 +3544 @@
   FreeAndNil(Buffer);
   FreeAndNil(Panel);
-  for I := 0 to nPl - 1 do
+  for i := 0 to nPl - 1 do
     if AILogo[i] <> nil then
-      FreeAndNil(AILogo[I]);
+      FreeAndNil(AILogo[i]);
   FreeAndNil(Offscreen);
 end;
@@ -3753 +3751 @@
   if supervising and (me <> 0) then
   begin
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close; // close windows
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+        DpiScreen.Forms[i].Close; // close windows
     ItsMeAgain(0);
   end;
@@ -3899 +3897 @@
   if IsMultiPlayerGame then
   begin // close windows for next player
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close;
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+        DpiScreen.Forms[i].Close;
   end
   else
@@ -3911 +3909 @@
   end;
   for i := 0 to Screen.FormCount - 1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      Screen.Forms[i].Enabled := false;
+    if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+      DpiScreen.Forms[i].Enabled := false;
 
   if Server(sTurn, pTurn, 0, nil^) >= rExecuted then
@@ -4179 +4177 @@
 {$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;
+function ScrollDC(Canvas: TDpiCanvas; 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,
@@ -5080 +5078 @@
 begin
   if idle and (me >= 0) and (GameMode <> cMovie) then
-    if (fsModal in Screen.ActiveForm.FormState) or
-      (Screen.ActiveForm is TBufferedDrawDlg) and
-      (TBufferedDrawDlg(Screen.ActiveForm).WindowMode <> wmPersistent) then
+    if (fsModal in DpiScreen.ActiveForm.FormState) or
+      (DpiScreen.ActiveForm is TBufferedDrawDlg) and
+      (TBufferedDrawDlg(DpiScreen.ActiveForm).WindowMode <> wmPersistent) then
     begin
       BlinkTime := BlinkOnTime + BlinkOffTime - 1;
@@ -5117 +5115 @@
         if (dx <> 0) or (dy <> 0) then
         begin
-          if (Screen.ActiveForm <> MainScreen) and
-            (@Screen.ActiveForm.OnDeactivate <> nil) then
-            Screen.ActiveForm.OnDeactivate(nil);
+          if (DpiScreen.ActiveForm <> MainScreen) and
+            (@DpiScreen.ActiveForm.OnDeactivate <> nil) then
+            DpiScreen.ActiveForm.OnDeactivate(nil);
           Scroll(dx, dy);
         end
@@ -6458 +6456 @@
     ((p = 0) or (1 shl p and G.RO[0].Alive <> 0)) then
   begin
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close; // close windows
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+        DpiScreen.Forms[i].Close; // close windows
     ItsMeAgain(p);
     SumCities(TaxSum, ScienceSum);
@@ -8003 +8001 @@
   Centre(CenterLoc);
   PaintAllMaps;
-  for i := 0 to Screen.FormCount - 1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      TBufferedDrawDlg(Screen.Forms[i]).SmartUpdateContent(false);
+  for i := 0 to DpiScreen.FormCount - 1 do
+    if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+      TBufferedDrawDlg(DpiScreen.Forms[i]).SmartUpdateContent(false);
 end;