projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CSM] Don't Load the package library (#6944)
[oweals/minetest.git]
/
src
/
chat.h
diff --git
a/src/chat.h
b/src/chat.h
index e39d97ec2a67252093df25ac978be1dba286471e..ef5a9d47a5b3c83fab9ef388e4f5f5eca101c944 100644
(file)
--- a/
src/chat.h
+++ b/
src/chat.h
@@
-17,27
+17,34
@@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef CHAT_HEADER
-#define CHAT_HEADER
+#pragma once
-#include "irrlichttypes.h"
#include <string>
#include <vector>
#include <list>
#include <string>
#include <vector>
#include <list>
-// Chat console related classes, only used by the client
+#include "irrlichttypes.h"
+#include "util/enriched_string.h"
+#include "settings.h"
+
+// Chat console related classes
struct ChatLine
{
// age in seconds
struct ChatLine
{
// age in seconds
- f32 age;
+ f32 age
= 0.0f
;
// name of sending player, or empty if sent by server
// name of sending player, or empty if sent by server
-
std::ws
tring name;
+
EnrichedS
tring name;
// message text
// 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)
{
name(a_name),
text(a_text)
{
@@
-47,7
+54,7
@@
struct ChatLine
struct ChatFormattedFragment
{
// text string
struct ChatFormattedFragment
{
// text string
-
std::ws
tring text;
+
EnrichedS
tring text;
// starting column
u32 column;
// formatting
// starting column
u32 column;
// formatting
@@
-66,7
+73,7
@@
class ChatBuffer
{
public:
ChatBuffer(u32 scrollback);
{
public:
ChatBuffer(u32 scrollback);
- ~ChatBuffer();
+ ~ChatBuffer()
= default
;
// Append chat line
// Removes oldest chat line if scrollback size is reached
// Append chat line
// Removes oldest chat line if scrollback size is reached
@@
-77,8
+84,6
@@
public:
// Get number of lines currently in buffer.
u32 getLineCount() const;
// 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;
// Get reference to i-th chat line.
const ChatLine& getLine(u32 index) const;
@@
-114,6
+119,7
@@
public:
u32 formatChatLine(const ChatLine& line, u32 cols,
std::vector<ChatFormattedLine>& destination) const;
u32 formatChatLine(const ChatLine& line, u32 cols,
std::vector<ChatFormattedLine>& destination) const;
+ void resize(u32 scrollback);
protected:
s32 getTopScrollPos() const;
s32 getBottomScrollPos() const;
protected:
s32 getTopScrollPos() const;
s32 getBottomScrollPos() const;
@@
-123,13
+129,13
@@
private:
u32 m_scrollback;
// Array of unformatted chat lines
std::vector<ChatLine> m_unformatted;
u32 m_scrollback;
// Array of unformatted chat lines
std::vector<ChatLine> m_unformatted;
-
+
// Number of character columns in console
// Number of character columns in console
- u32 m_cols;
+ u32 m_cols
= 0
;
// Number of character rows in console
// Number of character rows in console
- u32 m_rows;
+ u32 m_rows
= 0
;
// Scroll position (console's top line index into m_formatted)
// 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
// Array of formatted lines
std::vector<ChatFormattedLine> m_formatted;
// Empty formatted line, for error returns
@@
-139,20
+145,27
@@
private:
class ChatPrompt
{
public:
class ChatPrompt
{
public:
- ChatPrompt(
std::wstring
prompt, u32 history_limit);
- ~ChatPrompt();
+ ChatPrompt(
const std::wstring &
prompt, u32 history_limit);
+ ~ChatPrompt()
= default
;
- // Input character
+ // Input character
or string
void input(wchar_t ch);
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
// 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();
// Select previous command from history
void historyPrev();
@@
-168,10
+181,13
@@
public:
std::wstring getVisiblePortion() const;
// Get cursor position (relative to visible portion). -1 if invalid
s32 getVisibleCursorPosition() const;
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,
// Cursor operations
enum CursorOp {
CURSOROP_MOVE,
+ CURSOROP_SELECT,
CURSOROP_DELETE
};
CURSOROP_DELETE
};
@@
-185,7
+201,8
@@
public:
enum CursorOpScope {
CURSOROP_SCOPE_CHARACTER,
CURSOROP_SCOPE_WORD,
enum CursorOpScope {
CURSOROP_SCOPE_CHARACTER,
CURSOROP_SCOPE_WORD,
- CURSOROP_SCOPE_LINE
+ CURSOROP_SCOPE_LINE,
+ CURSOROP_SCOPE_SELECTION
};
// Cursor operation
};
// Cursor operation
@@
-207,34
+224,36
@@
protected:
private:
// Prompt prefix
private:
// Prompt prefix
- std::wstring m_prompt;
+ std::wstring m_prompt
= L""
;
// Currently edited line
// Currently edited line
- std::wstring m_line;
+ std::wstring m_line
= L""
;
// History buffer
std::vector<std::wstring> m_history;
// History buffer
std::vector<std::wstring> m_history;
- // History index (0 <= m_history_index <= m_history.size())
- u32 m_history_index;
+ // History index (0 <= m_history_index <= m_history.size())
+ u32 m_history_index
= 0
;
// Maximum number of history entries
u32 m_history_limit;
// Number of columns excluding columns reserved for the prompt
// 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)
// Start of visible portion (index into m_line)
- s32 m_view;
+ s32 m_view
= 0
;
// Cursor (index into m_line)
// 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)
// 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)
// Last nick completion start (index into m_line)
- s32 m_nick_completion_end;
+ s32 m_nick_completion_end
= 0
;
};
class ChatBackend
{
public:
ChatBackend();
};
class ChatBackend
{
public:
ChatBackend();
- ~ChatBackend();
+ ~ChatBackend()
= default
;
// Add chat message
void addMessage(std::wstring name, std::wstring text);
// Add chat message
void addMessage(std::wstring name, std::wstring text);
@@
-246,7
+265,7
@@
public:
// Get the recent messages buffer
ChatBuffer& getRecentBuffer();
// Concatenate all recent messages
// Get the recent messages buffer
ChatBuffer& getRecentBuffer();
// Concatenate all recent messages
-
std::wstring getRecentChat()
;
+
EnrichedString getRecentChat() const
;
// Get the console prompt
ChatPrompt& getPrompt();
// Get the console prompt
ChatPrompt& getPrompt();
@@
-264,11
+283,11
@@
public:
void scrollPageDown();
void scrollPageUp();
void scrollPageDown();
void scrollPageUp();
+ // Resize recent buffer based on settings
+ void applySettings();
+
private:
ChatBuffer m_console_buffer;
ChatBuffer m_recent_buffer;
ChatPrompt m_prompt;
};
private:
ChatBuffer m_console_buffer;
ChatBuffer m_recent_buffer;
ChatPrompt m_prompt;
};
-
-#endif
-