From 5ddbefcd1768f6274b46e4516277fbb0432f3f2d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 25 Aug 2015 22:46:08 +0300 Subject: Move receive code from chathandler into separate file. --- src/net/ea/chathandler.cpp | 159 +++---------------------------------- src/net/ea/chathandler.h | 18 ----- src/net/ea/chatrecv.cpp | 190 +++++++++++++++++++++++++++++++++++++++++++++ src/net/ea/chatrecv.h | 56 +++++++++++++ 4 files changed, 256 insertions(+), 167 deletions(-) create mode 100644 src/net/ea/chatrecv.cpp create mode 100644 src/net/ea/chatrecv.h (limited to 'src/net/ea') diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index fc489a18a..fd47bc48f 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -36,6 +36,8 @@ #include "net/messagein.h" +#include "net/ea/chatrecv.h" + #include "utils/gettext.h" #include "debug.h" @@ -43,26 +45,20 @@ namespace Ea { -WhisperQueue ChatHandler::mSentWhispers; -int ChatHandler::mMotdTime = -1; -bool ChatHandler::mShowAllLang = false; -bool ChatHandler::mShowMotd = false; -bool ChatHandler::mSkipping = true; - ChatHandler::ChatHandler() { - if (!mSentWhispers.empty()) - mSentWhispers.pop(); - mMotdTime = -1; - mShowAllLang = serverConfig.getValue("showAllLang", 0); - mShowMotd = config.getBoolValue("showmotd"); - mSkipping = true; + if (!ChatRecv::mSentWhispers.empty()) + ChatRecv::mSentWhispers.pop(); + ChatRecv::mMotdTime = -1; + ChatRecv::mShowAllLang = serverConfig.getValue("showAllLang", 0); + ChatRecv::mShowMotd = config.getBoolValue("showmotd"); + ChatRecv::mSkipping = true; } void ChatHandler::clear() { - mShowMotd = config.getBoolValue("showmotd"); - mSkipping = true; + ChatRecv::mShowMotd = config.getBoolValue("showmotd"); + ChatRecv::mSkipping = true; } void ChatHandler::me(const std::string &restrict text, @@ -73,139 +69,4 @@ void ChatHandler::me(const std::string &restrict text, talk(action, channel); } -std::string ChatHandler::getPopLastWhisperNick() -{ - std::string nick; - if (mSentWhispers.empty()) - { - nick = "user"; - } - else - { - nick = mSentWhispers.front(); - mSentWhispers.pop(); - } - return nick; -} - -std::string ChatHandler::getLastWhisperNick() -{ - std::string nick; - if (mSentWhispers.empty()) - nick = "user"; - else - nick = mSentWhispers.front(); - return nick; -} - -void ChatHandler::processWhisperResponseContinue(Net::MessageIn &msg, - const uint8_t type) -{ - const std::string nick = getPopLastWhisperNick(); - switch (type) - { - case 0x00: - // Success (don't need to report) - break; - case 0x01: - if (chatWindow) - { - chatWindow->addWhisper(nick, - // TRANSLATORS: chat message - strprintf(_("Whisper could not be sent, %s is offline."), - nick.c_str()), - ChatMsgType::BY_SERVER); - } - break; - case 0x02: - if (chatWindow) - { - chatWindow->addWhisper(nick, - // TRANSLATORS: chat message - strprintf(_("Whisper could not " - "be sent, ignored by %s."), nick.c_str()), - ChatMsgType::BY_SERVER); - } - break; - case 0x03: - if (chatWindow) - { - chatWindow->addWhisper(nick, - // TRANSLATORS: chat message - strprintf(_("Whisper could not " - "be sent, you ignored by all players.")), - ChatMsgType::BY_SERVER); - } - break; - default: - UNIMPLIMENTEDPACKET; - break; - } - BLOCK_END("ChatHandler::processWhisperResponse") -} - -void ChatHandler::processMVPEffect(Net::MessageIn &msg) -{ - BLOCK_START("ChatHandler::processMVPEffect") - // Display MVP player - const BeingId id = msg.readBeingId("being id"); - if (localChatTab && actorManager && config.getBoolValue("showMVP")) - { - const Being *const being = actorManager->findBeing(id); - if (!being) - NotifyManager::notify(NotifyTypes::MVP_PLAYER, ""); - else - NotifyManager::notify(NotifyTypes::MVP_PLAYER, being->getName()); - } - BLOCK_END("ChatHandler::processMVPEffect") -} - -void ChatHandler::processIgnoreAllResponse(Net::MessageIn &msg) -{ - BLOCK_START("ChatHandler::processIgnoreAllResponse") - const uint8_t action = msg.readUInt8("action"); - const uint8_t fail = msg.readUInt8("result"); - if (!localChatTab) - { - BLOCK_END("ChatHandler::processIgnoreAllResponse") - return; - } - - switch (action) - { - case 0: - { - switch (fail) - { - case 0: - NotifyManager::notify(NotifyTypes::WHISPERS_IGNORED); - break; - default: - NotifyManager::notify(NotifyTypes:: - WHISPERS_IGNORE_FAILED); - break; - } - break; - } - case 1: - { - switch (fail) - { - case 0: - NotifyManager::notify(NotifyTypes::WHISPERS_UNIGNORED); - break; - default: - NotifyManager::notify(NotifyTypes:: - WHISPERS_UNIGNORE_FAILED); - break; - } - break; - } - default: - // unknown result - break; - } - BLOCK_END("ChatHandler::processIgnoreAllResponse") -} - } // namespace Ea diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index d5a0e86f6..a71f63e83 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -48,24 +48,6 @@ class ChatHandler notfinal : public Net::ChatHandler const std::string &restrict channel) const override final; void clear() override final; - - protected: - static void processMVPEffect(Net::MessageIn &msg); - - static void processIgnoreAllResponse(Net::MessageIn &msg); - - static void processWhisperResponseContinue(Net::MessageIn &msg, - const uint8_t type); - - static std::string getPopLastWhisperNick(); - - static std::string getLastWhisperNick(); - - static WhisperQueue mSentWhispers; - static int mMotdTime; - static bool mShowAllLang; - static bool mShowMotd; - static bool mSkipping; }; } // namespace Ea diff --git a/src/net/ea/chatrecv.cpp b/src/net/ea/chatrecv.cpp new file mode 100644 index 000000000..3f11ab0e1 --- /dev/null +++ b/src/net/ea/chatrecv.cpp @@ -0,0 +1,190 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 + * 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, see . + */ + +#include "net/ea/chatrecv.h" + +#include "actormanager.h" +#include "configuration.h" +#include "notifymanager.h" + +#include "being/being.h" + +#include "enums/resources/notifytypes.h" + +#include "gui/windows/chatwindow.h" + +#include "gui/widgets/tabs/chat/chattab.h" + +#include "net/messagein.h" + +#include "utils/gettext.h" + +#include "debug.h" + +namespace Ea +{ + +namespace ChatRecv +{ + WhisperQueue mSentWhispers; + int mMotdTime = -1; + bool mShowAllLang = false; + bool mShowMotd = false; + bool mSkipping = true; +} // namespace ChatRecv + +std::string ChatRecv::getPopLastWhisperNick() +{ + std::string nick; + if (mSentWhispers.empty()) + { + nick = "user"; + } + else + { + nick = mSentWhispers.front(); + mSentWhispers.pop(); + } + return nick; +} + +std::string ChatRecv::getLastWhisperNick() +{ + std::string nick; + if (mSentWhispers.empty()) + nick = "user"; + else + nick = mSentWhispers.front(); + return nick; +} + +void ChatRecv::processWhisperResponseContinue(Net::MessageIn &msg, + const uint8_t type) +{ + const std::string nick = getPopLastWhisperNick(); + switch (type) + { + case 0x00: + // Success (don't need to report) + break; + case 0x01: + if (chatWindow) + { + chatWindow->addWhisper(nick, + // TRANSLATORS: chat message + strprintf(_("Whisper could not be sent, %s is offline."), + nick.c_str()), + ChatMsgType::BY_SERVER); + } + break; + case 0x02: + if (chatWindow) + { + chatWindow->addWhisper(nick, + // TRANSLATORS: chat message + strprintf(_("Whisper could not " + "be sent, ignored by %s."), nick.c_str()), + ChatMsgType::BY_SERVER); + } + break; + case 0x03: + if (chatWindow) + { + chatWindow->addWhisper(nick, + // TRANSLATORS: chat message + strprintf(_("Whisper could not " + "be sent, you ignored by all players.")), + ChatMsgType::BY_SERVER); + } + break; + default: + UNIMPLIMENTEDPACKET; + break; + } + BLOCK_END("ChatRecv::processWhisperResponse") +} + +void ChatRecv::processMVPEffect(Net::MessageIn &msg) +{ + BLOCK_START("ChatRecv::processMVPEffect") + // Display MVP player + const BeingId id = msg.readBeingId("being id"); + if (localChatTab && actorManager && config.getBoolValue("showMVP")) + { + const Being *const being = actorManager->findBeing(id); + if (!being) + NotifyManager::notify(NotifyTypes::MVP_PLAYER, ""); + else + NotifyManager::notify(NotifyTypes::MVP_PLAYER, being->getName()); + } + BLOCK_END("ChatRecv::processMVPEffect") +} + +void ChatRecv::processIgnoreAllResponse(Net::MessageIn &msg) +{ + BLOCK_START("ChatRecv::processIgnoreAllResponse") + const uint8_t action = msg.readUInt8("action"); + const uint8_t fail = msg.readUInt8("result"); + if (!localChatTab) + { + BLOCK_END("ChatRecv::processIgnoreAllResponse") + return; + } + + switch (action) + { + case 0: + { + switch (fail) + { + case 0: + NotifyManager::notify(NotifyTypes::WHISPERS_IGNORED); + break; + default: + NotifyManager::notify(NotifyTypes:: + WHISPERS_IGNORE_FAILED); + break; + } + break; + } + case 1: + { + switch (fail) + { + case 0: + NotifyManager::notify(NotifyTypes::WHISPERS_UNIGNORED); + break; + default: + NotifyManager::notify(NotifyTypes:: + WHISPERS_UNIGNORE_FAILED); + break; + } + break; + } + default: + // unknown result + break; + } + BLOCK_END("ChatRecv::processIgnoreAllResponse") +} + +} // namespace Ea diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h new file mode 100644 index 000000000..c84f38b62 --- /dev/null +++ b/src/net/ea/chatrecv.h @@ -0,0 +1,56 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 + * 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, see . + */ + +#ifndef NET_EA_CHATRECV_H +#define NET_EA_CHATRECV_H + +#include "net/chathandler.h" + +#include + +namespace Net +{ + class MessageIn; +} + +namespace Ea +{ + typedef std::queue WhisperQueue; + + namespace ChatRecv + { + void processMVPEffect(Net::MessageIn &msg); + void processIgnoreAllResponse(Net::MessageIn &msg); + void processWhisperResponseContinue(Net::MessageIn &msg, + const uint8_t type); + std::string getPopLastWhisperNick(); + std::string getLastWhisperNick(); + + extern WhisperQueue mSentWhispers; + extern int mMotdTime; + extern bool mShowAllLang; + extern bool mShowMotd; + extern bool mSkipping; + } // namespace ChatRecv +} // namespace Ea + +#endif // NET_EA_CHATRECV_H -- cgit v1.2.3-70-g09d2