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

Timestamp:

Sep 25, 2017, 2:48:08 PM (7 years ago)

Author:

chronos

Message:

• Added: Drawing relative to Canvas. In case of Window drawing relative to Window.
• Modified: Use custom TPoint and TRectangle if possible.

File:

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

trunk/Packages/Kernel/UAPI.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UList, DateUtils, UMemory, UScreen, UDevice, UIPC,
-  UScheduler;
+  SysUtils, UList, DateUtils, UMemory, UGraphics, UDevice, UIPC,
+  UScheduler, UScreen;
 
 type
   TApiCommand = (acNone, acWriteText, acDrawText, acDrawLine, acDrawRect, acSleep,
-    acReadMessage, acWindowCreate, acWindowSetAttr);
+    acReadMessage, acWindowCreate, acWindowSetAttr, acGetWindowCanvas);
 
   TDrawTextParams = record
+    CanvasId: Integer;
     P: TPoint;
     Text: string;
@@ -20 +21 @@
 
   TDrawLineParams = record
+    CanvasId: Integer;
     P1: TPoint;
     P2: TPoint;
@@ -26 +28 @@
 
   TWindowSetAttrParams = record
-    Size: TPoint;
+    WindowId: Integer;
+    Bounds: TRectangle;
     Visible: Boolean;
   end;
 
   TDrawRectParams = record
-    Rect: TRect;
+    CanvasId: Integer;
+    Rect: TRectangle;
     Color: TColor;
   end;
@@ -41 +45 @@
     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 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 Sleep(Time: TDateTime);
     procedure ReadMessage(Message: TIPCMessage);
     function WindowCreate: Integer;
-    procedure WindowSetAttr(Size: TPoint; Visible: Boolean);
+    function GetWindowCanvas(WindowId: Integer): Integer;
+    procedure WindowSetAttr(WindowId: Integer; Bounds: TRectangle; Visible: Boolean);
   end;
 
@@ -58 +63 @@
     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 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 Sleep(Time: TDateTime);
     procedure ReadMessage(Message: TIPCMessage);
     function WindowCreate: Integer;
-    procedure WindowSetAttr(Size: TPoint; Visible: Boolean);
+    function GetWindowCanvas(WindowId: Integer): Integer;
+    procedure WindowSetAttr(WindowId: Integer; Bounds: TRectangle; Visible: Boolean);
   end;
 
@@ -86 +92 @@
 end;
 
-procedure TUserApi.DrawText(P: TPoint; Text: string; Color: TColor);
+procedure TUserApi.DrawText(CanvasId: Integer; P: TPoint; Text: string; Color: TColor);
 var
   Params: TDrawTextParams;
 begin
+  Params.CanvasId := CanvasId;
   Params.P := P;
   Params.Text := Text;
@@ -96 +103 @@
 end;
 
-procedure TUserApi.DrawLine(P1, P2: TPoint; Color: TColor);
+procedure TUserApi.DrawLine(CanvasId: Integer; P1, P2: TPoint; Color: TColor);
 var
   Params: TDrawLineParams;
 begin
+  Params.CanvasId := CanvasId;
   Params.P1 := P1;
   Params.P2 := P2;
@@ -106 +114 @@
 end;
 
-procedure TUserApi.DrawRect(Rect: TRect; Color: TColor);
+procedure TUserApi.DrawRect(CanvasId: Integer; Rect: TRectangle; Color: TColor);
 var
   Params: TDrawRectParams;
 begin
+  Params.CanvasId := CanvasId;
   Params.Rect := Rect;
   Params.Color := Color;
@@ -127 +136 @@
 function TUserApi.WindowCreate: Integer;
 begin
-  Call(acWindowCreate, nil);
-end;
-
-procedure TUserApi.WindowSetAttr(Size: TPoint; Visible: Boolean);
+  Result := Integer(Call(acWindowCreate, nil));
+end;
+
+function TUserApi.GetWindowCanvas(WindowId: Integer): Integer;
+begin
+  Call(acGetWindowCanvas, Pointer(WindowId));
+end;
+
+procedure TUserApi.WindowSetAttr(WindowId: Integer; Bounds: TRectangle; Visible: Boolean);
 var
   Params: TWindowSetAttrParams;
 begin
-  Params.Size := Size;
+  Params.WindowId := WindowId;
+  Params.Bounds := Bounds;
   Params.Visible := Visible;
   Call(acWindowSetAttr, @Params);
@@ -145 +160 @@
 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);
+    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);
+    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^).Size,
-      TWindowSetAttrParams(Data^).Visible);
+    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;
@@ -169 +186 @@
 end;
 
-procedure TKernelApi.DrawText(P: TPoint; Text: string; Color: TColor);
+procedure TKernelApi.DrawText(CanvasId: Integer; P: TPoint; Text: string; Color: TColor);
 var
   Screen: TScreen;
-begin
-  Screen := TScreen(TKernel(Kernel).Screens.First);
-  Screen.DrawText(P, Text, Color);
-end;
-
-procedure TKernelApi.DrawLine(P1, P2: TPoint; Color: TColor);
+  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;
-begin
-  Screen := TScreen(TKernel(Kernel).Screens.First);
-  Screen.DrawLine(P1, P2, Color);
-end;
-
-procedure TKernelApi.DrawRect(Rect: TRect; Color: TColor);
+  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
   Screen: TScreen;
-begin
-  Screen := TScreen(TKernel(Kernel).Screens.First);
-  Screen.DrawRect(Rect, Color);
+  Canvas: TCanvas;
+begin
+  Canvas := TKernel(Kernel).Desktop.FindCanvasById(CanvasId);
+  if Assigned(Canvas) then begin
+    Canvas.DrawRect(Rect, Color);
+  end;
 end;
 
@@ -210 +236 @@
 
 function TKernelApi.WindowCreate: Integer;
-begin
-
-end;
-
-procedure TKernelApi.WindowSetAttr(Size: TPoint; Visible: Boolean);
-begin
-
+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;
+    Canvas.Parent := TKernel(Kernel).Screens.First.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;
+  end;
 end;