X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=d9dcdc6f54c15239a277b94c9f0365e28685385a;hp=eca54ba21bbb1f16b59d979fcbf9eecdc7bf3915;hb=11a1e4372551439769eafba3f3f5403adff763fb;hpb=ce629c1db1216f2050c2864f244f409836298d25 diff --git a/src/common/main.cpp b/src/common/main.cpp index eca54ba2..d9dcdc6f 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-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,138 +15,212 @@ * 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 "global.h" -#include "logger.h" -#include "network.h" -#include "settings.h" - -#if defined BUILD_CORE -#include -#include -#include "core.h" -#include "message.h" +#include +#ifdef BUILD_CORE +# include "coreapplication.h" #elif defined BUILD_QTUI -#include -#include "client.h" -#include "qtui.h" - +# include "aboutdata.h" +# include "qtuiapplication.h" #elif defined BUILD_MONO -#include -#include "client.h" -#include "core.h" -#include "coresession.h" -#include "qtui.h" +# include "aboutdata.h" +# include "monoapplication.h" #else #error "Something is wrong - you need to #define a build mode!" #endif -#include - -//! Signal handler for graceful shutdown. -void handle_signal(int sig) { - qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii()); - QCoreApplication::quit(); -} - -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); - - // Logger logger; - - Global::registerMetaTypes(); - Global::setupVersion(); +// 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 -#if defined BUILD_CORE - Global::runMode = Global::CoreOnly; - QCoreApplication app(argc, argv); -#elif defined BUILD_QTUI - Global::runMode = Global::ClientOnly; - QApplication app(argc, argv); +#ifdef HAVE_KDE4 +# include +# include "kcmdlinewrapper.h" +#elif defined HAVE_KF5 +# include +# include +# include "qt5cliparser.h" +#elif defined HAVE_QT5 +# include "qt5cliparser.h" #else - Global::runMode = Global::Monolithic; - QApplication app(argc, argv); +# include "cliparser.h" #endif - qsrand(QDateTime::currentDateTime().toTime_t()); - - // Set up i18n support - QLocale locale = QLocale::system(); - - QTranslator qtTranslator; - qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name())); - app.installTranslator(&qtTranslator); - - QTranslator quasselTranslator; - quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name())); - app.installTranslator(&quasselTranslator); +#if !defined(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +#endif - Network::setDefaultCodecForServer("ISO-8859-1"); - Network::setDefaultCodecForEncoding("UTF-8"); - Network::setDefaultCodecForDecoding("ISO-8859-15"); +#include "quassel.h" - QCoreApplication::setOrganizationDomain("quassel-irc.org"); - QCoreApplication::setApplicationName("Quassel IRC"); - QCoreApplication::setOrganizationName("Quassel Project"); +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 - // Check if a non-standard core port is requested - QStringList args = QCoreApplication::arguments(); // TODO Build a CLI parser - Global::DEBUG = args.contains("--debug"); // This enables various debug features. + Quassel::setupBuildInfo(); + QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); + QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString); + QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); + QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); - Global::defaultPort = 4242; - int idx; - if((idx = args.indexOf("-p")) > 0 && idx < args.count() - 1) { - int port = args[idx+1].toInt(); - if(port >= 1024 && port < 65536) Global::defaultPort = port; - } + // 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 + // We need to explicitly initialize the required resources when linking statically #ifndef BUILD_QTUI - Core::instance(); // create and init the core + Q_INIT_RESOURCE(sql); +#endif +#ifndef BUILD_CORE + Q_INIT_RESOURCE(pics); + Q_INIT_RESOURCE(hicolor); #endif - //Settings::init(); +#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 -#ifndef BUILD_CORE - QtUi *gui = new QtUi(); - Client::init(gui); - // init gui only after the event loop has started - QTimer::singleShot(0, gui, SLOT(init())); - //gui->init(); + AbstractCliParser *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("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); + KCmdLineArgs::init(argc, argv, &aboutData); + + cliParser = new KCmdLineWrapper(); +#elif defined HAVE_QT5 + cliParser = new Qt5CliParser(); +#else + cliParser = new CliParser(); +#endif + 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 + 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"); +#ifndef BUILD_CORE + // put client-only arguments here + cliParser->addOption("icontheme", 0, "Override the system icon theme ('oxygen' 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 - if(!args.contains("--norestore")) { - Core::restoreState(); - } + // 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->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"); + cliParser->addOption("select-backend", 0, "Switch storage backend (migrating data if possible)", "backendidentifier"); + 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"); +#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 + cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); +#endif + +#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 - int exitCode = app.exec(); +#if defined BUILD_CORE + CoreApplication app(argc, argv); +#elif defined BUILD_QTUI +# if QT_VERSION >= 0x050600 + QtUiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +# endif + QtUiApplication app(argc, argv); +#elif defined BUILD_MONO +# if QT_VERSION >= 0x050600 + MonolithicApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +# endif + MonolithicApplication app(argc, argv); +#endif -#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 false; + } #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(); }