X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=24a71588dda7cb4c5c2c792230152807dae7c658;hp=102c9d44cbf8546ec718015a76f06a221998b50a;hb=0a79f71c41f69643fdbf0c32c061f1b11d14346d;hpb=cf28e7152c5d940aec586be1b29fbf8ddc99f087 diff --git a/src/common/main.cpp b/src/common/main.cpp index 102c9d44..24a71588 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,119 +18,128 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "global.h" -#include "identity.h" -#include "settings.h" -#include -#include - -#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 "qtuiapplication.h" #elif defined BUILD_MONO -#include -#include "client.h" -#include "core.h" -#include "coresession.h" -#include "qtui.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); - - Global::registerMetaTypes(); +// We don't want quasselcore to depend on KDE +#if defined HAVE_KDE && defined BUILD_CORE +# undef HAVE_KDE +#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); -#else - Global::runMode = Global::Monolithic; - QApplication app(argc, argv); +#ifdef HAVE_KDE +# include +# include "kcmdlinewrapper.h" #endif - // Set up i18n support - QLocale locale = QLocale::system(); +#if !defined(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +#endif - QTranslator qtTranslator; - qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name())); - app.installTranslator(&qtTranslator); +#include "cliparser.h" +#include "quassel.h" - QTranslator quasselTranslator; - quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name())); - app.installTranslator(&quasselTranslator); +int main(int argc, char **argv) { - QCoreApplication::setOrganizationDomain("quassel-irc.org"); - QCoreApplication::setApplicationName("Quassel IRC"); - QCoreApplication::setOrganizationName("Quassel Project"); + // Setup build information and version string + # include "version.gen" + buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__)); + Quassel::setupBuildInfo(buildinfo); + QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); + QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); + QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); + + AbstractCliParser *cliParser; + +#ifdef HAVE_KDE + // We need to init KCmdLineArgs first + // TODO: build an AboutData compat class to replace our aboutDlg strings + 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(); +#else + cliParser = new CliParser(); +#endif + Quassel::setCliParser(cliParser); - // Check if a non-standard core port is requested - QStringList args = QCoreApplication::arguments(); // TODO Build a CLI parser + // Initialize CLI arguments + // NOTE: We can't use tr() at this point, since app is not yet created - 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; - } - -#ifndef BUILD_QTUI - Core::instance(); // create and init the core + // 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"); +#else + cliParser->addOption("configdir ", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate"); #endif - - //Settings::init(); + cliParser->addOption("datadir ", 0, "DEPRECATED - Use --configdir instead"); #ifndef BUILD_CORE - QtUi *gui = new QtUi(); - Client::init(gui); - gui->init(); + // put client-only arguments here + cliParser->addOption("qss ", 0, "Load a custom application stylesheet"); + cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); + cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); #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", QString("4242")); + cliParser->addSwitch("norestore", 'n', "Don't restore last core's state"); + cliParser->addOption("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); +#ifdef HAVE_SYSLOG + cliParser->addSwitch("syslog", 0, "Log to syslog"); #endif - - int exitCode = app.exec(); - -#ifndef BUILD_QTUI - Core::saveState(); + cliParser->addOption("logfile ", 'l', "Log to a file"); + cliParser->addOption("select-backend ", 0, "Switch storage backend (migrating data if possible)"); + 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"); #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(); +#ifdef HAVE_KDE + // 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_QTUI - Core::destroy(); + +# if defined BUILD_CORE + CoreApplication app(argc, argv); +# elif defined BUILD_QTUI + QtUiApplication app(argc, argv); +# elif defined BUILD_MONO + MonolithicApplication app(argc, argv); +# endif + +#ifndef HAVE_KDE + // the non-KDE version parses after app has been instantiated + if(!cliParser->init(app.arguments())) { + cliParser->usage(); + return false; + } #endif - return exitCode; + if(!app.init()) return EXIT_FAILURE; + return app.exec(); }