Refactor the wasm graphic layer (wgl) and the gui sample (#231)

samples/gui/wasm-apps/build_apps.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+APPS_ROOT=$(cd "$(dirname "$0")/" && pwd)
+cd ${APPS_ROOT}
+
+echo "OUT_DIR: ${OUT_DIR}"
+
+if [ -z ${OUT_DIR} ]; then
+    OUT_DIR=${APPS_ROOT}/out
+    echo "set the wasm app folder: ${OUT_DIR}"
+
+    if [ -d ${OUT_DIR} ]; then
+        rm -rf ${OUT_DIR}
+        echo "removed the present output folder: ${OUT_DIR}"
+    fi
+    mkdir ${OUT_DIR}
+
+fi
+
+if [ -z ${WAMR_DIR} ]; then
+    WAMR_DIR=${APPS_ROOT}/../../..
+fi
+
+
+cd ${APPS_ROOT}/increase
+
+rm -rf build
+mkdir build && cd build
+cmake .. -DCMAKE_TOOLCHAIN_FILE=${WAMR_DIR}/wamr-sdk/out/gui/app-sdk/wamr_toolchain.cmake
+make
+[ $? -eq 0 ] || exit $?
+mv ui_increase.wasm ${OUT_DIR}/
+
+# $makewrap
+# mv ui_app.wasm ${OUT_DIR}/
+
+cd ${APPS_ROOT}/decrease
+make
+[ $? -eq 0 ] || exit $?
+mv ui_decrease.wasm ${OUT_DIR}/
+
+echo "WASM files generated in folder  ${OUT_DIR}"
+
+echo "#####################  build WASM APPs finished #####################"

samples/gui/wasm-apps/decrease/Makefile

@@ -26,4 +26,4 @@ all:
     -Wl,--export=on_init -Wl,--export=on_timer_callback \
     -Wl,--export=on_widget_event \
     -Wl,--export=__heap_base,--export=__data_end \
-    -o ui_app_lvgl_compatible.wasm
+    -o ui_decrease.wasm

samples/gui/wasm-apps/decrease/src/main.c

@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 #include "wasm_app.h"
-#include "wa-inc/lvgl.h"
+#include "wa-inc/lvgl/lvgl.h"
 #include "wa-inc/timer_wasm_app.h"
 
 extern char g_widget_text[];

samples/gui/wasm-apps/increase/CMakeLists.txt

@@ -13,8 +13,8 @@ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},-L${WAMR_ROOT_DIR}/wamr-s
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},--export=on_init,--export=on_timer_callback,--export=on_widget_event,--export=__heap_base,--export=__data_end")
 set (CMAKE_C_FLAGS          "${CMAKE_C_FLAGS} -O3 -Wno-unused-command-line-argument")
 
