Changeset 468

Timestamp:

Dec 3, 2023, 11:28:08 AM (13 months ago)

Author:

chronos

Message:

• Added: High DPI support integrated into trunk branch. It can be enabled by adding DPI define to compiler parameters for main project and packages.

Location:

trunk

Files:

• Back.pas (modified) (4 diffs)
• Brain.pas (modified) (1 diff)
• Direct.pas (modified) (2 diffs)
• GameServer.pas (modified) (1 diff)
• IPQ.pas (modified) (4 diffs)
• Inp.pas (modified) (2 diffs)
• Integrated.lpi (modified) (5 diffs)
• Integrated.lpr (modified) (2 diffs)
• LocalPlayer/Battle.pas (modified) (2 diffs)
• LocalPlayer/CityScreen.pas (modified) (7 diffs)
• LocalPlayer/CityType.pas (modified) (1 diff)
• LocalPlayer/Diagram.pas (modified) (3 diffs)
• LocalPlayer/Diplomacy.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (5 diffs)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (5 diffs)
• LocalPlayer/IsoEngine.pas (modified) (7 diffs)
• LocalPlayer/KeyBindings.pas (modified) (1 diff)
• LocalPlayer/LocalPlayer.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (2 diffs)
• LocalPlayer/NatStat.pas (modified) (3 diffs)
• LocalPlayer/Nego.pas (modified) (3 diffs)
• LocalPlayer/PVSB.pas (modified) (2 diffs)
• LocalPlayer/Rates.pas (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (4 diffs)
• LocalPlayer/TechTree.pas (modified) (4 diffs)
• LocalPlayer/Term.pas (modified) (22 diffs)
• LocalPlayer/Tribes.pas (modified) (1 diff)
• LocalPlayer/UnitStat.pas (modified) (5 diffs)
• LocalPlayer/Wonders.pas (modified) (3 diffs)
• Log.pas (modified) (2 diffs)
• Messg.pas (modified) (1 diff)
• MiniMap.pas (modified) (5 diffs)
• NoTerm.pas (modified) (3 diffs)
• Packages/CevoComponents/Area.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (5 diffs)
• Packages/CevoComponents/ButtonA.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonB.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonBase.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonN.pas (modified) (2 diffs)
• Packages/CevoComponents/CevoComponents.lpk (modified) (1 diff)
• Packages/CevoComponents/DrawDlg.pas (modified) (1 diff)
• Packages/CevoComponents/EOTButton.pas (modified) (2 diffs)
• Packages/CevoComponents/GraphicSet.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (14 diffs)
• Packages/CevoComponents/Texture.pas (modified) (1 diff)
• Packages/DpiControls (added)
• Packages/DpiControls/Dpi.ComCtrls.pas (added)
• Packages/DpiControls/Dpi.Common.pas (added)
• Packages/DpiControls/Dpi.Controls.pas (added)
• Packages/DpiControls/Dpi.ExtCtrls.pas (added)
• Packages/DpiControls/Dpi.Forms.pas (added)
• Packages/DpiControls/Dpi.Graphics.pas (added)
• Packages/DpiControls/Dpi.Grids.pas (added)
• Packages/DpiControls/Dpi.Menus.pas (added)
• Packages/DpiControls/Dpi.PixelPointer.pas (added)
• Packages/DpiControls/Dpi.Spin.pas (added)
• Packages/DpiControls/Dpi.StdCtrls.pas (added)
• Packages/DpiControls/DpiControls.lpk (added)
• Packages/DpiControls/DpiControls.pas (added)
• Packages/DpiControls/DpiControlsPackage.pas (added)
• Packages/DpiControls/NativePixelPointer.pas (added)
• Settings.pas (modified) (2 diffs)
• Start.pas (modified) (7 diffs)

trunk/Back.pas

@@ -5 +5 @@
 
 uses
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Forms, Controls;
+  LCLIntf, LCLType, SysUtils, Classes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Forms, Dpi.Controls{$ELSE}
+  Graphics, Forms, Controls{$ENDIF};
 
 type
@@ -25 +27 @@
 var
   Background: TBackground;
+
 
 implementation
@@ -65 +68 @@
 begin
   if FullScreen then begin
-    WindowState := wsFullScreen;
+    WindowState := TWindowState.wsFullScreen;
     if not Assigned(Img) then begin
       FileName := GetGraphicsDir + DirectorySeparator + 'Background.png';
@@ -75 +78 @@
     end;
   end else begin
-    if WindowState <> wsMaximized then begin
-      WindowState := wsNormal;
-      WindowState := wsFullScreen;
+    if WindowState <> TWindowState.wsMaximized then begin
+      WindowState := TWindowState.wsNormal;
+      WindowState := TWindowState.wsFullScreen;
     end;
-    WindowState := wsNormal;
+    WindowState := TWindowState.wsNormal;
     BoundsRect := Bounds(StartDlg.Left - 8, StartDlg.Top - 8,
       StartDlg.Width + 16, StartDlg.Height + 16);

trunk/Brain.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections, Graphics, Protocol, LazFileUtils,
-  dynlibs, Types;
+  Classes, SysUtils, Generics.Collections, Protocol, LazFileUtils,
+  dynlibs, Types,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
 const

trunk/Direct.pas

@@ -8 +8 @@
 
   LCLIntf, LCLType, {$IFDEF UNIX}LMessages, {$ENDIF}Messages, SysUtils, Classes,
-  Graphics, Controls, Forms, DrawDlg, GameServer;
+  DrawDlg, GameServer,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}Graphics, Controls, Forms{$ENDIF};
 
 const
@@ -187 +188 @@
   BrainRandom.Name := Phrases.Lookup('RANDOMAI');
   Canvas.Font.Assign(UniFont[ftNormal]);
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
 end;
 

trunk/GameServer.pas

@@ -7 +7 @@
 
 uses
-  Protocol, Database, dynlibs, Platform, dateutils, LazFileUtils, Graphics,
-  Brain, Global;
+  Protocol, Database, DynLibs, Platform, DateUtils, LazFileUtils, Brain, Global,
+  {$IFDEF DPI}Graphics{$ELSE}Graphics{$ENDIF};
 
 const

trunk/IPQ.pas

@@ -11 +11 @@
   PIntegerArray = ^TIntegerArray;
 
-  TheapItem = record
+  THeapItem = record
     Item: Integer;
     Value: Integer;
   end;
 
-  TItemArray = array [0 .. $40000000 div SizeOf(TheapItem)] of TheapItem;
+  TItemArray = array [0 .. $40000000 div SizeOf(THeapItem)] of THeapItem;
   PItemArray = ^TItemArray;
 
@@ -37 +37 @@
   end;
 
+
 implementation
 
@@ -43 +44 @@
   inherited Create;
   fmax := Max;
-  GetMem(bh, fmax * SizeOf(TheapItem));
+  GetMem(bh, fmax * SizeOf(THeapItem));
   GetMem(Ix, fmax * SizeOf(Integer));
   N := -1;
@@ -118 +119 @@
 var
   I, J: Integer;
