author | wimpie <wimpie> | 2005-01-08 15:16:37 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-08 15:16:37 (UTC) |
commit | 955213d274c2f0c11d0f153e2fed5df5170e50f6 (patch) (unidiff) | |
tree | 5bf19444380a734ae5c184ba83aeb093e6ae4113 /noncore | |
parent | 9acc68823f95f62367813dbb42387ad5ee094aae (diff) | |
download | opie-955213d274c2f0c11d0f153e2fed5df5170e50f6.zip opie-955213d274c2f0c11d0f153e2fed5df5170e50f6.tar.gz opie-955213d274c2f0c11d0f153e2fed5df5170e50f6.tar.bz2 |
Changes in this patch:
*Added some irc numerical codes (253, 422)
*Reordered codes
*Unified some functions which did exactly the same in two functions
*Changed nick ordering in channel list, now nicks get ordered first
by flags and then by name.
-rw-r--r-- | noncore/net/opieirc/ircchannellist.cpp | 26 | ||||
-rw-r--r-- | noncore/net/opieirc/ircchannellist.h | 1 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 61 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.h | 8 |
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 | |||
@@ -5,43 +5,61 @@ IRCChannelList::IRCChannelList(IRCChannel *channel, QWidget *parent, const char | |||
5 | m_channel = channel; | 5 | m_channel = channel; |
6 | } | 6 | } |
7 | 7 | ||
8 | void IRCChannelList::update() { | 8 | 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 | ||
30 | bool IRCChannelList::hasPerson(QString nick) { | 31 | bool 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 | } |
35 | return FALSE; | 36 | return FALSE; |
36 | } | 37 | } |
37 | 38 | ||
38 | bool IRCChannelList::removePerson(QString nick) { | 39 | bool IRCChannelList::removePerson(QString nick) { |
39 | for (unsigned int i=0; i<count(); i++) { | 40 | for (unsigned int i=0; i<count(); i++) { |
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 | ||
49 | void 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 | |||
@@ -19,19 +19,20 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #ifndef __IRCCHANNELLIST_H | 21 | #ifndef __IRCCHANNELLIST_H |
22 | #define __IRCCHANNELLIST_H | 22 | #define __IRCCHANNELLIST_H |
23 | 23 | ||
24 | #include <qlistbox.h> | 24 | #include <qlistbox.h> |
25 | #include "ircchannel.h" | 25 | #include "ircchannel.h" |
26 | 26 | ||
27 | class IRCChannelList : public QListBox { | 27 | class IRCChannelList : public QListBox { |
28 | public: | 28 | public: |
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); |
33 | protected: | 34 | protected: |
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 | |||
@@ -20,52 +20,55 @@ IRCLiteralMessageParserStruct IRCMessageParser::literalParserProcTable[] = { | |||
20 | }; | 20 | }; |
21 | 21 | ||
22 | /* Lookup table for literal commands */ | 22 | /* Lookup table for literal commands */ |
23 | IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = { | 23 | 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 */ |
31 | IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { | 31 | IRCNumericalMessageParserStruct 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 | |||
60 | IRCMessageParser::IRCMessageParser(IRCSession *session) { | 63 | IRCMessageParser::IRCMessageParser(IRCSession *session) { |
61 | m_session = session; | 64 | m_session = session; |
62 | } | 65 | } |
63 | 66 | ||
64 | void IRCMessageParser::parse(IRCMessage *message) { | 67 | void 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()) { |
68 | for (int i=0; i<numericalParserProcTable[i].commandNumber; i++) { | 71 | for (int i=0; i<numericalParserProcTable[i].commandNumber; i++) { |
69 | if (message->commandNumber() == numericalParserProcTable[i].commandNumber) { | 72 | if (message->commandNumber() == numericalParserProcTable[i].commandNumber) { |
70 | (this->*(numericalParserProcTable[i].proc))(message); | 73 | (this->*(numericalParserProcTable[i].proc))(message); |
71 | return; | 74 | return; |
@@ -451,49 +454,33 @@ void IRCMessageParser::parseLiteralKick(IRCMessage *message) { | |||
451 | output.addParam(channel); | 454 | output.addParam(channel); |
452 | output.addParam(person); | 455 | output.addParam(person); |
453 | emit outputReady(output); | 456 | emit outputReady(output); |
454 | } | 457 | } |
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 | ||
463 | void IRCMessageParser::parseNumerical001(IRCMessage *message) { | ||
464 | /* Welcome to IRC message, display */ | ||
465 | emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); | ||
466 | } | ||
467 | 466 | ||
468 | void IRCMessageParser::parseNumerical002(IRCMessage *message) { | 467 | void 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 | ||
472 | void IRCMessageParser::parseNumerical003(IRCMessage *message) { | 471 | void IRCMessageParser::parseNumericalAllParams(IRCMessage *message) { |
473 | emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); | ||
474 | } | ||
475 | |||
476 | void IRCMessageParser::parseNumerical004(IRCMessage *message) { | ||
477 | emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); | 472 | emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); |
478 | } | 473 | } |
479 | 474 | ||
480 | void IRCMessageParser::parseNumerical005(IRCMessage *message) { | ||
481 | emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); | ||
482 | } | ||
483 | |||
484 | void IRCMessageParser::parseNumericalStats(IRCMessage *message) { | ||
485 | emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); | ||
486 | } | ||
487 | |||
488 | void IRCMessageParser::parseNumericalNames(IRCMessage *message) { | 475 | void 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 | ||
496 | while (!stream.atEnd()) { | 483 | while (!stream.atEnd()) { |
497 | stream >> temp; | 484 | stream >> temp; |
498 | 485 | ||
499 | char flagch = temp.at(0).latin1(); | 486 | char flagch = temp.at(0).latin1(); |
@@ -559,12 +546,14 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { | |||
559 | IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\"")); | 546 | IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\"")); |
560 | output.addParam(channel); | 547 | output.addParam(channel); |
561 | emit outputReady(output); | 548 | emit outputReady(output); |
562 | } else { | 549 | } else { |
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 | ||
569 | void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { | 556 | void 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 | |||
@@ -64,30 +64,26 @@ private: | |||
64 | void nullFunc(IRCMessage *message); | 64 | void nullFunc(IRCMessage *message); |
65 | void parseLiteralPing(IRCMessage *message); | 65 | void parseLiteralPing(IRCMessage *message); |
66 | void parseLiteralNotice(IRCMessage *message); | 66 | void parseLiteralNotice(IRCMessage *message); |
67 | void parseLiteralJoin(IRCMessage *message); | 67 | void parseLiteralJoin(IRCMessage *message); |
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); |
90 | void parseCTCPAction(IRCMessage *message); | 86 | void parseCTCPAction(IRCMessage *message); |
91 | protected: | 87 | protected: |
92 | IRCSession *m_session; | 88 | IRCSession *m_session; |
93 | /* Parser tables */ | 89 | /* Parser tables */ |