optional background fill for text, for splash screen

include/image.h

@@ -19,6 +19,10 @@
 #ifndef __IMAGE_H__
 #define __IMAGE_H__
 
+#include "pico/stdlib.h"
+
+void image_draw(char *data, uint width, uint height);
+
 void draw_splash(void);
 
 #endif // __IMAGE_H__

include/lcd.h

@@ -19,6 +19,14 @@
 #ifndef __LCD_H__
 #define __LCD_H__
 
+#include <stdint.h>
+
+#define RGB_565(r, g, b) ( \
+      (((r) >> 3) << 11)   \
+    | (((g) >> 2) << 5)    \
+    |  ((b) >> 3)          \
+)
+
 void lcd_init(void);
 
 uint16_t lcd_get_backlight(void);
@@ -26,5 +34,6 @@ void lcd_set_backlight(uint16_t value);
 
 void lcd_clear(void);
 void lcd_write_point(uint16_t x, uint16_t y, uint32_t color);
+void lcd_write_rect(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint32_t color);
 
 #endif // __LCD_H__

include/text.h

@@ -21,6 +21,8 @@
 
 #include "mcufont.h"
 
+#define TEXT_BG_NONE -1
+
 struct text_font {
     const char *fontname;
     //int scale; // TODO not supported - requires somewhere to store scaled versions
@@ -37,6 +39,7 @@ struct text_conf {
     int width;
     int height;
     int margin;
+    int bg;
 
     struct text_font *font;
 };

src/console.c

@@ -145,6 +145,7 @@ static void cnsl_interpret(const char *line) {
                 .width = 240,
                 .height = 240 - y_off,
                 .margin = 5,
+                .bg = TEXT_BG_NONE,
                 .font = &font,
             };
             text_draw(&text);

src/image.c

@@ -16,10 +16,9 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#include "pico/stdlib.h"
-
 #include "config.h"
 #include "lcd.h"
+#include "text.h"
 #include "image.h"
 
 #pragma GCC diagnostic push
@@ -27,17 +26,56 @@
 #include "logo.h"
 #pragma GCC diagnostic pop
 
-void draw_splash(void) {
-    char *data = logo_rgb_data;
-    for (uint x = 0; x < logo_width; x++) {
-        for (uint y = 0; y < logo_height; y++) {
+void image_draw(char *data, uint width, uint height) {
+    for (uint x = 0; x < width; x++) {
+        for (uint y = 0; y < height; y++) {
             uint32_t pixel[3];
             HEADER_PIXEL(data, pixel);
 
-            uint32_t color = (pixel[0] >> 3) << 11;
-            color |= (pixel[1] >> 2) << 5;
-            color |= pixel[2] >> 3;
+            uint32_t color = RGB_565(pixel[0], pixel[1], pixel[2]);
             lcd_write_point(240 - x - 1, y, color);
         }
     }
 }
+
+void draw_splash(void) {
+    image_draw(logo_rgb_data, logo_width, logo_height);
+
+    struct text_font font_big = {
+        .fontname = "DejaVuSerif32",
+    };
+    text_prepare_font(&font_big);
+
+    struct text_font font_small = {
+        .fontname = "DejaVuSerif16",
+    };
+    text_prepare_font(&font_small);
+
+    struct text_conf text1 = {
+        .text = "xythobuz.de",
+        .x = 0,
+        .y = 0,
+        .justify = false,
+        .alignment = MF_ALIGN_CENTER,
+        .width = 240,
+        .height = 240,
+        .margin = 2,
+        .bg = RGB_565(0x00, 0x00, 0x00),
+        .font = &font_big,
+    };
+    text_draw(&text1);
+
+    struct text_conf text2 = {
+        .text = __DATE__ " " __TIME__,
+        .x = 0,
+        .y = 195,
+        .justify = false,
+        .alignment = MF_ALIGN_CENTER,
+        .width = 240,
+        .height = 240,
+        .margin = 2,
+        .bg = RGB_565(0x00, 0x00, 0x00),
+        .font = &font_small,
+    };
+    text_draw(&text2);
+}

src/lcd.c

@@ -269,3 +269,7 @@ void lcd_clear(void) {
 void lcd_write_point(uint16_t x, uint16_t y, uint32_t color) {
     st7789_draw_point(&gs_handle, x, y, color);
 }
+
+void lcd_write_rect(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint32_t color) {
+    st7789_fill_rect(&gs_handle, left, top, right, bottom, color);
+}

src/text.c

@@ -34,9 +34,7 @@ static void pixel_callback(int16_t x, int16_t y, uint8_t count, uint8_t alpha,
     if (x < 0 || x + count >= s->options->width) return;
 
     while (count--) {
-        uint32_t c = (alpha >> 3) << 11;
-        c |= (alpha >> 2) << 5;
-        c |= alpha >> 3;
+        uint32_t c = RGB_565(alpha, alpha, alpha);
         lcd_write_point(240 - y - 1, x, c);
         x++;
     }
@@ -52,6 +50,31 @@ static uint8_t character_callback(int16_t x, int16_t y, mf_char character,
 static bool line_callback(const char *line, uint16_t count, void *state) {
     state_t *s = (state_t*)state;
 
+    if (s->options->bg != TEXT_BG_NONE) {
+        int16_t width = mf_get_string_width(s->options->font->font, line, count, false) + 2 * s->options->margin;
+        int16_t line_height = s->options->font->font->line_height;
+
+        if (s->options->alignment == MF_ALIGN_LEFT) {
+            lcd_write_rect(240 - s->options->y - 1 - line_height,
+                           s->options->x,
+                           240 - s->options->y - 1,
+                           s->options->x + width,
+                           s->options->bg);
+        } else if (s->options->alignment == MF_ALIGN_CENTER) {
+            lcd_write_rect(240 - s->options->y - 1 - line_height,
+                           s->options->x + s->options->width / 2 - width / 2,
+                           240 - s->options->y - 1,
+                           s->options->x + s->options->width / 2 + width / 2,
+                           s->options->bg);
+        } else if (s->options->alignment == MF_ALIGN_RIGHT) {
+            lcd_write_rect(240 - s->options->y - 1 - line_height,
+                           s->options->x + s->options->width - width,
+                           240 - s->options->y - 1,
+                           s->options->x + s->options->width,
+                           s->options->bg);
+        }
+    }
+
     if (s->options->justify) {
         mf_render_justified(s->options->font->font, s->anchor + s->options->x, s->options->y,
                             s->options->width - s->options->margin * 2,