-  Last: TheapItem;
+  Last: THeapItem;
   lbh: PItemArray;
 begin

trunk/Inp.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  DrawDlg, ButtonA, StdCtrls;
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, ButtonA, StdCtrls,
+  System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -35 +37 @@
 begin
   Canvas.Font.Assign(UniFont[ftNormal]);
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
   TitleHeight := Height;
   InitButtons;

trunk/Integrated.lpi

@@ -9 +9 @@
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
         <CompatibilityMode Value="True"/>
       </Flags>
@@ -69 +70 @@
               <IgnoredMessages idx5024="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-dBorland -dVer150 -dDelphi7 -dCompiler6_Up -dPUREPASCAL"/>
+            <OtherDefines Count="1">
+              <Define0 Value="DPI"/>
+            </OtherDefines>
           </Other>
         </CompilerOptions>
       </Item2>
       <SharedMatrixOptions Count="2">
-        <Item1 ID="151739052537" Targets="CevoComponents,Common" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
-        <Item2 ID="186701832267" Targets="CevoComponents,Common" Modes="Release" Value="-CX -XX -O3"/>
+        <Item1 ID="151739052537" Targets="CevoComponents,Common,DpiControls" Modes="Debug" Value="-g -gl -gh -O1"/>
+        <Item2 ID="186701832267" Targets="CevoComponents,Common,DpiControls" Modes="Release" Value="-CX -XX -O3"/>
       </SharedMatrixOptions>
     </BuildModes>
@@ -87 +90 @@
       </Modes>
     </RunParams>
-    <RequiredPackages Count="3">
+    <RequiredPackages Count="4">
       <Item1>
+        <PackageName Value="DpiControls"/>
+        <DefaultFilename Value="Packages\DpiControls\DpiControls.lpk" Prefer="True"/>
+      </Item1>
+      <Item2>
         <PackageName Value="Common"/>
         <DefaultFilename Value="Packages\Common\Common.lpk" Prefer="True"/>
-      </Item1>
-      <Item2>
+      </Item2>
+      <Item3>
         <PackageName Value="CevoComponents"/>
         <DefaultFilename Value="Packages\CevoComponents\CevoComponents.lpk" Prefer="True"/>
-      </Item2>
-      <Item3>
+      </Item3>
+      <Item4>
         <PackageName Value="LCL"/>
-      </Item3>
+      </Item4>
     </RequiredPackages>
     <Units Count="47">
@@ -395 +402 @@
       <Debugging>
         <DebugInfoType Value="dsDwarf2Set"/>
-        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>
@@ -409 +415 @@
       </CompilerMessages>
       <CustomOptions Value="-dDEBUG"/>
+      <OtherDefines Count="2">
+        <Define0 Value="DEBUG"/>
+        <Define1 Value="DPI"/>
+      </OtherDefines>
     </Other>
   </CompilerOptions>

trunk/Integrated.lpr

@@ -6 +6 @@
   cthreads, clocale,
   {$ENDIF}
-  Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
+  {$IFDEF DPI}Dpi.Forms,{$ELSE}Forms,{$ENDIF}
+  Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
   Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
   NoTerm, ScreenTools, Directories;
@@ -27 +28 @@
   Application.Initialize;
   Application.Title := 'C-evo';
-  Application.TaskBarBehavior := tbMultiButton;
+  Application.TaskBarBehavior := TTaskBarBehavior.tbMultiButton;
   Directories.UnitInit;
   ScreenTools.UnitInit;

trunk/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
-  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg, IsoEngine;
+  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType, UITypes,
+  SysUtils, Classes, DrawDlg, IsoEngine,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -236 +238 @@
     Brush.Color := 0;
     FillRect(Rect(0, 0, ClientWidth, ClientHeight));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
     PaintBackground(self, 3 + Border, 3 + Border,
       ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border));

trunk/LocalPlayer/CityScreen.pas

@@ -7 +7 @@
   {$IFDEF UNIX}LMessages,{$ENDIF}
   Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA,
-  ButtonC, Area, GraphType, Texture;
+  Messages, SysUtils, Classes, ButtonA, ButtonC, Area, GraphType, Texture,
+  System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
+  Graphics, Controls, Forms, ExtCtrls{$ENDIF};
 
 const
@@ -224 +226 @@
 
   Back := TBitmap.Create;
-  Back.PixelFormat := pf24bit;
+  Back.PixelFormat := TPixelFormat.pf24bit;
   Back.SetSize(Width, Height);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  Template.PixelFormat := pf24bit;
+  Template.PixelFormat := TPixelFormat.pf24bit;
   LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png',
     [gfNoGamma]);
   CityMapTemplate := TBitmap.Create;
-  CityMapTemplate.PixelFormat := pf24bit;
+  CityMapTemplate.PixelFormat := TPixelFormat.pf24bit;
   LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png',
     [gfNoGamma]);
   SmallCityMapTemplate := TBitmap.Create;
-  SmallCityMapTemplate.PixelFormat := pf24bit;
+  SmallCityMapTemplate.PixelFormat := TPixelFormat.pf24bit;
   LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
     [gfNoGamma]);
   SmallCityMap := TBitmap.Create;
-  SmallCityMap.PixelFormat := pf24bit;
+  SmallCityMap.PixelFormat := TPixelFormat.pf24bit;
   SmallCityMap.SetSize(98, 74);
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
   ZoomCityMap := TBitmap.Create;
-  ZoomCityMap.PixelFormat := pf24bit;
+  ZoomCityMap.PixelFormat := TPixelFormat.pf24bit;
   ZoomCityMap.SetSize(228, 124);
   ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
@@ -362 +364 @@
       end;
     end;
-    Brush.style := bsClear;
+    Brush.style := TBrushStyle.bsClear;
   end;
 end;
@@ -537 +539 @@
     Brush.Color := $FFFFFF;
     FillRect(Rect(8, 7, 36, 32));
-    Brush.style := bsClear;
+    Brush.style := TBrushStyle.bsClear;
     Font.Color := $000000;
     S := IntToStr(C.Size);
@@ -810 +812 @@
     Offscreen.Canvas.Brush.Color := MainTexture.ColorMark;
     Offscreen.Canvas.FillRect(Rect(X - 27, Y - 6, X + 27, Y + 6));
-    Offscreen.Canvas.Brush.style := bsClear;
+    Offscreen.Canvas.Brush.Style := TBrushStyle.bsClear;
   end;
   Sprite(Offscreen, HGrSystem, X - 16, Y - 5, 10, 10, 88, 115);
@@ -985 +987 @@
         FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
           yView + 5 + 40));
-        Brush.style := bsClear;
+        Brush.Style := TBrushStyle.bsClear;
       end;
     end
@@ -1624 +1626 @@
         FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
           yView + 5 + 40));
-        Brush.style := bsClear;
+        Brush.Style := TBrushStyle.bsClear;
       end
     else if BlinkTime = 6 then

