Changeset 66 for branches

Timestamp:

Oct 10, 2024, 11:05:35 PM (3 months ago)

Author:

chronos

Message:

• Added: Api calls to show windows.

Location:

branches/Independent

Files:

• . (modified) (1 prop)
• Api.pas (modified) (3 diffs)
• Apps.pas (modified) (2 diffs)
• FileSystem.pas (added)
• FormMain.lfm (deleted)
• FormMain.pas (deleted)
• Forms (added)
• Forms/FormConsole.lfm (added)
• Forms/FormConsole.pas (added)
• Forms/FormMain.lfm (added)
• Forms/FormMain.pas (added)
• Forms/FormScreen.lfm (added)
• Forms/FormScreen.pas (added)
• Independent.lpi (modified) (5 diffs)
• Independent.lpr (modified) (2 diffs)
• Os.pas (modified) (5 diffs)

branches/Independent

@@ -3 +3 @@
 Independent.lps
 Independent.res
+heaptrclog.trc

@@ -3 +3 @@
 Independent.lps
 Independent.res
+heaptrclog.trc

branches/Independent/Api.pas

@@ -7 +7 @@
 
 type
+  THandle = NativeInt;
+
+  { THandles }
+
+  THandles = class(TList<THandle>)
+    NewHandle: THandle;
+    function AddNew: THandle;
+  end;
+
   { TApi }
 
@@ -13 +22 @@
     procedure RunApp(Name: string); virtual; abstract;
     procedure Sleep(Time: TDateTime); virtual; abstract;
+    function CreateWindow: THandle; virtual; abstract;
+    procedure SetWindowName(Handle: THandle; Name: string); virtual; abstract;
+    procedure SetWindowRect(Handle: THandle; Rect: TRect); virtual; abstract;
+    procedure SetWindowVisible(Handle: THandle; Visible: Boolean); virtual; abstract;
   end;
 
@@ -38 +51 @@
 
 implementation
+
+{ THandles }
+
+function THandles.AddNew: THandle;
+begin
+  Result := NewHandle;
+  Inc(NewHandle);
+  Add(Result);
+end;
 
 { TApp }

branches/Independent/Apps.pas

@@ -30 +30 @@
 
 procedure TAppTest.Run(Context: TAppContext);
+var
+  Handle: THandle;
 begin
   with Context.Api do begin
@@ -35 +37 @@
     Sleep(OneSecond);
     RunApp('Code');
+    Handle := CreateWindow;
+    SetWindowName(Handle, 'New window');
+    SetWindowRect(Handle, Bounds(100, 100, 400, 200));
+    SetWindowVisible(Handle, True);
+
+    Handle := CreateWindow;
+    SetWindowName(Handle, 'Second window');
+    SetWindowRect(Handle, Bounds(350, 150, 500, 300));
+    SetWindowVisible(Handle, True);
   end;
 end;

branches/Independent/Independent.lpi

@@ -24 +24 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
+            <OtherUnitFiles Value="Forms"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
           </SearchPaths>
@@ -73 +74 @@
       </Unit>
       <Unit>
-        <Filename Value="FormMain.pas"/>
+        <Filename Value="Forms/FormMain.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormName"/>
@@ -99 +100 @@
         <IsPartOfProject Value="True"/>
       </Unit>
+      <Unit>
+        <Filename Value="Forms/FormConsole.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormConsole"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Forms/FormScreen.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormScreen"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit>
     </Units>
   </ProjectOptions>
@@ -108 +121 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="Forms"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
     </SearchPaths>
@@ -131 +145 @@
       <Debugging>
         <DebugInfoType Value="dsDwarf3"/>
+        <UseHeaptrc Value="True"/>
       </Debugging>
       <Options>

branches/Independent/Independent.lpr

@@ -1 +1 @@
 program Independent;
-
-{$mode objfpc}{$H+}
 
 uses
   {$IFDEF UNIX}
-  cthreads,
+  cthreads, clocale,
   {$ENDIF}
   {$IFDEF HASAMIGA}
