Changeset 67

Timestamp:

Nov 2, 2024, 10:04:51 PM (4 weeks ago)

Author:

chronos

Message:

• Modified: Apps split into separate units.
• Modified: SystemApi moved into separate unit.

Location:

branches/Independent

Files:

• Apps (added)
• Apps.pas (deleted)
• Apps/Code (added)
• Apps/Code/AppCode.pas (added)
• Apps/Test (added)
• Apps/Test/AppTest.pas (added)
• Forms/FormScreen.pas (modified) (2 diffs)
• Independent.lpi (modified) (5 diffs)
• Independent.lpr (modified) (1 diff)
• Os.pas (modified) (6 diffs)
• SystemApi.pas (added)

branches/Independent/Forms/FormScreen.pas

@@ -31 +31 @@
 var
   I: Integer;
+const
+  TitleHeight = 40;
 begin
   PaintBox1.Canvas.Brush.Color := clBlack;
@@ -45 +47 @@
       PaintBox1.Canvas.Rectangle(Rect);
       PaintBox1.Canvas.TextOut(Rect.Left + 20, Rect.Top + 5, Name);
+      PaintBox1.Canvas.Line(Rect.Left, Rect.Top + TitleHeight, Rect.Right, Rect.Top + TitleHeight);
     end;
   end;

branches/Independent/Independent.lpi

@@ -24 +24 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="Forms"/>
+            <OtherUnitFiles Value="Forms;Apps/Code;Apps/Test"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
           </SearchPaths>
@@ -85 +85 @@
       </Unit>
       <Unit>
-        <Filename Value="Apps.pas"/>
+        <Filename Value="Apps/Test/AppTest.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit>
@@ -104 +104 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormConsole"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>
@@ -110 +111 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormScreen"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Apps/Code/AppCode.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="SystemApi.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit>
     </Units>
@@ -121 +131 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="Forms"/>
+      <OtherUnitFiles Value="Forms;Apps/Code;Apps/Test"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
     </SearchPaths>

branches/Independent/Independent.lpr

@@ -9 +9 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, FormMain, FormScreen, SysUtils
+  Forms, FormMain, FormScreen, SysUtils, AppCode, SystemApi
   { you can add units after this };
 

branches/Independent/Os.pas

@@ -22 +22 @@
   TRunningApp = class
   private
-    AppThread: TAppThread;
     FApp: TApp;
     procedure SetApp(AValue: TApp);
   public
     Context: TAppContext;
+    AppThread: TAppThread;
     procedure Run;
     constructor Create;
@@ -37 +37 @@
   TRunningApps = class(TObjectList<TRunningApp>)
     function AddNew(App: TApp; System: TSystem): TRunningApp;
-  end;
-
-  { TSystemApi }
-
-  TSystemApi = class(TApi)
-  private
-    FName: string;
-    FText: string;
-    procedure WriteLineSync;
-    procedure RunAppSync;
-  public
-    App: TRunningApp;
-    System: TSystem;
-    procedure WriteLine(Text: string); override;
-    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;
 
@@ -80 +60 @@
   private
     FOnDraw: TNotifyEvent;
-    procedure Redraw;
   public
     Console: TConsole;
@@ -88 +67 @@
     Windows: TWindows;
     Handles: THandles;
+    procedure Redraw;
     procedure RunApp(Name: string);
     procedure Start;
@@ -95 +75 @@
   end;
 
+
 implementation
 
 uses
-  Apps;
+  AppCode, AppTest, SystemApi;
 
 { TAppThread }
@@ -151 +132 @@
 end;
 
-{ TSystemApi }
-
-procedure TSystemApi.WriteLineSync;
-begin
-  System.Console.Write(App.App.Name + ': ' + FText);
-end;
-
-procedure TSystemApi.RunAppSync;
-begin
-  System.RunApp(FName);
-end;
-
-procedure TSystemApi.WriteLine(Text: string);
-begin
-  FText := Text;
-  App.AppThread.Synchronize(WriteLineSync);
-end;
-
-procedure TSystemApi.RunApp(Name: string);
-begin
-  FName := Name;
-  App.AppThread.Synchronize(RunAppSync);
-end;
-
-procedure TSystemApi.Sleep(Time: TDateTime);
-begin
-  App.AppThread.Sleep(Round(Time / OneMillisecond));
-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 }