trunk/LocalPlayer/CityType.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType,
-  SysUtils, Classes, Graphics, Controls, Forms, ButtonB, ExtCtrls;
+  SysUtils, Classes, ButtonB, ExtCtrls,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}Graphics, Controls, Forms{$ENDIF};
 
 type

trunk/LocalPlayer/Diagram.pas

@@ -5 +5 @@
 
 uses
-  BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, Menus;
+  BaseWin, LCLIntf, LCLType, SysUtils, Classes, ButtonB,
+{$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus{$ELSE}
+Graphics, Controls, Forms, Menus{$ENDIF};
 
 type
@@ -60 +61 @@
   Canvas.Brush.Color := $000000;
   Canvas.FillRect(Rect(Left, Top, Left + Width, Top + 200));
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
     ScreenTools.Frame(Canvas, Left - 1, Top - 1, Left + Width, Top + 200,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
@@ -202 +203 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, InnerWidth, InnerHeight));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
       Pen.Color := $606060;
       MoveTo(Border, InnerHeight - Border);

trunk/LocalPlayer/Diplomacy.pas

@@ -8 +8 @@
 function DipCommandToString(pSender, pTarget, Treaty, OppCommand,
   Command: Integer; const OppOffer, Offer: TOffer): string;
+
 
 implementation

trunk/LocalPlayer/Draft.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
-  Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA, ButtonB, Area;
+  Classes, ButtonA, ButtonB, Area, System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
+  Graphics, Controls, Forms, ExtCtrls{$ENDIF};
 
 type
@@ -83 +85 @@
 
   Back := TBitmap.Create;
-  Back.PixelFormat := pf24bit;
+  Back.PixelFormat := TPixelFormat.pf24bit;
   Back.SetSize(Width, Height);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  Template.PixelFormat := pf24bit;
+  Template.PixelFormat := TPixelFormat.pf24bit;
   LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png',
     [gfNoGamma]);
@@ -156 +158 @@
               FrameRect(Rect(xTotal2 - 3 - dx, Y + 2,
                 xTotal2 + 11 - dx, Y + 16));
-              Brush.Style := bsClear;
+              Brush.Style := TBrushStyle.bsClear;
               Sprite(Offscreen, HGrSystem, xTotal2 - 1 - dx, Y + 4, 10, 10,
                 66 + I mod 11 * 11, 137 + I div 11 * 11);
@@ -167 +169 @@
                 FillRect(Rect(xTotal2 - 3 - dx, Y + 2,
                   xTotal2 + W - 1 - dx, Y + 16));
-                Brush.Style := bsClear;
+                Brush.Style := TBrushStyle.bsClear;
                 Textout(xTotal2 - 3 - dx + 1, Y, S);
               end;
@@ -508 +510 @@
   I, D: Integer;
 begin
-  if Button = mbLeft then
+  if Button = TMouseButton.mbLeft then
   begin
     for D := 0 to nDomains - 1 do

trunk/LocalPlayer/Enhance.pas

@@ -6 +6 @@
 uses
   ScreenTools, BaseWin, Protocol, ClientTools, LCLIntf, LCLType, SysUtils,
-  Classes, Graphics, Controls, Forms, IsoEngine, ButtonB, ButtonC, Menus;
+  Classes, IsoEngine, ButtonB, ButtonC,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus{$ELSE}
+  Graphics, Controls, Forms, Menus{$ENDIF};
+
 
 type

trunk/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonB, PVSB, Types, Generics.Collections, IsoEngine;
+  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType, System.UITypes,
+  Messages, SysUtils, Classes, ButtonB, PVSB, Types, Generics.Collections, IsoEngine,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Common{$ELSE}
+  Graphics, Controls, Forms, ExtCtrls{$ENDIF};
 
 const