@@ -11 +9 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, FormMain, Os, Apps, Api, Console, FileSystem
+  Forms, FormMain, FormScreen, SysUtils
   { you can add units after this };
 
 {$R *.res}
 
+{$if declared(UseHeapTrace)}
+const
+  HeapTraceLog = 'heaptrclog.trc';
+{$ENDIF}
+
 begin
+  {$if declared(UseHeapTrace)}
+  // Heap trace
+  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  {$ENDIF}
+
   RequireDerivedFormResource:=True;
   Application.Scaled:=True;

branches/Independent/Os.pas

@@ -53 +53 @@
     procedure RunApp(Name: string); override;
     procedure Sleep(Time: TDateTime); override;
+    function CreateWindow: THandle; override;
+    procedure SetWindowName(Handle: THandle; Name: string); override;
+    procedure SetWindowRect(Handle: THandle; Rect: TRect); override;
+    procedure SetWindowVisible(Handle: THandle; Visible: Boolean); override;
+  end;
+
+  { TWindow }
+
+  TWindow = class
+    Handle: THandle;
+    Name: string;
+    Visible: Boolean;
+    Rect: TRect;
+  end;
+
+  { TWindows }
+
+  TWindows = class(TObjectList<TWindow>)
+    function AddNew: TWindow;
+    function SearchByHandle(Handle: THandle): TWindow;
   end;
 
@@ -58 +78 @@
 
   TSystem = class
+  private
+    FOnDraw: TNotifyEvent;
+    procedure Redraw;
+  public
     Console: TConsole;
     FileSystem: TFileSystem;
     Apps: TApps;
     RunningApps: TRunningApps;
+    Windows: TWindows;
+    Handles: THandles;
     procedure RunApp(Name: string);
     procedure Start;
     constructor Create;
     destructor Destroy; override;
+    property OnDraw: TNotifyEvent read FOnDraw write FOnDraw;
   end;
 
@@ -153 +180 @@
 end;
 
+function TSystemApi.CreateWindow: THandle;
+var
+  Window: TWindow;
+begin
+  Window := System.Windows.AddNew;
+  Window.Handle := System.Handles.AddNew;
+  Result := Window.Handle;
+end;
+
+procedure TSystemApi.SetWindowName(Handle: THandle; Name: string);
+var
+  Window: TWindow;
+begin
+  Window := System.Windows.SearchByHandle(Handle);
+  if Assigned(Window) then begin
+    Window.Name := Name;
+    System.Redraw;
+  end;
+end;
+
+procedure TSystemApi.SetWindowRect(Handle: THandle; Rect: TRect);
+var
+  Window: TWindow;
+begin
+  Window := System.Windows.SearchByHandle(Handle);
+  if Assigned(Window) then begin
+    Window.Rect := Rect;
+    System.Redraw;
+  end;
+end;
+
+procedure TSystemApi.SetWindowVisible(Handle: THandle; Visible: Boolean);
+var
+  Window: TWindow;
+begin
+  Window := System.Windows.SearchByHandle(Handle);
+  if Assigned(Window) then begin
+    Window.Visible := Visible;
+    System.Redraw;
+  end;
+end;
+
+{ TWindows }
+
+function TWindows.AddNew: TWindow;
+begin
+  Result := TWindow.Create;
+  Add(Result);
+end;
+
+function TWindows.SearchByHandle(Handle: THandle): TWindow;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (Items[I].Handle <> Handle) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
 { TSystem }
+
+procedure TSystem.Redraw;
+begin
+  if Assigned(FOnDraw) then FOnDraw(Self);
+end;
 
 procedure TSystem.RunApp(Name: string);
@@ -182 +274 @@
 constructor TSystem.Create;
 begin
+  Handles := THandles.Create;
+  Windows := TWindows.Create;
   Console := TConsole.Create;
   FileSystem := TFileSystem.Create;
@@ -194 +288 @@
   FreeAndNil(Console);
   FreeAndNil(FileSystem);
+  FreeAndNil(Windows);
+  FreeAndNil(Handles);
   inherited;
 end;

@@ -3 +3 @@
 Independent.lps
 Independent.res
+heaptrclog.trc