Changes in / [20:30]

Location:

/branches

Files:

• UltimatOS (added)
• UltimatOS/Font.asm (added)
• UltimatOS/Forms (added)
• UltimatOS/Forms/UFormMain.lfm (added)
• UltimatOS/Forms/UFormMain.pas (added)
• UltimatOS/Forms/UFormMemory.lfm (added)
• UltimatOS/Forms/UFormMemory.pas (added)
• UltimatOS/Graphics.asm (added)
• UltimatOS/IO.asm (added)
• UltimatOS/Program.asm (added)
• UltimatOS/UCpu.pas (added)
• UltimatOS/UInstructionWriter.pas (added)
• UltimatOS/UMachine.pas (added)
• UltimatOS/UMemory.pas (added)
• UltimatOS/UltimatOS.ico (added)
• UltimatOS/UltimatOS.lpi (added)
• UltimatOS/UltimatOS.lpr (added)
• overos (modified) (1 prop)
• overos/UApplication.pas (added)
• overos/UControls.pas (added)
• overos/UFormMain.lfm (modified) (2 diffs)
• overos/UFormMain.pas (modified) (8 diffs)
• overos/UGraphics.pas (added)
• overos/UTypes.pas (modified) (6 diffs)
• overos/UWindow.pas (modified) (12 diffs)
• overos/overos.lpi (modified) (4 diffs)
• overos/overos.lpr (modified) (1 diff)
• topdown (added)
• topdown/Apps (added)
• topdown/Apps/UAppCalc.lfm (added)
• topdown/Apps/UAppCalc.pas (added)
• topdown/Apps/UAppFileManager.lfm (added)
• topdown/Apps/UAppFileManager.pas (added)
• topdown/Apps/UAppTextEditor.lfm (added)
• topdown/Apps/UAppTextEditor.pas (added)
• topdown/OS.ico (added)
• topdown/OS.lpi (added)
• topdown/OS.lpr (added)
• topdown/UApps.pas (added)
• topdown/UFormMain.lfm (added)
• topdown/UFormMain.pas (added)
• topdown/UFormMenu.lfm (added)
• topdown/UFormMenu.pas (added)
• topdown/USystem.pas (added)

/branches/overos/UFormMain.lfm ¶

@@ -7 +7 @@
   ClientHeight = 523
   ClientWidth = 758
-  DesignTimePPI = 128
+  DesignTimePPI = 120
+  OnClose = FormClose
   OnResize = FormResize
   OnShow = FormShow
@@ -21 +22 @@
     OnMouseUp = Image1MouseUp
   end
+  object Timer1: TTimer
+    Interval = 10
+    OnTimer = Timer1Timer
+    left = 303
+    top = 201
+  end
 end

/branches/overos/UFormMain.pas ¶

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UWindow, USystem, UTypes, UMouse;
+  Types, UWindow, USystem, UTypes, UMouse, UGraphics, UControls, UApplication;
 
 type
@@ -16 +16 @@
   TFormMain = class(TForm)
     Image1: TImage;
