Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-01 18:57:20 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add scr.scrollbar.bottom ##visual

Browse Source
This commit is contained in:
pancake 2019-04-11 04:48:14 +02:00
parent a7dffe0240
commit 1b4d56162d
3 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libr/core/cconfig.c
View File

@ -3276,6 +3276,7 @@ R_API int r_core_config_init(RCore *core) {
SETOPTIONS (n, "fun", "hit", "flag", NULL);
SETCB ("scr.pager", "", &cb_pager, "System program (or '..') to use when output exceeds screen boundaries");
SETPREF ("scr.scrollbar", "false", "Show scrollbar in visual mode");
SETPREF ("scr.scrollbar.bottom", "false", "Show scrollbar in the bottom");
SETPREF ("scr.randpal", "false", "Random color palete or just get the next one from 'eco'");
SETCB ("scr.highlight.grep", "false", &cb_scr_color_grep_highlight, "Highlight (INVERT) the grepped words");
SETPREF ("scr.prompt.file", "false", "Show user prompt file (used by r2 -q)");

72
libr/core/visual.c
View File

@ -3660,6 +3660,11 @@ static int visual_responsive(RCore *core) {
R_API void r_core_print_scrollbar(RCore *core) {
int i, h, w = r_cons_get_size (&h);
if (r_config_get_i (core->config, "scr.scrollbar.bottom")) {
r_core_print_scrollbar_bottom (core);
return;
}
if (w < 10 || h < 3) {
return;
}
@ -3714,6 +3719,73 @@ R_API void r_core_print_scrollbar(RCore *core) {
r_cons_flush ();
}
R_API void r_core_print_scrollbar_bottom(RCore *core) {
int i, h, w = r_cons_get_size (&h);
if (w < 10 || h < 4) {
return;
}
ut64 from = 0;
ut64 to = UT64_MAX;
if (r_config_get_i (core->config, "cfg.debug")) {
from = r_num_math (core->num, "$D");
to = r_num_math (core->num, "$D+$DD");
} else if (r_config_get_i (core->config, "io.va")) {
from = r_num_math (core->num, "$S");
to = r_num_math (core->num, "$S+$SS");
} else {
to = r_num_math (core->num, "$s");
}
char *s = r_str_newf ("[0x%08"PFMT64x"]", from);
int slen = strlen (s) + 1;
r_cons_gotoxy (0, h + 1);
r_cons_strcat (s);
free (s);
int linew = (w - (slen * 2)) + 1;
ut64 block = (to - from) / linew;
RList *words = r_flag_zone_barlist (core->flags, from, block, h);
bool hadMatch = false;
for (i = 0; i < linew + 1; i++) {
r_cons_gotoxy (i + slen, h + 1);
if (hadMatch) {
r_cons_strcat ("-");
} else {
ut64 cur = from + (block * i);
ut64 nex = from + (block * (i + 2));
if (R_BETWEEN (cur, core->offset, nex)) {
r_cons_strcat (Color_INVERT"-"Color_RESET);
hadMatch = true;
} else {
r_cons_strcat ("-");
}
}
}
for (i = 0; i < linew; i++) {
const char *word = r_list_pop_head (words);
if (word && *word) {
ut64 cur = from + (block * i);
ut64 nex = from + (block * (i + strlen (word) + 1));
r_cons_gotoxy (i + slen - 1, h);
if (R_BETWEEN (cur, core->offset, nex)) {
r_cons_printf (Color_INVERT"{%s}"Color_RESET, word);
} else {
r_cons_printf ("{%s}", word);
}
}
}
s = r_str_newf ("[0x%08"PFMT64x"]", to);
if (s) {
r_cons_gotoxy (linew + slen + 1, h + 1);
r_cons_strcat (s);
free (s);
}
r_list_free (words);
r_cons_flush ();
}
static void visual_refresh(RCore *core) {
static ut64 oseek = UT64_MAX;
const char *vi, *vcmd, *cmd_str;

1
libr/include/r_core.h
View File

@ -394,6 +394,7 @@ R_API int r_core_seek_size(RCore *core, ut64 addr, int bsize);
R_API int r_core_is_valid_offset (RCore *core, ut64 offset);
R_API int r_core_shift_block(RCore *core, ut64 addr, ut64 b_size, st64 dist);
R_API void r_core_print_scrollbar(RCore *core);
R_API void r_core_print_scrollbar_bottom(RCore *core);
R_API void r_core_visual_prompt_input (RCore *core);
R_API void r_core_visual_toggle_decompiler_disasm(RCore *core, bool for_graph, bool reset);
R_API int r_core_visual_refs(RCore *core, bool xref, bool fcnInsteadOfAddr);