Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / chat.cpp

diff --git a/src/chat.cpp b/src/chat.cpp
index 7a5196ed506bb307966f9aedb2f8b9af017e181d..ade3fefd3a42cbec629882d143bcb4906384eaa2 100644 (file)
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "chat.h"
 #include "debug.h"
+#include "config.h"
 #include "util/strfnd.h"
 #include <cctype>
 #include <sstream>
@@ -76,11 +77,6 @@ u32 ChatBuffer::getLineCount() const
        return m_unformatted.size();
 }
 
-u32 ChatBuffer::getScrollback() const
-{
-       return m_scrollback;
-}
-
 const ChatLine& ChatBuffer::getLine(u32 index) const
 {
        assert(index < getLineCount()); // pre-condition
@@ -97,6 +93,8 @@ void ChatBuffer::step(f32 dtime)
 
 void ChatBuffer::deleteOldest(u32 count)
 {
+       bool at_bottom = (m_scroll == getBottomScrollPos());
+
        u32 del_unformatted = 0;
        u32 del_formatted = 0;
 
@@ -120,6 +118,11 @@ void ChatBuffer::deleteOldest(u32 count)
 
        m_unformatted.erase(m_unformatted.begin(), m_unformatted.begin() + del_unformatted);
        m_formatted.erase(m_formatted.begin(), m_formatted.begin() + del_formatted);
+
+       if (at_bottom)
+               m_scroll = getBottomScrollPos();
+       else
+               scrollAbsolute(m_scroll - del_formatted);
 }
 
 void ChatBuffer::deleteByAge(f32 maxAge)
@@ -244,8 +247,7 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
        u32 hanging_indentation = 0;
 
        // Format the sender name and produce fragments
-       if (!line.name.empty())
-       {
+       if (!line.name.empty()) {
                temp_frag.text = L"<";
                temp_frag.column = 0;
                //temp_frag.bold = 0;
@@ -260,22 +262,20 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
                next_frags.push_back(temp_frag);
        }
 
+       std::wstring name_sanitized = line.name.c_str();
+
        // Choose an indentation level
-       if (line.name.empty())
-       {
+       if (line.name.empty()) {
                // Server messages
                hanging_indentation = 0;
-       }
-       else if (line.name.size() + 3 <= cols/2)
-       {
+       } else if (name_sanitized.size() + 3 <= cols/2) {
                // Names shorter than about half the console width
                hanging_indentation = line.name.size() + 3;
-       }
-       else
-       {
+       } else {
                // Very long names
                hanging_indentation = 2;
        }
+       //EnrichedString line_text(line.text);
 
        next_line.first = true;
        bool text_processing = false;
@@ -331,7 +331,7 @@ u32 ChatBuffer::formatChatLine(const ChatLine& line, u32 cols,
                        while (frag_length < remaining_in_input &&
                                        frag_length < remaining_in_output)
                        {
-                               if (isspace(line.text[in_pos + frag_length]))
+                               if (iswspace(line.text.getString()[in_pos + frag_length]))
                                        space_pos = frag_length;
                                ++frag_length;
                        }
@@ -381,7 +381,7 @@ s32 ChatBuffer::getBottomScrollPos() const
 
 
 
-ChatPrompt::ChatPrompt(std::wstring prompt, u32 history_limit):
+ChatPrompt::ChatPrompt(const std::wstring &prompt, u32 history_limit):
        m_prompt(prompt),
        m_line(L""),
        m_history(),
@@ -488,9 +488,9 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
        {
                // no previous nick completion is active
                prefix_start = prefix_end = m_cursor;
-               while (prefix_start > 0 && !isspace(m_line[prefix_start-1]))
+               while (prefix_start > 0 && !iswspace(m_line[prefix_start-1]))
                        --prefix_start;
-               while (prefix_end < m_line.size() && !isspace(m_line[prefix_end]))
+               while (prefix_end < m_line.size() && !iswspace(m_line[prefix_end]))
                        ++prefix_end;
                if (prefix_start == prefix_end)
                        return;
@@ -519,7 +519,7 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
        u32 replacement_index = 0;
        if (!initial)
        {
-               while (word_end < m_line.size() && !isspace(m_line[word_end]))
+               while (word_end < m_line.size() && !iswspace(m_line[word_end]))
                        ++word_end;
                std::wstring word = m_line.substr(prefix_start, word_end - prefix_start);
 
@@ -538,7 +538,7 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
                }
        }
        std::wstring replacement = completions[replacement_index];
-       if (word_end < m_line.size() && isspace(word_end))
+       if (word_end < m_line.size() && iswspace(m_line[word_end]))
                ++word_end;
 
        // replace existing word with replacement word,
@@ -593,17 +593,17 @@ void ChatPrompt::cursorOperation(CursorOp op, CursorOpDir dir, CursorOpScope sco
        case CURSOROP_SCOPE_WORD:
                if (dir == CURSOROP_DIR_RIGHT) {
                        // skip one word to the right
-                       while (new_cursor < length && isspace(m_line[new_cursor]))
+                       while (new_cursor < length && iswspace(m_line[new_cursor]))
                                new_cursor++;
-                       while (new_cursor < length && !isspace(m_line[new_cursor]))
+                       while (new_cursor < length && !iswspace(m_line[new_cursor]))
                                new_cursor++;
-                       while (new_cursor < length && isspace(m_line[new_cursor]))
+                       while (new_cursor < length && iswspace(m_line[new_cursor]))
                                new_cursor++;
                } else {
                        // skip one word to the left
-                       while (new_cursor >= 1 && isspace(m_line[new_cursor - 1]))
+                       while (new_cursor >= 1 && iswspace(m_line[new_cursor - 1]))
                                new_cursor--;
-                       while (new_cursor >= 1 && !isspace(m_line[new_cursor - 1]))
+                       while (new_cursor >= 1 && !iswspace(m_line[new_cursor - 1]))
                                new_cursor--;
                }
                break;
@@ -679,9 +679,6 @@ ChatBackend::~ChatBackend()
 
 void ChatBackend::addMessage(std::wstring name, std::wstring text)
 {
-       name = removeChatEscapes(name);
-       text = removeChatEscapes(text);
-
        // Note: A message may consist of multiple lines, for example the MOTD.
        WStrfnd fnd(text);
        while (!fnd.at_end())
@@ -725,19 +722,22 @@ ChatBuffer& ChatBackend::getRecentBuffer()
        return m_recent_buffer;
 }
 
-std::wstring ChatBackend::getRecentChat()
+EnrichedString ChatBackend::getRecentChat()
 {
-       std::wostringstream stream;
+       EnrichedString result;
        for (u32 i = 0; i < m_recent_buffer.getLineCount(); ++i)
        {
                const ChatLine& line = m_recent_buffer.getLine(i);
                if (i != 0)
-                       stream << L"\n";
-               if (!line.name.empty())
-                       stream << L"<" << line.name << L"> ";
-               stream << line.text;
+                       result += L"\n";
+               if (!line.name.empty()) {
+                       result += L"<";
+                       result += line.name;
+                       result += L"> ";
+               }
+               result += line.text;
        }
-       return stream.str();
+       return result;
 }
 
 ChatPrompt& ChatBackend::getPrompt()