dev

Source/colormath/simba.colormath.pas

@@ -38,6 +38,9 @@ interface
     function AsString: String;
   end;
 
+  TColor = Graphics.TColor;
+  PColor = ^TColor;
+
   TColorHelper = type helper for TColor
     function ToBGRA: TColorBGRA;
     function ToRGB: TColorRGB;

Source/components/simba.component_menubar.pas

@@ -51,6 +51,7 @@   TSimbaMainMenuBar = class(TCustomControl)
     function GetMenus: TPopupMenuArray;
   public
     constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
 
     property Menus: TPopupMenuArray read GetMenus;
     procedure AddMenu(Title: String; APopupMenu: TPopupMenu);
@@ -235,6 +236,8 @@ procedure TSimbaMainMenuBar.MouseLeave;
 
 procedure TSimbaMainMenuBar.DoMenuClose(Sender: TObject);
 begin
+  if (FTrackTimer = nil) then
+    Exit;
   FTrackTimer.Enabled := False;
 
   Application.QueueAsyncCall(@ClearPopupIndex, 0);
@@ -286,6 +289,14 @@ constructor TSimbaMainMenuBar.Create(AOwner: TComponent);
   CalculateSizes();
 end;
 
+destructor TSimbaMainMenuBar.Destroy;
+begin
+  Application.RemoveAsyncCalls(Self);
+  FTrackTimer := nil;
+
+  inherited Destroy();
+end;
+
 procedure TSimbaMainMenuBar.AddMenu(Title: String; APopupMenu: TPopupMenu);
 var
   I: Integer;

Source/components/simba.component_statusbar.pas

@@ -32,7 +32,7 @@   TSimbaStatusBar = class(TCustomControl)
     procedure Paint; override;
     procedure PaintPanel(Index: Integer);
 
-    procedure InvalidatePanel(Index: Integer);
+    procedure InvalidatePanelASync(Data: PtrInt);
     function PanelRect(Index: Integer): TRect;
 
     procedure CheckIndex(Index: Integer);
@@ -78,10 +78,9 @@ procedure TSimbaStatusBar.SetPanelText(Index: Integer; Value: String);
 begin
   if (FPanelText[Index] = Value) then
     Exit;
-
   FPanelText[Index] := Value;
 
-  InvalidatePanel(Index);
+  Application.QueueAsyncCall(@InvalidatePanelASync, Index);
 end;
 
 procedure TSimbaStatusBar.SetPanelTextMeasure(Index: Integer; Value: String);
@@ -194,11 +193,11 @@ procedure TSimbaStatusBar.PaintPanel(Index: Integer);
   Canvas.TextRect(R, R.Left + 5, R.Top, FPanelText[Index], Style);
 end;
 
-procedure TSimbaStatusBar.InvalidatePanel(Index: Integer);
+procedure TSimbaStatusBar.InvalidatePanelASync(Data: PtrInt);
 var
   R: TRect;
 begin
-  R := PanelRect(Index);
+  R := PanelRect(Data);
 
   InvalidateRect(Handle, @R, False);
 end;
@@ -226,4 +225,3 @@ function TSimbaStatusBar.PanelRect(Index: Integer): TRect;
 end;
 
 end.
-

Source/imagebox/simba.imagebox.pas

@@ -10,7 +10,7 @@
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, ComCtrls, LCLType,
+  Classes, SysUtils, Forms, Controls, Graphics, GraphType, ComCtrls, LCLType,
   simba.mufasatypes, simba.image, simba.dtm, simba.imagebox_image,
   simba.colormath;
 
@@ -112,7 +112,7 @@   TSimbaImageBox = class(TWinControl)
 implementation
 
 uses
-  Math, GraphType, LCLIntf,
+  Math, LCLIntf,
   simba.finder, simba.image_lazbridge, simba.windowhandle;
 
 procedure TSimbaImageBox_ScrollBox.GetPreferredSize(var PreferredWidth, PreferredHeight: integer; Raw: boolean; WithThemeSpace: boolean);

Source/simba.darwin_axui.pas

@@ -230,9 +230,8 @@ function AXUI_GetWindowInfo(PID: UInt32): TAXUIWindowInfo;
 end;
 
 initialization
-  SimbaIDEInitialization_AddBeforeShow(@RequestAccessibility, 'RequestAccessibility');
+  //SimbaIDEInitialization_AddBeforeShow(@RequestAccessibility, 'RequestAccessibility');
 
   CreateCFStrings();
 
 end.
-

Source/simba.ide_events.pas

@@ -44,6 +44,7 @@   SimbaIDEEvents = class
 
 
     // Called every 500ms from a script instance while a script is running.
+    // Called on a seperate thread - synchronize if doing GUI stuff!
     // Sender = TSimbaScriptInstance
     class procedure CallOnScriptRunning(Sender: TObject);
     class procedure RegisterMethodOnScriptRunning(Proc: TNotifyEvent);

Source/simba.input.pas

@@ -24,8 +24,8 @@ interface
     EMouseEventType = (TELEPORT, MOVING, CLICK, DOWN, UP);
     {$SCOPEDENUMS OFF}
   const
