mirror of
https://github.com/ArthurSonzogni/FTXUI.git
synced 2024-10-30 16:07:38 +08:00
Compare commits
4 Commits
abf1ae9cb5
...
150718c149
Author | SHA1 | Date | |
---|---|---|---|
|
150718c149 | ||
|
8922e6d55e | ||
|
99df1ac8ba | ||
|
baa5973128 |
@ -39,6 +39,8 @@ current (development)
|
|||||||
component in its parent. See #932
|
component in its parent. See #932
|
||||||
- Feature: Add `EntryState::index`. This allows to get the index of a menu entry.
|
- Feature: Add `EntryState::index`. This allows to get the index of a menu entry.
|
||||||
See #932
|
See #932
|
||||||
|
- Feature: Add `SliderOption::on_change`. This allows to set a callback when the
|
||||||
|
slider value changes. See #938.
|
||||||
|
|
||||||
### Dom
|
### Dom
|
||||||
- Feature: Add `hscroll_indicator`. It display an horizontal indicator
|
- Feature: Add `hscroll_indicator`. It display an horizontal indicator
|
||||||
|
@ -336,6 +336,7 @@ Feel free to add your projects here:
|
|||||||
- [Step-Writer](https://github.com/BrianAnakPintar/step-writer)
|
- [Step-Writer](https://github.com/BrianAnakPintar/step-writer)
|
||||||
- [XJ music](https://github.com/xjmusic/xjmusic)
|
- [XJ music](https://github.com/xjmusic/xjmusic)
|
||||||
- [UDP chat](https://github.com/Sergeydigl3/udp-chat-tui)
|
- [UDP chat](https://github.com/Sergeydigl3/udp-chat-tui)
|
||||||
|
- [2048-cpp](https://github.com/Chessom/2048-cpp)
|
||||||
|
|
||||||
### [cpp-best-practices/game_jam](https://github.com/cpp-best-practices/game_jam)
|
### [cpp-best-practices/game_jam](https://github.com/cpp-best-practices/game_jam)
|
||||||
|
|
||||||
|
@ -228,6 +228,7 @@ struct SliderOption {
|
|||||||
Direction direction = Direction::Right;
|
Direction direction = Direction::Right;
|
||||||
Color color_active = Color::White;
|
Color color_active = Color::White;
|
||||||
Color color_inactive = Color::GrayDark;
|
Color color_inactive = Color::GrayDark;
|
||||||
|
std::function<void()> on_change; ///> Called when `value` is updated.
|
||||||
};
|
};
|
||||||
|
|
||||||
// Parameter pack used by `WindowOptions::render`.
|
// Parameter pack used by `WindowOptions::render`.
|
||||||
|
@ -35,31 +35,26 @@ Decorator flexDirection(Direction direction) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
class SliderBase : public ComponentBase {
|
class SliderBase : public SliderOption<T>, public ComponentBase {
|
||||||
public:
|
public:
|
||||||
explicit SliderBase(SliderOption<T> options)
|
explicit SliderBase(SliderOption<T> options) : SliderOption<T>(options) {}
|
||||||
: value_(options.value),
|
|
||||||
min_(options.min),
|
|
||||||
max_(options.max),
|
|
||||||
increment_(options.increment),
|
|
||||||
options_(options) {}
|
|
||||||
|
|
||||||
Element Render() override {
|
Element Render() override {
|
||||||
auto gauge_color = Focused() ? color(options_.color_active)
|
auto gauge_color =
|
||||||
: color(options_.color_inactive);
|
Focused() ? color(this->color_active) : color(this->color_inactive);
|
||||||
const float percent = float(value_() - min_()) / float(max_() - min_());
|
const float percent =
|
||||||
return gaugeDirection(percent, options_.direction) |
|
float(this->value() - this->min()) / float(this->max() - this->min());
|
||||||
flexDirection(options_.direction) | reflect(gauge_box_) |
|
return gaugeDirection(percent, this->direction) |
|
||||||
gauge_color;
|
flexDirection(this->direction) | reflect(gauge_box_) | gauge_color;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnLeft() {
|
void OnLeft() {
|
||||||
switch (options_.direction) {
|
switch (this->direction) {
|
||||||
case Direction::Right:
|
case Direction::Right:
|
||||||
value_() -= increment_();
|
this->value() -= this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Left:
|
case Direction::Left:
|
||||||
value_() += increment_();
|
this->value() += this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Up:
|
case Direction::Up:
|
||||||
case Direction::Down:
|
case Direction::Down:
|
||||||
@ -68,12 +63,12 @@ class SliderBase : public ComponentBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void OnRight() {
|
void OnRight() {
|
||||||
switch (options_.direction) {
|
switch (this->direction) {
|
||||||
case Direction::Right:
|
case Direction::Right:
|
||||||
value_() += increment_();
|
this->value() += this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Left:
|
case Direction::Left:
|
||||||
value_() -= increment_();
|
this->value() -= this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Up:
|
case Direction::Up:
|
||||||
case Direction::Down:
|
case Direction::Down:
|
||||||
@ -82,12 +77,12 @@ class SliderBase : public ComponentBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void OnUp() {
|
void OnUp() {
|
||||||
switch (options_.direction) {
|
switch (this->direction) {
|
||||||
case Direction::Up:
|
case Direction::Up:
|
||||||
value_() -= increment_();
|
this->value() -= this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Down:
|
case Direction::Down:
|
||||||
value_() += increment_();
|
this->value() += this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Left:
|
case Direction::Left:
|
||||||
case Direction::Right:
|
case Direction::Right:
|
||||||
@ -96,12 +91,12 @@ class SliderBase : public ComponentBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void OnDown() {
|
void OnDown() {
|
||||||
switch (options_.direction) {
|
switch (this->direction) {
|
||||||
case Direction::Down:
|
case Direction::Down:
|
||||||
value_() -= increment_();
|
this->value() += this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Up:
|
case Direction::Up:
|
||||||
value_() += increment_();
|
this->value() -= this->increment();
|
||||||
break;
|
break;
|
||||||
case Direction::Left:
|
case Direction::Left:
|
||||||
case Direction::Right:
|
case Direction::Right:
|
||||||
@ -114,7 +109,7 @@ class SliderBase : public ComponentBase {
|
|||||||
return OnMouseEvent(event);
|
return OnMouseEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
T old_value = value_();
|
T old_value = this->value();
|
||||||
if (event == Event::ArrowLeft || event == Event::Character('h')) {
|
if (event == Event::ArrowLeft || event == Event::Character('h')) {
|
||||||
OnLeft();
|
OnLeft();
|
||||||
}
|
}
|
||||||
@ -128,8 +123,11 @@ class SliderBase : public ComponentBase {
|
|||||||
OnUp();
|
OnUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
value_() = util::clamp(value_(), min_(), max_());
|
this->value() = std::max(this->min(), std::min(this->max(), this->value()));
|
||||||
if (old_value != value_()) {
|
if (old_value != this->value()) {
|
||||||
|
if (this->on_change) {
|
||||||
|
this->on_change();
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,33 +141,45 @@ class SliderBase : public ComponentBase {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (options_.direction) {
|
T old_value = this->value();
|
||||||
|
switch (this->direction) {
|
||||||
case Direction::Right: {
|
case Direction::Right: {
|
||||||
value_() = min_() + (event.mouse().x - gauge_box_.x_min) *
|
this->value() =
|
||||||
(max_() - min_()) /
|
this->min() + (event.mouse().x - gauge_box_.x_min) *
|
||||||
|
(this->max() - this->min()) /
|
||||||
(gauge_box_.x_max - gauge_box_.x_min);
|
(gauge_box_.x_max - gauge_box_.x_min);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case Direction::Left: {
|
case Direction::Left: {
|
||||||
value_() = max_() - (event.mouse().x - gauge_box_.x_min) *
|
this->value() =
|
||||||
(max_() - min_()) /
|
this->max() - (event.mouse().x - gauge_box_.x_min) *
|
||||||
|
(this->max() - this->min()) /
|
||||||
(gauge_box_.x_max - gauge_box_.x_min);
|
(gauge_box_.x_max - gauge_box_.x_min);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case Direction::Down: {
|
case Direction::Down: {
|
||||||
value_() = min_() + (event.mouse().y - gauge_box_.y_min) *
|
this->value() =
|
||||||
(max_() - min_()) /
|
this->min() + (event.mouse().y - gauge_box_.y_min) *
|
||||||
|
(this->max() - this->min()) /
|
||||||
(gauge_box_.y_max - gauge_box_.y_min);
|
(gauge_box_.y_max - gauge_box_.y_min);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case Direction::Up: {
|
case Direction::Up: {
|
||||||
value_() = max_() - (event.mouse().y - gauge_box_.y_min) *
|
this->value() =
|
||||||
(max_() - min_()) /
|
this->max() - (event.mouse().y - gauge_box_.y_min) *
|
||||||
|
(this->max() - this->min()) /
|
||||||
(gauge_box_.y_max - gauge_box_.y_min);
|
(gauge_box_.y_max - gauge_box_.y_min);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
value_() = std::max(min_(), std::min(max_(), value_()));
|
|
||||||
|
this->value() =
|
||||||
|
std::max(this->min(), std::min(this->max(), this->value()));
|
||||||
|
|
||||||
|
if (old_value != this->value() && this->on_change) {
|
||||||
|
this->on_change();
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -197,11 +207,6 @@ class SliderBase : public ComponentBase {
|
|||||||
bool Focusable() const final { return true; }
|
bool Focusable() const final { return true; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ref<T> value_;
|
|
||||||
ConstRef<T> min_;
|
|
||||||
ConstRef<T> max_;
|
|
||||||
ConstRef<T> increment_;
|
|
||||||
SliderOption<T> options_;
|
|
||||||
Box gauge_box_;
|
Box gauge_box_;
|
||||||
CapturedMouse captured_mouse_;
|
CapturedMouse captured_mouse_;
|
||||||
};
|
};
|
||||||
@ -256,6 +261,7 @@ class SliderWithLabel : public ComponentBase {
|
|||||||
Box box_;
|
Box box_;
|
||||||
bool mouse_hover_ = false;
|
bool mouse_hover_ = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
/// @brief An horizontal slider.
|
/// @brief An horizontal slider.
|
||||||
@ -340,6 +346,7 @@ template <typename T>
|
|||||||
Component Slider(SliderOption<T> options) {
|
Component Slider(SliderOption<T> options) {
|
||||||
return Make<SliderBase<T>>(options);
|
return Make<SliderBase<T>>(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
template Component Slider(SliderOption<int8_t>);
|
template Component Slider(SliderOption<int8_t>);
|
||||||
template Component Slider(SliderOption<int16_t>);
|
template Component Slider(SliderOption<int16_t>);
|
||||||
template Component Slider(SliderOption<int32_t>);
|
template Component Slider(SliderOption<int32_t>);
|
||||||
|
@ -45,6 +45,7 @@ Event MouseReleased(int x, int y) {
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
TEST(SliderTest, Right) {
|
TEST(SliderTest, Right) {
|
||||||
|
int updated = 0;
|
||||||
int value = 50;
|
int value = 50;
|
||||||
auto slider = Slider<int>({
|
auto slider = Slider<int>({
|
||||||
.value = &value,
|
.value = &value,
|
||||||
@ -52,23 +53,31 @@ TEST(SliderTest, Right) {
|
|||||||
.max = 100,
|
.max = 100,
|
||||||
.increment = 10,
|
.increment = 10,
|
||||||
.direction = Direction::Right,
|
.direction = Direction::Right,
|
||||||
|
.on_change = [&]() { updated++; },
|
||||||
});
|
});
|
||||||
Screen screen(11, 1);
|
Screen screen(11, 1);
|
||||||
Render(screen, slider->Render());
|
Render(screen, slider->Render());
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(3, 0)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(3, 0)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 0)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 0)));
|
||||||
EXPECT_EQ(value, 90);
|
EXPECT_EQ(value, 90);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 2)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 2)));
|
||||||
EXPECT_EQ(value, 90);
|
EXPECT_EQ(value, 90);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(5, 2)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(5, 2)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 2);
|
||||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(5, 2)));
|
EXPECT_TRUE(slider->OnEvent(MouseReleased(5, 2)));
|
||||||
EXPECT_FALSE(slider->OnEvent(MousePressed(5, 2)));
|
EXPECT_FALSE(slider->OnEvent(MousePressed(5, 2)));
|
||||||
|
EXPECT_EQ(value, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SliderTest, Left) {
|
TEST(SliderTest, Left) {
|
||||||
|
int updated = 0;
|
||||||
int value = 50;
|
int value = 50;
|
||||||
auto slider = Slider<int>({
|
auto slider = Slider<int>({
|
||||||
.value = &value,
|
.value = &value,
|
||||||
@ -76,23 +85,31 @@ TEST(SliderTest, Left) {
|
|||||||
.max = 100,
|
.max = 100,
|
||||||
.increment = 10,
|
.increment = 10,
|
||||||
.direction = Direction::Left,
|
.direction = Direction::Left,
|
||||||
|
.on_change = [&]() { updated++; },
|
||||||
});
|
});
|
||||||
Screen screen(11, 1);
|
Screen screen(11, 1);
|
||||||
Render(screen, slider->Render());
|
Render(screen, slider->Render());
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(3, 0)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(3, 0)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 0)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 0)));
|
||||||
EXPECT_EQ(value, 10);
|
EXPECT_EQ(value, 10);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 2)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(9, 2)));
|
||||||
EXPECT_EQ(value, 10);
|
EXPECT_EQ(value, 10);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(5, 2)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(5, 2)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 2);
|
||||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(5, 2)));
|
EXPECT_TRUE(slider->OnEvent(MouseReleased(5, 2)));
|
||||||
EXPECT_FALSE(slider->OnEvent(MousePressed(5, 2)));
|
EXPECT_FALSE(slider->OnEvent(MousePressed(5, 2)));
|
||||||
|
EXPECT_EQ(value, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SliderTest, Down) {
|
TEST(SliderTest, Down) {
|
||||||
|
int updated = 0;
|
||||||
int value = 50;
|
int value = 50;
|
||||||
auto slider = Slider<int>({
|
auto slider = Slider<int>({
|
||||||
.value = &value,
|
.value = &value,
|
||||||
@ -100,23 +117,32 @@ TEST(SliderTest, Down) {
|
|||||||
.max = 100,
|
.max = 100,
|
||||||
.increment = 10,
|
.increment = 10,
|
||||||
.direction = Direction::Down,
|
.direction = Direction::Down,
|
||||||
|
.on_change = [&]() { updated++; },
|
||||||
});
|
});
|
||||||
Screen screen(1, 11);
|
Screen screen(1, 11);
|
||||||
Render(screen, slider->Render());
|
Render(screen, slider->Render());
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 3)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 3)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 9)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 9)));
|
||||||
EXPECT_EQ(value, 90);
|
EXPECT_EQ(value, 90);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 9)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 9)));
|
||||||
EXPECT_EQ(value, 90);
|
EXPECT_EQ(value, 90);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 5)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 5)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 2);
|
||||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(2, 5)));
|
EXPECT_TRUE(slider->OnEvent(MouseReleased(2, 5)));
|
||||||
EXPECT_FALSE(slider->OnEvent(MousePressed(2, 5)));
|
EXPECT_FALSE(slider->OnEvent(MousePressed(2, 5)));
|
||||||
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SliderTest, Up) {
|
TEST(SliderTest, Up) {
|
||||||
|
int updated = 0;
|
||||||
int value = 50;
|
int value = 50;
|
||||||
auto slider = Slider<int>({
|
auto slider = Slider<int>({
|
||||||
.value = &value,
|
.value = &value,
|
||||||
@ -124,20 +150,27 @@ TEST(SliderTest, Up) {
|
|||||||
.max = 100,
|
.max = 100,
|
||||||
.increment = 10,
|
.increment = 10,
|
||||||
.direction = Direction::Up,
|
.direction = Direction::Up,
|
||||||
|
.on_change = [&]() { updated++; },
|
||||||
});
|
});
|
||||||
Screen screen(1, 11);
|
Screen screen(1, 11);
|
||||||
Render(screen, slider->Render());
|
Render(screen, slider->Render());
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 3)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 3)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 0);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 9)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(0, 9)));
|
||||||
EXPECT_EQ(value, 10);
|
EXPECT_EQ(value, 10);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 9)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 9)));
|
||||||
EXPECT_EQ(value, 10);
|
EXPECT_EQ(value, 10);
|
||||||
|
EXPECT_EQ(updated, 1);
|
||||||
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 5)));
|
EXPECT_TRUE(slider->OnEvent(MousePressed(2, 5)));
|
||||||
EXPECT_EQ(value, 50);
|
EXPECT_EQ(value, 50);
|
||||||
|
EXPECT_EQ(updated, 2);
|
||||||
EXPECT_TRUE(slider->OnEvent(MouseReleased(2, 5)));
|
EXPECT_TRUE(slider->OnEvent(MouseReleased(2, 5)));
|
||||||
EXPECT_FALSE(slider->OnEvent(MousePressed(2, 5)));
|
EXPECT_FALSE(slider->OnEvent(MousePressed(2, 5)));
|
||||||
|
EXPECT_EQ(value, 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SliderTest, Focus) {
|
TEST(SliderTest, Focus) {
|
||||||
|
@ -48,25 +48,38 @@ Dimensions& FallbackSize() {
|
|||||||
return g_fallback_size;
|
return g_fallback_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* Safe(const char* c) {
|
|
||||||
return (c != nullptr) ? c : "";
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Contains(const std::string& s, const char* key) {
|
bool Contains(const std::string& s, const char* key) {
|
||||||
return s.find(key) != std::string::npos;
|
return s.find(key) != std::string::npos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://github.com/gabime/spdlog/blob/885b5473e291833b148eeac3b7ce227e582cd88b/include/spdlog/details/os-inl.h#L566
|
||||||
|
std::string getenv_safe(const char *field) {
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
#if defined(__cplusplus_winrt)
|
||||||
|
return std::string{}; // not supported under uwp
|
||||||
|
#else
|
||||||
|
size_t len = 0;
|
||||||
|
char buf[1024];
|
||||||
|
bool ok = ::getenv_s(&len, buf, sizeof(buf), field) == 0;
|
||||||
|
return ok ? buf : std::string{};
|
||||||
|
#endif
|
||||||
|
#else // revert to getenv
|
||||||
|
char *buf = ::getenv(field); // NOLINT(*-mt-unsafe)
|
||||||
|
return buf ? buf : std::string{};
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
Terminal::Color ComputeColorSupport() {
|
Terminal::Color ComputeColorSupport() {
|
||||||
#if defined(__EMSCRIPTEN__)
|
#if defined(__EMSCRIPTEN__)
|
||||||
return Terminal::Color::TrueColor;
|
return Terminal::Color::TrueColor;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::string COLORTERM = Safe(std::getenv("COLORTERM")); // NOLINT
|
std::string COLORTERM = getenv_safe("COLORTERM");
|
||||||
if (Contains(COLORTERM, "24bit") || Contains(COLORTERM, "truecolor")) {
|
if (Contains(COLORTERM, "24bit") || Contains(COLORTERM, "truecolor")) {
|
||||||
return Terminal::Color::TrueColor;
|
return Terminal::Color::TrueColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string TERM = Safe(std::getenv("TERM")); // NOLINT
|
std::string TERM = getenv_safe("TERM");
|
||||||
if (Contains(COLORTERM, "256") || Contains(TERM, "256")) {
|
if (Contains(COLORTERM, "256") || Contains(TERM, "256")) {
|
||||||
return Terminal::Color::Palette256;
|
return Terminal::Color::Palette256;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user