amass/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2024-11-29 22:55:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the correct macro check if we are compiling for windows

Browse Source
This commit is contained in:
Mikael Olenfalk 2020-03-25 08:54:03 +01:00
parent a4461f4196
commit a55baa1e9c
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,8 @@
#include "ftxui/screen/string.hpp" #include "ftxui/screen/string.hpp"
#include "ftxui/screen/terminal.hpp" #include "ftxui/screen/terminal.hpp"
#if defined(WIN32)
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOMINMAX #define NOMINMAX
#include <Windows.h> #include <Windows.h>
@ -39,7 +40,7 @@ void CharToEventStream(Receiver<char> receiver, Sender<Event> sender) {
Event::Convert(receiver, sender, c); Event::Convert(receiver, sender, c);
} }
#if defined(WIN32) #if defined(_WIN32)
void Win32EventListener(std::atomic<bool>* quit, void Win32EventListener(std::atomic<bool>* quit,
Sender<char> char_sender, Sender<char> char_sender,
@ -162,7 +163,7 @@ void ScreenInteractive::PostEvent(Event event) {
void ScreenInteractive::Loop(Component* component) { void ScreenInteractive::Loop(Component* component) {
// Save the old terminal configuration and restore it on exit. // Save the old terminal configuration and restore it on exit.
#if defined(WIN32) #if defined(_WIN32)
// Enable VT processing on stdout and stdin // Enable VT processing on stdout and stdin
auto stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); auto stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
auto stdin_handle = GetStdHandle(STD_INPUT_HANDLE); auto stdin_handle = GetStdHandle(STD_INPUT_HANDLE);
@ -217,7 +218,7 @@ void ScreenInteractive::Loop(Component* component) {
CharToEventStream, std::move(char_receiver), std::move(event_sender_1)); CharToEventStream, std::move(char_receiver), std::move(event_sender_1));
// Depending on the OS, start a thread that will produce events and/or chars. // Depending on the OS, start a thread that will produce events and/or chars.
#if defined(WIN32) #if defined(_WIN32)
auto event_sender_2 = event_receiver_->MakeSender(); auto event_sender_2 = event_receiver_->MakeSender();
auto event_listener = auto event_listener =
std::thread(&Win32EventListener, &quit_, std::move(char_sender), std::thread(&Win32EventListener, &quit_, std::move(char_sender),

5
src/ftxui/screen/screen.cpp
View File

@ -7,7 +7,8 @@
#include "ftxui/screen/string.hpp" #include "ftxui/screen/string.hpp"
#include "ftxui/screen/terminal.hpp" #include "ftxui/screen/terminal.hpp"
#if defined(WIN32)
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOMINMAX #define NOMINMAX
#include <Windows.h> #include <Windows.h>
@ -75,7 +76,7 @@ Screen::Screen(int dimx, int dimy)
dimx_(dimx), dimx_(dimx),
dimy_(dimy), dimy_(dimy),
pixels_(dimy, std::vector<Pixel>(dimx)) { pixels_(dimy, std::vector<Pixel>(dimx)) {
#if defined(WIN32) #if defined(_WIN32)
// The placement of this call is a bit weird, however we can assume that // The placement of this call is a bit weird, however we can assume that
// anybody who instantiates a Screen object eventually wants to output // anybody who instantiates a Screen object eventually wants to output
// something to the console. // something to the console.

5
src/ftxui/screen/terminal.cpp
View File

@ -2,7 +2,8 @@
#include <stdio.h> #include <stdio.h>
#if defined(WIN32)
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOMINMAX #define NOMINMAX
#include <Windows.h> #include <Windows.h>
@ -18,7 +19,7 @@ namespace ftxui {
Terminal::Dimensions Terminal::Size() { Terminal::Dimensions Terminal::Size() {
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
return Dimensions{80, 43}; return Dimensions{80, 43};
#elif defined(WIN32) #elif defined(_WIN32)
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
int columns, rows; int columns, rows;