Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updates to irc use in mastermenu: 

- shows local username
- bugfixes for detecting new/dropped users in the irc channel
- lots of cleanup to remove use of so many static variables
This commit is contained in:
Mark Vejvoda 2010-12-24 02:10:31 +00:00
parent b954d399df
commit 97ee61165a
9 changed files with 352 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/glest_game/game/chat_manager.cpp
View File

@ -40,11 +40,12 @@ ChatManager::ChatManager() {
disableTeamMode = false;
}
void ChatManager::init(Console* console, int thisTeamIndex, const bool inMenu) {
void ChatManager::init(Console* console, int thisTeamIndex, const bool inMenu, string manualPlayerNameOverride) {
this->console= console;
this->thisTeamIndex= thisTeamIndex;
this->disableTeamMode= false;
this->inMenu=inMenu;
this->manualPlayerNameOverride = manualPlayerNameOverride;
}
void ChatManager::keyUp(char key) {
@ -119,7 +120,13 @@ void ChatManager::keyDown(char key) {
if(text.empty() == false) {
string playerName = gameNetworkInterface->getHumanPlayerName();
int playerIndex = gameNetworkInterface->getHumanPlayerIndex();
if(this->manualPlayerNameOverride != "") {
console->addLine(text,false,this->manualPlayerNameOverride);
}
else {
console->addLine(text,false,playerIndex);
}
gameNetworkInterface->sendTextMessage(text, teamMode? thisTeamIndex: -1);
if(inMenu == false) {

4
source/glest_game/game/chat_manager.h
View File

@ -37,11 +37,11 @@ private:
string text;
int thisTeamIndex;
bool inMenu;
string manualPlayerNameOverride;
public:
ChatManager();
void init(Console* console, int thisTeamIndex, const bool inMenu=false );
void init(Console* console, int thisTeamIndex, const bool inMenu=false, string manualPlayerNameOverride="");
void keyDown(char key);
void keyUp(char key);

32
source/glest_game/game/console.cpp
View File

@ -79,6 +79,38 @@ void Console::addLine(string line, bool playSound, int playerIndex) {
}
}
void Console::addLine(string line, bool playSound, string playerName) {
try {
if(playSound == true) {
SoundRenderer::getInstance().playFx(CoreData::getInstance().getClickSoundA());
}
ConsoleLineInfo info;
info.text = line;
info.timeStamp = timeElapsed;
info.PlayerIndex = -1;
info.originalPlayerName = "";
if(playerName != "") {
info.originalPlayerName = playerName;
}
//printf("info.PlayerIndex = %d, line [%s]\n",info.PlayerIndex,info.originalPlayerName.c_str());
lines.insert(lines.begin(), info);
if(lines.size() > maxLines) {
lines.pop_back();
}
storedLines.insert(storedLines.begin(), info);
if(storedLines.size() > maxStoredLines) {
storedLines.pop_back();
}
}
catch(const exception &ex) {
char szBuf[1024]="";
sprintf(szBuf,"In [%s::%s %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what());
SystemFlags::OutputDebug(SystemFlags::debugError,szBuf);
throw runtime_error(szBuf);
}
}
void Console::clearStoredLines() {
while(storedLines.empty() == false) {
storedLines.pop_back();

1
source/glest_game/game/console.h
View File

@ -71,6 +71,7 @@ public:
void clearStoredLines();
void addStdMessage(const string &s);
void addLine(string line, bool playSound= false,int playerIndex=-1);
void addLine(string line, bool playSound,string playerName);
void update();
bool isEmpty();
};

22
source/glest_game/graphics/renderer.cpp
View File

@ -885,6 +885,28 @@ void Renderer::RenderConsoleLine(int lineIndex, int xPosition, const ConsoleLine
xPosition += (metrics.toVirtualX(fontMetrics->getTextWidth(headerLine)));
}
}
else if(lineInfo->originalPlayerName != "") {
string playerName = lineInfo->originalPlayerName;
string headerLine = playerName + ": ";
const Metrics &metrics= Metrics::getInstance();
const FontMetrics *fontMetrics= CoreData::getInstance().getConsoleFont()->getMetrics();
if(fontMetrics == NULL) {
throw runtime_error("fontMetrics == NULL");
}
renderTextShadow(
headerLine,
CoreData::getInstance().getConsoleFont(),
fontColor,
xPosition, lineIndex * 20 + 20);
fontColor = defaultFontColor;
//xPosition += (8 * (playerName.length() + 2));
// Proper font spacing after username portion of chat text rendering
xPosition += (metrics.toVirtualX(fontMetrics->getTextWidth(headerLine)));
}
else {
fontColor = defaultFontColor;
}

33
source/glest_game/menu/menu_state_masterserver.cpp
View File

@ -196,7 +196,6 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
containerName = "MasterServer";
updateFromMasterserverThread = NULL;
ircClient = NULL;
lastNickListUpdate = 0;
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
Lang &lang= Lang::getInstance();
@ -352,8 +351,13 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
GraphicComponent::applyAllCustomProperties(containerName);
char szIRCNick[80]="";
srand(time(NULL));
int randomNickId = rand() % 999;
sprintf(szIRCNick,"MG_%s_%d",Config::getInstance().getString("NetPlayerName",Socket::getHostName().c_str()).c_str(),randomNickId);
consoleIRC.addLine(lang.get("To switch off music press")+" - \""+configKeys.getCharKey("ToggleMusic")+"\"");
chatManager.init(&consoleIRC, -1,true);
chatManager.init(&consoleIRC, -1, true, szIRCNick);
MutexSafeWrapper safeMutexPtr(&masterServerThreadPtrChangeAccessor);
masterServerThreadInDeletion = false;
@ -362,11 +366,6 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
updateFromMasterserverThread->setUniqueID(__FILE__);
updateFromMasterserverThread->start();
char szIRCNick[80]="";
srand(time(NULL));
int randomNickId = rand() % 999;
sprintf(szIRCNick,"MG_%s_%d",Config::getInstance().getString("NetPlayerName",Socket::getHostName().c_str()).c_str(),randomNickId);
ircArgs.push_back(IRC_SERVER);
ircArgs.push_back(szIRCNick);
ircArgs.push_back(IRC_CHANNEL);
@ -626,11 +625,18 @@ void MenuStateMasterserver::render(){
renderer.renderLabel(&externalConnectPort,&titleLabelColor);
renderer.renderLabel(&selectButton,&titleLabelColor);
if(ircClient != NULL &&
ircClient->isConnected() == true &&
ircClient->getHasJoinedChannel() == true) {
const Vec4f titleLabelColor = GREEN;
renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor);
renderer.renderLabel(&ircOnlinePeopleListLabel,&titleLabelColor);
// render console
//renderer.renderConsole(&console,false,false);
}
else {
const Vec4f titleLabelColor = RED;
renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor);
}
const Vec4f titleLabelColorList = YELLOW;
renderer.renderLabel(&ircOnlinePeopleListLabel,&titleLabelColorList);
for(int i=0; i<serverLines.size(); ++i){
serverLines[i]->render();
@ -669,19 +675,16 @@ void MenuStateMasterserver::update() {
consoleIRC.update();
if(ircClient != NULL) {
if(difftime(time(NULL),lastNickListUpdate) >= 5) {
lastNickListUpdate = time(NULL);
std::vector<string> nickList = ircClient->getNickList();
string nicks = "";
for(int i = 0; i < nickList.size(); ++i) {
if(nicks != "") {
nicks += " ";
nicks += ", ";
}
nicks += nickList[i];
}
ircOnlinePeopleListLabel.setText(nicks);
}
}
else {
ircOnlinePeopleListLabel.setText("");
}

1
source/glest_game/menu/menu_state_masterserver.h
View File

@ -132,7 +132,6 @@ private:
std::vector<string> ircArgs;
IRCThread *ircClient;
time_t lastNickListUpdate;
Console consoleIRC;
ChatManager chatManager;

41
source/shared_lib/include/platform/posix/ircclient.h
View File

@ -42,20 +42,49 @@ protected:
std::vector<string> argv;
irc_session_t *ircSession;
string channel;
string nick;
bool hasJoinedChannel;
bool eventDataDone;
Mutex mutexNickList;
time_t lastNickListUpdate;
std::vector<string> eventData;
IRCCallbackInterface *callbackObj;
public:
IRCThread(const std::vector<string> &argv,IRCCallbackInterface *callbackObj);
virtual void execute();
virtual void signalQuit();
virtual bool shutdownAndWait();
void SendIRCCmdMessage(string target, string msg);
std::vector<string> GetIRCConnectedNickList(string target);
std::vector<string> getNickList() { return eventData; }
std::vector<string> getNickList();
bool isConnected();
static IRCCallbackInterface *callbackObj;
static std::vector<string> eventData;
static bool eventDataDone;
static bool isConnected;
std::vector<string> GetIRCConnectedNickList(string target, bool waitForCompletion);
bool getEventDataDone() const { return eventDataDone; }
void setEventDataDone(bool value) { eventDataDone=value; }
bool getHasJoinedChannel() const { return hasJoinedChannel; }
void setHasJoinedChannel(bool value) { hasJoinedChannel=value; }
time_t getLastNickListUpdate() const { return lastNickListUpdate; }
void setLastNickListUpdate(time_t value) { lastNickListUpdate = value;}
string getChannel() const { return channel;}
string getNick() const { return nick;}
std::vector<string> getArgs() const { return argv;}
Mutex * getMutexNickList() { return &mutexNickList; }
std::vector<string> & getCachedNickList() { return eventData; }
void setCachedNickList(std::vector<string> &list) { eventData = list; }
IRCCallbackInterface * getCallbackObj() { return callbackObj;}
};
}}//end namespace

150
source/shared_lib/sources/platform/posix/ircclient.cpp
View File

@ -34,18 +34,6 @@ using namespace Shared::PlatformCommon;
namespace Shared { namespace PlatformCommon {
IRCCallbackInterface *IRCThread::callbackObj=NULL;
std::vector<string> IRCThread::eventData;
bool IRCThread::eventDataDone = false;
bool IRCThread::isConnected = false;
//
// We store data in IRC session context.
//
typedef struct {
string channel;
string nick;
} irc_ctx_t;
void addlog (const char * fmt, ...) {
FILE * fp;
char buf[1024];
@ -82,30 +70,61 @@ void dump_event (irc_session_t * session, const char * event, const char * origi
}
addlog ("Event \"%s\", origin: \"%s\", params: %d [%s]", event, origin ? origin : "NULL", cnt, buf);
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
if(ctx != NULL) {
if(difftime(time(NULL),ctx->getLastNickListUpdate()) >= 7) {
ctx->setLastNickListUpdate(time(NULL));
ctx->GetIRCConnectedNickList(ctx->getArgs()[2],false);
}
}
}
void event_join(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) {
dump_event (session, event, origin, params, count);
if(IRCThread::isConnected == false) {
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
if(ctx != NULL) {
if(ctx->getHasJoinedChannel() == false) {
irc_cmd_user_mode (session, "+i");
irc_cmd_msg (session, params[0], "MG Bot says hello!");
ctx->setHasJoinedChannel(true);
ctx->GetIRCConnectedNickList(ctx->getArgs()[2],true);
}
else {
char realNick[128]="";
irc_target_get_nick(origin,&realNick[0],127);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: user joined channel realNick [%s] origin [%s]\n", realNick,origin);
IRCThread::eventData.push_back(realNick);
}
IRCThread::isConnected = true;
bool foundNick = false;
MutexSafeWrapper safeMutex(ctx->getMutexNickList());
std::vector<string> nickList = ctx->getCachedNickList();
for(unsigned int i = 0;
i < nickList.size(); ++i) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: lookingfor match [%s] realNick [%s]\n", nickList[i].c_str(),realNick);
if(nickList[i] == realNick) {
foundNick = true;
break;
}
}
if(foundNick == false) {
nickList.push_back(realNick);
}
}
}
}
void event_connect (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) {
irc_ctx_t * ctx = (irc_ctx_t *) irc_get_ctx (session);
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
dump_event (session, event, origin, params, count);
irc_cmd_join (session, ctx->channel.c_str(), 0);
if(ctx != NULL) {
irc_cmd_join (session, ctx->getChannel().c_str(), 0);
}
}
void event_privmsg (irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count) {
@ -179,8 +198,11 @@ void event_channel(irc_session_t * session, const char * event, const char * ori
irc_target_get_nick(origin, nickbuf, sizeof(nickbuf));
if(IRCThread::callbackObj) {
IRCThread::callbackObj->IRC_CallbackEvent(nickbuf, params, count);
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
if(ctx != NULL) {
if(ctx->getCallbackObj() != NULL) {
ctx->getCallbackObj()->IRC_CallbackEvent(nickbuf, params, count);
}
}
if ( !strcmp (params[1], "quit") )
@ -247,7 +269,6 @@ void event_leave(irc_session_t *session, const char *event, const char *origin,
sprintf (buf, "%s", event);
// someone left the channel.
if(origin) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: user left channel [%s]\n", origin);
@ -256,15 +277,21 @@ void event_leave(irc_session_t *session, const char *event, const char *origin,
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: user left channel realNick [%s]\n", realNick);
for(unsigned int i = 0; i < IRCThread::eventData.size(); ++i) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: lookingfor match [%s] realNick [%s]\n", IRCThread::eventData[i].c_str(),realNick);
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
if(ctx != NULL) {
MutexSafeWrapper safeMutex(ctx->getMutexNickList());
std::vector<string> &nickList = ctx->getCachedNickList();
for(unsigned int i = 0;
i < nickList.size(); ++i) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: lookingfor match [%s] realNick [%s]\n", nickList[i].c_str(),realNick);
if(IRCThread::eventData[i] == realNick) {
IRCThread::eventData.erase(IRCThread::eventData.begin() + i);
if(nickList[i] == realNick) {
nickList.erase(nickList.begin() + i);
break;
}
}
}
}
dump_event (session, buf, origin, params, count);
}
@ -282,23 +309,33 @@ void event_numeric(irc_session_t * session, unsigned int event, const char * ori
case LIBIRC_RFC_RPL_NAMREPLY :
{
if(event == LIBIRC_RFC_RPL_NAMREPLY) {
IRCThread::eventData.clear();
std::vector<string> nickList;
if(count >= 4) {
for(unsigned int i = 3; i < count && params[i]; ++i) {
vector<string> tokens;
Tokenize(params[i],tokens," ");
for(unsigned int j = 0; j < tokens.size(); ++j) {
IRCThread::eventData.push_back(tokens[j]);
nickList.push_back(tokens[j]);
}
}
}
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
if(ctx != NULL) {
MutexSafeWrapper safeMutex(ctx->getMutexNickList());
ctx->setCachedNickList(nickList);
}
}
break;
}
case LIBIRC_RFC_RPL_ENDOFNAMES:
IRCThread::eventDataDone = true;
{
IRCThread *ctx = (IRCThread *)irc_get_ctx(session);
if(ctx != NULL) {
ctx->setEventDataDone(true);
}
}
break;
}
@ -309,9 +346,10 @@ IRCThread::IRCThread(const std::vector<string> &argv, IRCCallbackInterface *call
this->argv = argv;
this->callbackObj = callbackObj;
ircSession = NULL;
IRCThread::eventData.clear();
IRCThread::eventDataDone = false;
isConnected = false;
eventData.clear();
eventDataDone = false;
hasJoinedChannel = false;
lastNickListUpdate = time(NULL);
}
void IRCThread::signalQuit() {
@ -322,7 +360,7 @@ void IRCThread::signalQuit() {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: Quitting Channel\n");
irc_cmd_quit(ircSession, "MG Bot is closing!");
BaseThread::signalQuit();
isConnected = false;
hasJoinedChannel = false;
}
}
@ -334,30 +372,52 @@ bool IRCThread::shutdownAndWait() {
}
void IRCThread::SendIRCCmdMessage(string target, string msg) {
if(ircSession != NULL && isConnected == true) {
if(ircSession != NULL && hasJoinedChannel == true) {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC command to [%s] cmd [%s]\n",__FILE__,__FUNCTION__,__LINE__,target.c_str(),msg.c_str());
int ret = irc_cmd_msg (ircSession, target.c_str(), msg.c_str());
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC command to [%s] cmd [%s] ret = %d\n",__FILE__,__FUNCTION__,__LINE__,target.c_str(),msg.c_str(),ret);
}
}
std::vector<string> IRCThread::GetIRCConnectedNickList(string target) {
IRCThread::eventDataDone = false;
//IRCThread::eventData.clear();
if(ircSession != NULL && isConnected == true) {
std::vector<string> IRCThread::GetIRCConnectedNickList(string target, bool waitForCompletion) {
eventDataDone = false;
if(ircSession != NULL && hasJoinedChannel == true) {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC nick list command to [%s]\n",__FILE__,__FUNCTION__,__LINE__,target.c_str());
int ret = irc_cmd_names (ircSession, target.c_str());
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] sending IRC nick list command to [%s] ret = %d\n",__FILE__,__FUNCTION__,__LINE__,target.c_str(),ret);
if(waitForCompletion == true) {
for(time_t tElapsed = time(NULL);
IRCThread::eventDataDone == false &&
eventDataDone == false &&
this->getQuitStatus() == false &&
difftime(time(NULL),tElapsed) <= 5;) {
sleep(50);
}
}
}
return IRCThread::eventData;
MutexSafeWrapper safeMutex(&mutexNickList);
std::vector<string> nickList = eventData;
safeMutex.ReleaseLock();
return nickList;
}
bool IRCThread::isConnected() {
bool ret = false;
if(ircSession != NULL) {
ret = irc_is_connected(ircSession);
}
return ret;
}
std::vector<string> IRCThread::getNickList() {
MutexSafeWrapper safeMutex(&mutexNickList);
std::vector<string> nickList = eventData;
safeMutex.ReleaseLock();
return nickList;
}
void IRCThread::execute() {
@ -373,7 +433,6 @@ void IRCThread::execute() {
try {
irc_callbacks_t callbacks;
irc_ctx_t ctx;
ircSession=NULL;
if(argv.size() != 3) {
@ -414,15 +473,14 @@ void IRCThread::execute() {
return;
}
ctx.channel = argv[2];
ctx.nick = argv[1];
this->channel = argv[2];
this->nick = argv[1];
irc_set_ctx(ircSession, this);
if(this->getQuitStatus() == true) {
return;
}
irc_set_ctx(ircSession, &ctx);
if(irc_connect(ircSession, argv[0].c_str(), 6667, 0, argv[1].c_str(), 0, 0)) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC Could not connect: %s\n", irc_strerror (irc_errno(ircSession)));
return;
@ -432,8 +490,6 @@ void IRCThread::execute() {
return;
}
GetIRCConnectedNickList(argv[2]);
if(this->getQuitStatus() == true) {
return;
}