| -rw-r--r-- | noncore/net/opieirc/ircoutput.cpp | 45 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircoutput.h | 19 |
2 files changed, 55 insertions, 9 deletions
diff --git a/noncore/net/opieirc/ircoutput.cpp b/noncore/net/opieirc/ircoutput.cpp index 4822fc4..d2c730f 100644 --- a/noncore/net/opieirc/ircoutput.cpp +++ b/noncore/net/opieirc/ircoutput.cpp @@ -1,33 +1,68 @@ +#include <qtopia/stringutil.h> + #include "ircoutput.h" + +IRCOutputEscapeSecuences IRCOutput::m_escapeSecuences[] = { + { '', "<b>", "</b>"}, + { ' ', "<u>", "</u>"}, + { 0, 0, 0}, +}; + IRCOutput::IRCOutput(IRCOutputType type, QString message) { m_type = type; - m_message = message; + /* Filter color, bold and underline escape sequences, since they aren't implemented yet */ + m_message = message.replace(QRegExp("[1-9]*,*[1-9]*"), ""); } IRCOutputType IRCOutput::type() { return m_type; } QString IRCOutput::message() { return m_message; } +void IRCOutput::setType(IRCOutputType type) { + m_type = type; +} + +void IRCOutput::setMessage(const QString &message) { + m_message = message; +} + QString IRCOutput::htmlMessage() { return toHTML(m_message); } -QString IRCOutput::toHTML(QString message) { - QString htmlMessage =message.replace(QRegExp("&"), "&"); - htmlMessage = htmlMessage.replace(QRegExp(">"), ">"); - htmlMessage = htmlMessage.replace(QRegExp("<"), "<"); +QString IRCOutput::toHTML(const QString &message) { + QString htmlMessage = Qtopia::escapeString(message); + + for(int i=0; m_escapeSecuences[i].escape != 0;++i) { + int pos = 0; + bool isOpen = false; + while( (pos = htmlMessage.find(m_escapeSecuences[i].escape, pos)) != -1) { + htmlMessage.remove(pos, 1); + if(isOpen) + htmlMessage.insert(pos, m_escapeSecuences[i].close); + else + htmlMessage.insert(pos, m_escapeSecuences[i].open); + + isOpen = !isOpen; + } + if(isOpen) + htmlMessage.append(m_escapeSecuences[i].close); + } + + htmlMessage = htmlMessage.replace(QRegExp("\n"), "<br>"); return htmlMessage; } void IRCOutput::addParam(void *data) { m_parameters.append(data); } void *IRCOutput::getParam(int index) { return m_parameters.at(index); } + diff --git a/noncore/net/opieirc/ircoutput.h b/noncore/net/opieirc/ircoutput.h index 9c0b8bb..934dbda 100644 --- a/noncore/net/opieirc/ircoutput.h +++ b/noncore/net/opieirc/ircoutput.h @@ -1,75 +1,86 @@ /* OpieIRC - An embedded IRC client Copyright (C) 2002 Wenzel Jakob This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __IRCOUTPUT_H #define __IRCOUTPUT_H #include <qstring.h> #include <qlist.h> #include "ircchannel.h" /* Types of possible IRC output */ enum IRCOutputType { OUTPUT_ERROR = -1, /* parameters : none */ OUTPUT_SERVERMESSAGE = 0, /* parameters : none */ OUTPUT_CLIENTMESSAGE = 1, /* parameters : none */ OUTPUT_CHANPRIVMSG = 2, /* parameters : channel (IRCChannel), person (IRCChannelPerson) */ OUTPUT_QUERYPRIVMSG = 3, /* parameters : person (IRCPerson) */ OUTPUT_NICKCHANGE = 4, /* parameters : person (IRCPerson) */ OUTPUT_SELFJOIN = 5, /* parameters : channel (IRCChannel) */ OUTPUT_OTHERJOIN = 6, /* parameters : channel (IRCChannel), person (IRCChannelPerson) */ OUTPUT_SELFPART = 7, /* parameters : channel (IRCChannel) */ OUTPUT_OTHERPART = 8, /* parameters : channel (IRCChannel), person (IRCChannelPerson) */ OUTPUT_QUIT = 9, /* parameters : person (IRCPerson) */ OUTPUT_CONNCLOSE = 10, /* parameters : none */ OUTPUT_CTCP = 11, /* parameters : none */ OUTPUT_SELFKICK = 12, /* parameters : channel (IRCChannel) */ OUTPUT_OTHERKICK = 13, /* parameters : channel (IRCChannel) person (IRCChannelPerson) */ OUTPUT_CHANACTION = 14, /* parameters : channel (IRCChannel) person (IRCChannelPerson) */ OUTPUT_QUERYACTION = 15, /* parameters : person (IRCPerson) */ OUTPUT_CHANPERSONMODE = 16, /* parameters : channel (IRCCHannel) person (IRCChannelPerson) */ - OUTPUT_TOPIC = 17 /* parameters : channel (IRCChannel) */ + OUTPUT_TOPIC = 17, /* parameters : channel (IRCChannel) */ + OUTPUT_TITLE = 18 /* parameters : channel (IRCChannel) */ +}; + +typedef struct IRCOutputEscapeSecuences { + char escape; + char *open; + char *close; }; /* The IRCOutput class is used as a kind of message which is sent by the IRC parser to inform the GUI of changes. This could for example be a channel message or a nickname change */ class IRCOutput { public: - IRCOutput(IRCOutputType type, QString message); + IRCOutput(IRCOutputType type = OUTPUT_SERVERMESSAGE, QString message = QString::null); /* Used to add a parameter to this IRCOutput. Parameters are dependent on which IRCOutputType we are using (see above) */ void addParam(void *data); IRCOutputType type(); QString message(); /* Return the message with all HTML code escaped (for example < instead of '<') */ QString htmlMessage(); - - static QString toHTML(QString message); + + void setType(IRCOutputType); + void setMessage(const QString &message); + + static QString toHTML(const QString &message); void *getParam(int index); protected: IRCOutputType m_type; QString m_message; QList<void> m_parameters; + static IRCOutputEscapeSecuences m_escapeSecuences[]; }; #endif |