From 81fd600ac9a941b1ee06e41d322399d19fc4dcaa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 5 Apr 2011 04:38:10 +0300 Subject: Add custom autocomplate list from file customwords.txt --- src/gui/chatwindow.cpp | 36 ++++++++++++++++++++++++++++++++---- src/gui/chatwindow.h | 8 ++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 1e530ecba..0b9945370 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -190,6 +190,7 @@ ChatWindow::ChatWindow(): fillCommands(); initTradeFilter(); + loadCustomList(); } ChatWindow::~ChatWindow() @@ -1093,12 +1094,14 @@ void ChatWindow::autoComplete() if (newName == "" && spellManager) newName = spellManager->autoComplete(name); if (newName == "") - newName = autoCompleteCommands(name); + newName = autoComplete(name, &mCommands); if (newName == "" && actorSpriteManager) { actorSpriteManager->getMobNames(nameList); newName = autoComplete(nameList, name); } + if (newName == "") + newName = autoComplete(name, &mCustomWords); if (newName != "") { @@ -1149,12 +1152,15 @@ std::string ChatWindow::autoComplete(std::vector &names, return newName; } -std::string ChatWindow::autoCompleteCommands(std::string partName) +std::string ChatWindow::autoComplete(std::string partName, History *words) { - Commands::iterator i = mCommands.begin(); + if (!words) + return ""; + + Commands::iterator i = words->begin(); std::vector nameList; - while (i != mCommands.end()) + while (i != words->end()) { std::string line = *i; std::string::size_type pos = line.find(partName, 0); @@ -1414,3 +1420,25 @@ std::string ChatWindow::doReplace(const std::string &msg) replaceSpecialChars(str); return str; } + +void ChatWindow::loadCustomList() +{ + std::ifstream listFile; + struct stat statbuf; + + std::string listName = Client::getServerConfigDirectory() + + "/customwords.txt"; + + if (!stat(listName.c_str(), &statbuf) && S_ISREG(statbuf.st_mode)) + { + listFile.open(listName.c_str(), std::ios::in); + char line[101]; + while (listFile.getline(line, 100)) + { + std::string str = line; + if (!str.empty()) + mCustomWords.push_back(str); + } + listFile.close(); + } +} diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 97f586442..1b10405d4 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -242,6 +242,8 @@ class ChatWindow : public Window, void saveState(); + void loadCustomList(); + std::string doReplace(const std::string &msg); protected: @@ -249,6 +251,8 @@ class ChatWindow : public Window, friend class WhisperTab; friend class PopupMenu; + typedef std::list History; + /** Remove the given tab from the window */ void removeTab(ChatTab *tab); @@ -265,7 +269,7 @@ class ChatWindow : public Window, std::string autoCompleteHistory(std::string partName); - std::string autoCompleteCommands(std::string partName); + std::string autoComplete(std::string partName, History *words); std::string autoComplete(std::vector &names, std::string partName) const; @@ -294,7 +298,6 @@ class ChatWindow : public Window, /** Manage whisper tabs */ TabMap mWhispers; - typedef std::list History; typedef History::iterator HistoryIterator; History mHistory; /**< Command history. */ HistoryIterator mCurHist; /**< History iterator. */ @@ -302,6 +305,7 @@ class ChatWindow : public Window, typedef std::list Commands; typedef Commands::iterator CommandsIterator; History mCommands; /**< Command list. */ + History mCustomWords; bool mReturnToggles; /**< Marks whether toggles the chat log or not */ -- cgit v1.2.3-70-g09d2