-add_executable(ui_app.wasm
+add_executable(ui_increase.wasm
     ${CMAKE_CURRENT_LIST_DIR}/src/main.c
 )
 
-target_link_libraries(ui_app.wasm  app_framework)
+target_link_libraries(ui_increase.wasm  app_framework)

samples/gui/wasm-apps/increase/src/main.c

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2019 Intel Corporation.  All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ */
+
+#include <stdlib.h>
+#include "wasm_app.h"
+#include "wa-inc/lvgl/lvgl.h"
+#include "wa-inc/timer_wasm_app.h"
+
+extern char g_widget_text[];
+
+static void btn_event_cb(lv_obj_t *btn, lv_event_t event);
+
+uint32_t count = 0;
+char count_str[11] = { 0 };
+lv_obj_t *hello_world_label;
+lv_obj_t *count_label;
+lv_obj_t *btn1;
+lv_obj_t *label_count1;
+int label_count1_value = 1;
+char label_count1_str[11] = { 0 };
+
+void timer1_update(user_timer_t timer1)
+{
+    if ((count % 100) == 0) {
+        snprintf(count_str, sizeof(count_str), "%d", count / 100);
+        lv_label_set_text(count_label, count_str);
+    }
+    ++count;
+}
+
+void on_init()
+{
+    char *text;
+
+    hello_world_label = lv_label_create(NULL, NULL);
+    lv_label_set_text(hello_world_label, "Hello world!");
+    text = lv_label_get_text(hello_world_label);
+    printf("Label text %lu %s \n", strlen(text), text);
+    lv_obj_align(hello_world_label, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 0);
+
+    count_label = lv_label_create(NULL, NULL);
+    lv_obj_align(count_label, NULL, LV_ALIGN_IN_TOP_MID, 0, 0);
+
+    btn1 = lv_btn_create(NULL, NULL); /*Create a button on the currently loaded screen*/
+    lv_obj_set_event_cb(btn1, btn_event_cb); /*Set function to be called when the button is released*/
+    lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0); /*Align below the label*/
+
+    /*Create a label on the button*/
+    lv_obj_t *btn_label = lv_label_create(btn1, NULL);
+    lv_label_set_text(btn_label, "Click ++");
+
+    label_count1 = lv_label_create(NULL, NULL);
+    lv_label_set_text(label_count1, "1");
+    lv_obj_align(label_count1, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+    /* set up a timer */
+    user_timer_t timer;
+    timer = api_timer_create(10, true, false, timer1_update);
+    if (timer)
+        api_timer_restart(timer, 10);
+    else
+        printf("Fail to create timer.\n");
+}
+
+static void btn_event_cb(lv_obj_t *btn, lv_event_t event)
+{
+    if(event == LV_EVENT_RELEASED) {
+        label_count1_value++;
+        snprintf(label_count1_str, sizeof(label_count1_str),
+                 "%d", label_count1_value);
+        lv_label_set_text(label_count1, label_count1_str);
+        if (label_count1_value == 100)
+            label_count1_value = 0;
+    }
+
+}

samples/gui/wasm-apps/wgl/src/main.c

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2019 Intel Corporation.  All rights reserved.
- * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
- */
-
-#include <stdlib.h>
-#include "wasm_app.h"
-#include "wa-inc/wgl.h"
-#include "wa-inc/timer_wasm_app.h"
-
-static void btn_event_cb(wgl_obj_t btn, wgl_event_t event);
-
-uint32_t count = 0;
-char count_str[11] = { 0 };
-wgl_obj_t hello_world_label;
-wgl_obj_t count_label;
-wgl_obj_t btn1;
-wgl_obj_t label_count1;
-int label_count1_value = 0;
-char label_count1_str[11] = { 0 };
-
-void timer1_update(user_timer_t timer1)
-{
-    if ((count % 100) == 0) {
-        snprintf(count_str, sizeof(count_str), "%d", count / 100);
-        wgl_label_set_text(count_label, count_str);
-    }
-    ++count;
-}
-
-void on_init()
-{
-    hello_world_label = wgl_label_create((wgl_obj_t)NULL, (wgl_obj_t)NULL);
-    wgl_label_set_text(hello_world_label, "Hello world!");
-    wgl_obj_align(hello_world_label, (wgl_obj_t)NULL, WGL_ALIGN_IN_TOP_LEFT, 0, 0);
-
-    count_label = wgl_label_create((wgl_obj_t)NULL, (wgl_obj_t)NULL);
-    wgl_obj_align(count_label, (wgl_obj_t)NULL, WGL_ALIGN_IN_TOP_MID, 0, 0);
-
-    btn1 = wgl_btn_create((wgl_obj_t)NULL, (wgl_obj_t)NULL); /*Create a button on the currently loaded screen*/
-    wgl_obj_set_event_cb(btn1, btn_event_cb); /*Set function to be called when the button is released*/
-    wgl_obj_align(btn1, (wgl_obj_t)NULL, WGL_ALIGN_CENTER, 0, 0); /*Align below the label*/
-
-    /*Create a label on the button*/
-    wgl_obj_t btn_label = wgl_label_create(btn1, (wgl_obj_t)NULL);
-    wgl_label_set_text(btn_label, "Click ++");
-
-    label_count1 = wgl_label_create((wgl_obj_t)NULL, (wgl_obj_t)NULL);
-    wgl_label_set_text(label_count1, "0");
-    wgl_obj_align(label_count1, (wgl_obj_t)NULL, WGL_ALIGN_IN_BOTTOM_MID, 0, 0);
-
-    /* set up a timer */
-    user_timer_t timer;
-    timer = api_timer_create(10, true, false, timer1_update);
-    if (timer)
-        api_timer_restart(timer, 10);
-    else
-        printf("Fail to create timer.\n");
-}
-
-static void btn_event_cb(wgl_obj_t btn, wgl_event_t event)
-{
-    if(event == WGL_EVENT_RELEASED) {
-        label_count1_value++;
-        snprintf(label_count1_str, sizeof(label_count1_str),
-                 "%d", label_count1_value);
-        wgl_label_set_text(label_count1, label_count1_str);
-
-        //wgl_cont_set_fit4(btn, WGL_FIT_FLOOD, WGL_FIT_FLOOD, WGL_FIT_FLOOD, WGL_FIT_FLOOD);
-        //wgl_obj_clean(btn);
-    }
-}