Use vectors in panels.c

rizinorg · Apr 20, 2024 · a31076c · a31076c
1 parent 61c634a
commit a31076c
Show file tree

Hide file tree

Showing 5 changed files with 275 additions and 191 deletions.
diff --git a/librz/core/core.c b/librz/core/core.c
@@ -1751,7 +1751,7 @@ RZ_API void rz_core_fini(RzCore *c) {
 	rz_core_seek_free(c);
 	RZ_FREE(c->rtr_host);
 	RZ_FREE(c->curtheme);
-	rz_core_visual_free(c->visual);
+	RZ_FREE_CUSTOM(c->visual, rz_core_visual_free);
 }
 
 RZ_API void rz_core_free(RzCore *c) {

diff --git a/librz/core/core_private.h b/librz/core/core_private.h
@@ -267,9 +267,9 @@ typedef struct rz_core_visual_tab_t {
 
 typedef int (*RzPanelsMenuCallback)(void *user);
 typedef struct rz_panels_menu_item {
-	int n_sub, selectedIndex;
+	int selectedIndex;
 	char *name;
-	struct rz_panels_menu_item **sub;
+	RzPVector /*<RzPanelsMenuItem* >*/ sub_vec;
 	RzPanelsMenuCallback cb;
 	RzPanel *p;
 } RzPanelsMenuItem;
@@ -326,11 +326,10 @@ typedef enum {
 } RzPanelsRootState;
 
 typedef struct rz_panels_root_t {
-	int n_panels;
 	int cur_panels;
+	RzPVector /*<RzPanels *>*/ panels_vec;
 	Sdb *pdc_caches;
 	Sdb *cur_pdc_cache;
-	RzPanels **panels;
 	RzPanelsRootState root_state;
 } RzPanelsRoot;
 
@@ -369,6 +368,9 @@ typedef struct rz_core_visual_t {
 RZ_IPI RZ_OWN RzCoreVisual *rz_core_visual_new();
 RZ_IPI void rz_core_visual_free(RZ_NULLABLE RzCoreVisual *visual);
 
+RZ_IPI void rz_panels_free(RZ_NULLABLE RzPanels *panels);
+RZ_IPI void rz_panels_root_free(RZ_NULLABLE RzPanelsRoot *panels_root);
+
 RZ_IPI void rz_core_visual_prompt_input(RzCore *core);
 RZ_IPI void rz_core_visual_toggle_hints(RzCore *core);
 RZ_IPI void rz_core_visual_toggle_decompiler_disasm(RzCore *core, bool for_graph, bool reset);