X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=0ee13ecd4305c2bf53c313b7fa4f6ef35d7e7fda;hp=2bbe0cfad9d1bfd870a67193dac1d64863550a50;hb=534f170271bf6e3749a1c10ca6518eb7746e71f0;hpb=aa8806ebf3072b8cab8a8f2f32048f4cd3c1062e diff --git a/src/common/main.cpp b/src/common/main.cpp index 2bbe0cfa..0ee13ecd 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2019 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 @@ -64,9 +71,17 @@ Q_IMPORT_PLUGIN(qgif) #endif #include "quassel.h" +#include "types.h" int main(int argc, char **argv) { +#ifdef HAVE_UMASK + umask(S_IRWXG | S_IRWXO); +#endif + + // Instantiate early, so log messages are handled + Quassel quassel; + #if QT_VERSION < 0x050000 // All our source files are in UTF-8, and Qt5 even requires that QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); @@ -83,27 +98,43 @@ int main(int argc, char **argv) #if QT_VERSION < 0x050000 && defined Q_OS_MAC && !defined BUILD_CORE QApplication::setGraphicsSystem("raster"); #endif - +//Setup the High-DPI settings +# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN) + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6 +#endif +# if QT_VERSION >= 0x050400 + //Added in the early Qt5 versions (5.0?)- use 5.4 as the cutoff since lots of high-DPI work was added then + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +# endif // 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); + 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); + 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; + std::shared_ptr cliParser; #ifdef HAVE_KDE4 // We need to init KCmdLineArgs first @@ -111,15 +142,15 @@ int main(int argc, char **argv) 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.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); KCmdLineArgs::init(argc, argv, &aboutData); - cliParser = new KCmdLineWrapper(); + cliParser = std::make_shared(); #elif defined HAVE_QT5 - cliParser = new Qt5CliParser(); + cliParser = std::make_shared(); #else - cliParser = new CliParser(); + cliParser = std::make_shared(); #endif Quassel::setCliParser(cliParser); @@ -137,10 +168,15 @@ 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 - cliParser->addOption("icontheme", 0, "Override the system icon theme ('oxygen' is recommended)", "theme"); + 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"); @@ -151,19 +187,28 @@ 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, "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"); + cliParser->addOption("ident-listen", 0, "The address(es) quasselcore will listen on for ident requests. Same format as --listen.", "
[,...]", "::1,127.0.0.1"); #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 @@ -175,19 +220,19 @@ int main(int argc, char **argv) } #endif -# if defined BUILD_CORE +#if defined BUILD_CORE CoreApplication app(argc, argv); -# elif defined BUILD_QTUI +#elif defined BUILD_QTUI QtUiApplication app(argc, argv); -# elif defined BUILD_MONO +#elif defined BUILD_MONO MonolithicApplication app(argc, argv); -# endif +#endif #ifndef HAVE_KDE4 // the non-KDE version parses after app has been instantiated if (!cliParser->init(app.arguments())) { cliParser->usage(); - return false; + return EXIT_FAILURE; } #endif @@ -204,9 +249,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() << qPrintable(e.errorString); + } + return e.exitCode; + } return app.exec(); }