76 lines
3.0 KiB
C++
76 lines
3.0 KiB
C++
$NetBSD$
|
|
|
|
--- ui/views/controls/textfield/textfield.cc.orig 2020-07-15 18:56:49.000000000 +0000
|
|
+++ ui/views/controls/textfield/textfield.cc
|
|
@@ -64,7 +64,7 @@
|
|
#include "base/win/win_util.h"
|
|
#endif
|
|
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
#include "ui/base/ime/linux/text_edit_command_auralinux.h" // nogncheck
|
|
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" // nogncheck
|
|
#endif
|
|
@@ -185,14 +185,14 @@ ui::TextEditCommand GetCommandForKeyEven
|
|
#endif
|
|
return ui::TextEditCommand::DELETE_BACKWARD;
|
|
}
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
// Only erase by line break on Linux and ChromeOS.
|
|
if (shift)
|
|
return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
|
|
#endif
|
|
return ui::TextEditCommand::DELETE_WORD_BACKWARD;
|
|
case ui::VKEY_DELETE:
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
// Only erase by line break on Linux and ChromeOS.
|
|
if (shift && control)
|
|
return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
|
|
@@ -260,7 +260,7 @@ bool IsControlKeyModifier(int flags) {
|
|
// Control-modified key combination, but we cannot extend it to other platforms
|
|
// as Control has different meanings and behaviors.
|
|
// https://crrev.com/2580483002/#msg46
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
return flags & ui::EF_CONTROL_DOWN;
|
|
#else
|
|
return false;
|
|
@@ -711,7 +711,7 @@ bool Textfield::OnMousePressed(const ui:
|
|
#endif
|
|
}
|
|
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
if (!handled && !had_focus && event.IsOnlyMiddleMouseButton())
|
|
RequestFocusWithPointer(ui::EventPointerType::kMouse);
|
|
#endif
|
|
@@ -757,7 +757,7 @@ bool Textfield::OnKeyPressed(const ui::K
|
|
if (!textfield)
|
|
return handled;
|
|
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
|
|
ui::GetTextEditKeyBindingsDelegate();
|
|
std::vector<ui::TextEditCommandAuraLinux> commands;
|
|
@@ -909,7 +909,7 @@ void Textfield::AboutToRequestFocusFromT
|
|
}
|
|
|
|
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
// Skip any accelerator handling that conflicts with custom keybindings.
|
|
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
|
|
ui::GetTextEditKeyBindingsDelegate();
|
|
@@ -2195,7 +2195,7 @@ bool Textfield::PasteSelectionClipboard(
|
|
}
|
|
|
|
void Textfield::UpdateSelectionClipboard() {
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) {
|
|
ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection)
|
|
.WriteText(GetSelectedText());
|