portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move RzPanels from RzCore to RzCoreVisual (#3575)

Browse source
This commit is contained in:
Anton Kochkov 2023-06-13 11:42:21 +08:00 committed by GitHub
parent a53598cab2
commit 89551db165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 397 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
librz/core/agraph.c
View file

@ -4058,6 +4058,7 @@ RZ_IPI int rz_core_visual_graph(RzCore *core, RzAGraph *g, RzAnalysisFunction *_
RzAnalysisFunction *fcn = NULL;
const char *key_s;
RzConsCanvas *can, *o_can = NULL;
RzCoreVisual *visual = core->visual;
bool graph_allocated = false;
int movspeed;
int ret, invscroll;
@ -4486,7 +4487,7 @@ RZ_IPI int rz_core_visual_graph(RzCore *core, RzAGraph *g, RzAnalysisFunction *_
get_bbupdate(g, core, fcn);
break;
case '!':
rz_core_visual_panels_root(core, core->panels_root);
rz_core_visual_panels_root(core, visual->panels_root);
break;
case '\'':
if (fcn) {

5
librz/core/cmd/cmd.c
View file

@ -848,6 +848,7 @@ RZ_IPI int rz_cmd_kuery(void *data, const char *input) {
RZ_IPI int rz_cmd_panels(void *data, const char *input) {
RzCore *core = (RzCore *)data;
RzCoreVisual *visual = core->visual;
if (core->vmode) {
return false;
}
@ -858,7 +859,7 @@ RZ_IPI int rz_cmd_panels(void *data, const char *input) {
char *sp = strchr(input, ' ');
switch (input[0]) {
case ' ': // "v [name]"
if (core->panels) {
if (visual->panels) {
rz_load_panels_layout(core, input + 1);
}
rz_config_set(core->config, "scr.layout", input + 1);
@ -879,7 +880,7 @@ RZ_IPI int rz_cmd_panels(void *data, const char *input) {
////rz_sys_cmdf ("v%s", input);
return false;
case 0:
rz_core_visual_panels_root(core, core->panels_root);
rz_core_visual_panels_root(core, visual->panels_root);
return true;
default:
rz_core_cmd_help(core, help_msg_v);

3
librz/core/core_private.h
View file

@ -293,6 +293,9 @@ typedef struct rz_core_visual_t {
int current3format;
int current4format;
int current5format;
/* Panels */
RzPanelsRoot *panels_root;
RzPanels *panels;
} RzCoreVisual;
RZ_IPI RZ_OWN RzCoreVisual *rz_core_visual_new();

673
librz/core/tui/panels.c
View file

File diff suppressed because it is too large Load diff

5
librz/core/tui/visual.c
View file

@ -450,6 +450,7 @@ RZ_IPI void rz_core_visual_append_help(RzStrBuf *p, const char *title, const cha
static int visual_help(RzCore *core) {
int ret = 0;
RzCoreVisual *visual = core->visual;
RzStrBuf *p, *q;
repeat:
p = rz_strbuf_new(NULL);
@ -467,7 +468,7 @@ repeat:
rz_strbuf_free(q);
return ret;
case '!':
rz_core_visual_panels_root(core, core->panels_root);
rz_core_visual_panels_root(core, visual->panels_root);
break;
case '?':
rz_core_visual_append_help(p, "Visual mode help", help_msg_visual);
@ -2253,7 +2254,7 @@ RZ_IPI int rz_core_visual_cmd(RzCore *core, const char *arg) {
rz_core_visual_showcursor(core, false);
} break;
case '!':
rz_core_visual_panels_root(core, core->panels_root);
rz_core_visual_panels_root(core, visual->panels_root);
break;
case 'g':
rz_core_visual_showcursor(core, true);

2
librz/include/rz_core.h
View file

@ -279,8 +279,6 @@ struct rz_core_t {
RzEgg *egg;
RzCrypto *crypto;
RzAGraph *graph;
RzPanelsRoot *panels_root;
RzPanels *panels;
char *cmdqueue;
char *lastcmd;
bool is_lastcmd;