@@ -151 +152 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer, Global,
-  KeyBindings;
+  {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
+  Directories, ClientTools, Term, Tribes, Inp, Messg, Global, KeyBindings;
 
 {$R *.lfm}
@@ -293 +294 @@
   CaptionFont := Font.Create;
   CaptionFont.Assign(UniFont[ftNormal]);
-  CaptionFont.Style := CaptionFont.Style + [fsItalic, fsBold];
+  CaptionFont.Style := CaptionFont.Style + [TFontStyle.fsItalic, TFontStyle.fsBold];
   InitButtons;
 
@@ -302 +303 @@
   ExtPic := TBitmap.Create;
   TerrIcon := TBitmap.Create;
-  TerrIcon.PixelFormat := pf24bit;
+  TerrIcon.PixelFormat := TPixelFormat.pf24bit;
   TerrIcon.SetSize(xSizeBig, ySizeBig);
   TerrIcon.Canvas.FillRect(0, 0, TerrIcon.Width, TerrIcon.Height);
@@ -699 +700 @@
                 FrameRect(Rect(ofs, 1 + 23 + I * 24, ofs + 14,
                   15 + 23 + I * 24));
-                Brush.Style := bsClear;
+                Brush.Style := TBrushStyle.bsClear;
                 Sprite(OffScreen, HGrSystem, ofs + 2, 3 + 23 + I * 24, 10, 10,
                   66 + HelpLineInfo.Picpix mod 11 * 11,

trunk/LocalPlayer/IsoEngine.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, Tribes, LCLIntf, LCLType, SysUtils,
-  Classes, Graphics, PixelPointer, GraphicSet;
+  Classes, GraphicSet,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.PixelPointer, Dpi.Common{$ELSE}
+  Graphics, PixelPointer{$ENDIF};
 
 const
@@ -215 +217 @@
 begin
   LandPatch := TBitmap.Create;
-  LandPatch.PixelFormat := pf24bit;
+  LandPatch.PixelFormat := TPixelFormat.pf24bit;
   OceanPatch := TBitmap.Create;
-  OceanPatch.PixelFormat := pf24bit;
+  OceanPatch.PixelFormat := TPixelFormat.pf24bit;
   Borders := TBitmap.Create;
-  Borders.PixelFormat := pf24bit;
+  Borders.PixelFormat := TPixelFormat.pf24bit;
   HGrTerrain := nil;
   HGrCities := nil;
@@ -251 +253 @@
   Mask24 := TBitmap.Create;
   Mask24.Assign(HGrTerrain.Mask);
-  Mask24.PixelFormat := pf24bit;
+  Mask24.PixelFormat := TPixelFormat.pf24bit;
   Mask24.BeginUpdate;
   for ySrc := 0 to TerrainIconLines - 1 do begin
@@ -344 +346 @@
   OceanPatch.Canvas.FillRect(0, 0, OceanPatch.Width, OceanPatch.Height);
   LandMore := TBitmap.Create;
-  LandMore.PixelFormat := pf24bit;
+  LandMore.PixelFormat := TPixelFormat.pf24bit;
   LandMore.Canvas.Brush.Color := 0;
   LandMore.SetSize(xxt * 18, yyt * 9);
   LandMore.Canvas.FillRect(0, 0, LandMore.Width, LandMore.Height);
   OceanMore := TBitmap.Create;
-  OceanMore.PixelFormat := pf24bit;
+  OceanMore.PixelFormat := TPixelFormat.pf24bit;
   OceanMore.Canvas.Brush.Color := 0;
   OceanMore.SetSize(xxt * 8, yyt * 4);
   OceanMore.Canvas.FillRect(0, 0, OceanMore.Width, OceanMore.Height);
   DitherMask := TBitmap.Create;
-  DitherMask.PixelFormat := pf24bit;
+  DitherMask.PixelFormat := TPixelFormat.pf24bit;
   DitherMask.SetSize(xxt * 2, yyt * 2);
   DitherMask.Canvas.FillRect(0, 0, DitherMask.Width, DitherMask.Height);
@@ -584 +586 @@
   FOutput.Canvas.Brush.Color := Color;
   FOutput.Canvas.FillRect(Rect(X, Y, X + Width, Y + Height));
-  FOutput.Canvas.Brush.Style := bsClear;
+  FOutput.Canvas.Brush.Style := TBrushStyle.bsClear;
 end;
 
@@ -1080 +1082 @@
       xs := X + xxt - (W + 1) div 2;
       if IsCapital then
-        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [fsUnderline];
+        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [TFontStyle.fsUnderline];
       Textout(xs + 1, Y - 9, $000000, S);
       Textout(xs, Y - 10, $FFFFFF, S);
       if IsCapital then
-        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [fsUnderline];
+        FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [TFontStyle.fsUnderline];
     end;
   end;
@@ -1509 +1511 @@
     Brush.Color := $000000;
     FillRect(Rect(FLeft, RealTop, FRight, RealBottom));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
   end;
 

trunk/LocalPlayer/KeyBindings.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Generics.Collections, Generics.Defaults, LCLProc, LCLType,
-  Menus, Registry;
+  Registry,
+  {$IFDEF DPI}Dpi.Menus{$ELSE}Menus{$ENDIF};
 
 type

trunk/LocalPlayer/LocalPlayer.pas

@@ -7 +7 @@
 procedure SetAIName(P: Integer; Name: string);
 
+
 implementation
 
 uses
-  Term, CityScreen, Nego, BaseWin, Forms;
+  Term, CityScreen, Nego, BaseWin,
+  {$IFDEF DPI}Dpi.Forms{$ELSE}Forms{$ENDIF};
 
 var

trunk/LocalPlayer/MessgEx.pas

@@ -6 +6 @@
 uses
   Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
-  SysUtils, Classes, Graphics, Controls, Forms, ButtonA, ButtonB, StdCtrls,
-  DrawDlg, Help;
+  SysUtils, Classes, ButtonA, ButtonB, DrawDlg, Help, System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Common{$ELSE}
+  Graphics, Controls, Forms, StdCtrls{$ENDIF};
 
 type
@@ -61 +62 @@
 
 uses
-  ClientTools, BaseWin, Term, UnitStat, Tribes, PixelPointer,
-  Diagram, Sound;
+  {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
+  ClientTools, BaseWin, Term, UnitStat, Tribes, Diagram, Sound;
 
 {$R *.lfm}

trunk/LocalPlayer/NatStat.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
-  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, Menus, EOTButton;
+  Classes, ButtonB, ButtonC, EOTButton,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus{$ELSE}
+  Graphics, Controls, Forms, Menus{$ENDIF};
 
 type
@@ -86 +88 @@
 
   Back := TBitmap.Create;
-  Back.PixelFormat := pf24bit;
+  Back.PixelFormat := TPixelFormat.pf24bit;
   Back.SetSize(Width, Height);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  Template.PixelFormat := pf24bit;
+  Template.PixelFormat := TPixelFormat.pf24bit;
   LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png',
     [gfNoGamma]);
@@ -359 +361 @@
         FillRect(Rect(xReport + PaperShade, yReport + hReport,
           xReport + wReport + PaperShade, yReport + hReport + PaperShade));
-        Brush.Style := bsClear;
+        Brush.Style := TBrushStyle.bsClear;
       end;
 

trunk/LocalPlayer/Nego.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonA, ButtonB, ButtonN;
+  ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, ButtonA, ButtonB,
+  ButtonN, System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 const
@@ -432 +434 @@
     else
       FillRect(Rect(X, Y, X + 64, Y + 48));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
     ScreenTools.Frame(Offscreen.Canvas, X - 1, Y - 1, X + 64, Y + 48, $000000, $000000);
   end
@@ -572 +574 @@
     FillRect(Rect(xText1 + PaperShade, yText1 + hText,
       xText1 + wText + PaperShade, yText1 + hText + PaperShade));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
   end;
 

trunk/LocalPlayer/PVSB.pas

@@ -6 +6 @@
 uses
   {$IFDEF WINDOWS}Windows,{$ENDIF}
-  Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
-  StdCtrls, Math;
+  Classes, LCLIntf, LCLType, LMessages, Messages, SysUtils, Math,
+  {$IFDEF DPI}Dpi.Controls, Dpi.Forms, Dpi.StdCtrls{$ELSE}
+  Controls, Forms, StdCtrls{$ENDIF};
 
 type
@@ -183 +184 @@
   Inc(Count);
   ScrollBar := TScrollBar.Create(Parent);
-  ScrollBar.Kind := sbVertical;
+  ScrollBar.Kind := TScrollBarKind.sbVertical;
   ScrollBar.Name := 'PVSB' + IntToStr(Count);
-  ScrollBar.Align := alRight;
+  ScrollBar.Align := TAlign.alRight;
   ScrollBar.OnChange := ScrollBarChanged;
   ScrollBar.Parent := Parent;

trunk/LocalPlayer/Rates.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonB, ButtonC;
+  Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, ButtonB,
+  ButtonC,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -124 +126 @@
       Brush.Color := $000000;
       FillRect(Rect(X, Y, X + Max - current, Y + 7));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
 

trunk/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, ScreenTools, PVSB, BaseWin,
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  ExtCtrls, ButtonB, ButtonBase, Menus, Types;
+  Protocol, ClientTools, ScreenTools, PVSB, BaseWin, System.UITypes,
+  LCLIntf, LCLType, Messages, SysUtils, Classes, ButtonB, ButtonBase, Types,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus{$ELSE}
+  Graphics, Controls, Forms, ExtCtrls, Menus{$ENDIF};
 
 const
@@ -118 +119 @@
   Layer2Btn.Hint := Phrases.Lookup('BTN_CLASSES');
   ScienceNationDotBuffer := TBitmap.Create;
-  ScienceNationDotBuffer.PixelFormat := pf24bit;
+  ScienceNationDotBuffer.PixelFormat := TPixelFormat.pf24bit;
   ScienceNationDotBuffer.SetSize(17, 17);
   ScienceNationDotBuffer.Canvas.FillRect(0, 0, ScienceNationDotBuffer.Width, ScienceNationDotBuffer.Height);
@@ -276 +277 @@
           Brush.Color := $FFFFFF;
           FillRect(rect(X - 4 - 12, Y, X - 4 + 12, Y + 20));
-          Brush.style := bsClear;
+          Brush.Style := TBrushStyle.bsClear;
           Font.Color := $000000;
           S := IntToStr(MyCity[lix].Size);
@@ -749 +750 @@
           FillRect(rect(104 - 33 + 14 + TechNameSpace + 24 * I + 1 * 2, 0,
             104 - 33 + 17 + TechNameSpace + 24 * I + 8 * 2, InnerHeight));
-          Brush.style := bsClear;
+          Brush.Style := TBrushStyle.bsClear;
         end
         else

trunk/LocalPlayer/TechTree.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonB, DrawDlg;
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, ButtonB, DrawDlg,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -132 +133 @@
   if Image = nil then begin
     Image := TBitmap.Create;
-    Image.PixelFormat := pf24bit;
+    Image.PixelFormat := TPixelFormat.pf24bit;
     LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png',
       [gfNoGamma]);
@@ -140 +141 @@
       Font.Assign(UniFont[ftSmall]);
       Font.Color := clBlack;
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
       for X := 0 to (Image.Width - xStart) div xPitch do
         for Y := 0 to (Image.Height - yStart) div yPitch do
@@ -186 +187 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  if Button = mbLeft then
+  if Button = TMouseButton.mbLeft then
   begin
     Dragging := True;

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   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,
+  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, System.UITypes,
+  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
   Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
-  Help;
+  Help,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus, Dpi.ExtCtrls,
+  Dpi.PixelPointer, Dpi.Common{$ELSE}
+  Graphics, Controls, Forms, Menus, ExtCtrls, PixelPointer{$ENDIF};
 
 const
@@ -642 +645 @@
 
 uses
-  Directories, Log, PixelPointer, Sound, Registry, Global, KeyBindings, CmdList;
+  Directories, Log, Sound, Registry, Global, KeyBindings, CmdList;
 
 {$R *.lfm}
@@ -1809 +1812 @@
   HGrStdUnits := LoadGraphicSet('StdUnits.png');
   SmallImp := TBitmap.Create;
-  SmallImp.PixelFormat := pf24bit;
+  SmallImp.PixelFormat := TPixelFormat.pf24bit;
   InitSmallImp;
   SoundPreloadDone := [];
@@ -1869 +1872 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, Panel.width, Panel.height));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
     with TopBar.Canvas do
