zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-10-31 10:38:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve ScreenInteractive wait function.

Browse Source
This commit is contained in:
ArthurSonzogni
2019-02-02 16:28:44 +01:00
parent 17cd6d25a5
commit 15da9cdc18
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/component/menu.cpp
View File

@@ -7,7 +7,7 @@
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
using namespace ftxui; using namespace ftxui;
auto screen = ScreenInteractive::FixedSize(30, 3); auto screen = ScreenInteractive::TerminalOutput();
Menu menu; Menu menu;
menu.entries = {L"entry 1", L"entry 2", L"entry 3"}; menu.entries = {L"entry 1", L"entry 2", L"entry 3"};

2
include/ftxui/component/screen_interactive.hpp
View File

@@ -40,7 +40,7 @@ class ScreenInteractive : public Screen {
Dimension dimension_ = Dimension::Fixed; Dimension dimension_ = Dimension::Fixed;
ScreenInteractive(int dimx, int dimy, Dimension dimension); ScreenInteractive(int dimx, int dimy, Dimension dimension);
std::condition_variable events_queue_wait; std::condition_variable events_queue_cv;
std::mutex events_queue_mutex; std::mutex events_queue_mutex;
std::queue<Event> events_queue; std::queue<Event> events_queue;
std::atomic<bool> quit_ = false; std::atomic<bool> quit_ = false;

22
src/ftxui/component/screen_interactive.cpp
View File

@@ -71,25 +71,21 @@ ScreenInteractive ScreenInteractive::FitComponent() {
return ScreenInteractive(0, 0, Dimension::FitComponent); return ScreenInteractive(0, 0, Dimension::FitComponent);
} }
void ScreenInteractive::PostEvent(Event event) { void ScreenInteractive::PostEvent(Event event) {
std::unique_lock<std::mutex> lock(events_queue_mutex); std::unique_lock<std::mutex> lock(events_queue_mutex);
events_queue.push(event); events_queue.push(event);
events_queue_wait.notify_one(); events_queue_cv.notify_one();
} }
void ScreenInteractive::EventLoop(Component* component) { void ScreenInteractive::EventLoop(Component* component) {
bool handled = 0; std::unique_lock<std::mutex> lock(events_queue_mutex);
for (;;) { while (!quit_ && events_queue.empty())
std::unique_lock<std::mutex> lock(events_queue_mutex); events_queue_cv.wait(lock);
while (!events_queue.empty()) {
component->OnEvent(events_queue.front());
events_queue.pop();
handled = true;
}
if (handled) // After the wait, we own the lock.
return; while (!events_queue.empty()) {
events_queue_wait.wait(lock); component->OnEvent(events_queue.front());
events_queue.pop();
} }
} }