Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor TUI panels and fix several memleaks #4452

Merged
merged 15 commits into from
Apr 27, 2024
Merged

Refactor TUI panels and fix several memleaks #4452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8d2aac8
Refactor TUI code to use vectors and fix several memleaks
pelijah Apr 19, 2024
83bd7a2
Replace __free_modal with RZ_FREE
pelijah Apr 21, 2024
c6d7c08
Fix index bug in __panels_refresh()
pelijah Apr 24, 2024
0b7d7ce
Store theme list in RzPanelsRoot instead of static variable
pelijah Apr 24, 2024
d09114f
Remove static variable fromVisual
pelijah Apr 24, 2024
f0c8a07
Fix type comment
pelijah Apr 24, 2024
9e71ca9
Fix index checks
pelijah Apr 26, 2024
7d75e24
Remove unused Sdb fields from RzPanelsRoot
pelijah Apr 26, 2024
20fbd50
Rename RzPanels to RzPanelsTab
pelijah Apr 26, 2024
b1f4a18
Use RZ_STR_ISNOTEMPTY
pelijah Apr 26, 2024
838c5c3
Declare loop counter var inside <for>
pelijah Apr 26, 2024
6b76c26
Use RZ_STR_ISEMPTY
pelijah Apr 26, 2024
7815038
Rename sub_vec to submenus
pelijah Apr 26, 2024
f37708a
Fix memleak in __rotate_panel_cmds()
pelijah Apr 26, 2024
18a503d
Use rz_pvector_enumerate
pelijah Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion librz/core/cmd/cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ RZ_IPI int rz_cmd_panels(void *data, const char *input) {
char *sp = strchr(input, ' ');
switch (input[0]) {
case ' ': // "v [name]"
if (visual->panels) {
if (visual->panels_root->active_tab) {
rz_load_panels_layout(core, input + 1);
}
rz_config_set(core->config, "scr.layout", input + 1);
Expand Down
2 changes: 1 addition & 1 deletion librz/core/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,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) {
Expand Down
21 changes: 11 additions & 10 deletions librz/core/core_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *>*/ submenus;
RzPanelsMenuCallback cb;
RzPanel *p;
} RzPanelsMenuItem;
Expand All @@ -295,7 +295,7 @@ typedef enum {
PANEL_LAYOUT_DEFAULT_DYNAMIC = 1
} RzPanelsLayout;

typedef struct rz_panels_t {
typedef struct rz_panels_tab_t {
RzConsCanvas *can;
RzPanel **panel;
int n_panels;
Expand All @@ -316,7 +316,7 @@ typedef struct rz_panels_t {
RzPanelsLayout layout;
char *name;
bool first_run;
} RzPanels;
} RzPanelsTab;

typedef enum {
DEFAULT,
Expand All @@ -326,12 +326,12 @@ typedef enum {
} RzPanelsRootState;

typedef struct rz_panels_root_t {
int n_panels;
int cur_panels;
Sdb *pdc_caches;
Sdb *cur_pdc_cache;
RzPanels **panels;
int cur_tab;
RzPVector /*<RzPanelsTab *>*/ tabs;
RzPanelsTab *active_tab; // Seems redudant since we have cur_tab index
RzPanelsRootState root_state;
RzList /*<char *>*/ *theme_list; ///< List of themes
bool from_visual;
} RzPanelsRoot;

typedef struct rz_core_visual_t {
Expand Down Expand Up @@ -363,12 +363,13 @@ typedef struct rz_core_visual_t {
int current5format;
/* Panels */
RzPanelsRoot *panels_root;
RzPanels *panels;
} RzCoreVisual;

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_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);
Expand Down
Loading
Loading