trilader
/
yttui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split TUI init code and prepare for embedded application version

This commit is contained in:
Daniel Schulte 2020-12-16 19:37:46 +01:00
parent 5c43b08b03
commit 507c66bf04
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tui.cpp
View File

@ -68,7 +68,7 @@ std::optional<Event> wait_for_event(termpaint_integration *integration, int time
return e; return e;
} }
void tp_init() static void tp_init_internal()
{ {
all_buttons = { all_buttons = {
{Button::Ok, "Ok", 2}, {Button::Ok, "Ok", 2},
@ -95,11 +95,42 @@ void tp_init()
new_attr_set(attributes[ASWatched], TERMPAINT_DEFAULT_COLOR); new_attr_set(attributes[ASWatched], TERMPAINT_DEFAULT_COLOR);
new_attr_set(attributes[ASUnwatched], TERMPAINT_DEFAULT_COLOR, TERMPAINT_STYLE_BOLD); new_attr_set(attributes[ASUnwatched], TERMPAINT_DEFAULT_COLOR, TERMPAINT_STYLE_BOLD);
integration = termpaintx_full_integration_setup_terminal_fullscreen( "+kbdsig +kbdsigint +kbdsigtstp", convert_tp_event, nullptr, &terminal);
surface = termpaint_terminal_get_surface(terminal); surface = termpaint_terminal_get_surface(terminal);
termpaint_terminal_set_cursor_visible(terminal, false); termpaint_terminal_set_cursor_visible(terminal, false);
} }
static const char* terminal_options = "+kbdsig +kbdsigint +kbdsigtstp";
void tp_init()
{
integration = termpaintx_full_integration_setup_terminal_fullscreen( "+kbdsig +kbdsigint +kbdsigtstp", convert_tp_event, nullptr, &terminal);
tp_init_internal();
}
void tp_init_from_fd(int fd)
{
integration = termpaintx_full_integration_from_fd(fd, false, terminal_options);
if (!integration) {
//std::string error = "Error: Terminal not available!";
//(void)!write(fd, error.c_str(), error.size()); // already printing an error message
return;
}
terminal = termpaint_terminal_new(integration);
termpaintx_full_integration_set_terminal(integration, terminal);
termpaint_terminal_set_event_cb(terminal, convert_tp_event, nullptr);
termpaint_terminal_auto_detect(terminal);
termpaintx_full_integration_wait_for_ready_with_message(integration, 10000,
"Terminal auto detection is taking unusually long, press space to abort.");
termpaintx_full_integration_apply_input_quirks(integration);
int width, height;
termpaintx_full_integration_terminal_size(integration, &width, &height);
termpaint_terminal_setup_fullscreen(terminal, width, height, terminal_options);
termpaintx_full_integration_ttyrescue_start(integration);
tp_init_internal();
}
void tp_shutdown() void tp_shutdown()
{ {
auto free_attr_set = [](AttributeSet &set) { auto free_attr_set = [](AttributeSet &set) {

1
tui.h
View File

@ -55,6 +55,7 @@ Button operator|(const Button &a, const Button &b);
Button operator&(const Button &a, const Button &b); Button operator&(const Button &a, const Button &b);
void tp_init(); void tp_init();
void tp_init_from_fd(int fd);
void tp_shutdown(); void tp_shutdown();
void tp_flush(const bool force=false); void tp_flush(const bool force=false);
void tp_pause(); void tp_pause();