paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 06:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NewPostSyncCheckEvent' into 'main'

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

See merge request freepascal.org/lazarus/lazarus!384
This commit is contained in:
David Jenkins 2025-04-03 14:55:19 +00:00
commit c3059c523c
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lcl/interfaces/cocoa/cocoaint.pas
View File

@ -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}

4
lcl/interfaces/cocoa/cocoaobject.inc
View File

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