@@ -1875 +1878 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, TopBar.width, TopBar.height));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
     Invalidate;
@@ -2885 +2888 @@
           Brush.Color := $000000;
           FillRect(Rect(0, 0, Panel.width, Panel.height));
-          Brush.Style := bsClear;
+          Brush.Style := TBrushStyle.bsClear;
         end;
         with TopBar.Canvas do
@@ -2891 +2894 @@
           Brush.Color := $000000;
           FillRect(Rect(0, 0, TopBar.width, TopBar.height));
-          Brush.Style := bsClear;
+          Brush.Style := TBrushStyle.bsClear;
         end;
         FormResize(nil); // place mini map correctly according to its size
@@ -3634 +3637 @@
   MiniMap := TMiniMap.Create;
   Panel := TBitmap.Create;
-  Panel.PixelFormat := pf24bit;
+  Panel.PixelFormat := TPixelFormat.pf24bit;
   Panel.Canvas.Font.Assign(UniFont[ftSmall]);
-  Panel.Canvas.Brush.Style := bsClear;
+  Panel.Canvas.Brush.Style := TBrushStyle.bsClear;
   TopBar := TBitmap.Create;
-  TopBar.PixelFormat := pf24bit;
+  TopBar.PixelFormat := TPixelFormat.pf24bit;
   TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
-  TopBar.Canvas.Brush.Style := bsClear;
+  TopBar.Canvas.Brush.Style := TBrushStyle.bsClear;
   Buffer := TBitmap.Create;
-  Buffer.PixelFormat := pf24bit;
+  Buffer.PixelFormat := TPixelFormat.pf24bit;
   if 2 * lxmax > 3 * xSizeBig then Buffer.width := 2 * lxmax
     else Buffer.width := 3 * xSizeBig;
@@ -4806 +4809 @@
       Brush.Color := $000000;
       FillRect(Rect(0, 0, MapWidth, MapHeight));
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
       OffscreenUser := self;
       Exit;
@@ -4991 +4994 @@
       xRightPanel + 2, PanelHeight, ClientWidth div 2);
 
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
     Pen.Color := $000000;
     MoveTo(0, 0);
@@ -5216 +5219 @@
     else if TroopLoc >= 0 then
     begin
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
       if UnFocus >= 0 then
         with MyUn^[UnFocus] do
@@ -5709 +5712 @@
 begin
   if Idle and (Me >= 0) and (GameMode <> cMovie) then
-    if (fsModal in Screen.ActiveForm.FormState) or
+    if (TFormStateType.fsModal in Screen.ActiveForm.FormState) or
       (Screen.ActiveForm is TBufferedDrawDlg) and
       (TBufferedDrawDlg(Screen.ActiveForm).WindowMode <> wmPersistent) then
@@ -5865 +5868 @@
   if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
     Exit;
-  if (Button = mbLeft) and not(ssShift in Shift) then
+  if (Button = TMouseButton.mbLeft) and not(ssShift in Shift) then
   begin
     DoCenter := True;
@@ -5992 +5995 @@
     end;
   end
-  else if (ClientMode <> cEditMap) and (Button = mbRight) and
+  else if (ClientMode <> cEditMap) and (Button = TMouseButton.mbRight) and
     not(ssShift in Shift) then
   begin
@@ -6075 +6078 @@
       end;
   end
-  else if (Button = mbMiddle) and (UnFocus >= 0) and
+  else if (Button = TMouseButton.mbMiddle) and (UnFocus >= 0) and
     (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler, mkSlaves]) then
   begin
@@ -6088 +6091 @@
       mEnhance.Click;
   end
-  else if (Button = mbLeft) and (ssShift in Shift) and
+  else if (Button = TMouseButton.mbLeft) and (ssShift in Shift) and
     (MyMap[MouseLoc] and fTerrain <> fUNKNOWN) then
     HelpOnTerrain(MouseLoc, wmPersistent)
-  else if (ClientMode <= cContinue) and (Button = mbRight) and
+  else if (ClientMode <= cContinue) and (Button = TMouseButton.mbRight) and
     (ssShift in Shift) and (UnFocus >= 0) and
     (MyMap[MouseLoc] and (fUnit or fOwned) = fUnit) then
@@ -6867 +6870 @@
     Exit;
 
-  if Button = mbLeft then
+  if Button = TMouseButton.mbLeft then
   begin
     if (X >= xMini + 2) and (Y >= yMini + 2) and (X < xMini + 2 + 2 * G.lx) and
@@ -7160 +7163 @@
 procedure TMainScreen.SetFullScreen(Active: Boolean);
 begin
-    if Active and (CurrentWindowState <> wsFullScreen) then begin
+    if Active and (CurrentWindowState <> TWindowState.wsFullScreen) then begin
       PrevWindowState := WindowState;