+    Timer1: TTimer;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure Image1MouseDown(Sender: TObject; Button: TControlsMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -23 +25 @@
     procedure FormResize(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure Timer1Timer(Sender: TObject);
   private
 
   public
+    App: TApplication;
     System: TSystem;
   end;
@@ -36 +40 @@
     procedure DrawArea(Rect: TRectangle; Color: TColor); override;
     procedure DrawText(P: TPosition; Color: TColor; Text: string); override;
+    function GetTextSize(Text: string): TSize; override;
   end;
 
@@ -66 +71 @@
 procedure TCanvasScreen.DrawText(P: TPosition; Color: TColor; Text: string);
 begin
+  Canvas.Brush.Style := bsClear;
   Canvas.Font.Color := Color;
   Canvas.TextOut(P.Left, P.Top, Text);
+end;
+
+function TCanvasScreen.GetTextSize(Text: string): TSize;
+var
+  Size: Types.TSize;
+begin
+  Size := Canvas.TextExtent(Text);
+  Result := TSize.Create(Size.cx, Size.cy);
 end;
 
@@ -85 +99 @@
 end;
 
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Timer1.Enabled := False;
+  App.Free;
+  System.Free;
+end;
+
 procedure TFormMain.Image1MouseMove(Sender: TObject; Shift: TShiftState; X,
   Y: Integer);
 begin
-  Caption := IntToStr(X) + ',' + IntToStr(Y);
-  System.Mouse.Move(TPosition.Create(Mouse.CursorPos.X, Mouse.CursorPos.Y));
+  //Caption := IntToStr(X) + ',' + IntToStr(Y);
+  System.Mouse.Move(TPosition.Create(X, Y));
 end;
 
@@ -117 +138 @@
 var
   Window: TWindow;
+  Button: TButton;
 begin
   System := TSystem.Create;
@@ -124 +146 @@
   System.Screen.Size := TSize.Create(Width, Height);
 
+  App := TApplication.Create;
+
   Window := System.Screen.CreateWindow('Test');
+  Window.Application := App;
 
   Window := System.Screen.CreateWindow('Commander');
-  Window.Rectangle.Position := TPosition.Create(100, 50);
-  Window.Rectangle.Size := TSize.Create(400, 200);
+  Window.Position := TPosition.Create(100, 50);
+  Window.Size := TSize.Create(400, 200);
+  Window.Application := App;
+  Button := TButton.Create;
+  Button.Rectangle := TRectangle.Create(TPosition.Create(10, 50), TSize.Create(100, 32));
+  Button.ParentControl := Window;
+  Button.Title := 'Click';
+  Button.Visible := True;
 
   Window := System.Screen.CreateWindow('Calculator');
-  Window.Rectangle.Position := TPosition.Create(200, 100);
-  Window.Rectangle.Size := TSize.Create(300, 200);
+  Window.Application := App;
+  Window.Position := TPosition.Create(200, 100);
+  Window.Size := TSize.Create(300, 200);
 
   System.Screen.Paint;
 end;
 
+procedure TFormMain.Timer1Timer(Sender: TObject);
+begin
+  App.ProcessMessages;
+end;
+
 end.
 

/branches/overos/UTypes.pas ¶

@@ -16 +16 @@
     Height: Integer;
     function Create(Width, Height: Integer): TSize;
+    class operator Add(A, B: TSize): TSize;
+    class operator Subtract(A, B: TSize): TSize;
+    class operator Equal(A, B: TSize): Boolean;
   end;
 
@@ -26 +29 @@
     class operator Add(A, B: TPosition): TPosition;
     class operator Subtract(A, B: TPosition): TPosition;
+    class operator Equal(A, B: TPosition): Boolean;
   end;
 
@@ -35 +39 @@
     function Create(Position: TPosition; Size: TSize): TRectangle;
     function Contains(Position: TPosition): Boolean;
+    class operator Equal(A, B: TRectangle): Boolean;
   end;
 
-  TColor = Integer;
+  TMessage = class
+    Handle: TObject;
+  end;
 
 
@@ -56 +63 @@
     (Self.Position.Left + Self.Size.Width >= Position.Left) and
     (Self.Position.Top + Self.Size.Height >= Position.Top);
+end;
+
+class operator TRectangle.Equal(A, B: TRectangle): Boolean;
+begin
+  Result := (A.Position = B.Position) and (A.Size = B.Size);
 end;
 
@@ -78 +90 @@
 end;
 
+class operator TPosition.Equal(A, B: TPosition): Boolean;
+begin
+  Result := (A.Left = B.Left) and (A.Top = B.Top);
+end;
+
 { TSize }
 
@@ -86 +103 @@
 end;
 
+class operator TSize.Add(A, B: TSize): TSize;
+begin
+  Result.Width := A.Width + B.Width;
+  Result.Height := A.Height + B.Height;
+end;
+
+class operator TSize.Subtract(A, B: TSize): TSize;
+begin
+  Result.Width := A.Width - B.Width;
+  Result.Height := A.Height - B.Height;
+end;
+
+class operator TSize.Equal(A, B: TSize): Boolean;
+begin
+  Result := (A.Width = B.Width) and (A.Height = B.Height);
+end;
+
 
 end.

/branches/overos/UWindow.pas ¶

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fgl, UTypes, UMouse;
+  Classes, SysUtils, fgl, UTypes, UMouse, UControls, UGraphics;
 
 type
-  { TCanvas }
-
-  TCanvas = class
-    procedure DrawLine(P1, P2: TPosition; Color: TColor); virtual;
-    procedure DrawFrame(Rect: TRectangle; Color: TColor); virtual;
-    procedure DrawArea(Rect: TRectangle; Color: TColor); virtual;
-    procedure DrawText(P: TPosition; Color: TColor; Text: string); virtual;
-  end;
-
   TScreen = class;
   TWindow = class;
@@ -28 +19 @@
     procedure DrawArea(Rect: TRectangle; Color: TColor); override;
     procedure DrawText(P: TPosition; Color: TColor; Text: string); override;
-  end;
+    function GetTextSize(Text: string): TSize; override;
+  end;
+
+  TWindowSide = (wsNone, wsLeft, wsTop, wsRight, wsBottom);
+
+  { TTitleBar }
+
+  TTitleBar = class(TControl)
+  private
+    FWindow: TWindow;
+    procedure SetWindow(AValue: TWindow);
+    procedure ButtonCloseClick(Sender: TObject);
+    procedure ButtonMaximizeClick(Sender: TObject);
+    procedure ButtonMinimizeClick(Sender: TObject);
+  protected
+    procedure SetRectangle(AValue: TRectangle); override;
+  public
+  const
+    TitleHeight = 32;
+  var
+    ButtonClose: TButton;
+    ButtonMaximize: TButton;
+    ButtonMinimize: TButton;
+    constructor Create; override;
+    destructor Destroy; override;
+    property Window: TWindow read FWindow write SetWindow;
+  end;
+
+  TMessageWindow = class(TMessage);
+  TMessageWindowClose = class(TMessageWindow);
+  TMessageWindowMaximize = class(TMessageWindow);
 
   { TWindow }
 
-  TWindow = class
+  TWindow = class(TControl)
   private
-    FVisible: Boolean;
-    procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton);
-    procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton);
-    procedure MouseMove(Pos: TPosition);
-    procedure SetVisible(AValue: Boolean);
+    FScreen: TScreen;
+    procedure SetScreen(AValue: TScreen);
+  protected
+    procedure SetRectangle(AValue: TRectangle); override;
+    procedure SetVisible(AValue: Boolean); override;
   public
