Changeset 624 for trunk

Timestamp:

Sep 16, 2024, 8:28:44 PM (3 months ago)

Author:

chronos

Message:

• Fixed: Do not process keyboard input during unit move on Linux.

File:

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

trunk/LocalPlayer/Term.pas

@@ -334 +334 @@
     LastResizeHeight: Integer;
     LastWindowState: TWindowState;
+    KeyboardDisabled: Boolean;
     // Forms
     FWondersDlg: TWondersDlg;
@@ -2099 +2100 @@
         IconKind := mikAge;
         IconIndex := Age;
-        { if age=0 then } Kind := mkOk
-        { else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end };
+        { if age = 0 then } Kind := mkOk
+        { else begin Kind := mkOkHelp; HelpKind := hkAdv; HelpNo := AgePreq[age]; end; };
         CenterTo := NewAgeCenterTo;
         OpenSound := 'AGE_' + Char(48 + Age);
@@ -6604 +6605 @@
       // TODO: Force animation under UNIX. Causes also to process keyboard events
       // which can lead to unexpected errors.
-      Application.ProcessMessages;
+      KeyboardDisabled := True;
+      try
+        Application.ProcessMessages;
+      finally
+        KeyboardDisabled := False;
+      end;
       {$ENDIF}
 
@@ -7095 +7101 @@
   ShortCut: TShortCut;
 begin
+  if KeyboardDisabled then Exit;
+
   ShortCut := KeyToShortCut(Key, Shift);
 
@@ -8171 +8179 @@
   Shift: TShiftState);
 begin
+  if KeyboardDisabled then Exit;
+
   if Idle and (Key = VK_APPS) then
   begin