maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix primary clipboard warning

Browse source
This commit is contained in:
ConteZero 2021-10-20 21:25:09 +02:00
parent 8474bb0a3c
commit 8c48b4a7e0
7 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/DisplayServer.xml
View file

@ -819,6 +819,8 @@
</constant> </constant>
<constant name="FEATURE_SWAP_BUFFERS" value="17" enum="Feature"> <constant name="FEATURE_SWAP_BUFFERS" value="17" enum="Feature">
</constant> </constant>
<constant name="FEATURE_CLIPBOARD_PRIMARY" value="19" enum="Feature">
</constant>
<constant name="MOUSE_MODE_VISIBLE" value="0" enum="MouseMode"> <constant name="MOUSE_MODE_VISIBLE" value="0" enum="MouseMode">
Makes the mouse cursor visible if it is hidden. Makes the mouse cursor visible if it is hidden.
</constant> </constant>

1
platform/linuxbsd/display_server_x11.cpp
View file

@ -124,6 +124,7 @@ bool DisplayServerX11::has_feature(Feature p_feature) const {
#ifdef DBUS_ENABLED #ifdef DBUS_ENABLED
case FEATURE_KEEP_SCREEN_ON: case FEATURE_KEEP_SCREEN_ON:
#endif #endif
case FEATURE_CLIPBOARD_PRIMARY:
return true; return true;
default: { default: {
} }

8
scene/gui/line_edit.cpp
View file

@ -235,7 +235,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
return; return;
} }
if (is_middle_mouse_paste_enabled() && b->is_pressed() && b->get_button_index() == MOUSE_BUTTON_MIDDLE && is_editable()) { if (is_middle_mouse_paste_enabled() && b->is_pressed() && b->get_button_index() == MOUSE_BUTTON_MIDDLE && is_editable() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
String paste_buffer = DisplayServer::get_singleton()->clipboard_get_primary().strip_escapes(); String paste_buffer = DisplayServer::get_singleton()->clipboard_get_primary().strip_escapes();
deselect(); deselect();
@ -290,7 +290,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
selection.double_click = true; selection.double_click = true;
last_dblclk = 0; last_dblclk = 0;
caret_column = selection.begin; caret_column = selection.begin;
if (!pass) { if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(text); DisplayServer::get_singleton()->clipboard_set_primary(text);
} }
} else if (b->is_double_click()) { } else if (b->is_double_click()) {
@ -308,7 +308,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
break; break;
} }
} }
if (!pass) { if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(text.substr(selection.begin, selection.end - selection.begin)); DisplayServer::get_singleton()->clipboard_set_primary(text.substr(selection.begin, selection.end - selection.begin));
} }
} }
@ -328,7 +328,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
update(); update();
} else { } else {
if (selection.enabled && !pass && b->get_button_index() == MOUSE_BUTTON_LEFT) { if (selection.enabled && !pass && b->get_button_index() == MOUSE_BUTTON_LEFT && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(text.substr(selection.begin, selection.end - selection.begin)); DisplayServer::get_singleton()->clipboard_set_primary(text.substr(selection.begin, selection.end - selection.begin));
} }
if (!text.is_empty() && is_editable() && clear_button_enabled) { if (!text.is_empty() && is_editable() && clear_button_enabled) {

6
scene/gui/rich_text_label.cpp
View file

@ -1596,14 +1596,16 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
selection.to_char = words[i + 1]; selection.to_char = words[i + 1];
selection.active = true; selection.active = true;
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text()); if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
}
update(); update();
break; break;
} }
} }
} }
} else if (!b->is_pressed()) { } else if (!b->is_pressed()) {
if (selection.enabled) { if (selection.enabled && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text()); DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
} }
selection.click_item = nullptr; selection.click_item = nullptr;

16
scene/gui/text_edit.cpp
View file

@ -1534,7 +1534,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
update(); update();
} }
if (is_middle_mouse_paste_enabled() && mb->get_button_index() == MOUSE_BUTTON_MIDDLE) { if (is_middle_mouse_paste_enabled() && mb->get_button_index() == MOUSE_BUTTON_MIDDLE && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
paste_primary_clipboard(); paste_primary_clipboard();
} }
@ -1575,7 +1575,9 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
dragging_selection = false; dragging_selection = false;
can_drag_minimap = false; can_drag_minimap = false;
click_select_held->stop(); click_select_held->stop();
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text()); if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
}
} }
// Notify to show soft keyboard. // Notify to show soft keyboard.
@ -5167,7 +5169,7 @@ void TextEdit::_paste_internal() {
} }
void TextEdit::_paste_primary_clipboard_internal() { void TextEdit::_paste_primary_clipboard_internal() {
if (!is_editable()) { if (!is_editable() || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
return; return;
} }
@ -5520,7 +5522,9 @@ void TextEdit::_update_selection_mode_word() {
} }
} }
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text()); if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
}
update(); update();
@ -5549,7 +5553,9 @@ void TextEdit::_update_selection_mode_line() {
set_caret_column(0); set_caret_column(0);
select(selection.selecting_line, selection.selecting_column, line, col); select(selection.selecting_line, selection.selecting_column, line, col);
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text()); if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
}
update(); update();

1
servers/display_server.cpp
View file

@ -497,6 +497,7 @@ void DisplayServer::_bind_methods() {
BIND_ENUM_CONSTANT(FEATURE_NATIVE_ICON); BIND_ENUM_CONSTANT(FEATURE_NATIVE_ICON);
BIND_ENUM_CONSTANT(FEATURE_ORIENTATION); BIND_ENUM_CONSTANT(FEATURE_ORIENTATION);
BIND_ENUM_CONSTANT(FEATURE_SWAP_BUFFERS); BIND_ENUM_CONSTANT(FEATURE_SWAP_BUFFERS);
BIND_ENUM_CONSTANT(FEATURE_CLIPBOARD_PRIMARY);
BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE); BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE);
BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN); BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN);

1
servers/display_server.h
View file

@ -114,6 +114,7 @@ public:
FEATURE_ORIENTATION, FEATURE_ORIENTATION,
FEATURE_SWAP_BUFFERS, FEATURE_SWAP_BUFFERS,
FEATURE_KEEP_SCREEN_ON, FEATURE_KEEP_SCREEN_ON,
FEATURE_CLIPBOARD_PRIMARY,
}; };
virtual bool has_feature(Feature p_feature) const = 0; virtual bool has_feature(Feature p_feature) const = 0;