Changeset 61 for trunk

Timestamp:

Apr 7, 2024, 11:50:48 PM (9 months ago)

Author:

chronos

Message:

• Modified: Kernel API class definition improvement.

Location:

trunk/Packages/Kernel

Files:

• Kernel.API.pas (modified) (2 diffs)
• Kernel.Core.pas (modified) (4 diffs)
• Kernel.KernelAPI.pas (added)
• Kernel.Screen.pas (modified) (3 diffs)
• Kernel.lpk (modified) (2 diffs)
• KernelPackage.pas (modified) (1 diff)

trunk/Packages/Kernel/Kernel.API.pas

@@ -38 +38 @@
   end;
 
-  { TKernelApi }
+  { TSystemApi }
 
-  TKernelApi = class
-    Kernel: TObject; //TKernel;
-    function Call(Command: TApiCommand; Data: Pointer): Pointer;
-    procedure WriteText(Text: string);
-    procedure DrawText(CanvasId: Integer; P: TPoint; Text: string; Color: TColor);
-    procedure DrawLine(CanvasId: Integer; P1, P2: TPoint; Color: TColor);
-    procedure DrawRect(CanvasId: Integer; Rect: TRectangle; Color: TColor);
-    procedure DrawFrame(CanvasId: Integer; Rect: TRectangle; Color: TColor);
-    procedure Sleep(Time: TDateTime);
-    procedure ReadMessage(Message: TIPCMessage);
-    function WindowCreate: Integer;
-    function GetWindowCanvas(WindowId: Integer): Integer;
-    procedure WindowSetAttr(WindowId: Integer; Bounds: TRectangle; Visible: Boolean);
+  TSystemApi = class
+    function Call(Command: TApiCommand; Data: Pointer): Pointer; virtual; abstract;
+    procedure WriteText(Text: string); virtual; abstract;
+    procedure DrawText(CanvasId: Integer; P: TPoint; Text: string; Color: TColor); virtual; abstract;
+    procedure DrawLine(CanvasId: Integer; P1, P2: TPoint; Color: TColor); virtual; abstract;
+    procedure DrawRect(CanvasId: Integer; Rect: TRectangle; Color: TColor); virtual; abstract;
+    procedure DrawFrame(CanvasId: Integer; Rect: TRectangle; Color: TColor); virtual; abstract;
+    procedure Sleep(Time: TDateTime); virtual; abstract;
+    procedure ReadMessage(Message: TIPCMessage); virtual; abstract;
+    function WindowCreate: Integer; virtual; abstract;
+    function GetWindowCanvas(WindowId: Integer): Integer; virtual; abstract;
+    procedure WindowSetAttr(WindowId: Integer; Bounds: TRectangle; Visible: Boolean); virtual; abstract;
   end;
 
@@ -166 +165 @@
 end;
 