-      CurrentWindowState := wsFullScreen;
+      CurrentWindowState := TWindowState.wsFullScreen;
       WindowState := CurrentWindowState;
       {$IFDEF WINDOWS}
@@ -7169 +7172 @@
       BorderIcons := [];
     end else
-    if not Active and (CurrentWindowState = wsFullScreen) then begin
-      if PrevWindowState = wsMaximized then begin
-        CurrentWindowState := wsMaximized;
+    if not Active and (CurrentWindowState = TWindowState.wsFullScreen) then begin
+      if PrevWindowState = TWindowState.wsMaximized then begin
+        CurrentWindowState := TWindowState.wsMaximized;
         WindowState := CurrentWindowState;
       end else begin
-        CurrentWindowState := wsNormal;
+        CurrentWindowState := TWindowState.wsNormal;
         WindowState := CurrentWindowState;
-        WindowState := wsFullScreen;
+        WindowState := TWindowState.wsFullScreen;
         WindowState := CurrentWindowState;
       end;
@@ -7182 +7185 @@
       BorderStyle := bsSizeable;
       {$ENDIF}
-      BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+      BorderIcons := [TBorderIcon.biSystemMenu, TBorderIcon.biMinimize,
+        TBorderIcon.biMaximize];
     end;
 end;
@@ -7954 +7958 @@
     MouseLoc := LocationOfScreenPixel(X, Y);
     if MouseLoc <> BrushLoc then
-      MapBoxMouseDown(nil, mbLeft, Shift, X, Y);
+      MapBoxMouseDown(nil, TMouseButton.mbLeft, Shift, X, Y);
   end
   (* else if Idle and (UnFocus>=0) then
@@ -8067 +8071 @@
           TopBarHeight + MapHeight - overlap));
       end;
-      Brush.Style := bsClear;
+      Brush.Style := TBrushStyle.bsClear;
     end;
   BitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,

trunk/LocalPlayer/Tribes.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global,
-  GraphicSet;
+  Protocol, ScreenTools, LazFileUtils, Classes, SysUtils, Global,
+  GraphicSet,
+  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
+
 
 type

trunk/LocalPlayer/UnitStat.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
-  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, IsoEngine;
+  Classes, ButtonB, ButtonC, IsoEngine,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -79 +81 @@
 
   Back := TBitmap.Create;
-  Back.PixelFormat := pf24bit;
+  Back.PixelFormat := TPixelFormat.pf24bit;
   Back.SetSize(5 * wCommon, hMax);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
-  Template.PixelFormat := pf24bit;
+  Template.PixelFormat := TPixelFormat.pf24bit;
   LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png',
     [gfNoGamma]);
@@ -343 +345 @@
               Brush.Color := $FFFFFF;
               FillRect(Rect(X - 3 + dx, Y + 2, X + W - 1 + dx, Y + 16));
-              Brush.Style := bsClear;
+              Brush.Style := TBrushStyle.bsClear;
               Textout(X - 3 + dx + 1, Y, S);
               Inc(dx, W + 1);
@@ -349 +351 @@
             Brush.Color := $C0C0C0;
             FrameRect(Rect(X - 3 + dx, Y + 2, X + 11 + dx, Y + 16));
-            Brush.Style := bsClear;
+            Brush.Style := TBrushStyle.bsClear;
             Sprite(dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
               66 + I mod 11 * 11, 137 + I div 11 * 11);
@@ -512 +514 @@
             Offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
               yView + 16));
-            Brush.Style := bsClear;
+            Brush.Style := TBrushStyle.bsClear;
           end;
 

trunk/LocalPlayer/Wonders.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonB;
+  ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, ButtonB,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Common{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -35 +36 @@
 
 uses
-  Term, ClientTools, Help, Tribes, PixelPointer;
+  {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
+  Term, ClientTools, Help, Tribes;
 
 {$R *.lfm}
@@ -67 +69 @@
 begin
   Canvas.Font.Assign(UniFont[ftNormal]);
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
   InitButtons;
 end;

trunk/Log.pas

@@ -5 +5 @@
 
 uses
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  StdCtrls, Menus;
+  LCLIntf, LCLType, Messages, SysUtils, Classes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus{$ELSE}
+  Graphics, Controls, Forms, StdCtrls, Menus{$ENDIF};
 
 type
@@ -130 +131 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  if Button = mbRight then
+  if Button = TMouseButton.mbRight then
     LogPopup.Popup(Left + X, Top + Y);
 end;

trunk/Messg.pas

@@ -6 +6 @@
 uses
   ScreenTools, LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes,
-  Graphics, Controls, Forms, ButtonA, DrawDlg;
+  ButtonA, DrawDlg, System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 const

trunk/MiniMap.pas

@@ -5 +5 @@
 
 uses
-  Classes, SysUtils, Graphics, Protocol, ClientTools;
+  Classes, SysUtils, Protocol, ClientTools,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Common{$ELSE}Graphics{$ENDIF};
 
 type
@@ -37 +38 @@
 
 uses
-  ScreenTools, PixelPointer, Global, GameServer, IsoEngine, Tribes;
+  {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
+  ScreenTools, Global, GameServer, IsoEngine, Tribes;
 
 const
@@ -169 +171 @@
   Size := WorldSize;
 
-  Bitmap.PixelFormat := pf24bit;
+  Bitmap.PixelFormat := TPixelFormat.pf24bit;
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
@@ -199 +201 @@
   OwnColor := HGrSystem.Data.Canvas.Pixels[95, 67];
   EnemyColor := HGrSystem.Data.Canvas.Pixels[96, 67];
-  Bitmap.PixelFormat := pf24bit;
+  Bitmap.PixelFormat := TPixelFormat.pf24bit;
   Bitmap.SetSize(Size.X * 2, Size.Y);
   if Mode = mmPicture then begin
@@ -261 +263 @@
     FillRect(Rect(0, 0, Bitmap.Width, Bitmap.Height));
   end;
-  Bitmap.PixelFormat := pf24bit;
+  Bitmap.PixelFormat := TPixelFormat.pf24bit;
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;

trunk/NoTerm.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, Messg, LCLIntf, LCLType, dateutils, Platform,
-  SysUtils, Classes, Graphics, Controls, Forms, ButtonB, DrawDlg;
+  ScreenTools, Protocol, Messg, LCLIntf, LCLType, DateUtils, Platform,
+  SysUtils, Classes, ButtonB, DrawDlg, System.UITypes,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
+  Graphics, Controls, Forms{$ENDIF};
 
 type
@@ -88 +90 @@
   Top := 8;
   Caption := Phrases.Lookup('AIT');
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
   Canvas.Font.Assign(UniFont[ftSmall]);
   TitleHeight := 36;
@@ -168 +170 @@
         State := TBitmap.Create;
         State.SetSize(192, 20);
-        State.Canvas.Brush.Style := bsClear;
+        State.Canvas.Brush.Style := TBrushStyle.bsClear;
         State.Canvas.Font.Assign(UniFont[ftSmall]);
         NewStat;

trunk/Packages/CevoComponents/Area.pas

@@ -4 +4 @@
 
 uses
-  Classes, Graphics, Controls;
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}
+  Graphics, Controls,{$ENDIF}
+  Classes;
 
 type

trunk/Packages/CevoComponents/BaseWin.pas

@@ -4 +4 @@
 
 uses
-  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  DrawDlg;
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms,{$ELSE}
+  Graphics, Controls, Forms,{$ENDIF}
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, System.UITypes;
 
 type
@@ -133 +134 @@
 begin
   if Key = VK_ESCAPE then begin
-    if fsModal in FormState then
+    if TFormStateType.fsModal in FormState then
       ModalResult := mrCancel;
   end else
   if Key = VK_RETURN then begin
-    if fsModal in FormState then
+    if TFormStateType.fsModal in FormState then
       ModalResult := mrOK;
   end else
@@ -245 +246 @@
   TexOverride := False;
   ModalIndication := True;
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
   InnerWidth := Width - 2 * SideFrame;
   InnerHeight := Height - TitleHeight - NarrowFrame;
@@ -479 +480 @@
     Exit;
   Offscreen := TBitmap.Create;
-  Offscreen.PixelFormat := pf24bit;
+  Offscreen.PixelFormat := TPixelFormat.pf24bit;
   if Screen.Height - yUnused < 480 then
     Offscreen.SetSize(Screen.Width, 480)
@@ -485 +486 @@
     Offscreen.SetSize(Screen.Width, Screen.Height - yUnused);
   Offscreen.Canvas.FillRect(0, 0, Offscreen.Width, OffScreen.Height);
-  Offscreen.Canvas.Brush.Style := bsClear;
+  Offscreen.Canvas.Brush.Style := TBrushStyle.bsClear;
 end;
 

trunk/Packages/CevoComponents/ButtonA.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools, Types;
+  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
+  ButtonBase, Classes, LCLIntf, LCLType, ScreenTools, Types;
 
 type
@@ -48 +49 @@
       BitBltCanvas(Canvas, 0, 0, 100, 25, Graphic.Canvas, 195,
         243 + 26 * Byte(Down));
-      Canvas.Brush.Style := bsClear;
+      Canvas.Brush.Style := TBrushStyle.bsClear;
       TextSize := TextExtent(FCaption);
       TextOut(50 - (TextSize.Width + 1) div 2,

trunk/Packages/CevoComponents/ButtonB.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase, Classes, Graphics, LCLIntf, LCLType;
+  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
+  ButtonBase, Classes, LCLIntf, LCLType;
 
 type

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -4 +4 @@
 
 uses
-  Classes, Graphics, Controls;
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}
+  Graphics, Controls,{$ENDIF}
+  Classes;
 
 type
@@ -84 +86 @@
         DownChangedProc(self);
     end;
-    if (Button = mbLeft) and (@ClickProc <> nil) then
+    if (Button = TMouseButton.mbLeft) and (@ClickProc <> nil) then
       ClickProc(self);
   end

trunk/Packages/CevoComponents/ButtonN.pas

@@ -4 +4 @@
 
 uses
-  Classes, Graphics, Controls, LCLIntf, LCLType, ScreenTools;
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}Graphics, Controls,{$ENDIF}
+  Classes, LCLIntf, LCLType, ScreenTools;
 
 type
@@ -85 +86 @@
   X, Y: Integer);
 begin