-    DEFAULT_KEY_PRESS_MIN = 30;
-    DEFAULT_KEY_PRESS_MAX = 140;
+    DEFAULT_KEY_PRESS_MIN = 20;
+    DEFAULT_KEY_PRESS_MAX = 125;
 
     DEFAULT_CLICK_MIN = 40;
     DEFAULT_CLICK_MAX = 220;
@@ -389,9 +389,16 @@ procedure TSimbaInput.MouseScroll(Scrolls: Integer);
 procedure TSimbaInput.KeySend(Text: String);
 var
   I: Integer;
+  SleepTimes: TIntegerArray;
 begin
-  for I := 1 to Length(Text) do
-    Target.KeySend(Text[I], GetRandomKeyPressTime() div 2, GetRandomKeyPressTime() div 2, GetRandomKeyPressTime() div 2, GetRandomKeyPressTime() div 2);
+  if (Length(Text) = 0) then
+    Exit;
+
+  SetLength(SleepTimes, Length(Text) * 5);
+  for I := 0 to High(SleepTimes) do
+    SleepTimes[I] := GetRandomKeyPressTime();
+
+  Target.KeySend(PChar(Text), @SleepTimes[0]);
 end;
 
 procedure TSimbaInput.KeyPress(Key: EKeyCode);

Source/simba.nativeinterface.pas

@@ -16,11 +16,6 @@ interface
 type
   TSimbaNativeInterface = class
   public
-    procedure KeyDownNativeKeyCode(EKeyCode: Integer); virtual; abstract;
-    procedure KeyUpNativeKeyCode(EKeyCode: Integer); virtual; abstract;
-
-    function GetNativeKeyCodeAndModifiers(Character: Char; out Code: Integer; out Modifiers: TShiftState): Boolean; virtual; abstract;
-
     function GetWindowImage(Window: TWindowHandle; X, Y, Width, Height: Integer; var ImageData: PColorBGRA): Boolean; virtual; abstract;
     function GetWindowBounds(Window: TWindowHandle; out Bounds: TBox): Boolean; virtual; abstract;
     function GetWindowBounds(Window: TWindowHandle): TBox; virtual; abstract;
@@ -34,6 +29,7 @@   TSimbaNativeInterface = class
     function GetMousePosition: TPoint; virtual; abstract;
     function GetMousePosition(Window: TWindowHandle): TPoint; virtual; abstract;
 
+    procedure KeySend(Text: PChar; TextLen: Integer; SleepTimes: PInt32); virtual; abstract;
     function KeyPressed(Key: EKeyCode): Boolean; virtual; abstract;
     procedure KeyDown(Key: EKeyCode); virtual; abstract;
     procedure KeyUp(Key: EKeyCode); virtual; abstract;
@@ -84,8 +80,6 @@   TSimbaNativeInterface = class
     procedure OpenURL(URL: String); virtual;
 
     function GetVirtualKeyCode(Character: Char): Integer; virtual;
-
-    procedure KeySend(Key: Char; KeyDownTime, KeyUpTime, ModifierDownTime, ModifierUpTime: Integer); virtual;
   end;
 
 var
@@ -109,36 +103,6 @@ implementation
   simba.nativeinterface_darwin;
   {$ENDIF}
 
-procedure TSimbaNativeInterface.KeySend(Key: Char; KeyDownTime, KeyUpTime, ModifierDownTime, ModifierUpTime: Integer);
-var
-  NativeKeyCode: Integer;
-  KeyModifiers: TShiftState;
-begin
-  if not GetNativeKeyCodeAndModifiers(Key, NativeKeyCode, KeyModifiers) then
-    raise Exception.CreateFmt('TSimbaNativeInterface.SendChar: Unknown key code for "%s"', [Key]);
-
-  if (KeyModifiers <> []) then
-  begin
-    if (ssShift in KeyModifiers) then KeyDown(EKeyCode.SHIFT);
-    if (ssCtrl  in KeyModifiers) then KeyDown(EKeyCode.CONTROL);
-    if (ssAlt   in KeyModifiers) then KeyDown(EKeyCode.MENU);
-
-    PreciseSleep(ModifierDownTime);
-  end;
-
-  KeyDownNativeKeyCode(NativeKeyCode); PreciseSleep(KeyDownTime);
-  KeyUpNativeKeyCode(NativeKeyCode);   PreciseSleep(KeyUpTime);
-
-  if (KeyModifiers <> []) then
-  begin
-    if (ssShift in KeyModifiers) then KeyUp(EKeyCode.SHIFT);
-    if (ssCtrl  in KeyModifiers) then KeyUp(EKeyCode.CONTROL);
-    if (ssAlt   in KeyModifiers) then KeyUp(EKeyCode.MENU);
-
-    PreciseSleep(ModifierUpTime);
-  end;
-end;
-
 function TSimbaNativeInterface.WindowHandleToStr(WindowHandle: TWindowHandle): String;
 begin
   Result := IntToStr(WindowHandle);