summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/include/screen_lua.hpp6
-rw-r--r--src/ui/screen_lua.cpp66
-rw-r--r--src/ui/ui_fsm.cpp64
3 files changed, 80 insertions, 56 deletions
diff --git a/src/ui/include/screen_lua.hpp b/src/ui/include/screen_lua.hpp
index 41d97a1e..8a463bad 100644
--- a/src/ui/include/screen_lua.hpp
+++ b/src/ui/include/screen_lua.hpp
@@ -8,6 +8,7 @@
#include "lua.hpp"
+#include "property.hpp"
#include "screen.hpp"
namespace ui {
@@ -26,6 +27,11 @@ class Lua : public Screen {
auto SetObjRef(lua_State*) -> void;
private:
+ /* Invokes a method on this screen's Lua counterpart. */
+ auto callMethod(std::string name) -> void;
+ /* Applies fn to each binding in this screen's `bindings` field. */
+ auto forEachBinding(std::function<void(lua::Binding*)> fn) -> void;
+
lua_State* s_;
std::optional<int> obj_ref_;
};
diff --git a/src/ui/screen_lua.cpp b/src/ui/screen_lua.cpp
index d43c7ee7..685e43cb 100644
--- a/src/ui/screen_lua.cpp
+++ b/src/ui/screen_lua.cpp
@@ -9,6 +9,7 @@
#include "core/lv_obj_tree.h"
#include "lua.h"
#include "lua.hpp"
+#include "property.hpp"
#include "themes.hpp"
#include "lua_thread.hpp"
@@ -28,28 +29,46 @@ Lua::~Lua() {
}
auto Lua::onShown() -> void {
+ callMethod("onShown");
+ forEachBinding([&](lua::Binding* b) { b->active = true; });
+}
+
+auto Lua::onHidden() -> void {
+ callMethod("onHidden");
+ forEachBinding([&](lua::Binding* b) { b->active = false; });
+}
+
+auto Lua::canPop() -> bool {
if (!s_ || !obj_ref_) {
- return;
+ return true;
}
lua_rawgeti(s_, LUA_REGISTRYINDEX, *obj_ref_);
- lua_pushliteral(s_, "onShown");
+ lua_pushliteral(s_, "canPop");
if (lua_gettable(s_, -2) == LUA_TFUNCTION) {
+ // If we got a callback instead of a value, then invoke it to turn it into
+ // value.
lua_pushvalue(s_, -2);
- lua::CallProtected(s_, 1, 0);
- } else {
- lua_pop(s_, 1);
+ lua::CallProtected(s_, 1, 1);
}
+ bool ret = lua_toboolean(s_, -1);
- lua_pop(s_, 1);
+ lua_pop(s_, 2);
+ return ret;
}
-auto Lua::onHidden() -> void {
+auto Lua::SetObjRef(lua_State* s) -> void {
+ assert(s_ == nullptr);
+ s_ = s;
+ obj_ref_ = luaL_ref(s, LUA_REGISTRYINDEX);
+}
+
+auto Lua::callMethod(std::string name) -> void {
if (!s_ || !obj_ref_) {
return;
}
lua_rawgeti(s_, LUA_REGISTRYINDEX, *obj_ref_);
- lua_pushliteral(s_, "onHidden");
+ lua_pushlstring(s_, name.data(), name.size());
if (lua_gettable(s_, -2) == LUA_TFUNCTION) {
lua_pushvalue(s_, -2);
@@ -61,29 +80,28 @@ auto Lua::onHidden() -> void {
lua_pop(s_, 1);
}
-auto Lua::canPop() -> bool {
+auto Lua::forEachBinding(std::function<void(lua::Binding*)> fn) -> void {
if (!s_ || !obj_ref_) {
- return true;
+ return;
}
lua_rawgeti(s_, LUA_REGISTRYINDEX, *obj_ref_);
- lua_pushliteral(s_, "canPop");
+ lua_pushliteral(s_, "bindings");
- if (lua_gettable(s_, -2) == LUA_TFUNCTION) {
- // If we got a callback instead of a value, then invoke it to turn it into
- // value.
- lua_pushvalue(s_, -2);
- lua::CallProtected(s_, 1, 1);
+ if (lua_gettable(s_, -2) != LUA_TTABLE) {
+ lua_pop(s_, 2);
+ return;
}
- bool ret = lua_toboolean(s_, -1);
- lua_pop(s_, 2);
- return ret;
-}
+ lua_pushnil(s_);
+ while (lua_next(s_, -2) != 0) {
+ lua::Binding* b = lua::Binding::get(s_, -1);
+ if (b) {
+ std::invoke(fn, b);
+ }
+ lua_pop(s_, 1);
+ }
-auto Lua::SetObjRef(lua_State* s) -> void {
- assert(s_ == nullptr);
- s_ = s;
- obj_ref_ = luaL_ref(s, LUA_REGISTRYINDEX);
+ lua_pop(s_, 2);
}
} // namespace screens
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index 1c296ac7..1305e764 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -132,13 +132,13 @@ lua::Property UiState::sPlaybackPlaying{
lua::Property UiState::sPlaybackTrack{};
lua::Property UiState::sPlaybackPosition{
0, [](const lua::LuaValue& val) {
- int current_val = std::get<int>(sPlaybackPosition.Get());
+ int current_val = std::get<int>(sPlaybackPosition.get());
if (!std::holds_alternative<int>(val)) {
return false;
}
int new_val = std::get<int>(val);
if (current_val != new_val) {
- auto track = sPlaybackTrack.Get();
+ auto track = sPlaybackTrack.get();
if (!std::holds_alternative<audio::TrackInfo>(track)) {
return false;
}
@@ -320,20 +320,20 @@ int UiState::PopScreen() {
void UiState::react(const system_fsm::KeyLockChanged& ev) {
sDisplay->SetDisplayOn(!ev.locking);
sInput->lock(ev.locking);
- sLockSwitch.Update(ev.locking);
+ sLockSwitch.setDirect(ev.locking);
}
void UiState::react(const system_fsm::SamdUsbStatusChanged& ev) {
- sUsbMassStorageBusy.Update(ev.new_status ==
- drivers::Samd::UsbStatus::kAttachedBusy);
+ sUsbMassStorageBusy.setDirect(ev.new_status ==
+ drivers::Samd::UsbStatus::kAttachedBusy);
}
void UiState::react(const database::event::UpdateStarted&) {
- sDatabaseUpdating.Update(true);
+ sDatabaseUpdating.setDirect(true);
}
void UiState::react(const database::event::UpdateFinished&) {
- sDatabaseUpdating.Update(false);
+ sDatabaseUpdating.setDirect(false);
}
void UiState::react(const internal::DismissAlerts&) {
@@ -341,46 +341,46 @@ void UiState::react(const internal::DismissAlerts&) {
}
void UiState::react(const system_fsm::BatteryStateChanged& ev) {
- sBatteryPct.Update(static_cast<int>(ev.new_state.percent));
- sBatteryMv.Update(static_cast<int>(ev.new_state.millivolts));
- sBatteryCharging.Update(ev.new_state.is_charging);
+ sBatteryPct.setDirect(static_cast<int>(ev.new_state.percent));
+ sBatteryMv.setDirect(static_cast<int>(ev.new_state.millivolts));
+ sBatteryCharging.setDirect(ev.new_state.is_charging);
}
void UiState::react(const audio::QueueUpdate&) {
auto& queue = sServices->track_queue();
- sQueueSize.Update(static_cast<int>(queue.totalSize()));
+ sQueueSize.setDirect(static_cast<int>(queue.totalSize()));
int current_pos = queue.currentPosition();
if (queue.current()) {
current_pos++;
}
- sQueuePosition.Update(current_pos);
- sQueueRandom.Update(queue.random());
- sQueueRepeat.Update(queue.repeat());
- sQueueReplay.Update(queue.replay());
+ sQueuePosition.setDirect(current_pos);
+ sQueueRandom.setDirect(queue.random());
+ sQueueRepeat.setDirect(queue.repeat());
+ sQueueReplay.setDirect(queue.replay());
}
void UiState::react(const audio::PlaybackUpdate& ev) {
if (ev.current_track) {
- sPlaybackTrack.Update(*ev.current_track);
+ sPlaybackTrack.setDirect(*ev.current_track);
} else {
- sPlaybackTrack.Update(std::monostate{});
+ sPlaybackTrack.setDirect(std::monostate{});
}
- sPlaybackPlaying.Update(!ev.paused);
- sPlaybackPosition.Update(static_cast<int>(ev.track_position.value_or(0)));
+ sPlaybackPlaying.setDirect(!ev.paused);
+ sPlaybackPosition.setDirect(static_cast<int>(ev.track_position.value_or(0)));
}
void UiState::react(const audio::VolumeChanged& ev) {
- sVolumeCurrentPct.Update(static_cast<int>(ev.percent));
- sVolumeCurrentDb.Update(static_cast<int>(ev.db));
+ sVolumeCurrentPct.setDirect(static_cast<int>(ev.percent));
+ sVolumeCurrentDb.setDirect(static_cast<int>(ev.db));
}
void UiState::react(const audio::VolumeBalanceChanged& ev) {
- sVolumeLeftBias.Update(ev.left_bias);
+ sVolumeLeftBias.setDirect(ev.left_bias);
}
void UiState::react(const audio::VolumeLimitChanged& ev) {
- sVolumeLimit.Update(ev.new_limit_db);
+ sVolumeLimit.setDirect(ev.new_limit_db);
}
void UiState::react(const system_fsm::BluetoothEvent& ev) {
@@ -388,19 +388,19 @@ void UiState::react(const system_fsm::BluetoothEvent& ev) {
auto dev = bt.ConnectedDevice();
switch (ev.event) {
case drivers::bluetooth::Event::kKnownDevicesChanged:
- sBluetoothDevices.Update(bt.KnownDevices());
+ sBluetoothDevices.setDirect(bt.KnownDevices());
break;
case drivers::bluetooth::Event::kConnectionStateChanged:
- sBluetoothConnected.Update(bt.IsConnected());
+ sBluetoothConnected.setDirect(bt.IsConnected());
if (dev) {
- sBluetoothPairedDevice.Update(drivers::bluetooth::Device{
+ sBluetoothPairedDevice.setDirect(drivers::bluetooth::Device{
.address = dev->mac,
.name = {dev->name.data(), dev->name.size()},
.class_of_device = 0,
.signal_strength = 0,
});
} else {
- sBluetoothPairedDevice.Update(std::monostate{});
+ sBluetoothPairedDevice.setDirect(std::monostate{});
}
break;
case drivers::bluetooth::Event::kPreferredDeviceChanged:
@@ -428,7 +428,7 @@ void Splash::react(const system_fsm::BootComplete& ev) {
themes::Theme::instance()->Apply();
int brightness = sServices->nvs().ScreenBrightness();
- sDisplayBrightness.Update(brightness);
+ sDisplayBrightness.setDirect(brightness);
sDisplay->SetBrightness(brightness);
sDeviceFactory = std::make_unique<input::DeviceFactory>(sServices);
@@ -530,12 +530,12 @@ void Lua::entry() {
{"msc_busy", &sUsbMassStorageBusy},
});
- sDatabaseAutoUpdate.Update(sServices->nvs().DbAutoIndex());
+ sDatabaseAutoUpdate.setDirect(sServices->nvs().DbAutoIndex());
auto bt = sServices->bluetooth();
- sBluetoothEnabled.Update(bt.IsEnabled());
- sBluetoothConnected.Update(bt.IsConnected());
- sBluetoothDevices.Update(bt.KnownDevices());
+ sBluetoothEnabled.setDirect(bt.IsEnabled());
+ sBluetoothConnected.setDirect(bt.IsConnected());
+ sBluetoothDevices.setDirect(bt.KnownDevices());
sCurrentScreen.reset();
sLua->RunScript("/sdcard/config.lua");
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-30 01:05:37 +0000