update 2023-11-05

jiale-gdyd · Nov 5, 2023 · 9d9e4ba · 9d9e4ba
1 parent 02cc1ae
commit 9d9e4ba
Show file tree

Hide file tree

Showing 34 changed files with 3,096 additions and 175 deletions.
diff --git a/project/entry/gui_demo/awtk/res/assets/__assets_all_dark.inc b/project/entry/gui_demo/awtk/res/assets/__assets_all_dark.inc
@@ -98,6 +98,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_right_middle[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_kb_default_t9ext[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_dragger[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_dialog2[]);
+extern TK_CONST_DATA_ALIGN(const unsigned char ui_t[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_color_picker_hsv[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_down_right[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_tab_bottom[]);
@@ -1025,6 +1026,7 @@ ret_t assets_init_dark(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets/__assets_all_default.inc b/project/entry/gui_demo/awtk/res/assets/__assets_all_default.inc
@@ -98,6 +98,7 @@
 #include "default/inc/ui/kb_default_t9ext.data"
 #include "default/inc/ui/dragger.data"
 #include "default/inc/ui/dialog2.data"
+#include "default/inc/ui/t.data"
 #include "default/inc/ui/color_picker_hsv.data"
 #include "default/inc/ui/menu_down_right.data"
 #include "default/inc/ui/tab_bottom.data"
@@ -1025,6 +1026,7 @@ ret_t assets_init_default(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets/__assets_old_dark.inc b/project/entry/gui_demo/awtk/res/assets/__assets_old_dark.inc
@@ -93,6 +93,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_right_middle[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_kb_default_t9ext[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_dragger[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_dialog2[]);
+extern TK_CONST_DATA_ALIGN(const unsigned char ui_t[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_color_picker_hsv[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_down_right[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_tab_bottom[]);
@@ -641,6 +642,7 @@ ret_t assets_init_dark(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets/__assets_old_default.inc b/project/entry/gui_demo/awtk/res/assets/__assets_old_default.inc
@@ -93,6 +93,7 @@
 #include "default/inc/ui/kb_default_t9ext.data"
 #include "default/inc/ui/dragger.data"
 #include "default/inc/ui/dialog2.data"
+#include "default/inc/ui/t.data"
 #include "default/inc/ui/color_picker_hsv.data"
 #include "default/inc/ui/menu_down_right.data"
 #include "default/inc/ui/tab_bottom.data"
@@ -641,6 +642,7 @@ ret_t assets_init_default(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets/default/inc/styles/button.data b/project/entry/gui_demo/awtk/res/assets/default/inc/styles/button.data
diff --git a/project/entry/gui_demo/awtk/res/assets/default/inc/ui/button.data b/project/entry/gui_demo/awtk/res/assets/default/inc/ui/button.data
@@ -1,5 +1,5 @@
 TK_CONST_DATA_ALIGN(const unsigned char ui_button[]) = {
-0x04,0x00,0x01,0x01,0xae,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,
+0x04,0x00,0x01,0x01,0xb2,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -43,22 +43,22 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_button[]) = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xaa,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,
 0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,
 0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,0x3d,0x31,0x37,0x30,0x2c,0x77,0x3d,0x36,0x30,0x2c,0x68,0x3d,0x36,
-0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x69,0x63,0x6f,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x54,
-0x65,0x78,0x74,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x75,0x72,0x73,0x6f,0x72,0x5f,0x74,0x65,0x78,0x74,
-0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
-0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,
-0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,0x3d,0x32,0x34,0x30,
-0x2c,0x77,0x3d,0x36,0x30,0x2c,0x68,0x3d,0x36,0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x69,0x63,
-0x6f,0x6e,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x75,0x72,0x73,0x6f,0x72,0x5f,0x68,0x61,0x6e,0x64,0x00,
-0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x01,
-0x00,0x00,0x1e,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,
-0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,0x3d,0x33,0x31,0x30,0x2c,
-0x77,0x3d,0x33,0x30,0x2c,0x68,0x3d,0x33,0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x69,0x6d,0x61,
-0x67,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x75,0x72,0x73,0x6f,0x72,0x00,0x00,0x00,0x62,0x75,0x74,
-0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x69,0x63,0x6f,0x6e,0x5f,0x74,0x6f,0x70,0x00,0x74,0x65,
+0x78,0x74,0x00,0x54,0x65,0x78,0x74,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x75,0x72,0x73,0x6f,0x72,0x5f,
+0x74,0x65,0x78,0x74,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x73,0x74,0x79,0x6c,
-0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,0x65,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,};/*1246*/
+0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,
+0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,
+0x3d,0x32,0x34,0x30,0x2c,0x77,0x3d,0x36,0x30,0x2c,0x68,0x3d,0x36,0x30,0x29,0x00,0x73,0x74,0x79,0x6c,
+0x65,0x00,0x69,0x63,0x6f,0x6e,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x75,0x72,0x73,0x6f,0x72,0x5f,0x68,
+0x61,0x6e,0x64,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x36,0x01,0x00,0x00,0x1e,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,
+0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,0x3d,
+0x33,0x31,0x30,0x2c,0x77,0x3d,0x33,0x30,0x2c,0x68,0x3d,0x33,0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,
+0x00,0x69,0x6d,0x61,0x67,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x75,0x72,0x73,0x6f,0x72,0x00,0x00,
+0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,
+0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,
+0x73,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*1250*/
diff --git a/project/entry/gui_demo/awtk/res/assets/default/raw/styles/button.bin b/project/entry/gui_demo/awtk/res/assets/default/raw/styles/button.bin
diff --git a/project/entry/gui_demo/awtk/res/assets/default/raw/ui/button.bin b/project/entry/gui_demo/awtk/res/assets/default/raw/ui/button.bin
diff --git a/project/entry/gui_demo/awtk/res/assets_all_dark.inc b/project/entry/gui_demo/awtk/res/assets_all_dark.inc
@@ -98,6 +98,7 @@
 #include "assets/default/inc/ui/kb_default_t9ext.data"
 #include "assets/default/inc/ui/dragger.data"
 #include "assets/default/inc/ui/dialog2.data"
+#include "assets/default/inc/ui/t.data"
 #include "assets/default/inc/ui/color_picker_hsv.data"
 #include "assets/default/inc/ui/menu_down_right.data"
 #include "assets/default/inc/ui/tab_bottom.data"
@@ -1025,6 +1026,7 @@ ret_t assets_init(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets_all_default.inc b/project/entry/gui_demo/awtk/res/assets_all_default.inc
@@ -98,6 +98,7 @@
 #include "assets/default/inc/ui/kb_default_t9ext.data"
 #include "assets/default/inc/ui/dragger.data"
 #include "assets/default/inc/ui/dialog2.data"
+#include "assets/default/inc/ui/t.data"
 #include "assets/default/inc/ui/color_picker_hsv.data"
 #include "assets/default/inc/ui/menu_down_right.data"
 #include "assets/default/inc/ui/tab_bottom.data"
@@ -1025,6 +1026,7 @@ ret_t assets_init(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets_old_dark.inc b/project/entry/gui_demo/awtk/res/assets_old_dark.inc
@@ -93,6 +93,7 @@
 #include "assets/default/inc/ui/kb_default_t9ext.data"
 #include "assets/default/inc/ui/dragger.data"
 #include "assets/default/inc/ui/dialog2.data"
+#include "assets/default/inc/ui/t.data"
 #include "assets/default/inc/ui/color_picker_hsv.data"
 #include "assets/default/inc/ui/menu_down_right.data"
 #include "assets/default/inc/ui/tab_bottom.data"
@@ -641,6 +642,7 @@ ret_t assets_init(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/entry/gui_demo/awtk/res/assets_old_default.inc b/project/entry/gui_demo/awtk/res/assets_old_default.inc
@@ -93,6 +93,7 @@
 #include "assets/default/inc/ui/kb_default_t9ext.data"
 #include "assets/default/inc/ui/dragger.data"
 #include "assets/default/inc/ui/dialog2.data"
+#include "assets/default/inc/ui/t.data"
 #include "assets/default/inc/ui/color_picker_hsv.data"
 #include "assets/default/inc/ui/menu_down_right.data"
 #include "assets/default/inc/ui/tab_bottom.data"
@@ -641,6 +642,7 @@ ret_t assets_init(void) {
   assets_manager_add(am, ui_kb_default_t9ext);
   assets_manager_add(am, ui_dragger);
   assets_manager_add(am, ui_dialog2);
+  assets_manager_add(am, ui_t);
   assets_manager_add(am, ui_color_picker_hsv);
   assets_manager_add(am, ui_menu_down_right);
   assets_manager_add(am, ui_tab_bottom);

diff --git a/project/gui/awtk/src/Makefile b/project/gui/awtk/src/Makefile
@@ -20,7 +20,9 @@ obj-y += lcd/
 obj-y += main_loop/
 obj-y += native_window/
 obj-y += platforms/
+obj-y += remote_ui/
 obj-y += romfs/
+obj-y += service/
 obj-y += streams/
 obj-y += svg/
 obj-y += tkc/

diff --git a/project/gui/awtk/src/base/widget.c b/project/gui/awtk/src/base/widget.c
@@ -1512,8 +1512,9 @@ ret_t widget_calc_icon_text_rect(const rect_t* ir, int32_t font_size, float_t te
     }
     case ICON_AT_LEFT:
     default: {
-      *r_icon = rect_init(ir->x, ir->y, ir->h, ir->h);
-      *r_text = rect_init(ir->x + ir->h + spacer, ir->y, ir->w - ir->h - spacer, ir->h);
+      wh_t w = tk_min(ir->h, ir->w);
+      *r_icon = rect_init(ir->x, ir->y, w, ir->h);
+      *r_text = rect_init(ir->x + w + spacer, ir->y, ir->w - w - spacer, ir->h);
       break;
     }
   }
@@ -5268,3 +5269,50 @@ ret_t widget_dispatch_model_event(widget_t* widget, const char* name, const char
 
   return RET_OK;
 }
+
+widget_t* widget_find_by_path(widget_t* widget, const char* path, bool_t recursive) {
+  bool_t is_first = TRUE;
+  tokenizer_t tokenizer;
+  widget_t* iter = widget;
+  tokenizer_t* t = NULL;
+  return_value_if_fail(widget != NULL && path != NULL, NULL);
+  if (strchr(path, '.') == NULL) {
+    const char* name = path;
+    if (tk_str_eq(name, STR_PROP_PARENT)) {
+      return widget->parent;
+    } else if (tk_str_eq(name, STR_PROP_SELF)) {
+      return widget;
+    } else if (tk_str_eq(name, STR_PROP_WINDOW)) {
+      return widget_get_window(widget);
+    } else if (tk_str_eq(name, STR_PROP_WINDOW_MANAGER)) {
+      return widget_get_window_manager(widget);
+    } else {
+      return widget_lookup(widget, name, recursive);
+    }
+  }
+  t = tokenizer_init(&tokenizer, path, strlen(path), ".");
+  return_value_if_fail(t != NULL, NULL);
+
+  while (tokenizer_has_more(t) && iter != NULL) {
+    const char* name = tokenizer_next(t);
+    if (is_first) {
+      if (tk_str_eq(name, STR_PROP_PARENT)) {
+        iter = widget->parent;
+      } else if (tk_str_eq(name, STR_PROP_SELF)) {
+        iter = widget;
+      } else if (tk_str_eq(name, STR_PROP_WINDOW)) {
+        iter = widget_get_window(widget);
+      } else if (tk_str_eq(name, STR_PROP_WINDOW_MANAGER)) {
+        iter = widget_get_window_manager(widget);
+      } else {
+        iter = widget_child(iter, name);
+      }
+      is_first = FALSE;
+    } else {
+      iter = widget_child(iter, name);
+    }
+  }
+  tokenizer_deinit(t);
+
+  return iter;
+}
diff --git a/project/gui/awtk/src/base/widget.h b/project/gui/awtk/src/base/widget.h
@@ -3389,6 +3389,8 @@ rect_t widget_get_content_area_ex(widget_t* widget, int32_t default_margin);
 ret_t widget_draw_image_with_region(widget_t* widget, canvas_t* c, bitmap_t* img,
   const char* region, const rect_t* dst, image_draw_type_t draw_type);
 
+widget_t* widget_find_by_path(widget_t* widget, const char* path, bool_t recursive);
+
 END_C_DECLS
 
 #endif /*TK_WIDGET_H*/
diff --git a/project/gui/awtk/src/fscript_ext/fscript_widget.c b/project/gui/awtk/src/fscript_ext/fscript_widget.c
@@ -3,7 +3,7 @@
  * Author: AWTK Develop Team
  * Brief:  widget functions for fscript
  *
- * Copyright (c) 2020 - 2022  Guangzhou ZHIYUAN Electronics Co.,Ltd.
+ * Copyright (c) 2020 - 2023  Guangzhou ZHIYUAN Electronics Co.,Ltd.
  *
  */
 
@@ -31,64 +31,16 @@
 #include "file_browser/file_dialog.h"
 #include "ui_loader/ui_builder_default.h"
 
-static widget_t* find_target_widget(widget_t* widget, const char* path, uint32_t len,
-                                    bool_t recursive) {
-  bool_t is_first = TRUE;
-  tokenizer_t tokenizer;
-  widget_t* iter = widget;
-  tokenizer_t* t = NULL;
-  return_value_if_fail(widget != NULL && path != NULL, NULL);
-  if (strchr(path, '.') == NULL) {
-    const char* name = path;
-    if (tk_str_eq(name, STR_PROP_PARENT)) {
-      return widget->parent;
-    } else if (tk_str_eq(name, STR_PROP_SELF)) {
-      return widget;
-    } else if (tk_str_eq(name, STR_PROP_WINDOW)) {
-      return widget_get_window(widget);
-    } else if (tk_str_eq(name, STR_PROP_WINDOW_MANAGER)) {
-      return widget_get_window_manager(widget);
-    } else {
-      return widget_lookup(widget, name, recursive);
-    }
-  }
-  t = tokenizer_init(&tokenizer, path, len, ".");
-  return_value_if_fail(t != NULL, NULL);
-
-  while (tokenizer_has_more(t) && iter != NULL) {
-    const char* name = tokenizer_next(t);
-    if (is_first) {
-      if (tk_str_eq(name, STR_PROP_PARENT)) {
-        iter = widget->parent;
-      } else if (tk_str_eq(name, STR_PROP_SELF)) {
-        iter = widget;
-      } else if (tk_str_eq(name, STR_PROP_WINDOW)) {
-        iter = widget_get_window(widget);
-      } else if (tk_str_eq(name, STR_PROP_WINDOW_MANAGER)) {
-        iter = widget_get_window_manager(widget);
-      } else {
-        iter = widget_child(iter, name);
-      }
-      is_first = FALSE;
-    } else {
-      iter = widget_child(iter, name);
-    }
-  }
-  tokenizer_deinit(t);
-
-  return iter;
-}
-
 static widget_t* to_widget(fscript_t* fscript, const value_t* v) {
   widget_t* widget = NULL;
   if (v->type == VALUE_TYPE_STRING) {
     widget_t* self = WIDGET(tk_object_get_prop_pointer(fscript->obj, STR_PROP_SELF));
     const char* path = value_str(v);
     return_value_if_fail(path != NULL, NULL);
 
-    widget = find_target_widget(self, path, strlen(path), TRUE);
+    widget = widget_find_by_path(self, path, TRUE);
     if (widget == NULL) {
-      widget = find_target_widget(widget_get_window(self), path, strlen(path), TRUE);
+      widget = widget_find_by_path(widget_get_window(self), path, TRUE);
     }
 
     return widget;
@@ -189,7 +141,10 @@ static ret_t widget_set(widget_t* self, const char* path, const value_t* v) {
   widget_t* widget = self;
   const char* prop = strrchr(path, '.');
   if (prop != NULL) {
-    widget = find_target_widget(self, path, prop - path, TRUE);
+    char name[MAX_PATH+1] = {0};
+    int32_t len = tk_min_int(prop - path, MAX_PATH);
+    tk_strncpy(name, path, len);
+    widget = widget_find_by_path(self, name, TRUE);
     prop++;
   } else {
     prop = path;
@@ -204,7 +159,10 @@ static ret_t widget_get(widget_t* self, const char* path, value_t* v) {
   widget_t* widget = self;
   const char* prop = strrchr(path, '.');
   if (prop != NULL) {
-    widget = find_target_widget(self, path, prop - path, TRUE);
+    char name[MAX_PATH+1] = {0};
+    int32_t len = tk_min_int(prop - path, MAX_PATH);
+    tk_strncpy(name, path, len);
+    widget = widget_find_by_path(self, name, TRUE);
     prop++;
   } else {
     prop = path;
@@ -257,7 +215,8 @@ static ret_t func_widget_layout(fscript_t* fscript, fscript_args_t* args, value_
   return RET_OK;
 }
 
-static ret_t func_widget_request_relayout(fscript_t* fscript, fscript_args_t* args, value_t* result) {
+static ret_t func_widget_request_relayout(fscript_t* fscript, fscript_args_t* args,
+                                          value_t* result) {
   widget_t* widget = NULL;
   FSCRIPT_FUNC_CHECK(args->size == 1, RET_BAD_PARAMS);
   widget = to_widget(fscript, args->args);
@@ -285,7 +244,7 @@ static ret_t func_widget_lookup(fscript_t* fscript, fscript_args_t* args, value_
   }
 
   FSCRIPT_FUNC_CHECK(widget != NULL && path != NULL, RET_BAD_PARAMS);
-  widget = find_target_widget(widget, path, strlen(path), recursive);
+  widget = widget_find_by_path(widget, path, recursive);
   if (widget == NULL) {
     result->type = VALUE_TYPE_INVALID;
     return RET_NOT_FOUND;
@@ -809,8 +768,8 @@ static ret_t func_show_fps(fscript_t* fscript, fscript_args_t* args, value_t* re
 
 static ret_t func_set_screen_saver_time(fscript_t* fscript, fscript_args_t* args, value_t* result) {
   FSCRIPT_FUNC_CHECK(args->size == 1, RET_BAD_PARAMS);
-  value_set_bool(result,
-                 window_manager_set_screen_saver_time(window_manager(), value_uint32(args->args)) == RET_OK);
+  value_set_bool(result, window_manager_set_screen_saver_time(window_manager(),
+                                                              value_uint32(args->args)) == RET_OK);
   return RET_OK;
 }
 

diff --git a/project/gui/awtk/src/remote_ui/Makefile b/project/gui/awtk/src/remote_ui/Makefile
@@ -0,0 +1,2 @@
+obj-y += service/
+obj-y += client/
diff --git a/project/gui/awtk/src/remote_ui/client/Makefile b/project/gui/awtk/src/remote_ui/client/Makefile
@@ -0,0 +1 @@
+obj-y += remote_ui.o