-{ TKernelApi }
-
-function TKernelApi.Call(Command: TApiCommand; Data: Pointer
-  ): Pointer;
-begin
-  case Command of
-    acDrawLine: DrawLine(TDrawLineParams(Data^).CanvasId, TDrawLineParams(Data^).P1,
-      TDrawLineParams(Data^).P2, TDrawLineParams(Data^).Color);
-    acDrawRect: DrawRect(TDrawRectParams(Data^).CanvasId, TDrawRectParams(Data^).Rect,
-      TDrawRectParams(Data^).Color);
-    acDrawFrame: DrawFrame(TDrawRectParams(Data^).CanvasId, TDrawRectParams(Data^).Rect,
-      TDrawRectParams(Data^).Color);
-    acDrawText: DrawText(TDrawTextParams(Data^).CanvasId, TDrawTextParams(Data^).P,
-      TDrawTextParams(Data^).Text, TDrawTextParams(Data^).Color);
-    acSleep: Sleep(TDateTime(Data^));
-    acWindowCreate: Result := Pointer(WindowCreate);
-    acWindowSetAttr: WindowSetAttr(TWindowSetAttrParams(Data^).WindowId,
-      TWindowSetAttrParams(Data^).Bounds, TWindowSetAttrParams(Data^).Visible);
-    acWriteText: WriteText(string(Data));
-    acReadMessage: ReadMessage(Data);
-    acGetWindowCanvas: Result := Pointer(GetWindowCanvas(Integer(Data)));
-  end;
-end;
-
-procedure TKernelApi.WriteText(Text: string);
-var
-  Device: TDeviceSerial;
-begin
-  Device := TDeviceSerial(TKernel(Kernel).Devices.FindByName('Serial0'));
-  if Assigned(Device) then begin
-    Device.WriteText(Text);
-  end else raise Exception.Create('Device Serial0 not found');
-end;
-
-procedure TKernelApi.DrawText(CanvasId: Integer; P: TPoint; Text: string; Color: TColor);
-var
-  Screen: TScreen;
-  Canvas: TCanvas;
-begin
-  Canvas := TKernel(Kernel).Desktop.FindCanvasById(CanvasId);
-  if Assigned(Canvas) then begin
-    Canvas.DrawText(P, Text, Color);
-  end;
-end;
-
-procedure TKernelApi.DrawLine(CanvasId: Integer; P1, P2: TPoint; Color: TColor);
-var
-  Screen: TScreen;
-  Canvas: TCanvas;
-begin
-  Canvas := TKernel(Kernel).Desktop.FindCanvasById(CanvasId);
-  if Assigned(Canvas) then begin
-    Canvas.DrawLine(P1.Add(Canvas.Position), P2.Add(Canvas.Position), Color);
-  end;
-end;
-
-procedure TKernelApi.DrawRect(CanvasId: Integer; Rect: TRectangle; Color: TColor);
-var
-  Canvas: TCanvas;
-begin
-  Canvas := TKernel(Kernel).Desktop.FindCanvasById(CanvasId);
-  if Assigned(Canvas) then begin
-    Canvas.DrawRect(Rect, Color);
-  end;
-end;
-
-procedure TKernelApi.DrawFrame(CanvasId: Integer; Rect: TRectangle;
-  Color: TColor);
-var
-  Canvas: TCanvas;
-begin
-  Canvas := TKernel(Kernel).Desktop.FindCanvasById(CanvasId);
-  if Assigned(Canvas) then begin
-    Canvas.DrawFrame(Rect, Color);
-  end;
-end;
-
-procedure TKernelApi.Sleep(Time: TDateTime);
-var
-  Task: TTask;
-begin
-  Task := TKernel(Kernel).Scheduler.GetCurrentTask;
-  Task.Sleep(Time);
-end;
-
-procedure TKernelApi.ReadMessage(Message: TIPCMessage);
-var
-  Task: TTask;
-begin
-  Task := TKernel(Kernel).Scheduler.GetCurrentTask;
-  while Task.Messages.List.Count = 0 do Task.WaitForMessage;
-end;
-
-function TKernelApi.WindowCreate: Integer;
-var
-  Window: TWindow;
-begin
-  Window := TKernel(Kernel).Desktop.CreateWindow;
-  Window.Desktop := TKernel(Kernel).Desktop;
-  Result := Window.Id;
-end;
-
-function TKernelApi.GetWindowCanvas(WindowId: Integer): Integer;
-var
-  Window: TWindow;
-  Canvas: TCanvas;
-begin
-  Window := TWindow(TKernel(Kernel).Desktop.FindObjectById(WindowId));
-  if Assigned(Window) then begin
-    Canvas := Window.Canvas;
-    Result := Canvas.Id;
-  end else Result := -1;
-end;
-
-procedure TKernelApi.WindowSetAttr(WindowId: Integer; Bounds: TRectangle; Visible: Boolean);
-var
-  Window: TWindow;
-begin
-  Window := TWindow(TKernel(Kernel).Desktop.FindObjectById(WindowId));
-  if Assigned(Window) then begin
-    Window.Bounds := Bounds;
-    Window.Canvas.Position := Bounds.Position;
-    Window.Visible := Visible;
-    Window.Desktop.Paint;
-  end;
-end;
-
-
 end.
 

trunk/Packages/Kernel/Kernel.Core.pas

@@ -6 +6 @@
   Classes, SysUtils, Kernel.List, Kernel.FileSystem, Kernel.Memory,
   Kernel.Screen, Kernel.Device, Kernel.App, Kernel.Scheduler, Kernel.Api,
-  Kernel.Graphics, Generics.Collections;
+  Kernel.Graphics, Generics.Collections, Kernel.IPC;
 
 type
@@ -25 +25 @@
   TKernel = class
   private
-    Api: TKernelApi;
+    Api: TSystemApi;
     procedure InitVideo;
     function KernelApiExecute(Command: TApiCommand; Data: Pointer): Pointer;
@@ -47 +47 @@
 
 implementation
+
+uses
+  Kernel.KernelAPI;
 
 { TDrive }
@@ -162 +165 @@
   Screens := TObjectList<TScreen>.Create;
   Api := TKernelApi.Create;
-  Api.Kernel := Self;
+  TKernelApi(Api).Kernel := Self;
   Desktop := TDesktop.Create;
 end;

trunk/Packages/Kernel/Kernel.Screen.pas

@@ -4 +4 @@
 
 uses
-  SysUtils, Math, Kernel.Graphics;
+  SysUtils, Math, Kernel.Graphics, Kernel.Device;
 
 type
@@ -31 +31 @@
     function GetVideoMemory: PByte;
   public
-    Device: TObject; // TDeviceVideo;
+    Device: TDeviceVideo;
     Size: TPoint;
     DPI: Integer;
@@ -44 +44 @@
 
 implementation
-
-uses
-  Kernel.Device;
 
 { TScreenCanvas }

trunk/Packages/Kernel/Kernel.lpk

@@ -24 +24 @@
       </Other>
     </CompilerOptions>
-    <Files Count="13">
+    <Files Count="14">
       <Item1>
         <Filename Value="Kernel.API.pas"/>
@@ -78 +78 @@
         <UnitName Value="KernelPackage"/>
       </Item13>
+      <Item14>
+        <Filename Value="Kernel.KernelAPI.pas"/>
+        <UnitName Value="Kernel.KernelAPI"/>
+      </Item14>
     </Files>
     <CompatibilityMode Value="True"/>

trunk/Packages/Kernel/KernelPackage.pas

@@ -11 +11 @@
   Kernel.API, Kernel.App, Kernel.Classes, Kernel.FileSystem, Kernel.Graphics, 
   Kernel.Core, Kernel.List, Kernel.Memory, Kernel.Device, Kernel.Screen, 
-  Kernel.IPC, Kernel.Scheduler, LazarusPackageIntf;
+  Kernel.IPC, Kernel.Scheduler, Kernel.KernelAPI, LazarusPackageIntf;
 
 implementation