X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=2a33a3d801200643f96e1733444fbbb33f07d2b7;hp=a46f0999a01d9175d7626f15305cb7937117ac43;hb=736012bf4a8b834d1adb2f4a3b0156380ecb5dcc;hpb=130fde74cee428ec2e3285db89c4348c3091b2aa diff --git a/src/common/main.cpp b/src/common/main.cpp index a46f0999..2a33a3d8 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-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,184 +18,113 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#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 "qtuiapplication.h" #elif defined BUILD_MONO -#include "client.h" -#include "core.h" -#include "coresession.h" -#include "qtuiapplication.h" -#include "qtui.h" +# include "monoapplication.h" #else #error "Something is wrong - you need to #define a build mode!" #endif +// We don't want quasselcore to depend on KDE +#if defined HAVE_KDE && defined BUILD_CORE +# undef HAVE_KDE +#endif -#include +#ifdef HAVE_KDE +# include +# include "kcmdlinewrapper.h" +#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(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +#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); +#include "cliparser.h" +#include "quassel.h" - Global::registerMetaTypes(); - Global::setupVersion(); +int main(int argc, char **argv) { -/* -#if defined BUILD_CORE - Global::runMode = Global::CoreOnly; - QCoreApplication app(argc, argv); -#elif defined BUILD_QTUI - Global::runMode = Global::ClientOnly; - QApplication app(argc, argv); + // 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.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); + KCmdLineArgs::init(argc, argv, &aboutData); + + cliParser = new KCmdLineWrapper(); #else - Global::runMode = Global::Monolithic; - QApplication app(argc, argv); + cliParser = new CliParser(); #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); -#else - Global::runMode = Global::Monolithic; - QtUiApplication app(argc, argv); -#endif - + Quassel::setCliParser(cliParser); + // Initialize CLI arguments + // NOTE: We can't use tr() at this point, since app is not yet created - Global::parser = CliParser(QCoreApplication::arguments()); + // put shared client&core arguments here + cliParser->addSwitch("debug",'d', "Enable debug output"); + cliParser->addSwitch("help",'h', "Display this help and exit"); -#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"); - - -#ifndef BUILD_QTUI - Core::instance(); // create and init the core + // put client-only arguments here + cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); + cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); #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(); +#ifndef BUILD_QTCLIENT + // 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("logfile ", 'l', "Path to logfile"); + cliParser->addOption("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); + cliParser->addOption("configdir ", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert"); + cliParser->addOption("datadir ", 0, "DEPRECATED - Use --configdir instead"); #endif -#ifndef BUILD_QTUI - if(!Global::parser.isSet("norestore")) { - Core::restoreState(); +#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_CORE - app.resumeSessionIfPossible(); -#endif - - int exitCode = app.exec(); - -#ifndef BUILD_QTUI - Core::saveState(); -#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(); -#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(); }