-    Canvas: TCanvas;
+  const
+    BorderGrabWidth = 15;
+  var
+    TitleBar: TTitleBar;
     Title: string;
-    Rectangle: TRectangle;
-    Screen: TScreen;
+    Application: TObject; // TApplication
+    procedure HandleMessage(Message: TMessage);
+    procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton); override;
+    procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton); override;
+    procedure Close;
+    procedure Maximize;
     procedure Focus;
-    procedure Paint;
+    procedure Paint; override;
     function Focused: Boolean;
-    property Visible: Boolean read FVisible write SetVisible;
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
+    property Screen: TScreen read FScreen write SetScreen;
   end;
 
@@ -57 +85 @@
   private
     FMouse: TMouse;
+    GrabActive: Boolean;
+    GrabWindow: TWindow;
+    GrabMousePosition: TPosition;
+    GrabWindowRectangle: TRectangle;
+    GrabWindowSide: TWindowSide;
     procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton);
     procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton);
@@ -72 +105 @@
   end;
 
-const
-  clBlack = $000000;
-  clGray = $808080;
-  clWhite = $ffffff;
 
 implementation
 
-{ TCanvas }
-
-procedure TCanvas.DrawLine(P1, P2: TPosition; Color: TColor);
-begin
-end;
-
-procedure TCanvas.DrawFrame(Rect: TRectangle; Color: TColor);
-begin
-  with Rect do begin
-    DrawLine(Position, Position + TPosition.Create(Size.Width, 0), Color);
-    DrawLine(Position + TPosition.Create(Size.Width, 0), Position + TPosition.Create(Size.Width, Size.Height), Color);
-    DrawLine(Position + TPosition.Create(Size.Width, Size.Height), Position + TPosition.Create(0, Size.Height), Color);
-    DrawLine(Position + TPosition.Create(0, Size.Height), Position, Color);
-  end;
-end;
-
-procedure TCanvas.DrawArea(Rect: TRectangle; Color: TColor);
-begin
-end;
-
-procedure TCanvas.DrawText(P: TPosition; Color: TColor; Text: string);
-begin
+uses
+  UApplication;
+
+{ TTitleBar }
+
+procedure TTitleBar.SetWindow(AValue: TWindow);
+begin
+  if FWindow = AValue then Exit;
+  Canvas.Free;
+  FWindow := AValue;
+  Canvas := TCanvasWindow.Create;
+  TCanvasWindow(Canvas).Window := FWindow;
+end;
+
+procedure TTitleBar.ButtonCloseClick(Sender: TObject);
+begin
+  Window.Close;
+end;
+
+procedure TTitleBar.ButtonMaximizeClick(Sender: TObject);
+begin
+  Window.Maximize;
+end;
+
+procedure TTitleBar.ButtonMinimizeClick(Sender: TObject);
+begin
+
+end;
+
+procedure TTitleBar.SetRectangle(AValue: TRectangle);
+begin
+  inherited;
+  ButtonClose.Rectangle := TRectangle.Create(TPosition.Create(Size.Width - TitleHeight, 4),
+    TSize.Create(TitleHeight - 8, TitleHeight - 8));
+  ButtonMaximize.Rectangle := TRectangle.Create(TPosition.Create(Size.Width - 2 * TitleHeight, 4),
+    TSize.Create(TitleHeight - 8, TitleHeight - 8));
+  ButtonMinimize.Rectangle := TRectangle.Create(TPosition.Create(Size.Width - 3 * TitleHeight, 4),
+    TSize.Create(TitleHeight - 8, TitleHeight - 8));
+end;
+
+constructor TTitleBar.Create;
+begin
+  inherited;
+
+  ButtonClose := TButton.Create;
+  ButtonClose.Title := 'X';
+  ButtonClose.ParentControl := Self;
+  ButtonClose.OnClick := ButtonCloseClick;
+  ButtonClose.Visible := True;
+
+  ButtonMaximize := TButton.Create;
+  ButtonMaximize.Title := '^';
+  ButtonMaximize.ParentControl := Self;
+  ButtonMaximize.OnClick := ButtonMaximizeClick;
+  ButtonMaximize.Visible := True;
+
+  ButtonMinimize := TButton.Create;
+  ButtonMinimize.Title := '_';
+  ButtonMinimize.ParentControl := Self;
+  ButtonMinimize.OnClick := ButtonMinimizeClick;
+  ButtonMinimize.Visible := True;
+end;
+
+destructor TTitleBar.Destroy;
+begin
+  ButtonClose.Free;
+  ButtonMaximize.Free;
+  ButtonMinimize.Free;
+  inherited;
 end;
 
