Merge branch 'NewPostSyncCheckEvent' into 'main'

Cocoa: Hybrid lclSyncCheck posting for performance and app response during modal loops

See merge request freepascal.org/lazarus/lazarus!384

lcl/interfaces/cocoa/cocoaint.pas

@@ -69,6 +69,7 @@ type
   { TCocoaApplication }
 
   TCocoaApplication = objcclass(NSApplication)
+    syncCheckEventRef: EventRef;
     aloop : TApplicationMainLoop;
     isrun : Boolean;
     modals : NSMutableDictionary;
@@ -89,6 +90,7 @@ type
     function nextEventMatchingMask_untilDate_inMode_dequeue(mask: NSUInteger; expiration: NSDate; mode: NSString; deqFlag: LCLObjCBoolean): NSEvent; override;
 
     function runModalForWindow(theWindow: NSWindow): NSInteger; override;
+    procedure lclPostSyncCheckEvent; message 'lclPostSyncCheckEvent';
     procedure lclSyncCheck(arg: id); message 'lclSyncCheck:';
     {$ifdef COCOAPPRUNNING_OVERRIDEPROPERTY}
     function isRunning: objc.ObjCBOOL; override;
@@ -687,6 +689,13 @@ begin
       Exit;
   end;
 
+  if (not Assigned(Result) and ((mask and NSPeriodicMask) <> 0)) or
+     (Assigned(Result) and (Result.eventRef = syncCheckEventRef)) then
+  begin
+    syncCheckEventRef := nil;
+    lclSyncCheck(nil);
+  end;
+  
   if (Result.type_=NSApplicationDefined) and (Result.subtype=LazarusApplicationDefinedSubtypeWakeup) then
     Result:= nil;
 
@@ -730,6 +739,21 @@ begin
   Result:=inherited runModalForWindow(theWindow);
 end;
 
+procedure TCocoaApplication.lclPostSyncCheckEvent;
+var ev: NSEvent;
+begin
+  if not Assigned(syncCheckEventRef) then
+  begin
+    ev := NSEvent.otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2(
+       NSPeriodic, NSPoint(CGPointZero), 0, 0, 0, nil, 0, 0, 0);
+    syncCheckEventRef := ev.eventRef;
+    postEvent_atStart(ev, False);
+  end
+  else
+    performSelectorOnMainThread_withObject_waitUntilDone(
+       ObjCSelector('lclSyncCheck:'), nil, false);
+end;
+
 procedure TCocoaApplication.lclSyncCheck(arg: id);
 begin
   {$ifdef COCOALOOPNATIVE}

lcl/interfaces/cocoa/cocoaobject.inc

@@ -50,9 +50,7 @@ end;
 
 procedure TCocoaWidgetSet.SendCheckSynchronizeMessage;
 begin
-  InitApplication
+  TCocoaApplication(NSApp).lclPostSyncCheckEvent;
-    .performSelectorOnMainThread_withObject_waitUntilDone(
-       ObjCSelector('lclSyncCheck:'), nil, false);
 end;
 
 {------------------------------------------------------------------------------

lcl/interfaces/qt5/qtwidgets.pas

@@ -107,6 +107,7 @@ type
 
   TQtWidget = class(TQtObject, IUnknown)
   private
+    FDefaultFocusReason: QtFocusReason;
     FInResizeEvent: boolean;
     FWidgetState: TQtWidgetStates;
     FWidgetDefaultFont: TQtFont;
@@ -319,6 +320,7 @@ type
       nil): QPixmapH;
     property ChildOfComplexWidget: TChildOfComplexWidget read FChildOfComplexWidget write FChildOfComplexWidget;
     property Context: HDC read GetContext;
+    property DefaultFocusReason: QtFocusReason read FDefaultFocusReason write FDefaultFocusReason;
     property HasCaret: Boolean read FHasCaret write SetHasCaret;
     property HasPaint: Boolean read FHasPaint write FHasPaint;
     property InResizeEvent: boolean read FInResizeEvent write FInResizeEvent;
@@ -2161,6 +2163,7 @@ end;
 
 procedure TQtWidget.InitializeWidget;
 begin
+  FDefaultFocusReason := QtTabFocusReason;
   FInResizeEvent := False;
   // default states
   FWidgetState := [];
@@ -5164,7 +5167,7 @@ end;
 procedure TQtWidget.setFocus;
 begin
   if getFocusPolicy <> QtNoFocus then
-    QWidget_setFocus(Widget, QtTabFocusReason) {issue #10155}
+    QWidget_setFocus(Widget, FDefaultFocusReason) {issue #10155}
   else
     QWidget_setFocus(Widget);
 end;
@@ -9769,6 +9772,7 @@ begin
   FCachedSelectionLen := -1;
   FIntValidator := nil;
   FNumbersOnly := False;
+  FDefaultFocusReason := QtOtherFocusReason;
   if AParams.WndParent <> 0 then
     Parent := TQtWidget(AParams.WndParent).GetContainerWidget
   else
@@ -16412,6 +16416,7 @@ end;
 
 procedure TQtMenu.InitializeWidget;
 begin
+  FDefaultFocusReason := QtTabFocusReason;
   FWidgetState := [];
   ChildOfComplexWidget := ccwNone;
   WidgetColorRole := QPaletteWindow;

lcl/interfaces/qt6/qtwidgets.pas

@@ -107,6 +107,7 @@ type
 
   TQtWidget = class(TQtObject, IUnknown)
   private
+    FDefaultFocusReason: QtFocusReason;
     FInResizeEvent: boolean;
     FWidgetState: TQtWidgetStates;
     FWidgetDefaultFont: TQtFont;
@@ -316,6 +317,7 @@ type
       nil): QPixmapH;
     property ChildOfComplexWidget: TChildOfComplexWidget read FChildOfComplexWidget write FChildOfComplexWidget;
     property Context: HDC read GetContext;
+    property DefaultFocusReason: QtFocusReason read FDefaultFocusReason write FDefaultFocusReason;
     property HasCaret: Boolean read FHasCaret write SetHasCaret;
     property HasPaint: Boolean read FHasPaint write FHasPaint;
     property InResizeEvent: boolean read FInResizeEvent write FInResizeEvent;
@@ -2158,6 +2160,7 @@ end;
 
 procedure TQtWidget.InitializeWidget;
 begin
+  FDefaultFocusReason := QtTabFocusReason;
   FInResizeEvent := False;
   // default states
   FWidgetState := [];
@@ -5168,7 +5171,7 @@ end;
 procedure TQtWidget.setFocus;
 begin
   if getFocusPolicy <> QtNoFocus then
-    QWidget_setFocus(Widget, QtTabFocusReason) {issue #10155}
+    QWidget_setFocus(Widget, FDefaultFocusReason) {issue #10155}
   else
     QWidget_setFocus(Widget);
 end;
@@ -9725,6 +9728,7 @@ begin
   FCachedSelectionLen := -1;
   FIntValidator := nil;
   FNumbersOnly := False;
+  FDefaultFocusReason := QtOtherFocusReason;
   if AParams.WndParent <> 0 then
     Parent := TQtWidget(AParams.WndParent).GetContainerWidget
   else
@@ -16322,6 +16326,7 @@ end;
 
 procedure TQtMenu.InitializeWidget;
 begin
+  FDefaultFocusReason := QtTabFocusReason;
   FWidgetState := [];
   ChildOfComplexWidget := ccwNone;
   WidgetColorRole := QPaletteWindow;