mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-08 19:13:25 -08:00
* [Client] Exit deterministically when launching the update installer * [Client] Only quit when the main window close is accepted Wait for MainWindow::close() to be accepted before quitting after the update installer is launched. When the close is vetoed (a running card DB update, open games, or an unsaved deck), keep running and tell the user the installer is already waiting, instead of exiting over their answer. Also fix the comment so it does not claim settings are saved on the vetoed path. * [Client] Only quit on update when the shutdown actually ran MainWindow::closeEvent has a static re-entrancy guard that returns early on a second close event, leaving it in its default accepted state. DlgUpdate reached from a nested event loop while a shutdown prompt was up could then get close() == true with no shutdown work done (no settings flush, no tab shutdown) and tear down the process behind an unanswered prompt. Add MainWindow::closeForUpdate(), which reports false when a close is already in progress or was vetoed, and gate the update-exit on it. * [Client] Use QCoreApplication::exit() to leave on update QCoreApplication::quit() only asks the application to quit and can be interrupted if a top-level window refuses its close event. On the update path the process must actually leave so its Qt DLLs are unlocked before the installer starts replacing files - apply the exit(0) variant both on the accepted-close path and the fallback where no MainWindow was ever closed. * [Client] Warn that the update installer force-closes within a minute Telling the user Cockatrice just 'stays open for now' is misleading: the installer launched by #7308 waits only about 60 s for a graceful close before it force-terminates the process, which would lose unsaved work. State the deadline and tell the user to save and close before then. * [Client] Warn that a vetoed update is cancelled, not forced The warning on the veto path promised the opposite of what the installer does: WaitForAppToClose in #7308 never force-closes cockatrice.exe ($AllowForceClose is 0), it aborts the update after 60 s so no unsaved data is lost. A user who is told Cockatrice will be terminated in a minute hurries to close it, only to find the update already given up. State the real outcome instead: the installer waits about a minute for a close, and the update is cancelled if that does not happen. * [Client] Warn about a waiting installer without blocking it CloseMatchingApps in #7308 sends the WM_CLOSE once and the wait loop only polls IsAppRunning afterwards, but QMessageBox::warning is application modal and QGuiApplicationPrivate::processCloseEvent drops spontaneous close events for windows blocked by a modal widget. The veto path therefore swallowed the installer's one and only request, so even a user who resolved the blocker and closed the app still ended in the 60 s timeout. Move the warning into warnInstallerIsWaiting() and show it modeless, so the main window stays able to answer the installer while the message is up. * [Client] Close the parent on the no-MainWindow update fallback The fallback branch exits the process without closing anything, so it skips the settings flush and tab shutdown this change exists to get in front of the installer - the opposite of the fix if a call site ever stops passing a MainWindow. Close the parent widget first, like the code before this change did, and only then leave unconditionally: the parent is the one that knows how to shut down gracefully, and the deterministic exit is what the installer needs. * Add override. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
221 lines
8.1 KiB
C++
221 lines
8.1 KiB
C++
/***************************************************************************
|
|
* Copyright (C) 2008 by Max-Wilhelm Bruker *
|
|
* brukie@gmx.net *
|
|
* *
|
|
* This program is free software; you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation; either version 2 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* This program is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* GNU General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program; if not, write to the *
|
|
* Free Software Foundation, Inc., *
|
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
|
***************************************************************************/
|
|
/**
|
|
* @file window_main.h
|
|
* @ingroup Core
|
|
*/
|
|
//! \todo Document this file.
|
|
#ifndef WINDOW_H
|
|
#define WINDOW_H
|
|
|
|
#include "../client/lag_monitor.h"
|
|
#include "connection_controller/remote_connection_controller.h"
|
|
#include "widgets/dialogs/dlg_local_game_options.h"
|
|
|
|
#include <QList>
|
|
#include <QMainWindow>
|
|
#include <QMessageBox>
|
|
#include <QSystemTrayIcon>
|
|
#include <QtNetwork>
|
|
#include <libcockatrice/network/client/abstract/abstract_client.h>
|
|
#include <libcockatrice/protocol/pb/response.pb.h>
|
|
|
|
inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");
|
|
inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup");
|
|
inline Q_LOGGING_CATEGORY(WindowMainStartupVersionLog, "window_main.startup.version");
|
|
inline Q_LOGGING_CATEGORY(WindowMainStartupShortcutsLog, "window_main.startup.shortcuts");
|
|
inline Q_LOGGING_CATEGORY(WindowMainStartupAutoconnectLog, "window_main.startup.autoconnect");
|
|
|
|
class Release;
|
|
class DlgConnect;
|
|
class DlgViewLog;
|
|
class GameReplay;
|
|
class HandlePublicServers;
|
|
class LocalClient;
|
|
class LocalServer;
|
|
class QLabel;
|
|
class LatencyStatusWidget;
|
|
class QThread;
|
|
class RemoteClient;
|
|
class ServerInfo_User;
|
|
class TabSupervisor;
|
|
class WndSets;
|
|
class DlgTipOfTheDay;
|
|
struct ContextConnectToServer;
|
|
class IntentUrlParser;
|
|
|
|
class MainWindow : public QMainWindow
|
|
{
|
|
Q_OBJECT
|
|
signals:
|
|
/** @brief Emitted after the background card-database update subprocess exits. */
|
|
void cardDatabaseUpdateFinished(bool success);
|
|
|
|
/** @brief Emitted while the background card-database update subprocess runs.
|
|
* @p stage is one of "download", "scan" or "import"; @p done/@p total
|
|
* are byte counts for the first two stages and set indices for "import". */
|
|
void cardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total);
|
|
|
|
public slots:
|
|
void actCheckCardUpdates();
|
|
void actCheckCardUpdatesBackground();
|
|
void actCheckServerUpdates();
|
|
void actCheckClientUpdates();
|
|
void actConnect();
|
|
void actExit();
|
|
void handleCockatriceLink(const QString &url);
|
|
private slots:
|
|
void updateTabMenu(const QList<QMenu *> &newMenuList);
|
|
void statusChanged(ClientStatus _status);
|
|
void localGameEnded();
|
|
void pixmapCacheSizeChanged(int newSizeInMBs);
|
|
void actDisconnect();
|
|
void actSinglePlayer();
|
|
void actWatchReplay();
|
|
void actFullScreen(bool checked);
|
|
void actSettings();
|
|
void actAbout();
|
|
void actTips();
|
|
void actUpdate();
|
|
void actViewLog();
|
|
void actOpenSettingsFolder();
|
|
void actShow();
|
|
void showWindowIfHidden();
|
|
void onUrlChainFinished(bool connected);
|
|
|
|
void cardUpdateError(QProcess::ProcessError err);
|
|
void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus);
|
|
void cardUpdateProgressOutput();
|
|
void refreshShortcuts();
|
|
void cardDatabaseLoadingFailed();
|
|
void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
|
|
void cardDatabaseAllNewSetsEnabled();
|
|
|
|
void checkClientUpdatesFinished(bool needToUpdate, bool isCompatible, Release *release);
|
|
void actCheckCommanderBracketDefinitionUpdates();
|
|
|
|
void actOpenCustomFolder();
|
|
void actOpenCustomsetsFolder();
|
|
void actAddCustomSet();
|
|
void actReloadCardDatabase();
|
|
|
|
void actManageSets();
|
|
void actEditTokens();
|
|
|
|
void startupConfigCheck();
|
|
void alertForcedOracleRun(const QString &version, bool isUpdate);
|
|
|
|
void applyStartupDestination();
|
|
void onStartupDestinationConnected(int destination, const ContextConnectToServer &serverContext);
|
|
void startupDestinationFailed(const QString &reason);
|
|
[[nodiscard]] bool startupDestinationConnectsToServer() const;
|
|
|
|
void attemptStartupAutoConnect();
|
|
|
|
private:
|
|
static const QString appName;
|
|
static const QStringList fileNameFilters;
|
|
void retranslateUi();
|
|
void createActions();
|
|
void createMenus();
|
|
|
|
void createTrayIcon();
|
|
int getNextCustomSetPrefix(QDir dataDir);
|
|
|
|
void runFirstRunWizard(bool firstRun = false);
|
|
|
|
inline QString getCardUpdaterBinaryName()
|
|
{
|
|
return "oracle";
|
|
}
|
|
void createCardUpdateProcess(bool background = false);
|
|
void exitCardDatabaseUpdate();
|
|
|
|
void startLocalGame(const LocalGameOptions &options);
|
|
|
|
QList<QMenu *> tabMenus;
|
|
QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu;
|
|
QAction *aAbout, *aSettings, *aShow, *aExit;
|
|
QAction *aConnect, *aDisconnect, *aRegister, *aForgotPassword, *aSinglePlayer, *aWatchReplay, *aFullScreen;
|
|
QAction *aManageSets, *aEditTokens, *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet,
|
|
*aReloadCardDatabase;
|
|
QAction *aTips, *aUpdate, *aCheckCardUpdates, *aCheckCardUpdatesBackground, *aFirstRunWizard, *aStatusBar,
|
|
*aViewLog, *aOpenSettingsFolder;
|
|
|
|
TabSupervisor *tabSupervisor;
|
|
IntentUrlParser *urlParser;
|
|
WndSets *wndSets;
|
|
ConnectionController *connectionController;
|
|
LocalServer *localServer;
|
|
LagMonitor lagMonitor; ///< watches the main thread for event loop stalls
|
|
LatencyStatusWidget *latencyStatus = nullptr; ///< status bar widget with live round-trip stats and history graph
|
|
bool bHasActivated, askedForDbUpdater;
|
|
bool bClosingDown = false; ///< guards closeEvent() against re-entrancy
|
|
bool skipStartupAutoConnect = false;
|
|
bool startupAutoConnectAttempted = false;
|
|
bool firstRunWizardActive = false;
|
|
QProcess *cardUpdateProcess;
|
|
QByteArray cardUpdateOutputBuffer;
|
|
DlgViewLog *logviewDialog;
|
|
GameReplay *replay;
|
|
DlgTipOfTheDay *tip;
|
|
QUrl connectTo;
|
|
|
|
public:
|
|
explicit MainWindow(QWidget *parent = nullptr);
|
|
void setConnectTo(QString url)
|
|
{
|
|
connectTo = QUrl(QString("cockatrice://%1").arg(url));
|
|
}
|
|
// When set, the window's own startup connection (--connect or auto-connect
|
|
// on first activation) is skipped. Used for activation launches: the intent
|
|
// chain triggered by a cockatrice:// URL owns the connection, and letting
|
|
// auto-connect race against it caused two connectToServer calls to tear
|
|
// each other down. onUrlChainFinished() clears this and retries the startup
|
|
// connection when the link's chain ended without connecting.
|
|
void setSkipStartupAutoConnect(bool skip)
|
|
{
|
|
skipStartupAutoConnect = skip;
|
|
}
|
|
~MainWindow() override;
|
|
|
|
RemoteClient *getRemoteClient() const
|
|
{
|
|
return connectionController->client();
|
|
}
|
|
|
|
TabSupervisor *getTabSupervisor() const
|
|
{
|
|
return tabSupervisor;
|
|
}
|
|
|
|
/**
|
|
* @brief Closes the window so an update installer can replace the running binaries.
|
|
* Returns true only if the shutdown actually ran (settings flushed, tabs shut down);
|
|
* false if the close was vetoed by the user or is already in progress.
|
|
*/
|
|
bool closeForUpdate();
|
|
|
|
protected:
|
|
void closeEvent(QCloseEvent *event) override;
|
|
void changeEvent(QEvent *event) override;
|
|
};
|
|
|
|
#endif
|