Set acceleration only once in falling node

[minetest.git] / src / chat.cpp

diff --git a/src/chat.cpp b/src/chat.cpp
index 0bd5c16709bb54565f677e7d34123cd6af173608..495e3450b2d132d6203a383176ae551b5d5e31fa 100644 (file)
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -83,7 +83,7 @@ u32 ChatBuffer::getScrollback() const
 
 const ChatLine& ChatBuffer::getLine(u32 index) const
 {
-       assert(index < getLineCount());
+       assert(index < getLineCount()); // pre-condition
        return m_unformatted[index];
 }
 
@@ -107,7 +107,8 @@ void ChatBuffer::deleteOldest(u32 count)
                // keep m_formatted in sync
                if (del_formatted < m_formatted.size())
                {
-                       assert(m_formatted[del_formatted].first);
+
+                       sanity_check(m_formatted[del_formatted].first);
                        ++del_formatted;
                        while (del_formatted < m_formatted.size() &&
                                        !m_formatted[del_formatted].first)
@@ -151,7 +152,7 @@ void ChatBuffer::reformat(u32 cols, u32 rows)
        }
        else if (cols != m_cols || rows != m_rows)
        {
-               // TODO: Avoid reformatting ALL lines (even inivisble ones)
+               // TODO: Avoid reformatting ALL lines (even invisible ones)
                // each time the console size changes.
 
                // Find out the scroll position in *unformatted* lines
@@ -389,6 +390,7 @@ ChatPrompt::ChatPrompt(std::wstring prompt, u32 history_limit):
        m_cols(0),
        m_view(0),
        m_cursor(0),
+       m_cursor_len(0),
        m_nick_completion_start(0),
        m_nick_completion_end(0)
 {
@@ -407,20 +409,22 @@ void ChatPrompt::input(wchar_t ch)
        m_nick_completion_end = 0;
 }
 
-std::wstring ChatPrompt::submit()
+void ChatPrompt::input(const std::wstring &str)
+{
+       m_line.insert(m_cursor, str);
+       m_cursor += str.size();
+       clampView();
+       m_nick_completion_start = 0;
+       m_nick_completion_end = 0;
+}
+
+void ChatPrompt::addToHistory(std::wstring line)
 {
-       std::wstring line = m_line;
-       m_line.clear();
        if (!line.empty())
                m_history.push_back(line);
        if (m_history.size() > m_history_limit)
                m_history.erase(m_history.begin());
        m_history_index = m_history.size();
-       m_view = 0;
-       m_cursor = 0;
-       m_nick_completion_start = 0;
-       m_nick_completion_end = 0;
-       return line;
 }
 
 void ChatPrompt::clear()
@@ -432,13 +436,15 @@ void ChatPrompt::clear()
        m_nick_completion_end = 0;
 }
 
-void ChatPrompt::replace(std::wstring line)
+std::wstring ChatPrompt::replace(std::wstring line)
 {
+       std::wstring old_line = m_line;
        m_line =  line;
        m_view = m_cursor = line.size();
        clampView();
        m_nick_completion_start = 0;
        m_nick_completion_end = 0;
+       return old_line;
 }
 
 void ChatPrompt::historyPrev()
@@ -501,7 +507,7 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
                {
                        std::wstring completion = narrow_to_wide(*i);
                        if (prefix_start == 0)
-                               completion += L":";
+                               completion += L": ";
                        completions.push_back(completion);
                }
        }
@@ -531,7 +537,7 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
                        }
                }
        }
-       std::wstring replacement = completions[replacement_index] + L" ";
+       std::wstring replacement = completions[replacement_index];
        if (word_end < m_line.size() && isspace(word_end))
                ++word_end;
 
@@ -580,14 +586,12 @@ void ChatPrompt::cursorOperation(CursorOp op, CursorOpDir dir, CursorOpScope sco
        s32 length = m_line.size();
        s32 increment = (dir == CURSOROP_DIR_RIGHT) ? 1 : -1;
 
-       if (scope == CURSOROP_SCOPE_CHARACTER)
-       {
+       switch (scope) {
+       case CURSOROP_SCOPE_CHARACTER:
                new_cursor += increment;
-       }
-       else if (scope == CURSOROP_SCOPE_WORD)
-       {
-               if (increment > 0)
-               {
+               break;
+       case CURSOROP_SCOPE_WORD:
+               if (dir == CURSOROP_DIR_RIGHT) {
                        // skip one word to the right
                        while (new_cursor < length && isspace(m_line[new_cursor]))
                                new_cursor++;
@@ -595,39 +599,47 @@ void ChatPrompt::cursorOperation(CursorOp op, CursorOpDir dir, CursorOpScope sco
                                new_cursor++;
                        while (new_cursor < length && isspace(m_line[new_cursor]))
                                new_cursor++;
-               }
-               else
-               {
+               } else {
                        // skip one word to the left
                        while (new_cursor >= 1 && isspace(m_line[new_cursor - 1]))
                                new_cursor--;
                        while (new_cursor >= 1 && !isspace(m_line[new_cursor - 1]))
                                new_cursor--;
                }
-       }
-       else if (scope == CURSOROP_SCOPE_LINE)
-       {
+               break;
+       case CURSOROP_SCOPE_LINE:
                new_cursor += increment * length;
+               break;
+       case CURSOROP_SCOPE_SELECTION:
+               break;
        }
 
        new_cursor = MYMAX(MYMIN(new_cursor, length), 0);
 
-       if (op == CURSOROP_MOVE)
-       {
+       switch (op) {
+       case CURSOROP_MOVE:
                m_cursor = new_cursor;
-       }
-       else if (op == CURSOROP_DELETE)
-       {
-               if (new_cursor < old_cursor)
-               {
-                       m_line.erase(new_cursor, old_cursor - new_cursor);
-                       m_cursor = new_cursor;
+               m_cursor_len = 0;
+               break;
+       case CURSOROP_DELETE:
+               if (m_cursor_len > 0) { // Delete selected text first
+                       m_line.erase(m_cursor, m_cursor_len);
+               } else {
+                       m_cursor = MYMIN(new_cursor, old_cursor);
+                       m_line.erase(m_cursor, abs(new_cursor - old_cursor));
                }
-               else if (new_cursor > old_cursor)
-               {
-                       m_line.erase(old_cursor, new_cursor - old_cursor);
-                       m_cursor = old_cursor;
+               m_cursor_len = 0;
+               break;
+       case CURSOROP_SELECT:
+               if (scope == CURSOROP_SCOPE_LINE) {
+                       m_cursor = 0;
+                       m_cursor_len = length;
+               } else {
+                       m_cursor = MYMIN(new_cursor, old_cursor);
+                       m_cursor_len += abs(new_cursor - old_cursor);
+                       m_cursor_len = MYMIN(m_cursor_len, length - m_cursor);
                }
+               break;
        }
 
        clampView();
@@ -667,6 +679,9 @@ 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.atend())
@@ -765,5 +780,5 @@ void ChatBackend::scrollPageDown()
 
 void ChatBackend::scrollPageUp()
 {
-       m_console_buffer.scroll(-m_console_buffer.getRows());
+       m_console_buffer.scroll(-(s32)m_console_buffer.getRows());
 }