Changeset 8 for os/trunk

Timestamp:

Jun 2, 2013, 10:46:40 PM (11 years ago)

Author:

chronos

Message:

• Added: Implemented simple TEdit control which react to key press messages.

Location:

os/trunk

Files:

• Applications/TestApplication.pas (modified) (3 diffs)
• Applications/UDesktop.pas (modified) (1 diff)
• Drivers/Driver.KeyboardVCL.pas (modified) (1 diff)
• System/LDOS.Kernel.pas (modified) (2 diffs)
• Xvcl/Xvcl.Controls.pas (modified) (9 diffs)

os/trunk/Applications/TestApplication.pas

@@ -12 +12 @@
     Button: TButton;
     Label1: TLabel;
+    Edit1: TEdit;
     Timer1: TTimer;
     procedure Run; override;
@@ -54 +55 @@
   Button.Caption := 'Start';
   Button.OnClick := ButtonClick;
-  Form1.Controls.Add(Button);
   Label1 := TLabel.Create;
   Label1.Parent := Form1;
@@ -61 +61 @@
   Label1.Visible := True;
   Label1.Caption := '0';
-  Form1.Controls.Add(Label1);
+  Edit1 := TEdit.Create;
+  Edit1.Parent := Form2;
+  Edit1.Owner := Form2;
+  Edit1.Bounds := TRectangle.Create(60, 80, 60, 24);
+  Edit1.Visible := True;
+  Edit1.Text := 'Text';
   MainForm := Form1;
   TScreen(Screen).Forms.Add(Form1);

os/trunk/Applications/UDesktop.pas

@@ -90 +90 @@
   TaskBar.Visible := True;
   TaskBar.Caption := 'dds';
-  MainBar.Controls.Add(TaskBar);
   MenuButton := TButton.Create;
-  MenuButton.Parent := TaskBar;
-  MenuButton.Owner := TaskBar;
+  MenuButton.Parent := MainBar;
+  MenuButton.Owner := MainBar;
   MenuButton.Bounds := TRectangle.Create(0, 0, 50, 24);
   MenuButton.Visible := True;
   MenuButton.Caption := 'Menu';
   MenuButton.OnClick := ButtonClick;
-  MainBar.Controls.Add(MenuButton);
   TScreen(Screen).Forms.Add(MainBar);
   MainForm := MainBar;

os/trunk/Drivers/Driver.KeyboardVCL.pas

@@ -34 +34 @@
 begin
   Kernel.Keyboard.KeysState[Key] := False;
+  Kernel.Keyboard.HandleKeyPress(Key);
 end;
 

os/trunk/System/LDOS.Kernel.pas

@@ -73 +73 @@
     function ReadKey: Char;
     function KeyPressed: Boolean;
+    procedure HandleKeyPress(Key: Word);
   end;
 
@@ -303 +304 @@
 { TKeyboard }
 
+procedure TKeyboard.HandleKeyPress(Key: Word);
+var
+  Form: TForm;
+  NewMessage: TMessageKeyPress;
+begin
+  NewMessage := TMessageKeyPress.Create;
+  NewMessage.KeyCode := Key;
+  try
+    for Form in Kernel.Screen.Forms do
+    if Form.HandleMessage(NewMessage) then begin
+      Break;
+    end;
+  finally
+    NewMessage.Destroy;
+  end;
+end;
+
 function TKeyboard.KeyPressed: Boolean;
 begin

os/trunk/Xvcl/Xvcl.Controls.pas

@@ -29 +29 @@
   TKeyState = (ksShift, ksAlt, ksOS);
   TKeyStateSet = set of TKeyState;
-  TMessageKeyboard = class(TMessage)
+  TMessageKeyPress = class(TMessage)
     KeyCode: Integer;
     States: TKeyStateSet;
@@ -59 +59 @@
     FOnMouseDown: TNotifyEvent;
     FOnMouseUp: TNotifyEvent;
+    FOnKeyPress: TNotifyEvent;
     function GetCanvas: TCanvas;
     procedure SetParent(const Value: TWinControl); virtual;
@@ -81 +82 @@
     property OnMouseDown: TNotifyEvent read FOnMouseDown write FOnMouseDown;
     property OnMouseUp: TNotifyEvent read FOnMouseUp write FOnMouseUp;
+    property OnKeyPress: TNotifyEvent read FOnKeyPress write FOnKeyPress;
   end;
 
@@ -97 +99 @@
     FCaption: string;
     procedure SetCaption(const Value: string);
+  protected
+    function HandleMessage(Message: TMessage): Boolean; override;
   public
     procedure Paint; override;
@@ -112 +116 @@
   end;
 
