author | wazlaf <wazlaf> | 2002-09-20 23:28:14 (UTC) |
---|---|---|
committer | wazlaf <wazlaf> | 2002-09-20 23:28:14 (UTC) |
commit | 912092425248f7fc5155b4c7c46b7d00ec2676bc (patch) (side-by-side diff) | |
tree | 5bbf746e83b2dffad89542c42031a573c34da751 /noncore | |
parent | cd3df897c1b0ed93c2be3ab411011a0bdfe88bf9 (diff) | |
download | opie-912092425248f7fc5155b4c7c46b7d00ec2676bc.zip opie-912092425248f7fc5155b4c7c46b7d00ec2676bc.tar.gz opie-912092425248f7fc5155b4c7c46b7d00ec2676bc.tar.bz2 |
support for client commands (only /join implemented so far), crash bugfix, fixed 2 leaks, server browser now includes a channel list
-rw-r--r-- | noncore/net/opieirc/ircchannel.cpp | 5 | ||||
-rw-r--r-- | noncore/net/opieirc/ircchannel.h | 1 | ||||
-rw-r--r-- | noncore/net/opieirc/ircchanneltab.cpp | 20 | ||||
-rw-r--r-- | noncore/net/opieirc/ircconnection.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmessage.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opieirc/ircoutput.cpp | 7 | ||||
-rw-r--r-- | noncore/net/opieirc/ircoutput.h | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircserver.cpp | 12 | ||||
-rw-r--r-- | noncore/net/opieirc/ircserver.h | 6 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservereditor.cpp | 19 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservereditor.h | 1 | ||||
-rw-r--r-- | noncore/net/opieirc/ircserverlist.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservertab.cpp | 70 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservertab.h | 3 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsession.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opieirc/irctab.h | 1 | ||||
-rw-r--r-- | noncore/net/opieirc/ircversion.h | 2 |
18 files changed, 148 insertions, 21 deletions
diff --git a/noncore/net/opieirc/ircchannel.cpp b/noncore/net/opieirc/ircchannel.cpp index 71ec03b..9814a26 100644 --- a/noncore/net/opieirc/ircchannel.cpp +++ b/noncore/net/opieirc/ircchannel.cpp @@ -7,4 +7,9 @@ IRCChannel::IRCChannel(QString channelname) { } +IRCChannel::~IRCChannel() { + /* We want this to get deleted */ + m_people.setAutoDelete(TRUE); +} + QString IRCChannel::channelname() { return m_channelname; diff --git a/noncore/net/opieirc/ircchannel.h b/noncore/net/opieirc/ircchannel.h index c800b99..e78f182 100644 --- a/noncore/net/opieirc/ircchannel.h +++ b/noncore/net/opieirc/ircchannel.h @@ -48,4 +48,5 @@ class IRCChannel : public QObject { public: IRCChannel(QString channelname); + ~IRCChannel(); void addPerson(IRCChannelPerson *person); diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp index c96a365..754442a 100644 --- a/noncore/net/opieirc/ircchanneltab.cpp +++ b/noncore/net/opieirc/ircchanneltab.cpp @@ -39,10 +39,22 @@ IRCChannelTab::~IRCChannelTab() { void IRCChannelTab::processCommand() { - if (m_field->text().length()>0) { + QString text = m_field->text(); + if (text.length()>0) { + if (session()->isSessionActive()) { + if (text.startsWith("/") && !text.startsWith("//")) { + /* Command mode */ + m_parentTab->executeCommand(this, text);; + } else { + if (session()->isSessionActive()) { session()->sendMessage(m_channel, m_field->text()); appendText("<<font color=\"#dd0000\">"+m_parentTab->server()->nick()+"</font>> "+m_field->text()+"<br>"); - m_field->clear(); } } + } else { + appendText("<font color=\"#ff0000\">"+tr("Disconnected")+"</font><br>"); + } + } + m_field->clear(); +} void IRCChannelTab::toggleList() { @@ -66,5 +78,9 @@ IRCSession *IRCChannelTab::session() { void IRCChannelTab::remove() { + if (session()->isSessionActive()) { session()->part(m_channel); + } else { + m_mainWindow->killTab(this); + } } diff --git a/noncore/net/opieirc/ircconnection.cpp b/noncore/net/opieirc/ircconnection.cpp index 02c4897..5eb0cf2 100644 --- a/noncore/net/opieirc/ircconnection.cpp +++ b/noncore/net/opieirc/ircconnection.cpp @@ -61,4 +61,12 @@ void IRCConnection::dataReady() { IRCMessage message(m_socket->readLine()); if (!m_loggedIn && message.isNumerical() && message.commandNumber() == 1) { + /* Now autojoin all channels specified inside the server profile */ + QStringList channels = QStringList::split(QChar(','), m_server->channels()); + for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { + QString channelName = (*it).stripWhiteSpace(); + if (channelName.startsWith("#")) { + sendLine("JOIN "+ channelName); + } + } m_loggedIn = TRUE; emit outputReady(IRCOutput(OUTPUT_CLIENTMESSAGE, tr("Successfully logged in."))); diff --git a/noncore/net/opieirc/ircmessage.cpp b/noncore/net/opieirc/ircmessage.cpp index 74e9c6f..9c2869c 100644 --- a/noncore/net/opieirc/ircmessage.cpp +++ b/noncore/net/opieirc/ircmessage.cpp @@ -25,4 +25,5 @@ IRCMessage::IRCMessage(QString line) { m_allParameters = line.right(line.length() - m_command.length() - 1); } + /* Create a list of all parameters */ while(!(stream.atEnd())) { @@ -37,4 +38,6 @@ IRCMessage::IRCMessage(QString line) { } } + + m_commandNumber = m_command.toInt(&m_isNumerical); /* Is this a CTCP command */ diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp index a2be5a4..4038673 100644 --- a/noncore/net/opieirc/ircmessageparser.cpp +++ b/noncore/net/opieirc/ircmessageparser.cpp @@ -27,4 +27,5 @@ IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = { { 0 , 0 } }; + /* Lookup table for numerical commands */ IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { @@ -229,4 +230,5 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) { IRCChannelPerson *chanperson = it.current()->getPerson(mask.nick()); it.current()->removePerson(chanperson); + delete chanperson; } m_session->removePerson(person); @@ -234,4 +236,5 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) { output.addParam(person); emit outputReady(output); + delete person; } else { emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person quit - desynchronized?"))); diff --git a/noncore/net/opieirc/ircoutput.cpp b/noncore/net/opieirc/ircoutput.cpp index aa57d86..878bc9b 100644 --- a/noncore/net/opieirc/ircoutput.cpp +++ b/noncore/net/opieirc/ircoutput.cpp @@ -14,4 +14,11 @@ QString IRCOutput::message() { } +QString IRCOutput::htmlMessage() { + QString htmlMessage =m_message.replace(QRegExp("&"), "&"); + htmlMessage = htmlMessage.replace(QRegExp(">"), ">"); + htmlMessage = htmlMessage.replace(QRegExp("<"), "<"); + return htmlMessage; +} + void IRCOutput::addParam(void *data) { m_parameters.append(data); diff --git a/noncore/net/opieirc/ircoutput.h b/noncore/net/opieirc/ircoutput.h index 4b757ed..72361d4 100644 --- a/noncore/net/opieirc/ircoutput.h +++ b/noncore/net/opieirc/ircoutput.h @@ -61,4 +61,6 @@ public: IRCOutputType type(); QString message(); + /* Return the message with all HTML code escaped (for example < instead of '<') */ + QString htmlMessage(); void *getParam(int index); protected: diff --git a/noncore/net/opieirc/ircserver.cpp b/noncore/net/opieirc/ircserver.cpp index e16e2b2..e27e41d 100644 --- a/noncore/net/opieirc/ircserver.cpp +++ b/noncore/net/opieirc/ircserver.cpp @@ -5,4 +5,6 @@ IRCServer::IRCServer() { } +/* Setter implementations */ + void IRCServer::setHostname(QString hostname) { m_hostname = hostname; @@ -33,4 +35,10 @@ void IRCServer::setRealname(QString realname) { } +void IRCServer::setChannels(QString channels) { + m_channels = channels; +} + +/* Getter implementations */ + QString IRCServer::hostname() { return m_hostname; @@ -61,2 +69,6 @@ QString IRCServer::realname() { } +QString IRCServer::channels() { + return m_channels; +} + diff --git a/noncore/net/opieirc/ircserver.h b/noncore/net/opieirc/ircserver.h index f56f231..0bc7d4c 100644 --- a/noncore/net/opieirc/ircserver.h +++ b/noncore/net/opieirc/ircserver.h @@ -29,6 +29,8 @@ class IRCServer { public: + /* Initialize to the default values */ IRCServer(); + /* Setters */ void setName(QString name); void setHostname(QString hostname); @@ -38,5 +40,7 @@ public: void setNick(QString nick); void setRealname(QString realname); + void setChannels(QString channels); + /* Getters */ QString hostname(); QString name(); @@ -46,4 +50,5 @@ public: QString nick(); QString realname(); + QString channels(); protected: QString m_hostname; @@ -54,4 +59,5 @@ protected: QString m_nick; QString m_realname; + QString m_channels; }; diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp index 798081f..c3a444d 100644 --- a/noncore/net/opieirc/ircservereditor.cpp +++ b/noncore/net/opieirc/ircservereditor.cpp @@ -5,5 +5,5 @@ IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal = FALSE, WFlags f) : QDialog(parent, name, modal, f) { - QGridLayout *layout = new QGridLayout(this, 6, 2, 5, 5); + QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 5); QLabel *label = new QLabel(tr("Profile name :"), this); m_name = new QLineEdit(server.name(), this); @@ -30,4 +30,8 @@ IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* layout->addWidget(label, 5, 0); layout->addWidget(m_password, 5, 1); + label = new QLabel(tr("Channels :"), this); + m_channels = new QLineEdit(server.channels(), this); + layout->addWidget(label, 6, 0); + layout->addWidget(m_channels, 6, 1); showMaximized(); } @@ -45,7 +49,17 @@ void IRCServerEditor::accept() { else if (m_realname->text().length()==0) QMessageBox::critical(this, tr("Error"), tr("Realname required")); - else + else { + /* Now verify whether the channel list has a valid format */ + QStringList channels = QStringList::split(QChar(','), m_channels->text()); + for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { + QString channelName = (*it).stripWhiteSpace(); + if (!channelName.startsWith("#")) { + QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with '#'")); + return; + } + } QDialog::accept(); } +} IRCServer IRCServerEditor::getServer() { @@ -58,4 +72,5 @@ IRCServer IRCServerEditor::getServer() { server.setUsername(m_nickname->text()); server.setPassword(m_password->text()); + server.setChannels(m_channels->text()); return server; } diff --git a/noncore/net/opieirc/ircservereditor.h b/noncore/net/opieirc/ircservereditor.h index 20c94f7..22311f7 100644 --- a/noncore/net/opieirc/ircservereditor.h +++ b/noncore/net/opieirc/ircservereditor.h @@ -40,4 +40,5 @@ protected: QLineEdit *m_password; QLineEdit *m_realname; + QLineEdit *m_channels; }; diff --git a/noncore/net/opieirc/ircserverlist.cpp b/noncore/net/opieirc/ircserverlist.cpp index b2d746a..e664ba1 100644 --- a/noncore/net/opieirc/ircserverlist.cpp +++ b/noncore/net/opieirc/ircserverlist.cpp @@ -60,4 +60,5 @@ IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFla server.setNick(m_config->readEntry("Nick")); server.setRealname(m_config->readEntry("Realname")); + server.setChannels(m_config->readEntry("Channels")); m_list->insertItem(new IRCListBoxServer(server)); } @@ -115,4 +116,5 @@ int IRCServerList::exec() { m_config->writeEntry("Nick", server.nick()); m_config->writeEntry("Realname", server.realname()); + m_config->writeEntry("Channels", server.channels()); } return returncode; diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp index 724f4bd..2ad56a8 100644 --- a/noncore/net/opieirc/ircservertab.cpp +++ b/noncore/net/opieirc/ircservertab.cpp @@ -1,3 +1,4 @@ #include <stdio.h> +#include <qtextstream.h> #include "ircservertab.h" @@ -26,8 +27,4 @@ void IRCServerTab::appendText(QString text) { IRCServerTab::~IRCServerTab() { - QListIterator<IRCChannelTab> it(m_channelTabs); - for (; it.current(); ++it) { - m_mainWindow->killTab(it.current()); - } delete m_session; } @@ -49,7 +46,30 @@ IRCServer *IRCServerTab::server() { } +void IRCServerTab::executeCommand(IRCTab *tab, QString line) { + QTextIStream stream(&line); + QString command; + stream >> command; + command = command.upper().right(command.length()-1); + + if (command == "JOIN") { + QString channel; + stream >> channel; + if (channel.length() > 0 && channel.startsWith("#")) { + m_session->join(channel); + } else { + tab->appendText("<font color=\"#ff0000\">Unknown channel format!</font><br>"); + } + } else { + tab->appendText("<font color=\"#ff0000\">Unknown command</font><br>"); + } +} + void IRCServerTab::processCommand() { + QString text = m_field->text(); + if (text.startsWith("/") && !text.startsWith("//")) { + /* Command mode */ + executeCommand(this, text); + } m_field->clear(); - appendText("<font color=\"#ff0000\">Not supported yet</font><br>"); } @@ -59,8 +79,15 @@ void IRCServerTab::doConnect() { void IRCServerTab::remove() { + /* Close requested */ if (m_session->isSessionActive()) { + /* While there is a running session */ m_close = TRUE; m_session->endSession(); } else { + /* Session has previously been closed */ + m_channelTabs.first(); + while (m_channelTabs.current() != 0) { + m_mainWindow->killTab(m_channelTabs.current()); + } m_mainWindow->killTab(this); } @@ -78,10 +105,21 @@ IRCChannelTab *IRCServerTab::getTabForChannel(IRCChannel *channel) { void IRCServerTab::display(IRCOutput output) { + + /* All messages to be displayed inside the GUI get here */ switch (output.type()) { case OUTPUT_CONNCLOSE: - if (m_close) + if (m_close) { + m_channelTabs.first(); + while (m_channelTabs.current() != 0) { + m_mainWindow->killTab(m_channelTabs.current()); + } m_mainWindow->killTab(this); - else - appendText("<font color=\"#0000dd\">" + output.message() +"</font><br>"); + } else { + appendText("<font color=\"#0000dd\">" + output.htmlMessage() +"</font><br>"); + QListIterator<IRCChannelTab> it(m_channelTabs); + for (; it.current(); ++it) { + it.current()->appendText("<font color=\"#0000dd\">" + output.htmlMessage() +"</font><br>"); + } + } break; case OUTPUT_SELFJOIN: { @@ -93,5 +131,5 @@ void IRCServerTab::display(IRCOutput output) { case OUTPUT_CHANPRIVMSG: { IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0)); - channelTab->appendText("<<font color=\"#0000dd\">"+((IRCChannelPerson *)output.getParam(1))->person->nick()+"</font>> "+output.message()+"<br>"); + channelTab->appendText("<<font color=\"#0000dd\">"+((IRCChannelPerson *)output.getParam(1))->person->nick()+"</font>> "+output.htmlMessage()+"<br>"); } break; @@ -103,5 +141,5 @@ void IRCServerTab::display(IRCOutput output) { break; case OUTPUT_SELFKICK: { - appendText("<font color=\"#ff0000\">" + output.message() + "</font><br>"); + appendText("<font color=\"#ff0000\">" + output.htmlMessage() + "</font><br>"); IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0)); if (channelTab) @@ -111,5 +149,5 @@ void IRCServerTab::display(IRCOutput output) { case OUTPUT_CHANACTION: { IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0)); - channelTab->appendText("<font color=\"#cc0000\">"+output.message()+"</font><br>"); + channelTab->appendText("<font color=\"#cc0000\">"+output.htmlMessage()+"</font><br>"); } break; @@ -119,5 +157,5 @@ void IRCServerTab::display(IRCOutput output) { for (; it.current(); ++it) { if (it.current()->list()->hasPerson(nick)) { - it.current()->appendText("<font color=\"#aa3e00\">"+output.message()+"</font><br>"); + it.current()->appendText("<font color=\"#aa3e00\">"+output.htmlMessage()+"</font><br>"); it.current()->list()->update(); } @@ -130,16 +168,16 @@ void IRCServerTab::display(IRCOutput output) { case OUTPUT_OTHERPART: { IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0)); - channelTab->appendText("<font color=\"#aa3e00\">"+output.message()+"</font><br>"); + channelTab->appendText("<font color=\"#aa3e00\">"+output.htmlMessage()+"</font><br>"); channelTab->list()->update(); } break; case OUTPUT_CTCP: - appendText("<font color=\"#00bb00\">" + output.message() + "</font><br>"); + appendText("<font color=\"#00bb00\">" + output.htmlMessage() + "</font><br>"); break; case OUTPUT_ERROR: - appendText("<font color=\"#ff0000\">" + output.message() + "</font><br>"); + appendText("<font color=\"#ff0000\">" + output.htmlMessage() + "</font><br>"); break; default: - appendText("<font color=\"#0000dd\">" + output.message() + "</font><br>"); + appendText("<font color=\"#0000dd\">" + output.htmlMessage() + "</font><br>"); break; } diff --git a/noncore/net/opieirc/ircservertab.h b/noncore/net/opieirc/ircservertab.h index fa9a0a3..cfa0832 100644 --- a/noncore/net/opieirc/ircservertab.h +++ b/noncore/net/opieirc/ircservertab.h @@ -40,4 +40,7 @@ public: void doConnect(); void removeChannelTab(IRCChannelTab *tab); + + /* Execute a user command such as /join */ + void executeCommand(IRCTab *tab, QString line); protected: void appendText(QString text); diff --git a/noncore/net/opieirc/ircsession.cpp b/noncore/net/opieirc/ircsession.cpp index b81038f..89df68c 100644 --- a/noncore/net/opieirc/ircsession.cpp +++ b/noncore/net/opieirc/ircsession.cpp @@ -13,4 +13,8 @@ IRCSession::IRCSession(IRCServer *server) { IRCSession::~IRCSession() { + /* We want this to get deleted automatically */ + m_channels.setAutoDelete(TRUE); + m_people.setAutoDelete(TRUE); + delete m_parser; delete m_connection; diff --git a/noncore/net/opieirc/irctab.h b/noncore/net/opieirc/irctab.h index 3124980..0ce9777 100644 --- a/noncore/net/opieirc/irctab.h +++ b/noncore/net/opieirc/irctab.h @@ -38,4 +38,5 @@ public: virtual QString title() = 0; virtual IRCSession *session() = 0; + virtual void appendText(QString text) = 0; public slots: virtual void remove() = 0; diff --git a/noncore/net/opieirc/ircversion.h b/noncore/net/opieirc/ircversion.h index 0ef0d2f..f8510e6 100644 --- a/noncore/net/opieirc/ircversion.h +++ b/noncore/net/opieirc/ircversion.h @@ -22,5 +22,5 @@ #define __IRCVERSION_H -#define APP_VERSION "OpieIRC 0.1" +#define APP_VERSION "OpieIRC 0.2" #define APP_COPYSTR "(c) 2002 by Wenzel Jakob" |