Optimize updateFastFaceRow processing by removing some TileSpec copy (#5678)

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

diff --git a/src/chat.h b/src/chat.h
index 8a40c7ccf58c37840249f004ddd2166c155132ef..5de676a2e02e9debb0489126885d4fcbd4c652c5 100644 (file)
--- a/src/chat.h
+++ b/src/chat.h
@@ -20,23 +20,32 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CHAT_HEADER
 #define CHAT_HEADER
 
-#include "irrlichttypes_bloated.h"
 #include <string>
 #include <vector>
 #include <list>
 
-// Chat console related classes, only used by the client
+#include "irrlichttypes.h"
+#include "util/enriched_string.h"
+
+// Chat console related classes
 
 struct ChatLine
 {
        // age in seconds
        f32 age;
        // name of sending player, or empty if sent by server
-       std::wstring name;
+       EnrichedString name;
        // message text
-       std::wstring text;
+       EnrichedString text;
+
+       ChatLine(const std::wstring &a_name, const std::wstring &a_text):
+               age(0.0),
+               name(a_name),
+               text(a_text)
+       {
+       }
 
-       ChatLine(std::wstring a_name, std::wstring a_text):
+       ChatLine(const EnrichedString &a_name, const EnrichedString &a_text):
                age(0.0),
                name(a_name),
                text(a_text)
@@ -47,7 +56,7 @@ struct ChatLine
 struct ChatFormattedFragment
 {
        // text string
-       std::wstring text;
+       EnrichedString text;
        // starting column
        u32 column;
        // formatting
@@ -123,7 +132,7 @@ private:
        u32 m_scrollback;
        // Array of unformatted chat lines
        std::vector<ChatLine> m_unformatted;
-       
+
        // Number of character columns in console
        u32 m_cols;
        // Number of character rows in console
@@ -139,20 +148,28 @@ private:
 class ChatPrompt
 {
 public:
-       ChatPrompt(std::wstring prompt, u32 history_limit);
+       ChatPrompt(const std::wstring &prompt, u32 history_limit);
        ~ChatPrompt();
 
-       // Input character
+       // Input character or string
        void input(wchar_t ch);
+       void input(const std::wstring &str);
+
+       // Add a string to the history
+       void addToHistory(std::wstring line);
+
+       // Get current line
+       std::wstring getLine() const { return m_line; }
 
-       // Submit, clear and return current line
-       std::wstring submit();
+       // Get section of line that is currently selected
+       std::wstring getSelection() const
+               { return m_line.substr(m_cursor, m_cursor_len); }
 
        // Clear the current line
        void clear();
 
        // Replace the current line with the given text
-       void replace(std::wstring line);
+       std::wstring replace(std::wstring line);
 
        // Select previous command from history
        void historyPrev();
@@ -160,7 +177,7 @@ public:
        void historyNext();
 
        // Nick completion
-       void nickCompletion(const std::list<std::wstring>& names, bool backwards);
+       void nickCompletion(const std::list<std::string>& names, bool backwards);
 
        // Update console size and reformat the visible portion of the prompt
        void reformat(u32 cols);
@@ -168,10 +185,13 @@ public:
        std::wstring getVisiblePortion() const;
        // Get cursor position (relative to visible portion). -1 if invalid
        s32 getVisibleCursorPosition() const;
+       // Get length of cursor selection
+       s32 getCursorLength() const { return m_cursor_len; }
 
        // Cursor operations
        enum CursorOp {
                CURSOROP_MOVE,
+               CURSOROP_SELECT,
                CURSOROP_DELETE
        };
 
@@ -185,7 +205,8 @@ public:
        enum CursorOpScope {
                CURSOROP_SCOPE_CHARACTER,
                CURSOROP_SCOPE_WORD,
-               CURSOROP_SCOPE_LINE
+               CURSOROP_SCOPE_LINE,
+               CURSOROP_SCOPE_SELECTION
        };
 
        // Cursor operation
@@ -212,7 +233,7 @@ private:
        std::wstring m_line;
        // History buffer
        std::vector<std::wstring> m_history;
-       // History index (0 <= m_history_index <= m_history.size()) 
+       // History index (0 <= m_history_index <= m_history.size())
        u32 m_history_index;
        // Maximum number of history entries
        u32 m_history_limit;
@@ -223,6 +244,8 @@ private:
        s32 m_view;
        // Cursor (index into m_line)
        s32 m_cursor;
+       // Cursor length (length of selected portion of line)
+       s32 m_cursor_len;
 
        // Last nick completion start (index into m_line)
        s32 m_nick_completion_start;
@@ -246,7 +269,7 @@ public:
        // Get the recent messages buffer
        ChatBuffer& getRecentBuffer();
        // Concatenate all recent messages
-       std::wstring getRecentChat();
+       EnrichedString getRecentChat();
        // Get the console prompt
        ChatPrompt& getPrompt();