X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=598425f6847084e5a916e719f40a25d7f7aec28b;hp=0441f2c4912d1cc93740ba098467e606884dcab3;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=8965e63594dd297347afced784dcaed6c26b7c6a diff --git a/src/common/main.cpp b/src/common/main.cpp index 0441f2c4..598425f6 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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 * @@ -19,7 +19,14 @@ ***************************************************************************/ #include +#include +#ifdef HAVE_UMASK +# include +# include +#endif /* HAVE_UMASK */ + +#include #include #ifdef BUILD_CORE @@ -35,26 +42,14 @@ #error "Something is wrong - you need to #define a build mode!" #endif -// 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 -#ifdef HAVE_KDE4 -# include -# include "kcmdlinewrapper.h" -#elif defined HAVE_KF5 +#if defined HAVE_KF5 # include # include -# include "qt5cliparser.h" -#elif defined HAVE_QT5 -# include "qt5cliparser.h" -#else -# include "cliparser.h" #endif #if !defined(BUILD_CORE) && defined(STATIC) @@ -63,26 +58,30 @@ Q_IMPORT_PLUGIN(qjpeg) Q_IMPORT_PLUGIN(qgif) #endif +#include "qt5cliparser.h" #include "quassel.h" +#include "types.h" 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")); +#ifdef HAVE_UMASK + umask(S_IRWXG | S_IRWXO); #endif + // Instantiate early, so log messages are handled + Quassel quassel; + 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"); + //Setup the High-DPI settings +# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN) + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6 #endif + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); // We need to explicitly initialize the required resources when linking statically #ifndef BUILD_QTUI @@ -90,43 +89,29 @@ int main(int argc, char **argv) #endif #ifndef BUILD_CORE Q_INIT_RESOURCE(pics); - Q_INIT_RESOURCE(hicolor); + Q_INIT_RESOURCE(hicolor_icons); #endif #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); + Q_INIT_RESOURCE(breeze_icons); + Q_INIT_RESOURCE(breeze_dark_icons); +# ifdef WITH_OXYGEN_ICONS + Q_INIT_RESOURCE(oxygen_icons); +# endif +# ifdef WITH_BUNDLED_ICONS + Q_INIT_RESOURCE(breeze_icon_theme); + Q_INIT_RESOURCE(breeze_dark_icon_theme); +# ifdef WITH_OXYGEN_ICONS + Q_INIT_RESOURCE(oxygen_icon_theme); # endif +# endif # endif #endif - 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 + std::shared_ptr cliParser = std::make_shared(); Quassel::setCliParser(cliParser); // Initialize CLI arguments @@ -143,6 +128,11 @@ int main(int argc, char **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"); #ifndef BUILD_CORE // put client-only arguments here @@ -157,60 +147,42 @@ int main(int argc, char **argv) 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->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, "Switch auth backend", "authidentifier"); + 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->addSwitch("oidentd", 0, "Enable oidentd integration. In most cases you should also enable --strict-ident"); cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file"); + cliParser->addSwitch("strict-ident", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting."); + cliParser->addSwitch("ident-daemon", 0, "Enable internal ident daemon"); + cliParser->addOption("ident-port", 0, "The port quasselcore will listen at for ident requests. Only meaningful with --ident-daemon", "port", "10113"); #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("debug-irc", 0, + "Enable logging of all raw IRC messages to debug log, including " + "passwords! In most cases you should also set --loglevel Debug"); + cliParser->addOption("debug-irc-id", 0, + "Limit raw IRC logging to this network ID. Implies --debug-irc", + "database network ID", "-1"); 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 - #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 -#ifndef HAVE_KDE4 - // the non-KDE version parses after app has been instantiated if (!cliParser->init(app.arguments())) { cliParser->usage(); return EXIT_FAILURE; } -#endif // Migrate settings from KDE4 to KF5 if appropriate #ifdef HAVE_KF5 @@ -225,9 +197,15 @@ int main(int argc, char **argv) AboutData::setQuasselPersons(&aboutData); KAboutData::setApplicationData(aboutData.kAboutData()); #endif - - if (!app.init()) - return EXIT_FAILURE; + try { + app.init(); + } + catch (ExitException e) { + if (!e.errorString.isEmpty()) { + qCritical() << e.errorString; + } + return e.exitCode; + } return app.exec(); }