Changeset 465 for branches/highdpi/Direct.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (5 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/Direct.pas (modified) (14 diffs)

branches/highdpi/Direct.pas

@@ -7 +7 @@
   UDpiControls, Messg,
 
-  LCLIntf, LCLType, {$IFDEF Linux}LMessages, {$ENDIF}Messages, SysUtils, Classes,
+  LCLIntf, LCLType, {$IFDEF UNIX}LMessages, {$ENDIF}Messages, SysUtils, Classes,
   Graphics, Controls, Forms, DrawDlg, GameServer;
 
@@ -29 +29 @@
     Gone: Boolean;
     Quick: Boolean;
-    procedure SetInfo(x: string);
-    procedure SetState(x: integer);
+    procedure SetInfo(X: string);
+    procedure SetState(X: Integer);
     procedure OnGo(var Msg: TMessage); message WM_GO;
     procedure OnChangeClient(var Msg: TMessage); message WM_CHANGECLIENT;
@@ -40 +40 @@
   DirectDlg: TDirectDlg;
 
+
 implementation
 
 uses
-  ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, UNetworkServer,
-  UNetworkClient;
+  ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, NetworkServer,
+  NetworkClient;
 
 {$R *.lfm}
@@ -57 +58 @@
 //  hMem: Cardinal;
 //  p: pointer;
-  s: string;
+  S: string;
 Begin
   case ID of
@@ -72 +73 @@
       if visible then
       begin
-        s := Format(Phrases.Lookup('BUSY_MOD'), [Brains[Index].Name]);
-        while BiColorTextWidth(Canvas, s) + 64 > ClientWidth do
-          Delete(s, Length(s), 1);
-        SetInfo(s);
+        S := Format(Phrases.Lookup('BUSY_MOD'), [Brains[Index].Name]);
+        while BiColorTextWidth(Canvas, S) + 64 > ClientWidth do
+          Delete(S, Length(S), 1);
+        SetInfo(S);
       end;
     ntCreateWorld:
@@ -111 +112 @@
           hMem := GlobalAlloc(GMEM_MOVEABLE or GMEM_DDESHARE,
             Length(NotifyMessage));
-          p := GlobalLock(hMem);
-          if p <> nil then
-            move(NotifyMessage[1], p^, Length(NotifyMessage));
+          P := GlobalLock(hMem);
+          if P <> nil then
+            Move(NotifyMessage[1], P^, Length(NotifyMessage));
           GlobalUnlock(hMem);
           SetClipboardData(CF_TEXT, hMem);
@@ -153 +154 @@
         State := -1;
         Show;
-        {$IFDEF LINUX}
-        // Force shown window repaint on Gtk2 widgetset
-        Sleep(1);
-        DpiApplication.ProcessMessages;
-        {$ENDIF}
+        Gtk2Fix;
         Invalidate;
         Update;
@@ -183 +180 @@
   BrainTerm.Name := Phrases.Lookup('HUMAN');
   if NetworkEnabled then begin
-    BrainNetworkServer.Client := UNetworkServer.Client;
+    BrainNetworkServer.Client := NetworkServer.Client;
     BrainNetworkServer.Name := Phrases.Lookup('NETWORK_SERVER');
-    BrainNetworkClient.Client := UNetworkClient.Client;
+    BrainNetworkClient.Client := NetworkClient.Client;
     BrainNetworkClient.Name := Phrases.Lookup('NETWORK_CLIENT');
   end;
@@ -198 +195 @@
   begin
     PostMessage(Handle, WM_GO, 0, 0);
-    Gone := true;
+    Gone := True;
   end;
 end;
@@ -209 +206 @@
 procedure TDirectDlg.OnGo(var Msg: TMessage);
 var
-  i: integer;
-  s: string;
+  I: Integer;
+  S: string;
   FileName: string;
 begin
@@ -220 +217 @@
     Exit;
   end;
-  Quick := false;
+  Quick := False;
   if ParamCount > 0 then
   begin
-    s := ParamStr(1);
-    if (s[1] = '-') {$IFDEF WINDOWS}or (s[1] = '/'){$ENDIF} then
+    S := ParamStr(1);
+    if (S[1] = '-') {$IFDEF WINDOWS}or (S[1] = '/'){$ENDIF} then
     begin // special mode
-      Delete(s, 1, 1);
-      for i := 1 to Length(s) do
-        if s[i] in ['a' .. 'z'] then
-          dec(s[i], 32);
-      if s = 'MAN' then
+      Delete(S, 1, 1);
+      for I := 1 to Length(S) do
+        if S[I] in ['a' .. 'z'] then
+          Dec(S[I], 32);
+      if S = 'MAN' then
       begin
-        Quick := true;
+        Quick := True;
         DirectHelp(cHelpOnly);
         Close;
@@ -242 +239 @@
         Quick := True;
         if not LoadGame(ExtractFilePath(ParamStr(1)), ExtractFileName(ParamStr(1)
-        ), -1, false) then begin
+        ), -1, False) then begin
           SimpleMessage(Phrases.Lookup('LOADERR'));
           Close;
@@ -280 +277 @@
 procedure TDirectDlg.FormPaint(Sender: TObject);
 begin
-  PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);
+  PaintBackground(Self, 3, 3, ClientWidth - 6, ClientHeight - 6);
   Frame(Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
   Frame(Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,
@@ -297 +294 @@
 end;
 
-procedure TDirectDlg.SetInfo(x: string);
-begin
-  Info := x;
+procedure TDirectDlg.SetInfo(X: string);
+begin
+  Info := X;
   Invalidate;
   Update;
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   DpiApplication.ProcessMessages;
   {$ENDIF}
 end;
 
-procedure TDirectDlg.SetState(x: integer);
-begin
-  if (x < 0) <> (State < 0) then begin
-    State := x;
+procedure TDirectDlg.SetState(X: Integer);
+begin
+  if (X < 0) <> (State < 0) then begin
+    State := X;
     Invalidate;
     Update;
   end
-  else if x <> State then begin
-    State := x;
+  else if X <> State then begin
+    State := X;
     PaintProgressBar(Canvas, 6, ClientWidth div 2 - 64, 40, State, 128 - State,
       128, MainTexture);