refactor(color): use LVGL styles and objects for UI, legacy cleanup (#4407)

radio/src/lua/api_colorlcd.cpp

@@ -198,10 +198,10 @@ static int luaLcdDrawLine(lua_State *L)
 
   if (pat == SOLID) {
     if (x1 == x2) {
-      luaLcdBuffer->drawSolidVerticalLine(x1, y1 < y2 ? y1 : y2, y1 < y2 ? (y2 - y1) + 1 : (y1 - y2) + 1, flags);
+      luaLcdBuffer->drawVerticalLine(x1, y1 < y2 ? y1 : y2, y1 < y2 ? (y2 - y1) + 1 : (y1 - y2) + 1, pat, flags);
       return 0;
     } else if (y1 == y2) {
-      luaLcdBuffer->drawSolidHorizontalLine(x1 < x2 ? x1 : x2, y1, x1 < x2 ? (x2 - x1) + 1 : (x1 - x2) + 1, flags);
+      luaLcdBuffer->drawHorizontalLine(x1 < x2 ? x1 : x2, y1, x1 < x2 ? (x2 - x1) + 1 : (x1 - x2) + 1, pat, flags);
       return 0;
     }
   }
@@ -353,11 +353,11 @@ static int luaLcdDrawTextLines(lua_State *L)
     if ((flags & BLINK) && !BLINK_ON_PHASE)
       return 0;
     if (flags & SHADOWED)
-      drawTextLines(luaLcdBuffer, x+1, y+1, w, h, s, flags & 0xFFFF); // force black
+      luaLcdBuffer->drawTextLines(x+1, y+1, w, h, s, flags & 0xFFFF); // force black
     flags = (flags & 0xFFFF) | flagsRGB(flags);
   }
   
-  drawTextLines(luaLcdBuffer, x, y, w, h, s, flags);
+  luaLcdBuffer->drawTextLines(x, y, w, h, s, flags);
   return 0;
 }
 
@@ -449,7 +449,7 @@ static int luaLcdDrawChannel(lua_State *L)
   LcdFlags flags = luaL_optunsigned(L, 4, 0);
   flags = flagsRGB(flags);
   getvalue_t value = getValue(channel);
-  drawSensorCustomValue(luaLcdBuffer, x, y, (channel-MIXSRC_FIRST_TELEM)/3, value, flags);
+  luaLcdBuffer->drawSensorCustomValue(x, y, (channel-MIXSRC_FIRST_TELEM)/3, value, flags);
 
   return 0;
 }
@@ -478,7 +478,7 @@ static int luaLcdDrawSwitch(lua_State *L)
   int s = luaL_checkinteger(L, 3);
   LcdFlags flags = luaL_optunsigned(L, 4, 0);
   flags = flagsRGB(flags);
-  drawSwitch(luaLcdBuffer, x, y, s, flags);
+  luaLcdBuffer->drawSwitch(x, y, s, flags);
 
   return 0;
 }
@@ -506,7 +506,7 @@ static int luaLcdDrawSource(lua_State *L)
   int s = luaL_checkinteger(L, 3);
   LcdFlags flags = luaL_optunsigned(L, 4, 0);
   flags = flagsRGB(flags);
-  drawSource(luaLcdBuffer, x, y, s, flags);
+  luaLcdBuffer->drawSource(x, y, s, flags);
 
   return 0;
 }
@@ -760,7 +760,7 @@ static int luaLcdDrawBitmapPattern(lua_State *L)
     auto y = luaL_checkunsigned(L, 3);
     auto flags = luaL_optunsigned(L, 4, 0);
     flags = flagsRGB(flags);
-    luaLcdBuffer->drawBitmapPattern(x, y, reinterpret_cast<const uint8_t*>(m), flags);
+    luaLcdBuffer->drawBitmapPattern(x, y, reinterpret_cast<const MaskBitmap*>(m), flags);
   }
 
   return 0;
@@ -799,7 +799,7 @@ static int luaLcdDrawBitmapPatternPie(lua_State *L)
     auto endAngle = luaL_checkinteger(L, 5);
     auto flags = luaL_optunsigned(L, 6, 0);
     flags = flagsRGB(flags);
-    luaLcdBuffer->drawBitmapPatternPie(x, y, reinterpret_cast<const uint8_t*>(m), flags, startAngle, endAngle);
+    luaLcdBuffer->drawBitmapPatternPie(x, y, reinterpret_cast<const MaskBitmap*>(m), flags, startAngle, endAngle);
   }
 
   return 0;
