[Complex Test Layouts] Change `String` to use UTF-32 encoding on all platforms.

6 files changed, 66 insertions, 66 deletions

diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index f49acc1b96..9f3db2ba20 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -235,8 +235,8 @@ void Label::_notification(int p_what) {
 					float x_ofs_shadow = x_ofs;
 					for (int i = 0; i < from->word_len; i++) {
 						if (visible_chars < 0 || chars_total_shadow < visible_chars) {
-							CharType c = xl_text[i + pos];
-							CharType n = xl_text[i + pos + 1];
+							char32_t c = xl_text[i + pos];
+							char32_t n = xl_text[i + pos + 1];
 							if (uppercase) {
 								c = String::char_uppercase(c);
 								n = String::char_uppercase(n);
@@ -255,8 +255,8 @@ void Label::_notification(int p_what) {
 				}
 				for (int i = 0; i < from->word_len; i++) {
 					if (visible_chars < 0 || chars_total < visible_chars) {
-						CharType c = xl_text[i + pos];
-						CharType n = xl_text[i + pos + 1];
+						char32_t c = xl_text[i + pos];
+						char32_t n = xl_text[i + pos + 1];
 						if (uppercase) {
 							c = String::char_uppercase(c);
 							n = String::char_uppercase(n);
@@ -308,7 +308,7 @@ int Label::get_longest_line_width() const {
 	real_t line_width = 0;
 
 	for (int i = 0; i < xl_text.size(); i++) {
-		CharType current = xl_text[i];
+		char32_t current = xl_text[i];
 		if (uppercase) {
 			current = String::char_uppercase(current);
 		}
@@ -390,7 +390,7 @@ void Label::regenerate_word_cache() {
 	WordCache *last = nullptr;
 
 	for (int i = 0; i <= xl_text.length(); i++) {
-		CharType current = i < xl_text.length() ? xl_text[i] : L' '; //always a space at the end, so the algo works
+		char32_t current = i < xl_text.length() ? xl_text[i] : L' '; //always a space at the end, so the algo works
 
 		if (uppercase) {
 			current = String::char_uppercase(current);
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 14167531a5..8b95acff70 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -42,7 +42,7 @@
 #include "editor/editor_settings.h"
 #endif
 #include "scene/main/window.h"
-static bool _is_text_char(CharType c) {
+static bool _is_text_char(char32_t c) {
 	return !is_symbol(c);
 }
 
@@ -582,7 +582,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
 				if (k->get_unicode() >= 32 && k->get_keycode() != KEY_DELETE) {
 					if (editable) {
 						selection_delete();
-						CharType ucodestr[2] = { (CharType)k->get_unicode(), 0 };
+						char32_t ucodestr[2] = { (char32_t)k->get_unicode(), 0 };
 						int prev_len = text.length();
 						append_at_cursor(ucodestr);
 						if (text.length() != prev_len) {
@@ -807,8 +807,8 @@ void LineEdit::_notification(int p_what) {
 								break;
 							}
 
-							CharType cchar = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs];
-							CharType next = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs + 1];
+							char32_t cchar = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs];
+							char32_t next = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs + 1];
 							int im_char_width = font->get_char_size(cchar, next).width;
 
 							if ((x_ofs + im_char_width) > ofs_max) {
@@ -830,8 +830,8 @@ void LineEdit::_notification(int p_what) {
 					}
 				}
 
-				CharType cchar = (pass && !text.empty()) ? secret_character[0] : t[char_ofs];
-				CharType next = (pass && !text.empty()) ? secret_character[0] : t[char_ofs + 1];
+				char32_t cchar = (pass && !text.empty()) ? secret_character[0] : t[char_ofs];
+				char32_t next = (pass && !text.empty()) ? secret_character[0] : t[char_ofs + 1];
 				int char_width = font->get_char_size(cchar, next).width;
 
 				// End of widget, break.
@@ -870,8 +870,8 @@ void LineEdit::_notification(int p_what) {
 							break;
 						}
 
-						CharType cchar = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs];
-						CharType next = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs + 1];
+						char32_t cchar = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs];
+						char32_t next = (pass && !text.empty()) ? secret_character[0] : ime_text[ofs + 1];
 						int im_char_width = font->get_char_size(cchar, next).width;
 
 						if ((x_ofs + im_char_width) > ofs_max) {
diff --git a/scene/gui/rich_text_effect.h b/scene/gui/rich_text_effect.h
index 77c82aa780..a5401f7eaa 100644
--- a/scene/gui/rich_text_effect.h
+++ b/scene/gui/rich_text_effect.h
@@ -59,7 +59,7 @@ public:
 	bool visibility;
 	Point2 offset;
 	Color color;
-	CharType character;
+	char32_t character;
 	float elapsed_time;
 	Dictionary environment;
 
@@ -79,7 +79,7 @@ public:
 	Color get_color() { return color; }
 	void set_color(Color p_color) { color = p_color; }
 	int get_character() { return (int)character; }
-	void set_character(int p_char) { character = (CharType)p_char; }
+	void set_character(int p_char) { character = (char32_t)p_char; }
 	Dictionary get_environment() { return environment; }
 	void set_environment(Dictionary p_environment) { environment = p_environment; }
 };
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 29337e20f3..c62fd24a5e 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -354,8 +354,8 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
 					font = p_base_font;
 				}
 
-				const CharType *c = text->text.c_str();
-				const CharType *cf = c;
+				const char32_t *c = text->text.get_data();
+				const char32_t *cf = c;
 				int ascent = font->get_ascent();
 				int descent = font->get_descent();
 
@@ -461,7 +461,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
 								bool selected = false;
 								Color fx_color = Color(color);
 								Point2 fx_offset;
-								CharType fx_char = c[i];
+								char32_t fx_char = c[i];
 
 								if (selection.active) {
 									int cofs = (&c[i]) - cf;
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index d6d8e74748..1d732bec5b 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -44,23 +44,23 @@
 
 #define TAB_PIXELS
 
-inline bool _is_symbol(CharType c) {
+inline bool _is_symbol(char32_t c) {
 	return is_symbol(c);
 }
 
-static bool _is_text_char(CharType c) {
+static bool _is_text_char(char32_t c) {
 	return !is_symbol(c);
 }
 
-static bool _is_whitespace(CharType c) {
+static bool _is_whitespace(char32_t c) {
 	return c == '\t' || c == ' ';
 }
 
-static bool _is_char(CharType c) {
+static bool _is_char(char32_t c) {
 	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
 }
 
-static bool _is_pair_right_symbol(CharType c) {
+static bool _is_pair_right_symbol(char32_t c) {
 	return c == '"' ||
 		   c == '\'' ||
 		   c == ')' ||
@@ -68,7 +68,7 @@ static bool _is_pair_right_symbol(CharType c) {
 		   c == '}';
 }
 
-static bool _is_pair_left_symbol(CharType c) {
+static bool _is_pair_left_symbol(char32_t c) {
 	return c == '"' ||
 		   c == '\'' ||
 		   c == '(' ||
@@ -76,11 +76,11 @@ static bool _is_pair_left_symbol(CharType c) {
 		   c == '{';
 }
 
-static bool _is_pair_symbol(CharType c) {
+static bool _is_pair_symbol(char32_t c) {
 	return _is_pair_left_symbol(c) || _is_pair_right_symbol(c);
 }
 
-static CharType _get_right_pair_symbol(CharType c) {
+static char32_t _get_right_pair_symbol(char32_t c) {
 	if (c == '"') {
 		return '"';
 	}
@@ -119,7 +119,7 @@ void TextEdit::Text::_update_line_cache(int p_line) const {
 	int w = 0;
 
 	int len = text[p_line].data.length();
-	const CharType *str = text[p_line].data.c_str();
+	const char32_t *str = text[p_line].data.get_data();
 
 	// Update width.
 
@@ -214,7 +214,7 @@ void TextEdit::Text::remove(int p_at) {
 	text.remove(p_at);
 }
 
-int TextEdit::Text::get_char_width(CharType c, CharType next_c, int px) const {
+int TextEdit::Text::get_char_width(char32_t c, char32_t next_c, int px) const {
 	int tab_w = font->get_char_size(' ').width * indent_size;
 	int w = 0;
 
@@ -654,8 +654,8 @@ void TextEdit::_notification(int p_what) {
 			if (brace_matching_enabled && cursor.line >= 0 && cursor.line < text.size() && cursor.column >= 0) {
 				if (cursor.column < text[cursor.line].length()) {
 					// Check for open.
-					CharType c = text[cursor.line][cursor.column];
-					CharType closec = 0;
+					char32_t c = text[cursor.line][cursor.column];
+					char32_t closec = 0;
 
 					if (c == '[') {
 						closec = ']';
@@ -671,10 +671,10 @@ void TextEdit::_notification(int p_what) {
 						for (int i = cursor.line; i < text.size(); i++) {
 							int from = i == cursor.line ? cursor.column + 1 : 0;
 							for (int j = from; j < text[i].length(); j++) {
-								CharType cc = text[i][j];
+								char32_t cc = text[i][j];
 								// Ignore any brackets inside a string.
 								if (cc == '"' || cc == '\'') {
-									CharType quotation = cc;
+									char32_t quotation = cc;
 									do {
 										j++;
 										if (!(j < text[i].length())) {
@@ -720,8 +720,8 @@ void TextEdit::_notification(int p_what) {
 				}
 
 				if (cursor.column > 0) {
-					CharType c = text[cursor.line][cursor.column - 1];
-					CharType closec = 0;
+					char32_t c = text[cursor.line][cursor.column - 1];
+					char32_t closec = 0;
 
 					if (c == ']') {
 						closec = '[';
@@ -737,10 +737,10 @@ void TextEdit::_notification(int p_what) {
 						for (int i = cursor.line; i >= 0; i--) {
 							int from = i == cursor.line ? cursor.column - 2 : text[i].length() - 1;
 							for (int j = from; j >= 0; j--) {
-								CharType cc = text[i][j];
+								char32_t cc = text[i][j];
 								// Ignore any brackets inside a string.
 								if (cc == '"' || cc == '\'') {
-									CharType quotation = cc;
+									char32_t quotation = cc;
 									do {
 										j--;
 										if (!(j >= 0)) {
@@ -1303,8 +1303,8 @@ void TextEdit::_notification(int p_what) {
 										break;
 									}
 
-									CharType cchar = ime_text[ofs];
-									CharType next = ime_text[ofs + 1];
+									char32_t cchar = ime_text[ofs];
+									char32_t next = ime_text[ofs + 1];
 									int im_char_width = cache.font->get_char_size(cchar, next).width;
 
 									if ((char_ofs + char_margin + im_char_width) >= xmargin_end) {
@@ -1399,8 +1399,8 @@ void TextEdit::_notification(int p_what) {
 									break;
 								}
 
-								CharType cchar = ime_text[ofs];
-								CharType next = ime_text[ofs + 1];
+								char32_t cchar = ime_text[ofs];
+								char32_t next = ime_text[ofs + 1];
 								int im_char_width = cache.font->get_char_size(cchar, next).width;
 
 								if ((char_ofs + char_margin + im_char_width) >= xmargin_end) {
@@ -1661,12 +1661,12 @@ void TextEdit::_notification(int p_what) {
 	}
 }
 
-void TextEdit::_consume_pair_symbol(CharType ch) {
+void TextEdit::_consume_pair_symbol(char32_t ch) {
 	int cursor_position_to_move = cursor_get_column() + 1;
 
-	CharType ch_single[2] = { ch, 0 };
-	CharType ch_single_pair[2] = { _get_right_pair_symbol(ch), 0 };
-	CharType ch_pair[3] = { ch, _get_right_pair_symbol(ch), 0 };
+	char32_t ch_single[2] = { ch, 0 };
+	char32_t ch_single_pair[2] = { _get_right_pair_symbol(ch), 0 };
+	char32_t ch_pair[3] = { ch, _get_right_pair_symbol(ch), 0 };
 
 	if (is_selection_active()) {
 		int new_column, new_line;
@@ -1771,8 +1771,8 @@ void TextEdit::_consume_backspace_for_pair_symbol(int prev_line, int prev_column
 	bool remove_right_symbol = false;
 
 	if (cursor.column < text[cursor.line].length() && cursor.column > 0) {
-		CharType left_char = text[cursor.line][cursor.column - 1];
-		CharType right_char = text[cursor.line][cursor.column];
+		char32_t left_char = text[cursor.line][cursor.column - 1];
+		char32_t right_char = text[cursor.line][cursor.column];
 
 		if (right_char == _get_right_pair_symbol(left_char)) {
 			remove_right_symbol = true;
@@ -2540,7 +2540,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 				if (k->get_unicode() > 32) {
 					_reset_caret_blink_timer();
 
-					const CharType chr[2] = { (CharType)k->get_unicode(), 0 };
+					const char32_t chr[2] = { (char32_t)k->get_unicode(), 0 };
 					if (auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
 						_consume_pair_symbol(chr[0]);
 					} else {
@@ -2784,7 +2784,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 							}
 
 							// No need to move the brace below if we are not taking the text with us.
-							char closing_char = _get_right_pair_symbol(indent_char);
+							char32_t closing_char = _get_right_pair_symbol(indent_char);
 							if ((closing_char != 0) && (closing_char == text[cursor.line][cursor.column]) && !k->get_command()) {
 								brace_indent = true;
 								ins += "\n" + ins.substr(1, ins.length() - 2);
@@ -3312,7 +3312,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 						// Compute whitespace symbols seq length.
 						int current_line_whitespace_len = 0;
 						while (current_line_whitespace_len < text[cursor.line].length()) {
-							CharType c = text[cursor.line][current_line_whitespace_len];
+							char32_t c = text[cursor.line][current_line_whitespace_len];
 							if (c != '\t' && c != ' ') {
 								break;
 							}
@@ -3458,7 +3458,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 
 					int current_line_whitespace_len = 0;
 					while (current_line_whitespace_len < text[cursor.line].length()) {
-						CharType c = text[cursor.line][current_line_whitespace_len];
+						char32_t c = text[cursor.line][current_line_whitespace_len];
 						if (c != '\t' && c != ' ')
 							break;
 						current_line_whitespace_len++;
@@ -3624,7 +3624,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
 					}
 				}
 
-				const CharType chr[2] = { (CharType)k->get_unicode(), 0 };
+				const char32_t chr[2] = { (char32_t)k->get_unicode(), 0 };
 
 				if (completion_hint != "" && k->get_unicode() == ')') {
 					completion_hint = "";
@@ -4251,7 +4251,7 @@ Vector<String> TextEdit::get_wrap_rows_text(int p_line) const {
 	}
 
 	while (col < line_text.length()) {
-		CharType c = line_text[col];
+		char32_t c = line_text[col];
 		int w = text.get_char_width(c, line_text[col + 1], px + word_px);
 
 		int indent_ofs = (cur_wrap_index != 0 ? tab_offset_px : 0);
@@ -6115,9 +6115,9 @@ void TextEdit::_confirm_completion() {
 
 	// When inserted into the middle of an existing string/method, don't add an unnecessary quote/bracket.
 	String line = text[cursor.line];
-	CharType next_char = line[cursor.column];
-	CharType last_completion_char = completion_current.insert_text[completion_current.insert_text.length() - 1];
-	CharType last_completion_char_display = completion_current.display[completion_current.display.length() - 1];
+	char32_t next_char = line[cursor.column];
+	char32_t last_completion_char = completion_current.insert_text[completion_current.insert_text.length() - 1];
+	char32_t last_completion_char_display = completion_current.display[completion_current.display.length() - 1];
 
 	if ((last_completion_char == '"' || last_completion_char == '\'') && (last_completion_char == next_char || last_completion_char_display == next_char)) {
 		_remove_text(cursor.line, cursor.column, cursor.line, cursor.column + 1);
@@ -6161,7 +6161,7 @@ void TextEdit::_cancel_completion() {
 	update();
 }
 
-static bool _is_completable(CharType c) {
+static bool _is_completable(char32_t c) {
 	return !_is_symbol(c) || c == '"' || c == '\'';
 }
 
@@ -6292,14 +6292,14 @@ void TextEdit::_update_completion_candidates() {
 
 			String display_lower = option.display.to_lower();
 
-			const CharType *ssq = &s[0];
-			const CharType *ssq_lower = &s_lower[0];
+			const char32_t *ssq = &s[0];
+			const char32_t *ssq_lower = &s_lower[0];
 
-			const CharType *tgt = &option.display[0];
-			const CharType *tgt_lower = &display_lower[0];
+			const char32_t *tgt = &option.display[0];
+			const char32_t *tgt_lower = &display_lower[0];
 
-			const CharType *ssq_last_tgt = nullptr;
-			const CharType *ssq_lower_last_tgt = nullptr;
+			const char32_t *ssq_last_tgt = nullptr;
+			const char32_t *ssq_lower_last_tgt = nullptr;
 
 			for (; *tgt; tgt++, tgt_lower++) {
 				if (*ssq == *tgt) {
@@ -6416,7 +6416,7 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const {
 	int beg, end;
 	if (select_word(s, col, beg, end)) {
 		bool inside_quotes = false;
-		CharType selected_quote = '\0';
+		char32_t selected_quote = '\0';
 		int qbegin = 0, qend = 0;
 		for (int i = 0; i < s.length(); i++) {
 			if (s[i] == '"' || s[i] == '\'') {
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index a6bc9963cc..70d7365d71 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -79,7 +79,7 @@ public:
 		void set_font(const Ref<Font> &p_font);
 		int get_line_width(int p_line) const;
 		int get_max_width(bool p_exclude_hidden = false) const;
-		int get_char_width(CharType c, CharType next_c, int px) const;
+		int get_char_width(char32_t c, char32_t next_c, int px) const;
 		void set_line_wrap_amount(int p_line, int p_wrap_amount) const;
 		int get_line_wrap_amount(int p_line) const;
 		void set(int p_line, const String &p_text);
@@ -488,7 +488,7 @@ protected:
 	void _gui_input(const Ref<InputEvent> &p_gui_input);
 	void _notification(int p_what);
 
-	void _consume_pair_symbol(CharType ch);
+	void _consume_pair_symbol(char32_t ch);
 	void _consume_backspace_for_pair_symbol(int prev_line, int prev_column);
 
 	static void _bind_methods();