62baf23796
During native dictation, waiting for the next native event is blocked while dictation runs in a loop within a native callback. Because of this, LibreOffice's painting timers won't fire until dictation is cancelled or the user pauses speaking. So, force any pending timers to fire after the marked text changes. Also, remove the fix for OpenOffice bug 106901 as causes any key down events to cancel dictation and removing the fix does not appear to cause the original crashing bug to reoccur. Note: inserting a character from the system Character Viewer window causes dictation to stop responding and the only way I have found to restart dictation is by toggling dictation off and then back on again. This same behavior occurs in Apple's TextEdit application so this appears to be a macOS bug. Change-Id: Iad2b54870ff1a315f2f71d72bef24af3cea808e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176100 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
206 lines
6.7 KiB
C++
206 lines
6.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <rtl/math.hxx>
|
|
#include <tools/time.hxx>
|
|
|
|
#include <osx/saltimer.h>
|
|
#include <osx/salnstimer.h>
|
|
#include <osx/saldata.hxx>
|
|
#include <osx/salframe.h>
|
|
#include <osx/salinst.h>
|
|
|
|
|
|
void ImplNSAppPostEvent( short nEventId, BOOL bAtStart, int nUserData )
|
|
{
|
|
ReleasePoolHolder aPool;
|
|
NSEvent* pEvent = [NSEvent otherEventWithType: NSEventTypeApplicationDefined
|
|
location: NSZeroPoint
|
|
modifierFlags: 0
|
|
timestamp: [[NSProcessInfo processInfo] systemUptime]
|
|
windowNumber: 0
|
|
context: nil
|
|
subtype: nEventId
|
|
data1: nUserData
|
|
data2: 0];
|
|
assert( pEvent );
|
|
if ( nil == pEvent )
|
|
return;
|
|
if ( NO == bAtStart )
|
|
{
|
|
// nextEventMatchingMask has to run in the main thread!
|
|
assert([NSThread isMainThread]);
|
|
|
|
// Posting an event to the end of an empty queue fails,
|
|
// so we peek the queue and post to the start, if empty.
|
|
// Some Qt bugs even indicate nextEvent without dequeue
|
|
// sometimes blocks, so we dequeue and re-add the event.
|
|
NSEvent* pPeekEvent = [NSApp nextEventMatchingMask: NSEventMaskAny
|
|
untilDate: nil
|
|
inMode: NSDefaultRunLoopMode
|
|
dequeue: YES];
|
|
if ( nil == pPeekEvent )
|
|
bAtStart = YES;
|
|
else
|
|
[NSApp postEvent: pPeekEvent atStart: YES];
|
|
}
|
|
[NSApp postEvent: pEvent atStart: bAtStart];
|
|
}
|
|
|
|
void AquaSalTimer::queueDispatchTimerEvent( bool bAtStart )
|
|
{
|
|
Stop();
|
|
m_bDirectTimeout = true;
|
|
ImplNSAppPostEvent( AquaSalInstance::DispatchTimerEvent,
|
|
bAtStart, GetNextEventVersion() );
|
|
}
|
|
|
|
void AquaSalTimer::Start( sal_uInt64 nMS )
|
|
{
|
|
SalData* pSalData = GetSalData();
|
|
|
|
if( !pSalData->mpInstance->IsMainThread() )
|
|
{
|
|
ImplNSAppPostEvent( AquaSalInstance::AppStartTimerEvent, YES, nMS );
|
|
return;
|
|
}
|
|
|
|
m_bDirectTimeout = (0 == nMS) && !ImplGetSVData()->mpWinData->mbIsLiveResize && !ImplGetSVData()->mpWinData->mbIsWaitingForNativeEvent;
|
|
if ( m_bDirectTimeout )
|
|
Stop();
|
|
else
|
|
{
|
|
NSTimeInterval aTI = double(nMS) / 1000.0;
|
|
if( m_pRunningTimer != nil )
|
|
{
|
|
if ([m_pRunningTimer isValid] && rtl::math::approxEqual(
|
|
[m_pRunningTimer timeInterval], aTI))
|
|
{
|
|
// set new fire date
|
|
[m_pRunningTimer setFireDate: [NSDate dateWithTimeIntervalSinceNow: aTI]];
|
|
}
|
|
else
|
|
Stop();
|
|
}
|
|
else
|
|
Stop();
|
|
if( m_pRunningTimer == nil )
|
|
{
|
|
m_pRunningTimer = [[NSTimer scheduledTimerWithTimeInterval: aTI
|
|
target: [[[TimerCallbackCaller alloc] init] autorelease]
|
|
selector: @selector(timerElapsed:)
|
|
userInfo: nil
|
|
repeats: NO
|
|
] retain];
|
|
/* #i84055# add timer to tracking run loop mode,
|
|
so they also elapse while e.g. life resize
|
|
*/
|
|
[[NSRunLoop currentRunLoop] addTimer: m_pRunningTimer forMode: NSEventTrackingRunLoopMode];
|
|
}
|
|
}
|
|
}
|
|
|
|
void AquaSalTimer::Stop()
|
|
{
|
|
assert( GetSalData()->mpInstance->IsMainThread() );
|
|
|
|
if( m_pRunningTimer != nil )
|
|
{
|
|
[m_pRunningTimer invalidate];
|
|
[m_pRunningTimer release];
|
|
m_pRunningTimer = nil;
|
|
}
|
|
InvalidateEvent();
|
|
}
|
|
|
|
void AquaSalTimer::callTimerCallback()
|
|
{
|
|
ImplSVData* pSVData = ImplGetSVData();
|
|
SolarMutexGuard aGuard;
|
|
m_bDirectTimeout = false;
|
|
if( pSVData->maSchedCtx.mpSalTimer )
|
|
pSVData->maSchedCtx.mpSalTimer->CallCallback();
|
|
}
|
|
|
|
void AquaSalTimer::handleTimerElapsed()
|
|
{
|
|
if ( m_bDirectTimeout || ImplGetSVData()->mpWinData->mbIsLiveResize || ImplGetSVData()->mpWinData->mbIsWaitingForNativeEvent )
|
|
{
|
|
// Stop the timer, as it is just invalidated after the firing function
|
|
Stop();
|
|
callTimerCallback();
|
|
}
|
|
else
|
|
queueDispatchTimerEvent( true );
|
|
}
|
|
|
|
bool AquaSalTimer::handleDispatchTimerEvent( NSEvent *pEvent )
|
|
{
|
|
bool bIsValidEvent = IsValidEventVersion( [pEvent data1] );
|
|
if ( bIsValidEvent )
|
|
callTimerCallback();
|
|
return bIsValidEvent;
|
|
}
|
|
|
|
void AquaSalTimer::handleStartTimerEvent( NSEvent* pEvent )
|
|
{
|
|
ImplSVData* pSVData = ImplGetSVData();
|
|
if( pSVData->maSchedCtx.mpSalTimer )
|
|
{
|
|
NSTimeInterval posted = [pEvent timestamp] + NSTimeInterval([pEvent data1])/1000.0;
|
|
NSTimeInterval current = [NSDate timeIntervalSinceReferenceDate];
|
|
sal_uLong nTimeoutMS = 0;
|
|
if( (posted - current) > 0.0 )
|
|
nTimeoutMS = ceil( (posted - current) * 1000 );
|
|
Start( nTimeoutMS );
|
|
}
|
|
}
|
|
|
|
bool AquaSalTimer::IsTimerElapsed() const
|
|
{
|
|
assert( !((ExistsValidEvent() || m_bDirectTimeout) && m_pRunningTimer) );
|
|
if ( ExistsValidEvent() || m_bDirectTimeout )
|
|
return true;
|
|
if ( !m_pRunningTimer )
|
|
return false;
|
|
NSDate* pDt = [m_pRunningTimer fireDate];
|
|
return pDt && ([pDt timeIntervalSinceNow] < 0);
|
|
}
|
|
|
|
AquaSalTimer::AquaSalTimer( )
|
|
: m_pRunningTimer( nil )
|
|
{
|
|
}
|
|
|
|
AquaSalTimer::~AquaSalTimer()
|
|
{
|
|
Stop();
|
|
}
|
|
|
|
void AquaSalTimer::handleWindowShouldClose()
|
|
{
|
|
// for whatever reason events get filtered on close, presumably by
|
|
// timestamp so post a new timeout event, if there was one queued...
|
|
if ( ExistsValidEvent() && !m_pRunningTimer )
|
|
queueDispatchTimerEvent( false );
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|