@@ -1339,7 +1339,7 @@ static void drawHudRectangle(BitmapBuffer * dc, float pitch, float roll, coord_t
         coord_t yy = ymin + s;
         coord_t xx = ox + ((float)yy - oy) / angle; // + 0.5f; rounding not needed
         if (xx >= xmin && xx <= xmax) {
-          dc->drawSolidHorizontalLine(xx, yy, xmax - xx + 1, flags);
+          dc->drawHorizontalLine(xx, yy, xmax - xx + 1, SOLID, flags);
         }
         else if (xx < xmin) {
           ybot = (inverted) ? max(yy, ybot) + 1 : min(yy, ybot);
@@ -1352,7 +1352,7 @@ static void drawHudRectangle(BitmapBuffer * dc, float pitch, float roll, coord_t
         coord_t yy = ymin + s;
         coord_t xx = ox + ((float)yy - oy) / angle; // + 0.5f; rounding not needed
         if (xx >= xmin && xx <= xmax) {
-          dc->drawSolidHorizontalLine(xmin, yy, xx - xmin, flags);
+          dc->drawHorizontalLine(xmin, yy, xx - xmin, SOLID, flags);
         }
         else if (xx > xmax) {
           ybot = (inverted) ? max(yy, ybot) + 1 : min(yy, ybot);

radio/src/lua/api_general.cpp

@@ -3129,8 +3129,8 @@ LROT_BEGIN(etxcst, NULL, 0)
   LROT_NUMENTRY( WARNING_COLOR, COLOR2FLAGS(COLOR_THEME_WARNING_INDEX) )
 
   // Literal colors
-  LROT_NUMENTRY( BLACK, RGB2FLAGS(0x00, 0x00, 0x00) )
-  LROT_NUMENTRY( WHITE, RGB2FLAGS(0xFF, 0xFF, 0xFF) )
+  LROT_NUMENTRY( BLACK, COLOR2FLAGS(COLOR_BLACK_INDEX) )
+  LROT_NUMENTRY( WHITE, COLOR2FLAGS(COLOR_WHITE_INDEX) )
   LROT_NUMENTRY( LIGHTWHITE, RGB2FLAGS(0xEA, 0xEA, 0xEA) )
   LROT_NUMENTRY( YELLOW, RGB2FLAGS(0xFF, 0xFF, 0x00) )
   LROT_NUMENTRY( BLUE, RGB2FLAGS(0x00, 0x00, 0xFF) )

radio/src/lua/interface.cpp

@@ -745,17 +745,17 @@ void displayLuaError(bool firstCall = false)
   
   if (!drewBackground) {
     drewBackground = true;
-    luaLcdBuffer->drawFilledRect(0, 0, LCD_W, LCD_H, SOLID, BLACK, OPACITY(6));
+    luaLcdBuffer->drawFilledRect(0, 0, LCD_W, LCD_H, SOLID, COLOR_BLACK, OPACITY(6));
   }
 
   luaLcdBuffer->drawSolidFilledRect(left, top - hh, w, hh, COLOR_THEME_SECONDARY1);
   luaLcdBuffer->drawSolidFilledRect(left, top, w, h, COLOR_THEME_SECONDARY3);
 #if (LCD_W > LCD_H)
   luaLcdBuffer->drawText(left + 10, top - hh + 2, title, FONT(XL) | COLOR_THEME_PRIMARY2);
-  drawTextLines(luaLcdBuffer, left + 10, top + 5, w - 20, h - 10, lua_warning_info, FONT(L) | COLOR_THEME_PRIMARY1);
+  luaLcdBuffer->drawTextLines(left + 10, top + 5, w - 20, h - 10, lua_warning_info, FONT(L) | COLOR_THEME_PRIMARY1);
 #else
   luaLcdBuffer->drawText(left + 10, top - hh + 2, title, FONT(L) | COLOR_THEME_PRIMARY2);
-  drawTextLines(luaLcdBuffer, left + 10, top + 5, w - 20, h - 10, lua_warning_info, FONT(STD) | COLOR_THEME_PRIMARY1);
+  luaLcdBuffer->drawTextLines(left + 10, top + 5, w - 20, h - 10, lua_warning_info, FONT(STD) | COLOR_THEME_PRIMARY1);
 #endif
 #else
   if (!luaLcdAllowed)

radio/src/lua/lua_api.h

@@ -61,19 +61,6 @@ extern lua_State * lsScripts;
 extern bool luaLcdAllowed;
 
 #if defined(COLORLCD)
-//
-// Obsoleted definitions:
-//  -> please check against libopenui_defines.h for conflicts
-//  -> here we use the 4 most significant bits for our flags (32 bit unsigned)
-//
-// INVERS & BLINK are used in most scripts, let's offer a compatibility mode.
-//
-#undef INVERS
-#undef BLINK
-
-#define INVERS     0x01u
-#define BLINK    0x1000u
-
 extern bool luaLcdAllowed;
 
 class BitmapBuffer;

radio/src/lua/lua_widget.cpp

@@ -20,14 +20,13 @@
  */
 
 #include "lua_widget.h"
-#include "lua_widget_factory.h"
 
 #include "lua_api.h"
 #include "lua_event.h"
-#include "draw_functions.h"
+#include "lua_widget_factory.h"
 #include "touch.h"
 
-#define MAX_INSTRUCTIONS       (20000/100)
+#define MAX_INSTRUCTIONS (20000 / 100)
 
 #if defined(HARDWARE_TOUCH)
 uint32_t LuaEventHandler::downTime = 0;
@@ -37,7 +36,7 @@ tmr10ms_t LuaEventHandler::swipeTimeOut = 0;
 coord_t LuaEventHandler::_startX;
 coord_t LuaEventHandler::_startY;
 bool LuaEventHandler::_sliding = false;
-#endif  
+#endif
 
 void LuaEventHandler::event_cb(lv_event_t* e)
 {
@@ -53,10 +52,9 @@ void LuaEventHandler::event_cb(lv_event_t* e)
     } else if (key == LV_KEY_RIGHT) {
       win->onEvent(EVT_ROTARY_RIGHT);
     }
-  }
-  else if (code == LV_EVENT_LONG_PRESSED) {
+  } else if (code == LV_EVENT_LONG_PRESSED) {
     lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act());
-    if(indev_type != LV_INDEV_TYPE_POINTER) {
+    if (indev_type != LV_INDEV_TYPE_POINTER) {
       // Do not use `lv_indev_wait_release()` as some LUA scripts
       // rely on EVT_KEY_BREAK(KEY_ENTER) being generated on key release
       luaPushEvent(EVT_KEY_LONG(KEY_ENTER));
@@ -131,7 +129,7 @@ void LuaEventHandler::event_cb(lv_event_t* e)
       tapCount = 0;
     }
   }
-#endif  
+#endif
 }
 
 void LuaEventHandler::onClicked()
@@ -140,7 +138,6 @@ void LuaEventHandler::onClicked()
   auto click_source = lv_indev_get_act();
   bool is_pointer = lv_indev_get_type(click_source) == LV_INDEV_TYPE_POINTER;
   if (is_pointer) {
-
     lv_point_t point_act;
     lv_indev_get_point(click_source, &point_act);
 
@@ -165,10 +162,7 @@ void LuaEventHandler::onClicked()
   luaPushEvent(EVT_KEY_BREAK(KEY_ENTER));
 }
 
-void LuaEventHandler::onCancel()
-{
-  luaPushEvent(EVT_KEY_BREAK(KEY_EXIT));
-}
+void LuaEventHandler::onCancel() { luaPushEvent(EVT_KEY_BREAK(KEY_EXIT)); }
 
 void LuaEventHandler::onEvent(event_t event)
 {
@@ -195,14 +189,48 @@ void LuaEventHandler::removeHandler(Window* w)
   lv_obj_remove_event_cb(obj, LuaEventHandler::event_cb);
 }
 
+void LuaWidget::redraw_cb(lv_event_t* e)
+{
+  lv_obj_t* target = lv_event_get_target(e);
+  if (lv_obj_has_flag(target, LV_OBJ_FLAG_HIDDEN)) return;
+
+  LuaWidget* widget = (LuaWidget*)lv_obj_get_user_data(target);
+
+  if (widget) {
+    lv_draw_ctx_t* draw_ctx = lv_event_get_draw_ctx(e);
+
+    lv_area_t a, clipping, obj_coords;
+    lv_area_copy(&a, draw_ctx->buf_area);
+    lv_area_copy(&clipping, draw_ctx->clip_area);
+    lv_obj_get_coords(target, &obj_coords);
+
+    auto w = a.x2 - a.x1 + 1;
+    auto h = a.y2 - a.y1 + 1;
+
+    TRACE_WINDOWS("Draw %s", widget->getWindowDebugString().c_str());
+
+    BitmapBuffer buf = {BMP_RGB565, (uint16_t)w, (uint16_t)h,
+                        (uint16_t*)draw_ctx->buf};
+
+    buf.setDrawCtx(draw_ctx);
+
+    buf.setOffset(obj_coords.x1 - a.x1, obj_coords.y1 - a.y1);
+    buf.setClippingRect(clipping.x1 - a.x1, clipping.x2 + 1 - a.x1,
+                        clipping.y1 - a.y1, clipping.y2 + 1 - a.y1);
+
+    widget->refresh(&buf);
+  }
+}
+
 LuaWidget::LuaWidget(const WidgetFactory* factory, Window* parent,
                      const rect_t& rect, WidgetPersistentData* persistentData,
-                     int luaWidgetDataRef,int zoneRectDataRef) :
+                     int luaWidgetDataRef, int zoneRectDataRef) :
     Widget(factory, parent, rect, persistentData),
     luaWidgetDataRef(luaWidgetDataRef),
     zoneRectDataRef(zoneRectDataRef),
     errorMessage(nullptr)
 {
+  lv_obj_add_event_cb(lvobj, LuaWidget::redraw_cb, LV_EVENT_DRAW_MAIN, nullptr);
 }
 
 LuaWidget::~LuaWidget()
@@ -215,7 +243,7 @@ LuaWidget::~LuaWidget()
 void LuaWidget::onClicked()
 {
   if (!fullscreen) {
-    Button::onClicked();
+    ButtonBase::onClicked();
     return;
   }
 
@@ -225,7 +253,7 @@ void LuaWidget::onClicked()
 void LuaWidget::onCancel()
 {
   if (!fullscreen) {
-    Button::onCancel();
+    ButtonBase::onCancel();
     return;
   }
 
@@ -241,16 +269,16 @@ void LuaWidget::checkEvents()
     background();
     refreshed = true;
   }
-  
+
   refreshed = false;
   invalidate();
 
 #if defined(DEBUG_WINDOWS)
-    TRACE_WINDOWS("# refresh: %s", getWindowDebugString().c_str());
+  TRACE_WINDOWS("# refresh: %s", getWindowDebugString().c_str());
 #endif
 }
 
-static void l_pushtableint(const char * key, int value)
+static void l_pushtableint(const char* key, int value)
 {
   lua_pushstring(lsWidgets, key);
   lua_pushinteger(lsWidgets, value);
@@ -260,9 +288,9 @@ static void l_pushtableint(const char * key, int value)
 void LuaWidget::update()
 {
   Widget::update();
-  
+
   if (lsWidgets == 0 || errorMessage) return;
-  LuaWidgetFactory * lua_factory = (LuaWidgetFactory *)factory;
+  LuaWidgetFactory* lua_factory = (LuaWidgetFactory*)factory;
 
   luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
   lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, lua_factory->updateFunction);
@@ -270,11 +298,13 @@ void LuaWidget::update()
 
   lua_newtable(lsWidgets);
   int i = 0;
-  for (const ZoneOption * option = getOptions(); option->name; option++, i++) {
+  for (const ZoneOption* option = getOptions(); option->name; option++, i++) {
     if (option->type == ZoneOption::String) {
       lua_pushstring(lsWidgets, option->name);
-      char str[LEN_ZONE_OPTION_STRING + 1] = {0}; // Zero-terminated string for Lua
-      strncpy(str, persistentData->options[i].value.stringValue, LEN_ZONE_OPTION_STRING);
+      char str[LEN_ZONE_OPTION_STRING + 1] = {
+          0};  // Zero-terminated string for Lua
+      strncpy(str, persistentData->options[i].value.stringValue,
+              LEN_ZONE_OPTION_STRING);
       lua_pushstring(lsWidgets, &str[0]);
       lua_settable(lsWidgets, -3);
     } else if (option->type == ZoneOption::Color) {
@@ -318,8 +348,7 @@ bool LuaWidget::updateTable(const char* idx, int val)
 
 void LuaWidget::updateZoneRect(rect_t rect)
 {
-  if (lsWidgets)
-  {
+  if (lsWidgets) {
     // Update widget zone with current size and position
 
     lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, zoneRectDataRef);
@@ -333,8 +362,7 @@ void LuaWidget::updateZoneRect(rect_t rect)
 
     lua_pop(lsWidgets, 1);
 
-    if (changed)
-      update();
+    if (changed) update();
   }
 }
 
@@ -348,10 +376,11 @@ void LuaWidget::onFullscreen(bool enable)
   }
 }
 
-void LuaWidget::setErrorMessage(const char * funcName)
+void LuaWidget::setErrorMessage(const char* funcName)
 {
   const char* lua_err = lua_tostring(lsWidgets, -1);
-  TRACE("Error in widget %s %s function: %s", factory->getName(), funcName, lua_err);
+  TRACE("Error in widget %s %s function: %s", factory->getName(), funcName,
+        lua_err);
   TRACE("Widget disabled");
 
   size_t err_len = snprintf(NULL, 0, "ERROR in %s: %s", funcName, lua_err);
@@ -363,35 +392,31 @@ void LuaWidget::setErrorMessage(const char * funcName)
   }
 }
 
-const char * LuaWidget::getErrorMessage() const
-{
-  return errorMessage;
-}
+const char* LuaWidget::getErrorMessage() const { return errorMessage; }
 
 void LuaWidget::refresh(BitmapBuffer* dc)
 {
   if (lsWidgets == 0) return;
 
   if (errorMessage) {
-    drawTextLines(dc, 0, 0, fullscreen ? LCD_W : rect.w,
-                  fullscreen ? LCD_H : rect.h, errorMessage,
-                  FONT(XS) | COLOR_THEME_WARNING);
+    dc->drawTextLines(0, 0, fullscreen ? LCD_W : rect.w,
+                      fullscreen ? LCD_H : rect.h, errorMessage,
+                      FONT(XS) | COLOR_THEME_WARNING);
     return;
   }
 
   luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
-  LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
+  LuaWidgetFactory* factory = (LuaWidgetFactory*)this->factory;
   lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->refreshFunction);
   lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, luaWidgetDataRef);
-  
+
   // Pass key event to fullscreen Lua widget
   LuaEventData evt;
   luaNextEvent(&evt);
 
   if (fullscreen) {
     lua_pushinteger(lsWidgets, evt.event);
-  }
-  else
+  } else
     lua_pushnil(lsWidgets);
 
 #if defined(HARDWARE_TOUCH)
