Changeset 12 for trunk/Packages/Kernel/UAPI.pas

Timestamp:

Sep 6, 2017, 6:47:49 PM (7 years ago)

Author:

chronos

Message:

• Modified: Separate API command to be kernel and user space. Execute API command through single callback function.

File:

• trunk/Packages/Kernel/UAPI.pas (modified) (9 diffs)

trunk/Packages/Kernel/UAPI.pas

@@ -10 +10 @@
 
 type
-
-  { TAPI }
-
-  TAPI = class
+  TApiCommand = (acNone, acWriteText, acDrawText, acDrawLine, acDrawRect, acSleep,
+    acReadMessage, acWindowCreate, acWindowSetAttr);
+
+  TDrawTextParams = record
+    P: TPoint;
+    Text: string;
+    Color: TColor;
+  end;
+
+  TDrawLineParams = record
+    P1: TPoint;
+    P2: TPoint;
+    Color: TColor;
+  end;
+
+  TWindowSetAttrParams = record
+    Size: TPoint;
+    Visible: Boolean;
+  end;
+
+  TDrawRectParams = record
+    Rect: TRect;
+    Color: TColor;
+  end;
+
+  { TKernelApi }
+
+  TKernelApi = class
     Kernel: TObject; //TKernel;
+    function Call(Command: TApiCommand; Data: Pointer): Pointer;
     procedure WriteText(Text: string);
     procedure DrawText(P: TPoint; Text: string; Color: TColor);
@@ -22 +47 @@
     procedure ReadMessage(Message: TIPCMessage);
     function WindowCreate: Integer;
-    procedure WindowSetAttr(SizeX, SizeY: Integer; Visible: Boolean);
+    procedure WindowSetAttr(Size: TPoint; Visible: Boolean);
+  end;
+
+  TApiCall = function (Command: TApiCommand; Data: Pointer): Pointer of object;
+
+  { TUserApi }
+
+  TUserApi = class
+    KernelApiCallback: TApiCall;
+    function Call(Command: TApiCommand; Data: Pointer): Pointer;
+    procedure WriteText(Text: string);
+    procedure DrawText(P: TPoint; Text: string; Color: TColor);
+    procedure DrawLine(P1, P2: TPoint; Color: TColor);
+    procedure DrawRect(Rect: TRect; Color: TColor);
+    procedure Sleep(Time: TDateTime);
+    procedure ReadMessage(Message: TIPCMessage);
+    function WindowCreate: Integer;
+    procedure WindowSetAttr(Size: TPoint; Visible: Boolean);
   end;
 
@@ -31 +73 @@
   UKernel;
 
-{ TAPI }
-
-procedure TAPI.WriteText(Text: string);
+{ TUserApi }
+
+function TUserApi.Call(Command: TApiCommand; Data: Pointer
+  ): Pointer;
+begin
+  Result := KernelApiCallback(Command, Data);
+end;
+
+procedure TUserApi.WriteText(Text: string);
+begin
+  Call(acWriteText, Pointer(Text));
+end;
+
+procedure TUserApi.DrawText(P: TPoint; Text: string; Color: TColor);
+var
+  Params: TDrawTextParams;
+begin
+  Params.P := P;
+  Params.Text := Text;
+  Params.Color := Color;
+  Call(acDrawText, @Params);
+end;
+
+procedure TUserApi.DrawLine(P1, P2: TPoint; Color: TColor);
+var
+  Params: TDrawLineParams;
+begin
+  Params.P1 := P1;
+  Params.P2 := P2;
+  Params.Color := Color;
+  Call(acDrawLine, @Params);
+end;
+
+procedure TUserApi.DrawRect(Rect: TRect; Color: TColor);
+var
+  Params: TDrawRectParams;
+begin
+  Params.Rect := Rect;
+  Params.Color := Color;
+  Call(acDrawRect, @Params);
+end;
+
+procedure TUserApi.Sleep(Time: TDateTime);
+begin
+  Call(acSleep, @Time);
+end;
+
+procedure TUserApi.ReadMessage(Message: TIPCMessage);
+begin
+  Call(acReadMessage, Message);
+end;
+
+function TUserApi.WindowCreate: Integer;
+begin
+  Call(acWindowCreate, nil);
+end;
+
+procedure TUserApi.WindowSetAttr(Size: TPoint; Visible: Boolean);
+var
+  Params: TWindowSetAttrParams;
+begin
+  Params.Size := Size;
+  Params.Visible := Visible;
+  Call(acWindowSetAttr, @Params);
+end;
+
+{ TKernelApi }
+
+function TKernelApi.Call(Command: TApiCommand; Data: Pointer
+  ): Pointer;
+begin
+  case Command of
+    acDrawLine: DrawLine(TDrawLineParams(Data^).P1, TDrawLineParams(Data^).P2,
+      TDrawLineParams(Data^).Color);
+    acDrawRect: DrawRect(TDrawRectParams(Data^).Rect, TDrawRectParams(Data^).Color);
+    acDrawText: DrawText(TDrawTextParams(Data^).P, TDrawTextParams(Data^).Text,
+      TDrawTextParams(Data^).Color);
+    acSleep: Sleep(TDateTime(Data^));
+    acWindowCreate: Result := Pointer(WindowCreate);
+    acWindowSetAttr: WindowSetAttr(TWindowSetAttrParams(Data^).Size,
+      TWindowSetAttrParams(Data^).Visible);
+    acWriteText: WriteText(string(Data));
+    acReadMessage: ReadMessage(Data);
+  end;
+end;
+
+procedure TKernelApi.WriteText(Text: string);
 var
   Device: TDeviceSerial;
@@ -43 +169 @@
 end;
 
-procedure TAPI.DrawText(P: TPoint; Text: string; Color: TColor);
+procedure TKernelApi.DrawText(P: TPoint; Text: string; Color: TColor);
 var
   Screen: TScreen;
@@ -51 +177 @@
 end;
 
-procedure TAPI.DrawLine(P1, P2: TPoint; Color: TColor);
+procedure TKernelApi.DrawLine(P1, P2: TPoint; Color: TColor);
 var
   Screen: TScreen;
@@ -59 +185 @@
 end;
 
-procedure TAPI.DrawRect(Rect: TRect; Color: TColor);
+procedure TKernelApi.DrawRect(Rect: TRect; Color: TColor);
 var
   Screen: TScreen;
@@ -67 +193 @@
 end;
 
-procedure TAPI.Sleep(Time: TDateTime);
+procedure TKernelApi.Sleep(Time: TDateTime);
 var
   Task: TTask;
@@ -75 +201 @@
 end;
 
-procedure TAPI.ReadMessage(Message: TIPCMessage);
+procedure TKernelApi.ReadMessage(Message: TIPCMessage);
 var
   Task: TTask;
@@ -83 +209 @@
 end;
 
-function TAPI.WindowCreate: Integer;
-begin
-
-end;
-
-procedure TAPI.WindowSetAttr(SizeX, SizeY: Integer; Visible: Boolean);
+function TKernelApi.WindowCreate: Integer;
+begin
+
+end;
+
+procedure TKernelApi.WindowSetAttr(Size: TPoint; Visible: Boolean);
 begin