author | skyhusker <skyhusker> | 2005-01-14 20:53:08 (UTC) |
---|---|---|
committer | skyhusker <skyhusker> | 2005-01-14 20:53:08 (UTC) |
commit | b6c5c3b8b1ab130217678ec789db573ffc52c3eb (patch) (unidiff) | |
tree | 67e8ef2f6e447b7795d2ec3c10c896d56069e727 /noncore/net/opieirc | |
parent | f572b6a41ab3576957b29d73b54bfc34adeea07c (diff) | |
download | opie-b6c5c3b8b1ab130217678ec789db573ffc52c3eb.zip opie-b6c5c3b8b1ab130217678ec789db573ffc52c3eb.tar.gz opie-b6c5c3b8b1ab130217678ec789db573ffc52c3eb.tar.bz2 |
Added bold and underline display support
-rw-r--r-- | noncore/net/opieirc/ircoutput.cpp | 45 | ||||
-rw-r--r-- | noncore/net/opieirc/ircoutput.h | 17 |
2 files changed, 54 insertions, 8 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,8 +1,18 @@ | |||
1 | #include <qtopia/stringutil.h> | ||
2 | |||
1 | #include "ircoutput.h" | 3 | #include "ircoutput.h" |
2 | 4 | ||
5 | |||
6 | IRCOutputEscapeSecuences IRCOutput::m_escapeSecuences[] = { | ||
7 | { '', "<b>", "</b>"}, | ||
8 | { '', "<u>", "</u>"}, | ||
9 | { 0, 0, 0}, | ||
10 | }; | ||
11 | |||
3 | IRCOutput::IRCOutput(IRCOutputType type, QString message) { | 12 | IRCOutput::IRCOutput(IRCOutputType type, QString message) { |
4 | m_type = type; | 13 | m_type = type; |
5 | m_message = message; | 14 | /* Filter color, bold and underline escape sequences, since they aren't implemented yet */ |
15 | m_message = message.replace(QRegExp("[1-9]*,*[1-9]*"), ""); | ||
6 | } | 16 | } |
7 | 17 | ||
8 | IRCOutputType IRCOutput::type() { | 18 | IRCOutputType IRCOutput::type() { |
@@ -13,14 +23,38 @@ QString IRCOutput::message() { | |||
13 | return m_message; | 23 | return m_message; |
14 | } | 24 | } |
15 | 25 | ||
26 | void IRCOutput::setType(IRCOutputType type) { | ||
27 | m_type = type; | ||
28 | } | ||
29 | |||
30 | void IRCOutput::setMessage(const QString &message) { | ||
31 | m_message = message; | ||
32 | } | ||
33 | |||
16 | QString IRCOutput::htmlMessage() { | 34 | QString IRCOutput::htmlMessage() { |
17 | return toHTML(m_message); | 35 | return toHTML(m_message); |
18 | } | 36 | } |
19 | 37 | ||
20 | QString IRCOutput::toHTML(QString message) { | 38 | QString IRCOutput::toHTML(const QString &message) { |
21 | QString htmlMessage =message.replace(QRegExp("&"), "&"); | 39 | QString htmlMessage = Qtopia::escapeString(message); |
22 | htmlMessage = htmlMessage.replace(QRegExp(">"), ">"); | 40 | |
23 | htmlMessage = htmlMessage.replace(QRegExp("<"), "<"); | 41 | for(int i=0; m_escapeSecuences[i].escape != 0;++i) { |
42 | int pos = 0; | ||
43 | bool isOpen = false; | ||
44 | while( (pos = htmlMessage.find(m_escapeSecuences[i].escape, pos)) != -1) { | ||
45 | htmlMessage.remove(pos, 1); | ||
46 | if(isOpen) | ||
47 | htmlMessage.insert(pos, m_escapeSecuences[i].close); | ||
48 | else | ||
49 | htmlMessage.insert(pos, m_escapeSecuences[i].open); | ||
50 | |||
51 | isOpen = !isOpen; | ||
52 | } | ||
53 | if(isOpen) | ||
54 | htmlMessage.append(m_escapeSecuences[i].close); | ||
55 | } | ||
56 | |||
57 | htmlMessage = htmlMessage.replace(QRegExp("\n"), "<br>"); | ||
24 | return htmlMessage; | 58 | return htmlMessage; |
25 | } | 59 | } |
26 | 60 | ||
@@ -31,3 +65,4 @@ void IRCOutput::addParam(void *data) { | |||
31 | void *IRCOutput::getParam(int index) { | 65 | void *IRCOutput::getParam(int index) { |
32 | return m_parameters.at(index); | 66 | return m_parameters.at(index); |
33 | } | 67 | } |
68 | |||
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 | |||
@@ -45,7 +45,14 @@ enum IRCOutputType { | |||
45 | OUTPUT_CHANACTION = 14, /* parameters : channel (IRCChannel) person (IRCChannelPerson) */ | 45 | OUTPUT_CHANACTION = 14, /* parameters : channel (IRCChannel) person (IRCChannelPerson) */ |
46 | OUTPUT_QUERYACTION = 15, /* parameters : person (IRCPerson) */ | 46 | OUTPUT_QUERYACTION = 15, /* parameters : person (IRCPerson) */ |
47 | OUTPUT_CHANPERSONMODE = 16, /* parameters : channel (IRCCHannel) person (IRCChannelPerson) */ | 47 | OUTPUT_CHANPERSONMODE = 16, /* parameters : channel (IRCCHannel) person (IRCChannelPerson) */ |
48 | OUTPUT_TOPIC = 17 /* parameters : channel (IRCChannel) */ | 48 | OUTPUT_TOPIC = 17, /* parameters : channel (IRCChannel) */ |
49 | OUTPUT_TITLE = 18 /* parameters : channel (IRCChannel) */ | ||
50 | }; | ||
51 | |||
52 | typedef struct IRCOutputEscapeSecuences { | ||
53 | char escape; | ||
54 | char *open; | ||
55 | char *close; | ||
49 | }; | 56 | }; |
50 | 57 | ||
51 | /* The IRCOutput class is used as a kind of message which is sent by the | 58 | /* The IRCOutput class is used as a kind of message which is sent by the |
@@ -54,7 +61,7 @@ enum IRCOutputType { | |||
54 | 61 | ||
55 | class IRCOutput { | 62 | class IRCOutput { |
56 | public: | 63 | public: |
57 | IRCOutput(IRCOutputType type, QString message); | 64 | IRCOutput(IRCOutputType type = OUTPUT_SERVERMESSAGE, QString message = QString::null); |
58 | /* Used to add a parameter to this IRCOutput. Parameters are dependent | 65 | /* Used to add a parameter to this IRCOutput. Parameters are dependent |
59 | on which IRCOutputType we are using (see above) */ | 66 | on which IRCOutputType we are using (see above) */ |
60 | void addParam(void *data); | 67 | void addParam(void *data); |
@@ -64,12 +71,16 @@ public: | |||
64 | /* Return the message with all HTML code escaped (for example < instead of '<') */ | 71 | /* Return the message with all HTML code escaped (for example < instead of '<') */ |
65 | QString htmlMessage(); | 72 | QString htmlMessage(); |
66 | 73 | ||
67 | static QString toHTML(QString message); | 74 | void setType(IRCOutputType); |
75 | void setMessage(const QString &message); | ||
76 | |||
77 | static QString toHTML(const QString &message); | ||
68 | void *getParam(int index); | 78 | void *getParam(int index); |
69 | protected: | 79 | protected: |
70 | IRCOutputType m_type; | 80 | IRCOutputType m_type; |
71 | QString m_message; | 81 | QString m_message; |
72 | QList<void> m_parameters; | 82 | QList<void> m_parameters; |
83 | static IRCOutputEscapeSecuences m_escapeSecuences[]; | ||
73 | }; | 84 | }; |
74 | 85 | ||
75 | #endif | 86 | #endif |