@@ -400,11 +425,12 @@ void LuaWidget::refresh(BitmapBuffer* dc)
   } else
 #endif
     lua_pushnil(lsWidgets);
-  
+
   // Enable drawing into the current LCD buffer
   luaLcdBuffer = dc;
 
-  // This little hack is needed to not interfere with the LCD usage of preempted scripts
+  // This little hack is needed to not interfere with the LCD usage of preempted
+  // scripts
   bool lla = luaLcdAllowed;
   luaLcdAllowed = true;
   runningFS = this;
@@ -427,7 +453,7 @@ void LuaWidget::background()
 
   // TRACE("LuaWidget::background()");
   luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
-  LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
+  LuaWidgetFactory* factory = (LuaWidgetFactory*)this->factory;
   if (factory->backgroundFunction) {
     lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->backgroundFunction);
     lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, luaWidgetDataRef);

radio/src/lua/lua_widget.h

@@ -87,14 +87,17 @@ class LuaWidget : public Widget, public LuaEventHandler
   std::string getName() const override { return "LuaWidget"; }
 #endif
 
-  // Window interface
-  void onEvent(event_t event) override;
-
   // Widget interface
   const char* getErrorMessage() const override;
   void update() override;
   void background() override;
 
+ protected:
   // Calls LUA widget 'refresh' method
-  void refresh(BitmapBuffer* dc) override;
+  void refresh(BitmapBuffer* dc);
+
+  // Window interface
+  void onEvent(event_t event) override;
+
+  static void redraw_cb(lv_event_t *e);
 };

radio/src/lua/widgets.cpp

@@ -390,7 +390,7 @@ void luaInitThemesAndWidgets()
 
 void luaUnregisterWidgets()
 {
-  std::list<const WidgetFactory *> regWidgets(getRegisteredWidgets());
+  std::list<const WidgetFactory *> regWidgets(WidgetFactory::getRegisteredWidgets());
   for (auto w : regWidgets) {
     if (w->isLuaWidgetFactory()) {
       delete w;