@@ -107 +183 @@
 procedure TCanvasWindow.DrawLine(P1, P2: TPosition; Color: TColor);
 begin
-  Window.Screen.Canvas.DrawLine(P1 + Window.Rectangle.Position, P2 + Window.Rectangle.Position, Color);
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Window.Screen.Canvas.DrawLine(P1 + Window.Position, P2 + Window.Position, Color);
 end;
 
 procedure TCanvasWindow.DrawArea(Rect: TRectangle; Color: TColor);
 begin
-  Window.Screen.Canvas.DrawArea(TRectangle.Create(Rect.Position + Window.Rectangle.Position,
-    Rect.Size), Color);
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Window.Screen.Canvas.DrawArea(TRectangle.Create(Rect.Position + Window.Position,
+      Rect.Size), Color);
 end;
 
 procedure TCanvasWindow.DrawText(P: TPosition; Color: TColor; Text: string);
 begin
-  Window.Screen.Canvas.DrawText(P + Window.Rectangle.Position, Color, Text);
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Window.Screen.Canvas.DrawText(P + Window.Position, Color, Text);
+end;
+
+function TCanvasWindow.GetTextSize(Text: string): TSize;
+begin
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Result := Window.Screen.Canvas.GetTextSize(Text);
 end;
 
 { TWindow }
 
