X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=ee7cd4349c503429164b9fddc4c168c7b0d83a29;hp=aa1c75ad12a0fae734cf4624ff937de3c707a216;hb=f9e037ea6a0b946c84db62d324996d8f878c1efb;hpb=75b56fa155ec64fbe2a0a1a1aefe79f80646767c diff --git a/src/common/main.cpp b/src/common/main.cpp index aa1c75ad..ee7cd434 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,263 +15,222 @@ * 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. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include -#include "global.h" -#include "logger.h" -#include "network.h" -#include "settings.h" -#include "cliparser.h" - -#if defined BUILD_CORE -#include -#include "core.h" -#include "message.h" +#include +#ifdef BUILD_CORE +# include "coreapplication.h" #elif defined BUILD_QTUI -#include "client.h" -#include "qtuiapplication.h" -#include "qtui.h" - +# include "aboutdata.h" +# include "qtuiapplication.h" #elif defined BUILD_MONO -#include "client.h" -#include "core.h" -#include "coresession.h" -#include "qtuiapplication.h" -#include "qtui.h" +# include "aboutdata.h" +# include "monoapplication.h" #else #error "Something is wrong - you need to #define a build mode!" #endif - -#include - -#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) -#include -#include -#include +// We don't want quasselcore to depend on KDE +#if defined HAVE_KDE4 && defined BUILD_CORE +# undef HAVE_KDE4 +#endif +// We don't want quasselcore to depend on KDE +#if defined HAVE_KF5 && defined BUILD_CORE +# undef HAVE_KF5 #endif -//! Signal handler for graceful shutdown. -void handle_signal(int sig) { - qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig))); - QCoreApplication::quit(); -} - -#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) -void handle_crash(int sig) { - Q_UNUSED(sig) - void* callstack[128]; - int i, frames = backtrace(callstack, 128); - - QFile dumpFile(QString("Quassel-Crash-%1").arg(QDateTime::currentDateTime().toString("yyyyMMdd-hhmm.log"))); - dumpFile.open(QIODevice::WriteOnly); - QTextStream dumpStream(&dumpFile); - - for (i = 0; i < frames; ++i) { - Dl_info info; - dladdr (callstack[i], &info); - // as a reference: - // typedef struct - // { - // __const char *dli_fname; /* File name of defining object. */ - // void *dli_fbase; /* Load address of that object. */ - // __const char *dli_sname; /* Name of nearest symbol. */ - // void *dli_saddr; /* Exact value of nearest symbol. */ - // } Dl_info; - -#if __LP64__ - int addrSize = 16; +#ifdef HAVE_KDE4 +# include +# include "kcmdlinewrapper.h" +#elif defined HAVE_KF5 +# include +# include +# include "qt5cliparser.h" +#elif defined HAVE_QT5 +# include "qt5cliparser.h" #else - int addrSize = 8; +# include "cliparser.h" #endif - QString funcName; - if(info.dli_sname) { - char *func = abi::__cxa_demangle(info.dli_sname, 0, 0, 0); - if(func) { - funcName = QString(func); - free(func); - } else { - funcName = QString(info.dli_sname); - } - } else { - funcName = QString("0x%1").arg((long)info.dli_saddr, addrSize, QLatin1Char('0')); - } +#if !defined(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +#endif - // prettificating the filename - QString fileName("???"); - if(info.dli_fname) { - fileName = QString(info.dli_fname); - int slashPos = fileName.lastIndexOf('/'); - if(slashPos != -1) - fileName = fileName.mid(slashPos + 1); - if(fileName.count() < 20) - fileName += QString(20 - fileName.count(), ' '); - } +#include "quassel.h" - QString debugLine = QString("#%1 %2 0x%3 %4").arg(i, 3, 10) - .arg(fileName) - .arg((long)(callstack[i]), addrSize, 16, QLatin1Char('0')) - .arg(funcName); +int main(int argc, char **argv) +{ +#if QT_VERSION < 0x050000 + // All our source files are in UTF-8, and Qt5 even requires that + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); +#endif - dumpStream << debugLine << "\n"; - qDebug() << qPrintable(debugLine); - } - dumpFile.close(); - exit(27); -} -#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) + Quassel::setupBuildInfo(); + QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); + QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString); + QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); + QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); + // on OSX with Qt4, raster seems to fix performance issues +#if QT_VERSION < 0x050000 && defined Q_OS_MAC && !defined BUILD_CORE + QApplication::setGraphicsSystem("raster"); +#endif -int main(int argc, char **argv) { - // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel. - signal(SIGTERM, handle_signal); - signal(SIGINT, handle_signal); + // We need to explicitly initialize the required resources when linking statically +#ifndef BUILD_QTUI + Q_INIT_RESOURCE(sql); +#endif +#ifndef BUILD_CORE + Q_INIT_RESOURCE(pics); + Q_INIT_RESOURCE(hicolor); +#endif -#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) - signal(SIGABRT, handle_crash); - signal(SIGBUS, handle_crash); - signal(SIGSEGV, handle_crash); -#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) - - Global::registerMetaTypes(); - Global::setupVersion(); +#ifdef EMBED_DATA + Q_INIT_RESOURCE(i18n); +# ifndef BUILD_CORE + Q_INIT_RESOURCE(data); +# ifdef WITH_OXYGEN + Q_INIT_RESOURCE(oxygen); +# endif +# ifdef WITH_BREEZE + Q_INIT_RESOURCE(breeze); +# endif +# ifdef WITH_BREEZE_DARK + Q_INIT_RESOURCE(breezedark); +# endif +# endif +#endif -/* -#if defined BUILD_CORE - Global::runMode = Global::CoreOnly; - QCoreApplication app(argc, argv); -#elif defined BUILD_QTUI - Global::runMode = Global::ClientOnly; - QApplication app(argc, argv); + std::shared_ptr cliParser; + +#ifdef HAVE_KDE4 + // We need to init KCmdLineArgs first + KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(), + ki18n("A modern, distributed IRC client")); + aboutData.addLicense(KAboutData::License_GPL_V2); + aboutData.addLicense(KAboutData::License_GPL_V3); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); + KCmdLineArgs::init(argc, argv, &aboutData); + + cliParser = std::make_shared(); +#elif defined HAVE_QT5 + cliParser = std::make_shared(); #else - Global::runMode = Global::Monolithic; - QApplication app(argc, argv); + cliParser = std::make_shared(); #endif -*/ -#if defined BUILD_CORE - Global::runMode = Global::CoreOnly; - QCoreApplication app(argc, argv); -#elif defined BUILD_QTUI - Global::runMode = Global::ClientOnly; - QtUiApplication app(argc, argv); + Quassel::setCliParser(cliParser); + + // Initialize CLI arguments + // NOTE: We can't use tr() at this point, since app is not yet created + // TODO: Change this once we get rid of KDE4 and can initialize the parser after creating the app + + // put shared client&core arguments here + cliParser->addSwitch("debug", 'd', "Enable debug output"); + cliParser->addSwitch("help", 'h', "Display this help and exit"); + cliParser->addSwitch("version", 'v', "Display version information"); +#ifdef BUILD_QTUI + cliParser->addOption("configdir", 'c', "Specify the directory holding the client configuration", "path"); #else - Global::runMode = Global::Monolithic; - QtUiApplication app(argc, argv); + cliParser->addOption("configdir", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate", "path"); #endif + cliParser->addOption("datadir", 0, "DEPRECATED - Use --configdir instead", "path"); + cliParser->addOption("loglevel", 'L', "Loglevel Debug|Info|Warning|Error", "level", "Info"); +#ifdef HAVE_SYSLOG + cliParser->addSwitch("syslog", 0, "Log to syslog"); +#endif + cliParser->addOption("logfile", 'l', "Log to a file", "path"); - Global::parser = CliParser(QCoreApplication::arguments()); - -#ifndef BUILD_QTUI -// put core-only arguments here - Global::parser.addOption("port",'p',"The port quasselcore will listen at",QString("4242")); - Global::parser.addSwitch("norestore", 'n', "Don't restore last core's state"); - Global::parser.addOption("logfile",'l',"Path to logfile"); - Global::parser.addOption("loglevel",'L',"Loglevel Debug|Info|Warning|Error","Info"); - Global::parser.addOption("datadir", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert"); -#endif // BUILD_QTUI #ifndef BUILD_CORE -// put client-only arguments here - Global::parser.addSwitch("debugbufferswitches",0,"Enables debugging for bufferswitches"); - Global::parser.addSwitch("debugmodel",0,"Enables debugging for models"); -#endif // BUILD_QTCORE -// put shared client&core arguments here - Global::parser.addSwitch("debug",'d',"Enable debug output"); - Global::parser.addSwitch("help",'h', "Display this help and exit"); - - if(!Global::parser.parse() || Global::parser.isSet("help")) { - Global::parser.usage(); - return 1; - } - - /* - This is an initial check if logfile is writable since the warning would spam stdout if done - in current Logger implementation. Can be dropped whenever the logfile is only opened once. - */ - if(Global::runMode != Global::ClientOnly) { - QFile logFile; - if(!Global::parser.value("logfile").isEmpty()) { - logFile.setFileName(Global::parser.value("logfile")); - if(!logFile.open(QIODevice::Append | QIODevice::Text)) - qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName())); - else logFile.close(); - } - } - - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); - - // Set up i18n support - QLocale locale = QLocale::system(); - - QTranslator qtTranslator(&app); - qtTranslator.setObjectName("QtTr"); - qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name())); - app.installTranslator(&qtTranslator); - - QTranslator quasselTranslator(&app); - quasselTranslator.setObjectName("QuasselTr"); - quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name())); - app.installTranslator(&quasselTranslator); - - Network::setDefaultCodecForServer("ISO-8859-1"); - Network::setDefaultCodecForEncoding("UTF-8"); - Network::setDefaultCodecForDecoding("ISO-8859-15"); - - QCoreApplication::setOrganizationDomain("quassel-irc.org"); - QCoreApplication::setApplicationName("Quassel IRC"); - QCoreApplication::setOrganizationName("Quassel Project"); - - + // put client-only arguments here + cliParser->addOption("icontheme", 0, "Override the system icon theme ('breeze' is recommended)", "theme"); + cliParser->addOption("qss", 0, "Load a custom application stylesheet", "file.qss"); + cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); + cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); + cliParser->addSwitch("hidewindow", 0, "Start the client minimized to the system tray"); +#endif #ifndef BUILD_QTUI - Core::instance(); // create and init the core + // put core-only arguments here + cliParser->addOption("listen", 0, "The address(es) quasselcore will listen on", "
[,
[,...]]", "::,0.0.0.0"); + cliParser->addOption("port", 'p', "The port quasselcore will listen at", "port", "4242"); + cliParser->addSwitch("norestore", 'n', "Don't restore last core's state"); + cliParser->addSwitch("config-from-environment", 0, "Load configuration from environment variables"); + cliParser->addOption("select-backend", 0, "Switch storage backend (migrating data if possible)", "backendidentifier"); + cliParser->addOption("select-authenticator", 0, "Select authentication backend", "authidentifier"); + cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user"); + cliParser->addOption("change-userpass", 0, "Starts an interactive session to change the password of the user identified by ", "username"); + cliParser->addSwitch("oidentd", 0, "Enable oidentd integration"); + cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file"); + cliParser->addSwitch("oidentd-strict", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting. Only meaningful with --oidentd."); +#ifdef HAVE_SSL + cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections"); + cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem"); + cliParser->addOption("ssl-key", 0, "Specify the path to the SSL key", "path", "ssl-cert-path"); #endif - - //Settings::init(); - -#ifndef BUILD_CORE - // session resume - QtUi *gui = new QtUi(); - Client::init(gui); - // init gui only after the event loop has started - QTimer::singleShot(0, gui, SLOT(init())); - //gui->init(); + cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif -#ifndef BUILD_QTUI - if(!Global::parser.isSet("norestore")) { - Core::restoreState(); - } +#ifdef HAVE_KDE4 + // the KDE version needs this extra call to parse argc/argv before app is instantiated + if (!cliParser->init()) { + cliParser->usage(); + return EXIT_FAILURE; + } #endif -#ifndef BUILD_CORE - app.resumeSessionIfPossible(); +#if defined BUILD_CORE + CoreApplication app(argc, argv); +#elif defined BUILD_QTUI +# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN) + QtUiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif +# if QT_VERSION >= 0x050700 + QtUiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +# endif + QtUiApplication app(argc, argv); +#elif defined BUILD_MONO +# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN) + MonolithicApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif +# if QT_VERSION >= 0x050700 + MonolithicApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +# endif + MonolithicApplication app(argc, argv); #endif - - int exitCode = app.exec(); -#ifndef BUILD_QTUI - Core::saveState(); +#ifndef HAVE_KDE4 + // the non-KDE version parses after app has been instantiated + if (!cliParser->init(app.arguments())) { + cliParser->usage(); + return EXIT_FAILURE; + } #endif -#ifndef BUILD_CORE - // the mainWin has to be deleted before the Core - // if not Quassel will crash on exit under certain conditions since the gui - // still wants to access clientdata - delete gui; - Client::destroy(); +// Migrate settings from KDE4 to KF5 if appropriate +#ifdef HAVE_KF5 + Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName()); + migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc"); + migrator.migrate(); #endif -#ifndef BUILD_QTUI - Core::destroy(); + +#ifdef HAVE_KF5 + // FIXME: This should be done after loading the translation catalogue, but still in main() + AboutData aboutData; + AboutData::setQuasselPersons(&aboutData); + KAboutData::setApplicationData(aboutData.kAboutData()); #endif - return exitCode; + if (!app.init()) + return EXIT_FAILURE; + + return app.exec(); }