Software keyboard refactored (#594)

Removed software keyboard in Tactility subproject (GuiService, Lvgl.cpp) and re-implemented it in TactilityKernel.

Tactility/Source/lvgl/Keyboard.cpp

@@ -1,73 +0,0 @@
-#include "Tactility/lvgl/Keyboard.h"
-#include "Tactility/service/gui/GuiService.h"
-
-#include <tactility/device.h>
-#include <tactility/drivers/keyboard.h>
-
-namespace tt::lvgl {
-
-static lv_indev_t* keyboard_device = nullptr;
-static lv_group_t* pending_keyboard_group = nullptr;
-
-void software_keyboard_show(lv_obj_t* textarea) {
-    auto gui_service = service::gui::findService();
-    if (gui_service != nullptr) {
-        gui_service->softwareKeyboardShow(textarea);
-    }
-}
-
-void software_keyboard_hide() {
-    auto gui_service = service::gui::findService();
-    if (gui_service != nullptr) {
-        gui_service->softwareKeyboardHide();
-    }
-}
-
-bool software_keyboard_is_enabled() {
-    auto gui_service = service::gui::findService();
-    if (gui_service != nullptr) {
-        return gui_service->softwareKeyboardIsEnabled();
-    } else {
-        return false;
-    }
-}
-
-void software_keyboard_activate(lv_group_t* group) {
-    pending_keyboard_group = group;
-    if (keyboard_device != nullptr) {
-        lv_indev_set_group(keyboard_device, group);
-    }
-}
-
-void software_keyboard_deactivate() {
-    pending_keyboard_group = nullptr;
-    if (keyboard_device != nullptr) {
-        lv_indev_set_group(keyboard_device, nullptr);
-    }
-}
-
-bool hardware_keyboard_is_available() {
-    if (keyboard_device != nullptr) {
-        return true;
-    }
-    bool has_kernel_keyboard = false;
-    device_for_each_of_type(&KEYBOARD_TYPE, &has_kernel_keyboard, [](Device* device, void* context) {
-        if (device_is_ready(device)) {
-            *static_cast<bool*>(context) = true;
-            return false;
-        }
-        return true;
-    });
-    return has_kernel_keyboard;
-}
-
-void hardware_keyboard_set_indev(lv_indev_t* device) {
-    keyboard_device = device;
-    // If an app already activated a keyboard group while no hardware keyboard was
-    // connected, apply the pending group now that the device is available.
-    if (device != nullptr && pending_keyboard_group != nullptr) {
-        lv_indev_set_group(device, pending_keyboard_group);
-    }
-}
-
-}

Tactility/Source/lvgl/UsbHidInput.cpp

@@ -3,7 +3,6 @@
 #ifdef ESP_PLATFORM
 
 #include <Tactility/Assets.h>
-#include <Tactility/lvgl/Keyboard.h>
 
 #include <tactility/device.h>
 #include <tactility/drivers/usb_host_hid.h>
@@ -15,6 +14,7 @@
 #include <freertos/semphr.h>
 
 #include <lvgl/lvgl.h>
+#include <lvgl/devices/keyboard.h>
 
 #include <atomic>
 
@@ -171,6 +171,7 @@ static void usbHidInputTask(void* arg) {
     lv_indev_set_read_cb(ctx->kb_indev, keyboard_read_cb);
     lv_indev_set_user_data(ctx->kb_indev, ctx);
     lv_indev_set_group(ctx->kb_indev, lv_group_get_default());
+    lvgl_hardware_keyboard_add_custom(ctx->kb_indev);
 
     lvgl_unlock();
 
@@ -230,13 +231,15 @@ static void usbHidInputTask(void* arg) {
         }
         case USB_HID_EVENT_KEYBOARD_CONNECTED:
             if (ctx->kb_indev && lvgl_try_lock(pdMS_TO_TICKS(200))) {
-                hardware_keyboard_set_indev(ctx->kb_indev);
+                lvgl_keyboard_enable(ctx->kb_indev);
                 lvgl_unlock();
             }
             break;
         case USB_HID_EVENT_KEYBOARD_DISCONNECTED:
             if (lvgl_try_lock(pdMS_TO_TICKS(200))) {
-                hardware_keyboard_set_indev(nullptr);
+                if (ctx->kb_indev) {
+                    lvgl_keyboard_disable(ctx->kb_indev);
+                }
                 lvgl_unlock();
             }
             break;
@@ -263,7 +266,7 @@ static void usbHidInputTask(void* arg) {
     if (ctx->mouse_indev)  { lv_indev_delete(ctx->mouse_indev);  ctx->mouse_indev  = nullptr; }
     if (ctx->mouse_cursor) { lv_obj_delete(ctx->mouse_cursor);   ctx->mouse_cursor = nullptr; }
     if (ctx->kb_indev) {
-        hardware_keyboard_set_indev(nullptr);
+        lvgl_hardware_keyboard_remove_custom(ctx->kb_indev);
         lv_indev_delete(ctx->kb_indev);
         ctx->kb_indev = nullptr;
     }
@@ -347,7 +350,7 @@ void stopUsbHidInput() {
             if (ctx->mouse_indev)  { lv_indev_delete(ctx->mouse_indev);  ctx->mouse_indev  = nullptr; }
             if (ctx->mouse_cursor) { lv_obj_delete(ctx->mouse_cursor);   ctx->mouse_cursor = nullptr; }
             if (ctx->kb_indev) {
-                hardware_keyboard_set_indev(nullptr);
+                lvgl_hardware_keyboard_remove_custom(ctx->kb_indev);
                 lv_indev_delete(ctx->kb_indev);
                 ctx->kb_indev = nullptr;
             }

Tactility/Source/lvgl/wrappers/textarea.cpp

@@ -1,10 +1,7 @@
 #ifdef ESP_PLATFORM
 
-#include <lvgl.h>
-
 #include <lvgl/lvgl.h>
-
-#include <Tactility/service/gui/GuiService.h>
+#include <lvgl/devices/keyboard.h>
 
 extern "C" {
 
@@ -17,9 +14,9 @@ lv_obj_t* __wrap_lv_textarea_create(lv_obj_t* parent) {
         lv_obj_set_style_pad_all(textarea, 2, LV_STATE_DEFAULT);
     }
 
-    auto gui_service = tt::service::gui::findService();
-    if (gui_service != nullptr) {
-        gui_service->keyboardAddTextArea(textarea);
+    auto* software_keyboard = lvgl_software_keyboard_get_last();
+    if (software_keyboard != nullptr) {
+        lvgl_keyboard_add_textarea(software_keyboard, textarea);
     }
 
     if (lv_display_get_color_format(lv_obj_get_display(parent)) == LV_COLOR_FORMAT_L8) {