+procedure TWindow.SetScreen(AValue: TScreen);
+begin
+  if FScreen = AValue then Exit;
+  if Assigned(FScreen) then
+    FScreen.Windows.Remove(Self);
+  FScreen := AValue;
+  if Assigned(FScreen) then
+    FScreen.Windows.Add(Self);
+end;
+
+procedure TWindow.SetRectangle(AValue: TRectangle);
+begin
+  inherited;
+  TitleBar.Rectangle := TRectangle.Create(Position, TSize.Create(Size.Width, TitleBar.TitleHeight));
+end;
+
+procedure TWindow.SetVisible(AValue: Boolean);
+begin
+  inherited;
+  if not Visible and Assigned(Screen) then
+    Screen.Paint;
+end;
+
+procedure TWindow.HandleMessage(Message: TMessage);
+begin
+  if Message is TMessageWindowClose then begin
+    Free;
+  end else
+  if Message is TMessageWindowMaximize then begin;
+    Rectangle := TRectangle.Create(TPosition.Create(0, 0), Screen.Size);
+    Paint;
+  end;
+end;
+
 procedure TWindow.MouseButtonDown(Pos: TPosition; Button: TMouseButton);
 begin
-  Focus;
+  inherited;
+  TitleBar.MouseButtonDown(Pos, Button);
 end;
 
 procedure TWindow.MouseButtonUp(Pos: TPosition; Button: TMouseButton);
 begin
-
-end;
-
-procedure TWindow.MouseMove(Pos: TPosition);
-begin
-
-end;
-
-procedure TWindow.SetVisible(AValue: Boolean);
-begin
-  if FVisible = AValue then Exit;
-  FVisible := AValue;
-  Paint;
+  inherited;
+  TitleBar.MouseButtonUp(Pos, Button);
+end;
+
+procedure TWindow.Close;
+begin
+  TApplication(Application).MessageQueue.PostMessage(Self, TMessageWindowClose.Create);
+end;
+
+procedure TWindow.Maximize;
+begin
+  TApplication(Application).MessageQueue.PostMessage(Self, TMessageWindowMaximize.Create);
 end;
 
@@ -154 +273 @@
 
 procedure TWindow.Paint;
-const
-  TitleHeight = 32;
-begin
-  Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clGray);
-  Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clWhite);
-  Canvas.DrawLine(TPosition.Create(0, TitleHeight),
-    TPosition.Create(Rectangle.Size.Width, TitleHeight), clWhite);
-  Canvas.DrawText(TPosition.Create(8, 4), clWhite, Title);
+begin
+  if Visible then begin
+    Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Size), clGray);
+    Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Size), clWhite);
+    Canvas.DrawLine(TPosition.Create(0, TitleBar.TitleHeight),
+      TPosition.Create(Size.Width, TitleBar.TitleHeight), clWhite);
+    Canvas.DrawText(TPosition.Create(8, 4), clWhite, Title);
+    TitleBar.Paint;
+  end;
+  inherited;
 end;
 
@@ -171 +292 @@
 constructor TWindow.Create;
 begin
+  inherited;
+  Canvas.Free;
   Canvas := TCanvasWindow.Create;
   TCanvasWindow(Canvas).Window := Self;
+  TitleBar := TTitleBar.Create;
+  TitleBar.Window := Self;
+  TitleBar.Visible := True;
 end;
 
 destructor TWindow.Destroy;
 begin
-  Canvas.Free;
+  Visible := False;
+  TitleBar.Free;
+  Screen := nil;
   inherited Destroy;
 end;
@@ -190 +318 @@
   for I := Windows.Count - 1 downto 0 do begin
     Window := Windows[I];