+  TEdit = class(TControl)
+  private
+    FText: string;
+    procedure SetText(const Value: string);
+  protected
+    function HandleMessage(Message: TMessage): Boolean; override;
+  public
+    procedure Paint; override;
+    constructor Create; override;
+    property Text: string read FText write SetText;
+  end;
+
 
 implementation
@@ -153 +169 @@
 
 function TControl.HandleMessage(Message: TMessage): Boolean;
+begin
+  Result := False;
+end;
+
+procedure TControl.Paint;
+begin
+  with Canvas do begin
+    Brush.Color := Color;
+    FillRect(TRectangle.Create(0, 0, Bounds.Width, Bounds.Height));
+  end;
+end;
+
+function TControl.ScreenToClient(Position: TPoint): TPoint;
+begin
+  Result := Position.Substract(Bounds.TopLeft);
+  if Assigned(Parent) then Result := Parent.ClientToScreen(Result);
+end;
+
+procedure TControl.SetColor(const Value: TColor);
+begin
+  if FColor <> Value then begin
+    FColor := Value;
+    if Visible then Paint;
+  end;
+end;
+
+procedure TControl.SetParent(const Value: TWinControl);
+begin
+  if FParent <> Value then begin
+    if Assigned(FParent) then Parent.Controls.Remove(Self);
+    FParent := Value;
+    if Assigned(FParent) then Parent.Controls.Add(Self);
+  end;
+end;
+
+{ TButton }
+
+function TButton.HandleMessage(Message: TMessage): Boolean;
 begin
   Result := False;
@@ -170 +224 @@
 end;
 
-procedure TControl.Paint;
-begin
-  with Canvas do begin
-    Brush.Color := Color;
-    FillRect(TRectangle.Create(0, 0, Bounds.Width, Bounds.Height));
-  end;
-end;
-
-function TControl.ScreenToClient(Position: TPoint): TPoint;
-begin
-  Result := Position.Substract(Bounds.TopLeft);
-  if Assigned(Parent) then Result := Parent.ClientToScreen(Result);
-end;
-
-procedure TControl.SetColor(const Value: TColor);
-begin
-  if FColor <> Value then begin
-    FColor := Value;
-    if Visible then Paint;
-  end;
-end;
-
-procedure TControl.SetParent(const Value: TWinControl);
-begin
-  if FParent <> Value then begin
-    if Assigned(FParent) then Parent.Controls.Remove(Self);
-    FParent := Value;
-    if Assigned(FParent) then Parent.Controls.Add(Self);
-  end;
-end;
-
-{ TButton }
-
 constructor TButton.Create;
 begin
@@ -268 +289 @@
     if Message is TMessageMouse then
     with TMessageMouse(Message) do begin
-    if Control.Bounds.Contains(ScreenToClient(Position)) then begin
+      if Control.Bounds.Contains(ScreenToClient(Position)) then begin
+        if TWinControl(Control).HandleMessage(Message) then begin
+          Result := True;
+          Break;
+        end;
+      end;
+    end else
+    if Message is TMessageKeyPress then
       if TWinControl(Control).HandleMessage(Message) then begin
         Result := True;
         Break;
       end;
-    end;
-  end;
   end;
 end;
@@ -305 +331 @@
 end;
 
+{ TEdit }
+
+constructor TEdit.Create;
+begin
+  inherited;
+  FColor := clWhite;
+end;
+
+function TEdit.HandleMessage(Message: TMessage): Boolean;
+begin
+  Result := False;
+  if Message is TMessageKeyPress then
+  with TMessageKeyPress(Message) do begin
+    if Assigned(FOnKeyPress) then FOnKeyPress(Self);
+    if KeyCode = 8 then Text := Copy(Text, 1, Length(Text) - 1)
+      else Text := Text + Chr(TMessageKeyPress(Message).KeyCode);
+    Paint;
+    Result := True;
+  end else
+end;
+
+procedure TEdit.Paint;
+var
+  TextShort: string;
+begin
+  inherited;
+  with Canvas do begin
+    MoveTo(TPoint.Create(0, 0));
+    LineTo(TPoint.Create(Bounds.Width - 1, 0));
+    LineTo(TPoint.Create(Bounds.Width - 1, Bounds.Height - 1));
+    LineTo(TPoint.Create(0, Bounds.Height - 1));
+    LineTo(TPoint.Create(0, 0));
+    TextShort := Text;
+    while (GetTextSize(TextShort).X > Bounds.Width) and
+      (Length(TextShort) > 0) do
+      Delete(TextShort, 1, 1);
+
+    TextOut(TPoint.Create(3,
+      (Bounds.Height - GetTextSize(TextShort).Y) div 2), TextShort);
+  end;
+end;
+
+procedure TEdit.SetText(const Value: string);
+begin
+  if FText <> Value then begin
+    FText := Value;
+    if Visible then Paint;
+  end;
+end;
+
 end.