Modernize client code (#6250)

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

diff --git a/src/chat.h b/src/chat.h
index db4146d35ba8ffd59dd6d2cf0159959a90a727b2..6a6b7c26ff5d93aebd85d4ec3f632ccb3390616c 100644 (file)
--- a/src/chat.h
+++ b/src/chat.h
@@ -20,24 +20,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CHAT_HEADER
 #define CHAT_HEADER
 
-#include "irrlichttypes.h"
 #include <string>
 #include <vector>
 #include <list>
 
+#include "irrlichttypes.h"
+#include "util/enriched_string.h"
+
 // Chat console related classes
 
 struct ChatLine
 {
        // age in seconds
-       f32 age;
+       f32 age = 0.0f;
        // 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):
+               name(a_name),
+               text(a_text)
+       {
+       }
 
-       ChatLine(std::wstring a_name, std::wstring a_text):
-               age(0.0),
+       ChatLine(const EnrichedString &a_name, const EnrichedString &a_text):
                name(a_name),
                text(a_text)
        {
@@ -47,7 +54,7 @@ struct ChatLine
 struct ChatFormattedFragment
 {
        // text string
-       std::wstring text;
+       EnrichedString text;
        // starting column
        u32 column;
        // formatting
@@ -77,8 +84,6 @@ public:
 
        // Get number of lines currently in buffer.
        u32 getLineCount() const;
-       // Get scrollback size, maximum number of lines in buffer.
-       u32 getScrollback() const;
        // Get reference to i-th chat line.
        const ChatLine& getLine(u32 index) const;
 
@@ -125,11 +130,11 @@ private:
        std::vector<ChatLine> m_unformatted;
 
        // Number of character columns in console
-       u32 m_cols;
+       u32 m_cols = 0;
        // Number of character rows in console
-       u32 m_rows;
+       u32 m_rows = 0;
        // Scroll position (console's top line index into m_formatted)
-       s32 m_scroll;
+       s32 m_scroll = 0;
        // Array of formatted lines
        std::vector<ChatFormattedLine> m_formatted;
        // Empty formatted line, for error returns
@@ -139,7 +144,7 @@ private:
 class ChatPrompt
 {
 public:
-       ChatPrompt(std::wstring prompt, u32 history_limit);
+       ChatPrompt(const std::wstring &prompt, u32 history_limit);
        ~ChatPrompt();
 
        // Input character or string
@@ -153,8 +158,7 @@ public:
        std::wstring getLine() const { return m_line; }
 
        // Get section of line that is currently selected
-       std::wstring getSelection() const
-               { return m_line.substr(m_cursor, m_cursor_len); }
+       std::wstring getSelection() const { return m_line.substr(m_cursor, m_cursor_len); }
 
        // Clear the current line
        void clear();
@@ -219,29 +223,29 @@ protected:
 
 private:
        // Prompt prefix
-       std::wstring m_prompt;
+       std::wstring m_prompt = L"";
        // Currently edited line
-       std::wstring m_line;
+       std::wstring m_line = L"";
        // History buffer
        std::vector<std::wstring> m_history;
        // History index (0 <= m_history_index <= m_history.size())
-       u32 m_history_index;
+       u32 m_history_index = 0;
        // Maximum number of history entries
        u32 m_history_limit;
 
        // Number of columns excluding columns reserved for the prompt
-       s32 m_cols;
+       s32 m_cols = 0;
        // Start of visible portion (index into m_line)
-       s32 m_view;
+       s32 m_view = 0;
        // Cursor (index into m_line)
-       s32 m_cursor;
+       s32 m_cursor = 0;
        // Cursor length (length of selected portion of line)
-       s32 m_cursor_len;
+       s32 m_cursor_len = 0;
 
        // Last nick completion start (index into m_line)
-       s32 m_nick_completion_start;
+       s32 m_nick_completion_start = 0;
        // Last nick completion start (index into m_line)
-       s32 m_nick_completion_end;
+       s32 m_nick_completion_end = 0;
 };
 
 class ChatBackend
@@ -260,7 +264,7 @@ public:
        // Get the recent messages buffer
        ChatBuffer& getRecentBuffer();
        // Concatenate all recent messages
-       std::wstring getRecentChat();
+       EnrichedString getRecentChat();
        // Get the console prompt
        ChatPrompt& getPrompt();