+    if TRectangle.Create(Window.Position - TPosition.Create(Window.BorderGrabWidth div 2, 0),
+    TSize.Create(Window.BorderGrabWidth, Window.Size.Height)).Contains(Pos) then begin
+      GrabMousePosition := Pos;
+      GrabWindowRectangle := Window.Rectangle;
+      GrabWindow := Window;
+      GrabWindowSide := wsLeft;
+      GrabActive := True;
+    end else
+    if TRectangle.Create(Window.Position - TPosition.Create(0, Window.BorderGrabWidth div 2),
+    TSize.Create(Window.Size.Width, Window.BorderGrabWidth)).Contains(Pos) then begin
+      GrabMousePosition := Pos;
+      GrabWindowRectangle := Window.Rectangle;
+      GrabWindow := Window;
+      GrabWindowSide := wsTop;
+      GrabActive := True;
+    end else
+    if TRectangle.Create(Window.Position + TPosition.Create(Window.Size.Width, 0) - TPosition.Create(Window.BorderGrabWidth div 2, 0),
+    TSize.Create(Window.BorderGrabWidth, Window.Size.Height)).Contains(Pos) then begin
+      GrabMousePosition := Pos;
+      GrabWindowRectangle := Window.Rectangle;
+      GrabWindow := Window;
+      GrabWindowSide := wsRight;
+      GrabActive := True;
+    end else
+    if TRectangle.Create(Window.Position + TPosition.Create(0, Window.Size.Height) - TPosition.Create(0, Window.BorderGrabWidth div 2),
+    TSize.Create(Window.Size.Width, Window.BorderGrabWidth)).Contains(Pos) then begin
+      GrabMousePosition := Pos;
+      GrabWindowRectangle := Window.Rectangle;
+      GrabWindow := Window;
+      GrabWindowSide := wsBottom;
+      GrabActive := True;
+    end else
+    if TRectangle.Create(Window.Position, TSize.Create(Window.Size.Width, Window.TitleBar.TitleHeight)).Contains(Pos) then begin
+      GrabMousePosition := Pos;
+      GrabWindowRectangle := Window.Rectangle;
+      GrabWindow := Window;
+      GrabWindowSide := wsNone;
+      GrabActive := True;
+    end;
     if Window.Rectangle.Contains(Pos) then begin
-      Window.MouseButtonDown(Pos - Window.Rectangle.Position, Button);
+      Window.Focus;
+      Window.MouseButtonDown(Pos - Window.Position, Button);
       Break;
     end;
@@ -200 +368 @@
 var
   I: Integer;
-begin
+  Window: TWindow;
+begin
+  if GrabActive then begin
+    GrabActive := False;
+    GrabWindow := nil;
+  end;
   for I := Windows.Count - 1 downto 0 do begin
-    if Windows[I].Rectangle.Contains(Pos) then begin
-      Windows[I].MouseButtonUp(Pos - Windows[I].Rectangle.Position, Button);
+    Window := Windows[I];
+    if Window.Rectangle.Contains(Pos) then begin
+      Window.MouseButtonUp(Pos - Window.Position, Button);
       Break;
     end;
@@ -213 +387 @@
   I: Integer;
 begin
+  if GrabActive then begin
+    if GrabWindowSide = wsNone then
+      GrabWindow.Position := GrabWindowRectangle.Position + (Pos - GrabMousePosition)
+    else if GrabWindowSide = wsLeft then
+      GrabWindow.Rectangle := TRectangle.Create(GrabWindowRectangle.Position + TPosition.Create(Pos.Left - GrabMousePosition.Left, 0),
+        GrabWindowRectangle.Size - TSize.Create(Pos.Left - GrabMousePosition.Left, 0))
+    else if GrabWindowSide = wsTop then
+      GrabWindow.Rectangle := TRectangle.Create(GrabWindowRectangle.Position + TPosition.Create(0, Pos.Top - GrabMousePosition.Top),
+        GrabWindowRectangle.Size - TSize.Create(0, Pos.Top - GrabMousePosition.Top))
+    else if GrabWindowSide = wsRight then
+      GrabWindow.Rectangle := TRectangle.Create(GrabWindowRectangle.Position,
+        GrabWindowRectangle.Size + TSize.Create(Pos.Left - GrabMousePosition.Left, 0))
+    else if GrabWindowSide = wsBottom then
+      GrabWindow.Rectangle := TRectangle.Create(GrabWindowRectangle.Position,
+        GrabWindowRectangle.Size + TSize.Create(0, Pos.Top - GrabMousePosition.Top));
+    Paint;
+  end;
   for I := Windows.Count - 1 downto 0 do begin
     if Windows[I].Rectangle.Contains(Pos) then begin
