X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fchat.h;h=38727c6680a4bcd7f71b456079f90838471fb8f9;hb=67f97f8d3274e0e96a8f541a05a39f81dfec1a20;hp=5d26baf7bbdb247f09197bf52b5d74d5eacb2785;hpb=5e507c9829942c434a6f1ae7a4f3a488c7e50bef;p=oweals%2Fminetest.git diff --git a/src/chat.h b/src/chat.h index 5d26baf7b..38727c668 100644 --- a/src/chat.h +++ b/src/chat.h @@ -17,27 +17,33 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef CHAT_HEADER -#define CHAT_HEADER +#pragma once -#include "irrlichttypes.h" #include #include #include +#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 +53,7 @@ struct ChatLine struct ChatFormattedFragment { // text string - std::wstring text; + EnrichedString text; // starting column u32 column; // formatting @@ -66,7 +72,7 @@ class ChatBuffer { public: ChatBuffer(u32 scrollback); - ~ChatBuffer(); + ~ChatBuffer() = default; // Append chat line // Removes oldest chat line if scrollback size is reached @@ -77,8 +83,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 +129,11 @@ private: std::vector 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 m_formatted; // Empty formatted line, for error returns @@ -139,21 +143,27 @@ private: class ChatPrompt { public: - ChatPrompt(std::wstring prompt, u32 history_limit); - ~ChatPrompt(); + ChatPrompt(const std::wstring &prompt, u32 history_limit); + ~ChatPrompt() = default; // Input character or string void input(wchar_t ch); void input(const std::wstring &str); - // Submit, clear and return current line - std::wstring submit(); + // Add a string to the history + void addToHistory(std::wstring line); + + // Get current line + 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); } // 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(); @@ -169,10 +179,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 }; @@ -186,7 +199,8 @@ public: enum CursorOpScope { CURSOROP_SCOPE_CHARACTER, CURSOROP_SCOPE_WORD, - CURSOROP_SCOPE_LINE + CURSOROP_SCOPE_LINE, + CURSOROP_SCOPE_SELECTION }; // Cursor operation @@ -208,34 +222,36 @@ 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 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 = 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 { public: ChatBackend(); - ~ChatBackend(); + ~ChatBackend() = default; // Add chat message void addMessage(std::wstring name, std::wstring text); @@ -247,7 +263,7 @@ public: // Get the recent messages buffer ChatBuffer& getRecentBuffer(); // Concatenate all recent messages - std::wstring getRecentChat(); + EnrichedString getRecentChat(); // Get the console prompt ChatPrompt& getPrompt(); @@ -270,6 +286,3 @@ private: ChatBuffer m_recent_buffer; ChatPrompt m_prompt; }; - -#endif -