diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm index 4fe1fb287..5ec91732b 100644 --- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm +++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm @@ -51,13 +51,17 @@ QString strNeedToRefresh2() { NSString *fullname; NSURL *app; NSImage *icon; + } + @property (nonatomic, retain) NSString *fullname; @property (nonatomic, retain) NSURL *app; @property (nonatomic, retain) NSImage *icon; -@end + +@end // @interface OpenWithApp @implementation OpenWithApp + @synthesize fullname, app, icon; - (void) dealloc { @@ -67,7 +71,7 @@ QString strNeedToRefresh2() { [super dealloc]; } -@end +@end // @implementation OpenWithApp @interface OpenFileWithInterface : NSObject { } @@ -77,7 +81,7 @@ QString strNeedToRefresh2() { - (void) itemChosen:(id)sender; - (void) dealloc; -@end +@end // @interface OpenFileWithInterface @implementation OpenFileWithInterface { NSString *toOpen; @@ -89,6 +93,7 @@ QString strNeedToRefresh2() { NSMutableArray *apps; NSMenu *menu; + } - (void) fillAppByUrl:(NSURL*)url bundle:(NSString**)bundle name:(NSString**)name version:(NSString**)version icon:(NSImage**)icon { @@ -233,13 +238,13 @@ QString strNeedToRefresh2() { [super dealloc]; } -@end +@end // @implementation OpenFileWithInterface @interface NSURL(CompareUrls) - (BOOL) isEquivalent:(NSURL *)aURL; -@end +@end // @interface NSURL(CompareUrls) @implementation NSURL(CompareUrls) @@ -253,7 +258,7 @@ QString strNeedToRefresh2() { return YES; } -@end +@end // @implementation NSURL(CompareUrls) @interface ChooseApplicationDelegate : NSObject { } @@ -264,7 +269,7 @@ QString strNeedToRefresh2() { - (void) menuDidClose; - (void) dealloc; -@end +@end // @interface ChooseApplicationDelegate @implementation ChooseApplicationDelegate { BOOL onlyRecommended; @@ -275,6 +280,7 @@ QString strNeedToRefresh2() { NSImageView *icon; NSString *recom; NSView *accessory; + } - (id) init:(NSArray *)recommendedApps withPanel:(NSOpenPanel *)creator withSelector:(NSPopUpButton *)menu withGood:(NSTextField *)goodLabel withBad:(NSTextField *)badLabel withIcon:(NSImageView *)badIcon withAccessory:(NSView *)acc { @@ -379,7 +385,7 @@ QString strNeedToRefresh2() { [super dealloc]; } -@end +@end // @implementation ChooseApplicationDelegate namespace Platform { namespace File { diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h index 1858b040e..770cf0056 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.h +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_main_window.h" #include "platform/mac/specific_mac_p.h" +#include "base/timer.h" namespace Platform { @@ -65,9 +66,6 @@ public slots: void psMacDelete(); void psMacSelectAll(); -private slots: - void onHideAfterFullScreen(); - protected: bool eventFilter(QObject *obj, QEvent *evt) override; @@ -119,7 +117,7 @@ private: mutable bool psIdle; mutable QTimer psIdleTimer; - QTimer _hideAfterFullScreenTimer; + base::Timer _hideAfterFullScreenTimer; QMenuBar psMainMenu; QAction *psLogout = nullptr; diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 3165754f9..639f8b8c7 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -37,6 +37,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +namespace { + +// When we close a window that is fullscreen we first leave the fullscreen +// mode and after that hide the window. This is a timeout for elaving the +// fullscreen mode, after that we'll hide the window no matter what. +constexpr auto kHideAfterFullscreenTimeoutMs = 3000; + +} // namespace + @interface MainWindowObserver : NSObject { } @@ -48,7 +57,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org - (void) windowWillEnterFullScreen:(NSNotification *)aNotification; - (void) windowWillExitFullScreen:(NSNotification *)aNotification; -@end +@end // @interface MainWindowObserver namespace Platform { @@ -105,8 +114,7 @@ public: } // namespace Platform @implementation MainWindowObserver { - -MainWindow::Private *_private; + MainWindow::Private *_private; } @@ -141,7 +149,7 @@ MainWindow::Private *_private; _private->willExitFullScreen(); } -@end +@end // @implementation MainWindowObserver namespace Platform { @@ -239,8 +247,7 @@ MainWindow::MainWindow() trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), dbisOne); trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), dbisOne); - _hideAfterFullScreenTimer.setSingleShot(true); - connect(&_hideAfterFullScreenTimer, SIGNAL(timeout()), this, SLOT(onHideAfterFullScreen())); + _hideAfterFullScreenTimer.setCallback([this] { hideAndDeactivate(); }); } void MainWindow::closeWithoutDestroy() { @@ -248,7 +255,7 @@ void MainWindow::closeWithoutDestroy() { auto isFullScreen = (([nsWindow styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask); if (isFullScreen) { - _hideAfterFullScreenTimer.start(3000); + _hideAfterFullScreenTimer.callOnce(kHideAfterFullscreenTimeoutMs); [nsWindow toggleFullScreen:nsWindow]; } else { hideAndDeactivate(); @@ -257,8 +264,7 @@ void MainWindow::closeWithoutDestroy() { void MainWindow::stateChangedHook(Qt::WindowState state) { if (_hideAfterFullScreenTimer.isActive()) { - _hideAfterFullScreenTimer.stop(); - QTimer::singleShot(0, this, SLOT(onHideAfterFullScreen())); + _hideAfterFullScreenTimer.callOnce(0); } } @@ -278,14 +284,8 @@ void MainWindow::titleVisibilityChangedHook() { updateTitleCounter(); } -void MainWindow::onHideAfterFullScreen() { - hideAndDeactivate(); -} - void MainWindow::hideAndDeactivate() { hide(); - NSWindow *nsWindow = [reinterpret_cast(winId()) window]; - [[NSApplication sharedApplication] hide: nsWindow]; } QImage MainWindow::psTrayIcon(bool selected) const { diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h index a9c6bbbaa..57c79cd98 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "platform/platform_notifications_manager.h" +#include "base/weak_unique_ptr.h" namespace Platform { namespace Notifications { @@ -28,7 +29,7 @@ namespace Notifications { bool SkipAudio(); bool SkipToast(); -class Manager : public Window::Notifications::NativeManager { +class Manager : public Window::Notifications::NativeManager, public base::enable_weak_from_this { public: Manager(Window::Notifications::System *system); ~Manager(); diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm index 27c7476e2..eedd6a7fc 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm @@ -26,6 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "base/task_queue.h" +#include #include namespace { @@ -54,19 +55,18 @@ NSImage *qt_mac_create_nsimage(const QPixmap &pm); @interface NotificationDelegate : NSObject { } -- (id) initWithManager:(std::shared_ptr)manager; -- (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification; -- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification; +- (id) initWithManager:(base::weak_unique_ptr)manager; +- (void) userNotificationCenter:(NSUserNotificationCenter*)center didActivateNotification:(NSUserNotification*)notification; +- (BOOL) userNotificationCenter:(NSUserNotificationCenter*)center shouldPresentNotification:(NSUserNotification*)notification; -@end +@end // @interface NotificationDelegate @implementation NotificationDelegate { - -std::weak_ptr _manager; + base::weak_unique_ptr _manager; } -- (id) initWithManager:(std::shared_ptr)manager { +- (id) initWithManager:(base::weak_unique_ptr)manager { if (self = [super init]) { _manager = manager; } @@ -77,14 +77,27 @@ std::weak_ptr _manager; NSDictionary *notificationUserInfo = [notification userInfo]; NSNumber *launchIdObject = [notificationUserInfo objectForKey:@"launch"]; auto notificationLaunchId = launchIdObject ? [launchIdObject unsignedLongLongValue] : 0ULL; - DEBUG_LOG(("Received notification with instance %1").arg(notificationLaunchId)); + DEBUG_LOG(("Received notification with instance %1, mine: %2").arg(notificationLaunchId).arg(Global::LaunchId())); if (notificationLaunchId != Global::LaunchId()) { // other app instance notification + base::TaskQueue::Main().Put([] { + // Usually we show and activate main window when the application + // is activated (receives applicationDidBecomeActive: notification). + // + // This is used for window show in Cmd+Tab switching to the application. + // + // But when a notification arrives sometimes macOS still activates the app + // and we receive applicationDidBecomeActive: notification even if the + // notification was sent by another instance of the application. In that case + // we set a flag for a couple of seconds to ignore this app activation. + objc_ignoreApplicationActivationRightNow(); + }); return; } NSNumber *peerObject = [notificationUserInfo objectForKey:@"peer"]; auto notificationPeerId = peerObject ? [peerObject unsignedLongLongValue] : 0ULL; if (!notificationPeerId) { + LOG(("App Error: A notification with unknown peer was received")); return; } @@ -92,23 +105,27 @@ std::weak_ptr _manager; auto notificationMsgId = msgObject ? [msgObject intValue] : 0; if (notification.activationType == NSUserNotificationActivationTypeReplied) { auto notificationReply = QString::fromUtf8([[[notification response] string] UTF8String]); - if (auto manager = _manager.lock()) { - (*manager)->notificationReplied(notificationPeerId, notificationMsgId, notificationReply); - } + base::TaskQueue::Main().Put([manager = _manager, notificationPeerId, notificationMsgId, notificationReply] { + if (manager) { + manager->notificationReplied(notificationPeerId, notificationMsgId, notificationReply); + } + }); } else if (notification.activationType == NSUserNotificationActivationTypeContentsClicked) { - if (auto manager = _manager.lock()) { - (*manager)->notificationActivated(notificationPeerId, notificationMsgId); - } + base::TaskQueue::Main().Put([manager = _manager, notificationPeerId, notificationMsgId] { + if (manager) { + manager->notificationActivated(notificationPeerId, notificationMsgId); + } + }); } [center removeDeliveredNotification: notification]; } -- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification { +- (BOOL) userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification { return YES; } -@end +@end // @implementation NotificationDelegate namespace Platform { namespace Notifications { @@ -156,6 +173,7 @@ void CustomNotificationShownHook(QWidget *widget) { class Manager::Private : public QObject, private base::Subscriber { public: Private(Manager *manager); + void showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton); void clearAll(); void clearFromHistory(History *history); @@ -164,14 +182,12 @@ public: ~Private(); private: - std::shared_ptr _guarded; NotificationDelegate *_delegate = nullptr; }; Manager::Private::Private(Manager *manager) -: _guarded(std::make_shared(manager)) -, _delegate([[NotificationDelegate alloc] initWithManager:_guarded]) { +: _delegate([[NotificationDelegate alloc] initWithManager:manager]) { updateDelegate(); subscribe(Global::RefWorkMode(), [this](DBIWorkMode mode) { // We need to update the delegate _after_ the tray icon change was done in Qt. @@ -225,7 +241,6 @@ void Manager::Private::clearAll() { [center removeDeliveredNotification:notification]; } } - [center removeAllDeliveredNotifications]; } void Manager::Private::clearFromHistory(History *history) { diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h index cdad7ab96..62daf8fce 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.h +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.h @@ -31,6 +31,7 @@ bool objc_idleSupported(); bool objc_idleTime(TimeMs &idleTime); void objc_start(); +void objc_ignoreApplicationActivationRightNow(); void objc_finish(); bool objc_execUpdater(); void objc_execTelegram(const QString &crashreport); diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index ca625ce49..73290e991 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -26,6 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/mac/mac_utilities.h" #include "styles/style_window.h" #include "lang.h" +#include "base/timer.h" #include #include @@ -33,6 +34,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +namespace { + +constexpr auto kIgnoreActivationTimeoutMs = 1500; + +} // namespace + using Platform::Q2NSString; using Platform::NSlang; using Platform::NS2QString; @@ -48,10 +55,11 @@ using Platform::NS2QString; - (id)debugQuickLookObject; -@end +@end // @interface qVisualize @implementation qVisualize { NSString *value; + } + (id)bytearr:(const QByteArray &)arr { @@ -78,59 +86,68 @@ using Platform::NS2QString; return value; } -@end +@end // @implementation qVisualize @interface ApplicationDelegate : NSObject { - -SPMediaKeyTap *keyTap; -BOOL watchingMediaKeys; - } -- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag; -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification; -- (void)applicationDidBecomeActive:(NSNotification *)aNotification; -- (void)receiveWakeNote:(NSNotification*)note; -- (void)setWatchingMediaKeys:(BOOL)watching; -- (BOOL)isWatchingMediaKeys; -- (void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event; +- (BOOL) applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag; +- (void) applicationDidFinishLaunching:(NSNotification *)aNotification; +- (void) applicationDidBecomeActive:(NSNotification *)aNotification; +- (void) receiveWakeNote:(NSNotification*)note; -@end +- (void) setWatchingMediaKeys:(bool)watching; +- (bool) isWatchingMediaKeys; +- (void) mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event; + +- (void) ignoreApplicationActivationRightNow; + +@end // @interface ApplicationDelegate ApplicationDelegate *_sharedDelegate = nil; @implementation ApplicationDelegate { + SPMediaKeyTap *_keyTap; + bool _watchingMediaKeys; + bool _ignoreActivation; + base::Timer _ignoreActivationStop; } -- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag { +- (BOOL) applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag { if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); return YES; } -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - keyTap = nullptr; - watchingMediaKeys = false; +- (void) applicationDidFinishLaunching:(NSNotification *)aNotification { + _keyTap = nullptr; + _watchingMediaKeys = false; + _ignoreActivation = false; + _ignoreActivationStop.setCallback([self] { + _ignoreActivation = false; + }); #ifndef OS_MAC_STORE if ([SPMediaKeyTap usesGlobalMediaKeyTap]) { - keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self]; + _keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self]; } else { LOG(("Media key monitoring disabled")); } #endif // else for !OS_MAC_STORE } -- (void)applicationDidBecomeActive:(NSNotification *)aNotification { +- (void) applicationDidBecomeActive:(NSNotification *)aNotification { if (auto messenger = Messenger::InstancePointer()) { - messenger->handleAppActivated(); - if (auto window = App::wnd()) { - if (window->isHidden()) { - window->showFromTray(); + if (!_ignoreActivation) { + messenger->handleAppActivated(); + if (auto window = App::wnd()) { + if (window->isHidden()) { + window->showFromTray(); + } } } } } -- (void)receiveWakeNote:(NSNotification*)aNotification { +- (void) receiveWakeNote:(NSNotification*)aNotification { if (auto messenger = Messenger::InstancePointer()) { messenger->checkLocalTime(); } @@ -139,38 +156,43 @@ ApplicationDelegate *_sharedDelegate = nil; Media::Player::DetachFromDeviceByTimer(); } -- (void)setWatchingMediaKeys:(BOOL)watching { - if (watchingMediaKeys != watching) { - watchingMediaKeys = watching; - if (keyTap) { +- (void) setWatchingMediaKeys:(bool)watching { + if (_watchingMediaKeys != watching) { + _watchingMediaKeys = watching; + if (_keyTap) { #ifndef OS_MAC_STORE - if (watchingMediaKeys) { - [keyTap startWatchingMediaKeys]; + if (_watchingMediaKeys) { + [_keyTap startWatchingMediaKeys]; } else { - [keyTap stopWatchingMediaKeys]; + [_keyTap stopWatchingMediaKeys]; } #endif // else for !OS_MAC_STORE } } } -- (BOOL)isWatchingMediaKeys { - return watchingMediaKeys; +- (bool) isWatchingMediaKeys { + return _watchingMediaKeys; } -- (void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)e { +- (void) mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)e { if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) { objc_handleMediaKeyEvent(e); } } -@end +- (void) ignoreApplicationActivationRightNow { + _ignoreActivation = true; + _ignoreActivationStop.callOnce(kIgnoreActivationTimeoutMs); +} + +@end // @implementation ApplicationDelegate namespace Platform { void SetWatchingMediaKeys(bool watching) { if (_sharedDelegate) { - [_sharedDelegate setWatchingMediaKeys:(watching ? YES : NO)]; + [_sharedDelegate setWatchingMediaKeys:watching]; } } @@ -327,12 +349,19 @@ void objc_start() { name: NSWorkspaceDidWakeNotification object: NULL]; } +void objc_ignoreApplicationActivationRightNow() { + if (_sharedDelegate) { + [_sharedDelegate ignoreApplicationActivationRightNow]; + } +} + namespace { NSURL *_downloadPathUrl = nil; } void objc_finish() { [_sharedDelegate release]; + _sharedDelegate = nil; if (_downloadPathUrl) { [_downloadPathUrl stopAccessingSecurityScopedResource]; _downloadPathUrl = nil;