-      Windows[I].MouseMove(Pos - Windows[I].Rectangle.Position);
+      Windows[I].MouseMove(Pos - Windows[I].Position);
       Break;
     end;
@@ -249 +440 @@
 begin
   Result := TWindow.Create;
-  Windows.Add(Result);
   Result.Screen := Self;
   Result.Title := Title;
@@ -259 +449 @@
 begin
   Windows := TFPGObjectList<TWindow>.Create;
+  Windows.FreeObjects := False;
   Canvas := TCanvas.Create;
 end;
 
 destructor TScreen.Destroy;
-begin
+var
+  I: Integer;
+begin
+  for I := Windows.Count - 1 downto 0 do
+    Windows[I].Free;
   Windows.Free;
   Canvas.Free;

/branches/overos/overos.lpi ¶

@@ -11 +11 @@
       <Icon Value="0"/>
     </General>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes Count="2">
+      <Item1 Name="Debug" Default="True"/>
+      <Item2 Name="Release">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <Target>
+            <Filename Value="overos"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
+          </SearchPaths>
+          <Parsing>
+            <SyntaxOptions>
+              <SyntaxMode Value="Delphi"/>
+              <CStyleOperator Value="False"/>
+              <AllowLabel Value="False"/>
+              <CPPInline Value="False"/>
+            </SyntaxOptions>
+          </Parsing>
+          <CodeGeneration>
+            <SmartLinkUnit Value="True"/>
+            <Optimizations>
+              <OptimizationLevel Value="3"/>
+            </Optimizations>
+          </CodeGeneration>
+          <Linking>
+            <Debugging>
+              <GenerateDebugInfo Value="False"/>
+            </Debugging>
+            <LinkSmart Value="True"/>
+            <Options>
+              <Win32>
+                <GraphicApplication Value="True"/>
+              </Win32>
+            </Options>
+          </Linking>
+        </CompilerOptions>
+      </Item2>
     </BuildModes>
     <PublishOptions>
@@ -27 +64 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="6">
+    <Units Count="9">
       <Unit0>
         <Filename Value="overos.lpr"/>
@@ -55 +92 @@
         <IsPartOfProject Value="True"/>
       </Unit5>
+      <Unit6>
+        <Filename Value="UControls.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit6>
+      <Unit7>
+        <Filename Value="UGraphics.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit7>
+      <Unit8>
+        <Filename Value="UApplication.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit8>
     </Units>
   </ProjectOptions>
@@ -64 +113 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <SyntaxMode Value="Delphi"/>
+        <CStyleOperator Value="False"/>
+        <IncludeAssertionCode Value="True"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+      <VerifyObjMethodCallValidity Value="True"/>
+    </CodeGeneration>
     <Linking>
+      <Debugging>
+        <UseHeaptrc Value="True"/>
+      </Debugging>
       <Options>
         <Win32>

/branches/overos/overos.lpr ¶

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UWindow, UMouse, USystem, UTypes
+  Forms, UFormMain, UWindow, UMouse, USystem, UTypes, UControls, UGraphics,
+  UApplication, SysUtils
   { you can add units after this };
 
 {$R *.res}
 
+{$if declared(UseHeapTrace)}
+const
+  HeapTraceLog = 'heaptrclog.trc';
+{$ENDIF}
+
 begin
+  {$if declared(UseHeapTrace)}
+  // Heap trace
+  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  {$ENDIF}
+
   RequireDerivedFormResource:=True;
   Application.Initialize;