Compare commits

...

8 Commits

Author SHA1 Message Date
Clément Roblot
0469c00e8c
Merge 3754136dd6 into 1d40687a40 2024-10-06 21:08:23 -05:00
ArthurSonzogni
3754136dd6
Reformat + fix pending selection. 2024-08-31 15:39:42 +02:00
Clement Roblot
f8dd258d65 More cleanup 2024-08-27 21:20:19 +07:00
Clement Roblot
118055d942 Cleanup 2024-08-27 21:16:04 +07:00
Clement Roblot
364993464a It somewhat works 2024-08-27 21:13:00 +07:00
Clement Roblot
e4a63318ad We can act on the screen 2024-08-27 17:40:48 +07:00
Clement Roblot
dea2d6408b We can catch mouse events 2024-08-27 17:35:21 +07:00
Clement Roblot
4e75cf9e0e We have a basic decorator 2024-08-27 15:33:25 +07:00
9 changed files with 220 additions and 2 deletions

View File

@ -88,6 +88,7 @@ add_library(dom
src/ftxui/dom/paragraph.cpp
src/ftxui/dom/reflect.cpp
src/ftxui/dom/scroll_indicator.cpp
src/ftxui/dom/selectable.cpp
src/ftxui/dom/separator.cpp
src/ftxui/dom/size.cpp
src/ftxui/dom/spinner.cpp

View File

@ -38,6 +38,7 @@ example(radiobox)
example(radiobox_in_frame)
example(renderer)
example(resizable_split)
example(selectable_input)
example(scrollbar)
example(slider)
example(slider_direction)

View File

@ -0,0 +1,72 @@
// Copyright 2020 Arthur Sonzogni. All rights reserved.
// Use of this source code is governed by the MIT license that can be found in
// the LICENSE file.
#include <string> // for char_traits, operator+, string, basic_string
#include "ftxui/component/component.hpp" // for Input, Renderer, Vertical
#include "ftxui/component/component_base.hpp" // for ComponentBase
#include "ftxui/component/component_options.hpp" // for InputOption
#include "ftxui/component/screen_interactive.hpp" // for Component, ScreenInteractive
#include "ftxui/dom/elements.hpp" // for text, hbox, separator, Element, operator|, vbox, border
#include "ftxui/util/ref.hpp" // for Ref
int main() {
using namespace ftxui;
// The data:
std::string first_name;
std::string last_name;
std::string password;
std::string phoneNumber;
// Region selection;
std::string textToCopy;
auto screen = ScreenInteractive::TerminalOutput();
// The basic input components:
Component input_first_name = Input(&first_name, "first name");
Component input_last_name = Input(&last_name, "last name");
// The password input component:
InputOption password_option;
password_option.password = true;
Component input_password = Input(&password, "password", password_option);
// The phone number input component:
// We are using `CatchEvent` to filter out non-digit characters.
Component input_phone_number = Input(&phoneNumber, "phone number");
input_phone_number |= CatchEvent([&](const Event& event) {
return event.is_character() && !std::isdigit(event.character()[0]);
});
input_phone_number |= CatchEvent([&](const Event& event) {
return event.is_character() && phoneNumber.size() > 10;
});
// The component tree:
auto component = Container::Vertical({
input_first_name,
input_last_name,
input_password,
input_phone_number,
});
// Tweak how the component tree is rendered:
auto renderer = Renderer(component, [&] {
return vbox({
hbox(text(" First name : "), input_first_name->Render()),
hbox(text(" Last name : ") | selectable(),
input_last_name->Render()),
hbox(text(" Password : "), input_password->Render()),
hbox(text(" Phone num : "), input_phone_number->Render()) |
selectable(),
separator(),
text("Hello " + first_name + " " + last_name),
text("Your password is " + password),
text("Your phone number is " + phoneNumber),
text("Selected test is " + screen.GetSelection()),
}) |
border;
});
screen.Loop(renderer);
}

View File

@ -26,6 +26,13 @@ struct Event;
using Component = std::shared_ptr<ComponentBase>;
class ScreenInteractivePrivate;
typedef struct {
uint16_t startx = 0;
uint16_t endx = 0;
uint16_t starty = 0;
uint16_t endy = 0;
} Region;
class ScreenInteractive : public Screen {
public:
// Constructors:
@ -68,6 +75,8 @@ class ScreenInteractive : public Screen {
void ForceHandleCtrlC(bool force);
void ForceHandleCtrlZ(bool force);
std::string GetSelection();
private:
void ExitNow();
@ -82,6 +91,8 @@ class ScreenInteractive : public Screen {
void RunOnceBlocking(Component component);
void HandleTask(Component component, Task& task);
bool HandleSelection(Event event);
void RefreshSelection();
void Draw(Component component);
void ResetCursorPosition();
@ -126,6 +137,11 @@ class ScreenInteractive : public Screen {
bool force_handle_ctrl_c_ = true;
bool force_handle_ctrl_z_ = true;
bool selection_enabled = false;
CapturedMouse selection_pending;
Region selection_region;
std::string selection_text;
// The style of the cursor to restore on exit.
int cursor_reset_shape_ = 1;

View File

@ -113,6 +113,8 @@ Decorator focusPositionRelative(float x, float y);
Element automerge(Element child);
Decorator hyperlink(std::string link);
Element hyperlink(std::string link, Element child);
Element selectable(Element child);
Decorator selectable(void);
// --- Layout is
// Horizontal, Vertical or stacked set of elements.

View File

@ -52,6 +52,12 @@ class Node {
};
virtual void Check(Status* status);
// Selection.
// Propagated from Parents to Children.
virtual void Select(Box selected_area) {
// TODO: Implement this.
}
protected:
Elements children_;
Requirement requirement_;

View File

@ -21,6 +21,7 @@ struct Pixel {
underlined(false),
underlined_double(false),
strikethrough(false),
selectable(false),
automerge(false) {}
// A bit field representing the style:
@ -30,6 +31,7 @@ struct Pixel {
bool inverted : 1;
bool underlined : 1;
bool underlined_double : 1;
bool selectable : 1;
bool strikethrough : 1;
bool automerge : 1;

View File

@ -351,7 +351,8 @@ ScreenInteractive::ScreenInteractive(int dimx,
bool use_alternative_screen)
: Screen(dimx, dimy),
dimension_(dimension),
use_alternative_screen_(use_alternative_screen) {
use_alternative_screen_(use_alternative_screen),
selection_text("") {
task_receiver_ = MakeReceiver<Task>();
}
@ -781,7 +782,9 @@ void ScreenInteractive::HandleTask(Component component, Task& task) {
arg.screen_ = this;
const bool handled = component->OnEvent(arg);
bool handled = component->OnEvent(arg);
handled = handled || HandleSelection(arg);
if (arg == Event::CtrlC && (!handled || force_handle_ctrl_c_)) {
RecordSignal(SIGABRT);
@ -824,6 +827,80 @@ void ScreenInteractive::HandleTask(Component component, Task& task) {
// clang-format on
}
// private
bool ScreenInteractive::HandleSelection(Event event) {
if (!event.is_mouse()) {
return false;
}
auto& mouse = event.mouse();
if (mouse.button != Mouse::Left) {
return false;
}
if (mouse.motion == Mouse::Pressed) {
selection_pending = CaptureMouse();
if (!selection_pending) {
return false;
}
selection_enabled = true;
selection_region.startx = mouse.x;
selection_region.starty = mouse.y;
selection_region.endx = mouse.x;
selection_region.endy = mouse.y;
return true;
}
if (!selection_pending) {
return false;
}
if (mouse.motion == Mouse::Moved) {
selection_region.endx = mouse.x;
selection_region.endy = mouse.y;
return true;
}
if (mouse.motion == Mouse::Released) {
selection_region.endx = mouse.x;
selection_region.endy = mouse.y;
selection_pending = nullptr;
if (selection_region.startx == selection_region.endx &&
selection_region.starty == selection_region.endy) {
selection_enabled = false;
return true;
}
return true;
}
return false;
}
void ScreenInteractive::RefreshSelection() {
if (!selection_enabled) {
return;
}
selection_text = "";
for (int y = std::min(selection_region.starty, selection_region.endy);
y <= std::max(selection_region.starty, selection_region.endy); ++y) {
for (int x = std::min(selection_region.startx, selection_region.endx);
x <= std::max(selection_region.startx, selection_region.endx) - 1;
++x) {
if (PixelAt(x, y).selectable == true) {
PixelAt(x, y).inverted ^= true;
selection_text += PixelAt(x, y).character;
}
}
}
}
std::string ScreenInteractive::GetSelection() {
return selection_text;
}
// private
// NOLINTNEXTLINE
void ScreenInteractive::Draw(Component component) {
@ -894,6 +971,8 @@ void ScreenInteractive::Draw(Component component) {
Render(*this, document);
RefreshSelection();
// Set cursor position for user using tools to insert CJK characters.
{
const int dx = dimx_ - 1 - cursor_.x + int(dimx_ != terminal.dimx);

View File

@ -0,0 +1,39 @@
#include "ftxui/dom/elements.hpp" // for Element, Decorator
#include "ftxui/dom/node_decorator.hpp" // for NodeDecorator
#include "ftxui/component/event.hpp" // for Event
namespace ftxui {
namespace {
class Selectable : public NodeDecorator {
public:
explicit Selectable(Element child)
: NodeDecorator(std::move(child)) {}
private:
void Render(Screen& screen) override {
for (int y = box_.y_min; y <= box_.y_max; ++y) {
for (int x = box_.x_min; x <= box_.x_max; ++x) {
screen.PixelAt(x, y).selectable = true;
}
}
NodeDecorator::Render(screen);
}
};
} // namespace
Element selectable(Element child) {
return std::make_shared<Selectable>(std::move(child));
}
Decorator selectable(void) {
return
[](Element child) { return selectable(std::move(child)); };
}
} // namespace ftxui