-  if FPossible and (Button = mbLeft) and (@ChangeProc <> nil) then
+  if FPossible and (Button = TMouseButton.mbLeft) and (@ChangeProc <> nil) then
     ChangeProc(Self);
 end;

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -112 +112 @@
     </Files>
     <CompatibilityMode Value="True"/>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="4">
       <Item1>
-        <PackageName Value="Common"/>
+        <PackageName Value="DpiControls"/>
       </Item1>
       <Item2>
-        <PackageName Value="LCL"/>
+        <PackageName Value="Common"/>
       </Item2>
       <Item3>
+        <PackageName Value="LCL"/>
+      </Item3>
+      <Item4>
         <PackageName Value="FCL"/>
-      </Item3>
+      </Item4>
     </RequiredPkgs>
     <UsageOptions>

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
+  {$IFDEF DPI}Dpi.Forms, Dpi.Common,{$ELSE}
+  Forms,{$ENDIF}
+  Classes, SysUtils, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
   Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
   {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF};

trunk/Packages/CevoComponents/EOTButton.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType;
+  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
+  ButtonBase, Classes, SysUtils, LCLIntf, LCLType;
 
 const
@@ -53 +54 @@
   inherited;
   Buffer := TBitmap.Create;
-  Buffer.PixelFormat := pf24bit;
+  Buffer.PixelFormat := TPixelFormat.pf24bit;
   Buffer.SetSize(48, 48);
   Buffer.Canvas.FillRect(0, 0, Buffer.Width, Buffer.Height);
   Back := TBitmap.Create;
-  Back.PixelFormat := pf24bit;
+  Back.PixelFormat := TPixelFormat.pf24bit;
   Back.SetSize(48, 48);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);

trunk/Packages/CevoComponents/GraphicSet.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Graphics, Generics.Collections, LCLType, DOM,
+  {$IFDEF DPI}Dpi.Graphics,{$ELSE}
+  Graphics,{$ENDIF}
+  Classes, SysUtils, Generics.Collections, LCLType, DOM,
   XMLRead, XMLWrite, XML;
 
@@ -228 +230 @@
 begin
   Data := TBitmap.Create;
-  Data.PixelFormat := pf24bit;
+  Data.PixelFormat := TPixelFormat.pf24bit;
   Mask := TBitmap.Create;
-  Mask.PixelFormat := pf24bit;
+  Mask.PixelFormat := TPixelFormat.pf24bit;
   Items := TGraphicSetItems.Create;
   Items.GraphicSet := Self;

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -7 +7 @@
   Windows,
   {$ENDIF}
-  StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Math,
-  Forms, Menus, GraphType, GraphicSet, LazFileUtils, Texture;
+  StringTables, LCLIntf, LCLType, SysUtils, Classes, Math,
+  GraphType, GraphicSet, LazFileUtils, Texture,
+  {$IFDEF DPI}Dpi.Forms, Dpi.Menus, Dpi.Graphics, Dpi.Controls, Dpi.Common{$ELSE}
+  Forms, Menus, Graphics, Controls{$ENDIF};
 
 type
@@ -96 +98 @@
 procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Cardinal);
 procedure DarkenImage(Bitmap: TBitmap; Change: Integer);
+{$IFNDEF DPI}
 function ScaleToNative(Value: Integer): Integer;
 function ScaleFromNative(Value: Integer): Integer;
+{$ENDIF}
 procedure UnshareBitmap(Bitmap: TBitmap);
 procedure Gtk2Fix;
@@ -199 +203 @@
 
 uses
