refactor functions

Author: ym

display.go

@@ -35,24 +35,24 @@ func updateDisplay() {
 	nativeInstance.UpdateLabelIfChanged("home_info_ipv4_addr", networkState.IPv4String())
 	nativeInstance.UpdateLabelAndChangeVisibility("home_info_ipv6_addr", networkState.IPv6String())
 
-	nativeInstance.ObjHide("menu_btn_network")
-	nativeInstance.ObjHide("menu_btn_access")
+	nativeInstance.UIObjHide("menu_btn_network")
+	nativeInstance.UIObjHide("menu_btn_access")
 
 	nativeInstance.UpdateLabelIfChanged("home_info_mac_addr", networkState.MACString())
 
 	if usbState == "configured" {
 		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Connected")
-		_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_DEFAULT")
+		_, _ = nativeInstance.UIObjSetState("usb_status", "LV_STATE_DEFAULT")
 	} else {
 		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Disconnected")
-		_, _ = nativeInstance.ObjSetState("usb_status", "LV_STATE_DISABLED")
+		_, _ = nativeInstance.UIObjSetState("usb_status", "LV_STATE_DISABLED")
 	}
 	if lastVideoState.Ready {
 		nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Connected")
-		_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_DEFAULT")
+		_, _ = nativeInstance.UIObjSetState("hdmi_status", "LV_STATE_DEFAULT")
 	} else {
 		nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Disconnected")
-		_, _ = nativeInstance.ObjSetState("hdmi_status", "LV_STATE_DISABLED")
+		_, _ = nativeInstance.UIObjSetState("hdmi_status", "LV_STATE_DISABLED")
 	}
 	nativeInstance.UpdateLabelIfChanged("cloud_status_label", fmt.Sprintf("%d active", actionSessions))
 
@@ -63,20 +63,20 @@ func updateDisplay() {
 	}
 
 	if cloudConnectionState == CloudConnectionStateNotConfigured {
-		_, _ = nativeInstance.ObjHide("cloud_status_icon")
+		_, _ = nativeInstance.UIObjHide("cloud_status_icon")
 	} else {
-		_, _ = nativeInstance.ObjShow("cloud_status_icon")
+		_, _ = nativeInstance.UIObjShow("cloud_status_icon")
 	}
 
 	switch cloudConnectionState {
 	case CloudConnectionStateDisconnected:
-		_, _ = nativeInstance.ImgSetSrc("cloud_status_icon", "cloud_disconnected")
+		_, _ = nativeInstance.UIObjSetImageSrc("cloud_status_icon", "cloud_disconnected")
 		stopCloudBlink()
 	case CloudConnectionStateConnecting:
-		_, _ = nativeInstance.ImgSetSrc("cloud_status_icon", "cloud")
+		_, _ = nativeInstance.UIObjSetImageSrc("cloud_status_icon", "cloud")
 		startCloudBlink()
 	case CloudConnectionStateConnected:
-		_, _ = nativeInstance.ImgSetSrc("cloud_status_icon", "cloud")
+		_, _ = nativeInstance.UIObjSetImageSrc("cloud_status_icon", "cloud")
 		stopCloudBlink()
 	}
 }
@@ -100,9 +100,9 @@ func startCloudBlink() {
 			if cloudConnectionState != CloudConnectionStateConnecting {
 				continue
 			}
-			_, _ = nativeInstance.ObjFadeOut("cloud_status_icon", 1000)
+			_, _ = nativeInstance.UIObjFadeOut("cloud_status_icon", 1000)
 			time.Sleep(1000 * time.Millisecond)
-			_, _ = nativeInstance.ObjFadeIn("cloud_status_icon", 1000)
+			_, _ = nativeInstance.UIObjFadeIn("cloud_status_icon", 1000)
 			time.Sleep(1000 * time.Millisecond)
 		}
 	}()
@@ -347,7 +347,7 @@ func initDisplay() {
 	go func() {
 		displayLogger.Info().Msg("setting initial display contents")
 		time.Sleep(500 * time.Millisecond)
-		_, _ = nativeInstance.DispSetRotation(config.DisplayRotation)
+		_, _ = nativeInstance.DisplaySetRotation(config.DisplayRotation)
 		updateStaticContents()
 		displayInited = true
 		displayLogger.Info().Msg("display inited")

internal/native/cgo/ctrl.c

@@ -12,7 +12,7 @@
 #include "edid.h"
 #include "ctrl.h"
 #include <lvgl.h>
-#include "ui/vars.h"
+#include "ui_index.h"
 #include "log.h"
 #include "log_handler.h"
 
@@ -154,8 +154,24 @@ lv_obj_flag_t str_to_lv_obj_flag(const char *flag)
     }
 }
 
-void jetkvm_set_app_version(const char *version) {
-    set_var_app_version(version);
+void jetkvm_ui_set_var(const char *name, const char *value) {
+    for (int i = 0; i < ui_vars_size; i++) {
+        if (strcmp(ui_vars[i].name, name) == 0) {
+            ui_vars[i].setter(value);
+            return;
+        }
+    }
+    log_error("variable %s not found", name);
+}
+
+const char *jetkvm_ui_get_var(const char *name) {
+    for (int i = 0; i < ui_vars_size; i++) {
+        if (strcmp(ui_vars[i].name, name) == 0) {
+            return ui_vars[i].getter();
+        }
+    }
+    log_error("variable %s not found", name);
+    return NULL;
 }
 
 void jetkvm_ui_init() {

internal/native/cgo/ctrl.h

@@ -22,7 +22,8 @@ typedef void (jetkvm_video_handler_t)(const uint8_t *frame, ssize_t len);
 void jetkvm_set_log_handler(jetkvm_log_handler_t *handler);
 void jetkvm_set_video_handler(jetkvm_video_handler_t *handler);
 
-void jetkvm_set_app_version(const char *version);
+void jetkvm_ui_set_var(const char *name, const char *value);
+const char *jetkvm_ui_get_var(const char *name);
 
 void jetkvm_ui_init();
 void jetkvm_ui_tick();

internal/native/cgo/ui_index.gen.sh

@@ -19,6 +19,14 @@ done)
 };
 
 const int ui_images_size = sizeof(ui_images) / sizeof(ui_images[0]);
+
+ui_var_map ui_vars[] = {
+$(grep 'extern const char \*get_var_' ui/vars.h | sed 's/extern const char \*get_var_//g' | sed 's/();//g' | sed 's/\r//' | while read -r line; do
+echo "    {\"$line\", &get_var_$line, &set_var_$line},"
+done)
+};
+
+const int ui_vars_size = sizeof(ui_vars) / sizeof(ui_vars[0]);
 EOF
 
 echo "ui_index.c has been generated successfully."

internal/native/cgo/ui_index.h

@@ -4,6 +4,7 @@
 #include "ui/ui.h"
 #include "ui/screens.h"
 #include "ui/images.h"
+#include "ui/vars.h"
 
 typedef struct {
     const char *name;
@@ -21,5 +22,13 @@ typedef struct {
 extern ui_img_map ui_images[];
 extern const int ui_images_size;
 
+typedef struct {
+    const char *name;
+    const char *(*getter)();
+    void (*setter)(const char *value);
+} ui_var_map;
+
+extern ui_var_map ui_vars[];
+extern const int ui_vars_size;
 
 #endif // UI_INDEX_H