summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircchannellist.cpp26
-rw-r--r--noncore/net/opieirc/ircchannellist.h1
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp61
-rw-r--r--noncore/net/opieirc/ircmessageparser.h8
4 files changed, 50 insertions, 46 deletions
diff --git a/noncore/net/opieirc/ircchannellist.cpp b/noncore/net/opieirc/ircchannellist.cpp
index 4e13dee..6bef318 100644
--- a/noncore/net/opieirc/ircchannellist.cpp
+++ b/noncore/net/opieirc/ircchannellist.cpp
@@ -9,26 +9,27 @@ void IRCChannelList::update() {
9 QPixmap op = Resource::loadPixmap("opieirc/op"); 9 QPixmap op = Resource::loadPixmap("opieirc/op");
10 QPixmap hop = Resource::loadPixmap("opieirc/hop"); 10 QPixmap hop = Resource::loadPixmap("opieirc/hop");
11 QPixmap voice = Resource::loadPixmap("opieirc/voice"); 11 QPixmap voice = Resource::loadPixmap("opieirc/voice");
12 QListIterator<IRCChannelPerson> it = m_channel->people(); 12 QListIterator<IRCChannelPerson> it = m_channel->people();
13 clear(); 13 clear();
14 for (; it.current(); ++it) { 14 for (; it.current(); ++it) {
15 IRCChannelPerson *person = it.current(); 15 IRCChannelPerson *person = it.current();
16 if (person->flags & PERSON_FLAG_OP) { 16 if (person->flags & PERSON_FLAG_OP) {
17 insertItem(op, person->person->nick()); 17 insertItem(op, "1" + person->person->nick());
18 } else if (person->flags & PERSON_FLAG_HALFOP) { 18 } else if (person->flags & PERSON_FLAG_HALFOP) {
19 insertItem(op, person->person->nick()); 19 insertItem(op, "2" + person->person->nick());
20 } else if (person->flags & PERSON_FLAG_VOICE) { 20 } else if (person->flags & PERSON_FLAG_VOICE) {
21 insertItem(voice, person->person->nick()); 21 insertItem(voice, "3" + person->person->nick());
22 } else { 22 } else {
23 insertItem(person->person->nick()); 23 insertItem("4" + person->person->nick());
24 } 24 }
25 } 25 }
26 sort(); 26 sort();
27 adjustNicks();
27} 28}
28 29
29 30
30bool IRCChannelList::hasPerson(QString nick) { 31bool IRCChannelList::hasPerson(QString nick) {
31 for (unsigned int i=0; i<count(); i++) { 32 for (unsigned int i=0; i<count(); i++) {
32 if (text(i) == nick) 33 if (text(i) == nick)
33 return TRUE; 34 return TRUE;
34 } 35 }
@@ -40,8 +41,25 @@ bool IRCChannelList::removePerson(QString nick) {
40 if (text(i) == nick){ 41 if (text(i) == nick){
41 removeItem(i); 42 removeItem(i);
42 return TRUE; 43 return TRUE;
43 } 44 }
44 } 45 }
45 return FALSE; 46 return FALSE;
46} 47}
47 48
49void IRCChannelList::adjustNicks() {
50 QString txt;
51 QPixmap pm;
52
53 for(unsigned int i=0; i<count(); i++) {
54 txt = text(i).remove(0,1);
55 if(pixmap(i)) {
56 pm = *pixmap(i);
57 removeItem(i);
58 insertItem(pm, txt, i);
59 }
60 else {
61 removeItem(i);
62 insertItem(txt,i);
63 }
64 }
65}
diff --git a/noncore/net/opieirc/ircchannellist.h b/noncore/net/opieirc/ircchannellist.h
index deab649..b4e46eb 100644
--- a/noncore/net/opieirc/ircchannellist.h
+++ b/noncore/net/opieirc/ircchannellist.h
@@ -23,15 +23,16 @@
23 23
24#include <qlistbox.h> 24#include <qlistbox.h>
25#include "ircchannel.h" 25#include "ircchannel.h"
26 26
27class IRCChannelList : public QListBox { 27class IRCChannelList : public QListBox {
28public: 28public:
29 IRCChannelList(IRCChannel *channel, QWidget *parent = 0, const char *name = 0, WFlags f = 0); 29 IRCChannelList(IRCChannel *channel, QWidget *parent = 0, const char *name = 0, WFlags f = 0);
30 void update(); 30 void update();
31 void adjustNicks();
31 bool hasPerson(QString nick); 32 bool hasPerson(QString nick);
32 bool removePerson(QString nick); 33 bool removePerson(QString nick);
33protected: 34protected:
34 IRCChannel *m_channel; 35 IRCChannel *m_channel;
35}; 36};
36 37
37#endif /* __IRCCHANNELLIST_H */ 38#endif /* __IRCCHANNELLIST_H */
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index ecc7e9a..f8ccbb6 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -24,44 +24,47 @@ IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = {
24 { "PING", FUNC(parseCTCPPing) }, 24 { "PING", FUNC(parseCTCPPing) },
25 { "VERSION", FUNC(parseCTCPVersion) }, 25 { "VERSION", FUNC(parseCTCPVersion) },
26 { "ACTION", FUNC(parseCTCPAction) }, 26 { "ACTION", FUNC(parseCTCPAction) },
27 { 0 , 0 } 27 { 0 , 0 }
28}; 28};
29 29
30/* Lookup table for numerical commands */ 30/* Lookup table for numerical commands */
31IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { 31IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = {
32 { 1, FUNC(parseNumerical001) }, // RPL_WELCOME 32 { 1, FUNC(parseNumericalSecondParam) }, // RPL_WELCOME
33 { 2, FUNC(parseNumerical002) }, // RPL_YOURHOST 33 { 2, FUNC(parseNumericalSecondParam) }, // RPL_YOURHOST
34 { 3, FUNC(parseNumerical003) }, // RPL_CREATED 34 { 3, FUNC(parseNumericalSecondParam) }, // RPL_CREATED
35 { 4, FUNC(parseNumerical004) }, // RPL_MYINFO 35 { 4, FUNC(parseNumericalAllParams) }, // RPL_MYINFO
36 { 5, FUNC(parseNumerical005) }, // RPL_BOUNCE, RPL_PROTOCTL 36 { 5, FUNC(parseNumericalSecondParam) }, // RPL_BOUNCE, RPL_PROTOCTL
37 { 251, FUNC(parseNumericalStats) }, // RPL_LUSERCLIENT 37 { 250, FUNC(parseNumericalAllParams) }, // RPL_STATSCONN
38 { 252, FUNC(parseNumericalStats) }, // RPL_LUSEROP 38 { 251, FUNC(parseNumericalSecondParam) }, // RPL_LUSERCLIENT
39 { 265, FUNC(parseNumericalStats) }, // RPL_LOCALUSERS 39 { 252, FUNC(parseNumericalAllParams) }, // RPL_LUSEROP
40 { 266, FUNC(parseNumericalStats) }, // RPL_GLOBALUSERS 40 { 253, FUNC(parseNumericalAllParams) }, // RPL_LUSERUNKNOWN
41 { 250, FUNC(parseNumericalStats) }, // RPL_STATSCONN 41 { 254, FUNC(parseNumericalAllParams) }, // RPL_LUSERCHANNELS
42 { 254, FUNC(nullFunc)}, // RPL_LUSERCHANNELS 42 { 255, FUNC(parseNumericalSecondParam) }, // RPL_LUSERME
43 { 255, FUNC(parseNumericalStats) }, // RPL_LUSERNAME 43 { 265, FUNC(parseNumericalAllParams) }, // RPL_LOCALUSERS
44 { 266, FUNC(parseNumericalAllParams) }, // RPL_GLOBALUSERS
44 { 332, FUNC(parseNumericalTopic) }, // RPL_TOPIC 45 { 332, FUNC(parseNumericalTopic) }, // RPL_TOPIC
45 { 333, FUNC(parseNumericalTopicWhoTime) }, // RPL_TOPICWHOTIME 46 { 333, FUNC(parseNumericalTopicWhoTime) }, // RPL_TOPICWHOTIME
46 { 353, FUNC(parseNumericalNames) }, // RPL_NAMREPLY 47 { 353, FUNC(parseNumericalNames) }, // RPL_NAMREPLY
47 { 366, FUNC(parseNumericalEndOfNames) }, // RPL_ENDOFNAMES 48 { 366, FUNC(parseNumericalEndOfNames) }, // RPL_ENDOFNAMES
48 { 375, FUNC(parseNumericalStats) }, // RPL_MOTDSTART 49 { 372, FUNC(parseNumericalSecondParam) }, // RPL_MOTD
49 { 372, FUNC(parseNumericalStats) }, // RPL_MOTD 50 { 375, FUNC(parseNumericalSecondParam) }, // RPL_MOTDSTART
50 { 376, FUNC(parseNumericalStats) }, // RPL_ENDOFMOTD 51 { 376, FUNC(parseNumericalSecondParam) }, // RPL_ENDOFMOTD
51 { 377, FUNC(parseNumericalStats) }, // RPL_MOTD2 52 { 377, FUNC(parseNumericalSecondParam) }, // RPL_MOTD2
52 { 378, FUNC(parseNumericalStats) }, // RPL_MOTD3 53 { 378, FUNC(parseNumericalSecondParam) }, // RPL_MOTD3
53 { 401, FUNC(parseNumericalNoSuchNick) }, // ERR_NOSUCHNICK 54 { 401, FUNC(parseNumericalNoSuchNick) }, // ERR_NOSUCHNICK
54 { 406, FUNC(parseNumericalNoSuchNick) }, // ERR_WASNOSUCHNICK 55 { 406, FUNC(parseNumericalNoSuchNick) }, // ERR_WASNOSUCHNICK
55 { 412, FUNC(parseNumericalStats) }, // ERR_NOTEXTTOSEND 56 { 412, FUNC(parseNumericalSecondParam) }, // ERR_NOTEXTTOSEND
57 { 422, FUNC(parseNumericalSecondParam) }, // ERR_NOMOTD
56 { 433, FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE 58 { 433, FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE
57 { 0, 0 } 59 { 0, 0 }
58}; 60};
59 61
62
60IRCMessageParser::IRCMessageParser(IRCSession *session) { 63IRCMessageParser::IRCMessageParser(IRCSession *session) {
61 m_session = session; 64 m_session = session;
62} 65}
63 66
64void IRCMessageParser::parse(IRCMessage *message) { 67void IRCMessageParser::parse(IRCMessage *message) {
65 /* Find out what kind of message we have here and call the appropriate handler using 68 /* Find out what kind of message we have here and call the appropriate handler using
66 the parser tables. If no handler can be found, print out an error message */ 69 the parser tables. If no handler can be found, print out an error message */
67 if (message->isNumerical()) { 70 if (message->isNumerical()) {
@@ -455,41 +458,25 @@ void IRCMessageParser::parseLiteralKick(IRCMessage *message) {
455 } else { 458 } else {
456 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person kick - desynchronized?"))); 459 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person kick - desynchronized?")));
457 } 460 }
458 } else { 461 } else {
459 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?"))); 462 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?")));
460 } 463 }
461} 464}
462 465
463void IRCMessageParser::parseNumerical001(IRCMessage *message) {
464 /* Welcome to IRC message, display */
465 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
466}
467 466
468void IRCMessageParser::parseNumerical002(IRCMessage *message) { 467void IRCMessageParser::parseNumericalSecondParam(IRCMessage *message) {
469 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); 468 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
470} 469}
471 470
472void IRCMessageParser::parseNumerical003(IRCMessage *message) { 471void IRCMessageParser::parseNumericalAllParams(IRCMessage *message) {
473 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
474}
475
476void IRCMessageParser::parseNumerical004(IRCMessage *message) {
477 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); 472 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters()));
478} 473}
479 474
480void IRCMessageParser::parseNumerical005(IRCMessage *message) {
481 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters()));
482}
483
484void IRCMessageParser::parseNumericalStats(IRCMessage *message) {
485 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
486}
487
488void IRCMessageParser::parseNumericalNames(IRCMessage *message) { 475void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
489 /* Name list sent when joining a channel */ 476 /* Name list sent when joining a channel */
490 IRCChannel *channel = m_session->getChannel(message->param(2).lower()); 477 IRCChannel *channel = m_session->getChannel(message->param(2).lower());
491 if (channel != 0) { 478 if (channel != 0) {
492 QString people = message->param(3); 479 QString people = message->param(3);
493 QTextIStream stream(&people); 480 QTextIStream stream(&people);
494 QString temp; 481 QString temp;
495 482
@@ -563,8 +550,10 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
563 IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\"")); 550 IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\""));
564 output.addParam(0); 551 output.addParam(0);
565 emit outputReady(output); 552 emit outputReady(output);
566 } 553 }
567} 554}
568 555
569void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { 556void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {
570} 557}
558
559
diff --git a/noncore/net/opieirc/ircmessageparser.h b/noncore/net/opieirc/ircmessageparser.h
index c4dd96c..5412f5f 100644
--- a/noncore/net/opieirc/ircmessageparser.h
+++ b/noncore/net/opieirc/ircmessageparser.h
@@ -68,22 +68,18 @@ private:
68 void parseLiteralPrivMsg(IRCMessage *message); 68 void parseLiteralPrivMsg(IRCMessage *message);
69 void parseLiteralNick(IRCMessage *message); 69 void parseLiteralNick(IRCMessage *message);
70 void parseLiteralPart(IRCMessage *message); 70 void parseLiteralPart(IRCMessage *message);
71 void parseLiteralQuit(IRCMessage *message); 71 void parseLiteralQuit(IRCMessage *message);
72 void parseLiteralError(IRCMessage *message); 72 void parseLiteralError(IRCMessage *message);
73 void parseLiteralMode(IRCMessage *message); 73 void parseLiteralMode(IRCMessage *message);
74 void parseLiteralKick(IRCMessage *message); 74 void parseLiteralKick(IRCMessage *message);
75 void parseLiteralTopic(IRCMessage *message); 75 void parseLiteralTopic(IRCMessage *message);
76 void parseNumerical001(IRCMessage *message); 76 void parseNumericalSecondParam(IRCMessage *message);
77 void parseNumerical002(IRCMessage *message); 77 void parseNumericalAllParams(IRCMessage *message);
78 void parseNumerical003(IRCMessage *message);
79 void parseNumerical004(IRCMessage *message);
80 void parseNumerical005(IRCMessage *message);
81 void parseNumericalStats(IRCMessage *message);
82 void parseNumericalNames(IRCMessage *message); 78 void parseNumericalNames(IRCMessage *message);
83 void parseNumericalEndOfNames(IRCMessage *message); 79 void parseNumericalEndOfNames(IRCMessage *message);
84 void parseNumericalNicknameInUse(IRCMessage *message); 80 void parseNumericalNicknameInUse(IRCMessage *message);
85 void parseNumericalNoSuchNick(IRCMessage *message); 81 void parseNumericalNoSuchNick(IRCMessage *message);
86 void parseNumericalTopic(IRCMessage *message); 82 void parseNumericalTopic(IRCMessage *message);
87 void parseNumericalTopicWhoTime(IRCMessage *message); 83 void parseNumericalTopicWhoTime(IRCMessage *message);
88 void parseCTCPPing(IRCMessage *message); 84 void parseCTCPPing(IRCMessage *message);
89 void parseCTCPVersion(IRCMessage *message); 85 void parseCTCPVersion(IRCMessage *message);