-  Directories, Sound, PixelPointer;
+  {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
+  Directories, Sound;
 
 var
@@ -419 +424 @@
         Jpeg.LoadFromFile(FileName);
         if not (gfNoGamma in Options) then
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
         Bmp.SetSize(Jpeg.Width, Jpeg.Height);
         Bmp.Canvas.Draw(0, 0, Jpeg);
@@ -434 +439 @@
         Png.LoadFromFile(FileName);
         if not (gfNoGamma in Options) then
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
         Bmp.SetSize(Png.Width, Png.Height);
         if (Png.RawImage.Description.Format = ricfGray) then
         begin
           // LCL doesn't support 8-bit colors properly. Use 24-bit instead.
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
           CopyGray8BitTo24bitBitmap(Bmp, Png);
         end
@@ -454 +459 @@
         Bmp.LoadFromFile(FileName);
         if not (gfNoGamma in Options) then
-          Bmp.PixelFormat := pf24bit;
+          Bmp.PixelFormat := TPixelFormat.pf24bit;
         Result := True;
       except
@@ -634 +639 @@
   Height := ScaleToNative(Height);
   //Assert(Src.PixelFormat = pf8bit);
-  Assert(dst.PixelFormat = pf24bit);
+  Assert(dst.PixelFormat = TPixelFormat.pf24bit);
   if xDst < 0 then begin
     Width := Width + xDst;
@@ -821 +826 @@
   Height := ScaleToNative(Height);
   bmp.BeginUpdate;
-  Assert(bmp.PixelFormat = pf24bit);
+  Assert(bmp.PixelFormat = TPixelFormat.pf24bit);
   Height := Y + Height;
   PixelPtr := TPixelPointer.Create(Bmp, X, Y);
@@ -1524 +1529 @@
     Brush.Color := $000000;
     FillRect(Rect(X + Pos + abs(Growth), Y, X + Max, Y + 7));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
   end;
 end;
@@ -1627 +1632 @@
 end;
 
+{$IFNDEF DPI}
 function ScaleToNative(Value: Integer): Integer;
 begin
@@ -1636 +1642 @@
   Result := Value;
 end;
+{$ENDIF}
 
 procedure UnshareBitmap(Bitmap: TBitmap);
@@ -1691 +1698 @@
                   Size := Size * 10 + Byte(S[I]) - 48;
                 'B', 'b':
-                  UniFont[section].Style := UniFont[section].Style + [fsBold];
+                  UniFont[section].Style := UniFont[section].Style + [TFontStyle.fsBold];
                 'I', 'i':
-                  UniFont[section].Style := UniFont[section].Style + [fsItalic];
+                  UniFont[section].Style := UniFont[section].Style + [TFontStyle.fsItalic];
               end;
-            UniFont[section].Size := Round(Size * 72 / UniFont[section].PixelsPerInch);
+            UniFont[section].Size := Round(Size * ScaleToNative(72) / UniFont[section].PixelsPerInch);
           end;
         end;
@@ -1783 +1790 @@
 
   Colors := TBitmap.Create;
-  Colors.PixelFormat := pf24bit;
+  Colors.PixelFormat := TPixelFormat.pf24bit;
   Paper := TBitmap.Create;
-  Paper.PixelFormat := pf24bit;
+  Paper.PixelFormat := TPixelFormat.pf24bit;
   BigImp := TBitmap.Create;
-  BigImp.PixelFormat := pf24bit;
+  BigImp.PixelFormat := TPixelFormat.pf24bit;
   MainTexture := TTexture.Create;
   ClickFrameColor := HGrSystem.Data.Canvas.Pixels[187, 175];
@@ -1796 +1803 @@
 
   LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := pf24bit;
+  LogoBuffer.PixelFormat := TPixelFormat.pf24bit;
   LogoBuffer.SetSize(BigBook.Width, BigBook.Height);
 end;

trunk/Packages/CevoComponents/Texture.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Graphics;
+  {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
+  Classes, SysUtils;
 
 type

trunk/Settings.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  LCLProc, ScreenTools, Messg, ButtonA, Directories, DrawDlg, ButtonC,
-  KeyBindings, Languages;
+  Classes, SysUtils, FileUtil, Dialogs, LCLProc, ScreenTools, Messg, ButtonA,
+  Directories, DrawDlg, ButtonC, KeyBindings, Languages, System.UITypes,
+  {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls{$ELSE}
+  Forms, Controls, Graphics, StdCtrls{$ENDIF};
 
 type
@@ -82 +83 @@
 
   Canvas.Font.Assign(UniFont[ftNormal]);
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
 
   ButtonOk.Caption := Phrases.Lookup('BTN_OK');

trunk/Start.pas

@@ -6 +6 @@
 uses
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
-  Menus, Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain,
-  Translator;
+  LCLIntf, LCLType, SysUtils, Classes, System.UITypes,
+  Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain, Translator,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus{$ELSE}
+  Graphics, Controls, Forms, StdCtrls, Menus{$ENDIF};
 
 type
@@ -255 +256 @@
 
   Canvas.Font.Assign(UniFont[ftNormal]);
-  Canvas.Brush.Style := bsClear;
+  Canvas.Brush.Style := TBrushStyle.bsClear;
 
   QuitBtn.Hint := Phrases.Lookup('STARTCONTROLS', 0);
@@ -303 +304 @@
 
   EmptyPicture := TBitmap.Create;
-  EmptyPicture.PixelFormat := pf24bit;
+  EmptyPicture.PixelFormat := TPixelFormat.pf24bit;
   EmptyPicture.SetSize(64, 64);
   EmptyPicture.Canvas.FillRect(0, 0, EmptyPicture.Width, EmptyPicture.Height);
   LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := pf24bit;
+  LogoBuffer.PixelFormat := TPixelFormat.pf24bit;
   LogoBuffer.SetSize(wBuffer, 56);
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
@@ -531 +532 @@
 begin
   Canvas.Font.Assign(UniFont[ftCaption]);
-  Canvas.Font.Style := Canvas.Font.Style + [fsUnderline];
+  Canvas.Font.Style := Canvas.Font.Style + [TFontStyle.fsUnderline];
   RisedTextOut(Canvas, xAction, Y - 3, Phrases2.Lookup(HeaderItem));
   Canvas.Font.Assign(UniFont[ftNormal]);
@@ -566 +567 @@
     FillRect(Rect(0, 1, ClientWidth, 3));
     FillRect(Rect(TabOffset + 4 * TabSize + 2, 0, ClientWidth, TabHeight));
-    Brush.Style := bsClear;
+    Brush.Style := TBrushStyle.bsClear;
   end;
   if Page in [pgStartRandom, pgStartMap] then
@@ -745 +746 @@
               FillRect(Rect(xBrain[I] - 5, yBrain[I] + 25, xBrain[I] - 2,
                 yBrain[I] + 27));
-              Brush.Style := bsClear;
+              Brush.Style := TBrushStyle.bsClear;
             end;
             if PlayerSlots[I].OfferMultiple then
@@ -911 +912 @@
 begin
   {$IFDEF UNIX}
-  ShowInTaskBar := stAlways;
+  ShowInTaskBar := TShowInTaskbar.stAlways;
   {$ENDIF}
   MainTexture.Age := -1;