Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 15:10:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Move the console flushing decision to the console context ##cons

Browse Source
This commit is contained in:
thymol0 2021-09-29 08:46:37 +00:00 committed by GitHub
parent 56a0e2eedb
commit 6513ffa59f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libr/cons/cons.c
View File

@ -116,6 +116,8 @@ static void cons_context_init(RConsContext *context, R_NULLABLE RConsContext *pa
context->event_interrupt_data = NULL;
context->pageable = true;
context->log_callback = NULL;
context->cmd_str_depth = 0;
context->noflush = false;
if (parent) {
context->color_mode = parent->color_mode;
@ -588,7 +590,6 @@ R_API RCons *r_cons_new(void) {
I.force_columns = 0;
I.event_resize = NULL;
I.event_data = NULL;
I.noflush = false;
I.linesleep = 0;
I.fdin = stdin;
I.fdout = 1;
@ -975,12 +976,12 @@ static void optimize(void) {
R_API void r_cons_flush(void) {
const char *tee = I.teefile;
if (I.noflush) {
return;
}
if (!I.context) {
r_cons_context_reset ();
}
if (I.context->noflush) {
return;
}
if (I.context->errmode == R_CONS_ERRMODE_FLUSH) {
r_cons_eflush ();
}
@ -1095,7 +1096,7 @@ R_API void r_cons_flush(void) {
}
R_API void r_cons_visual_flush(void) {
if (I.noflush) {
if (I.context->noflush) {
return;
}
r_cons_highlight (I.highlight);

12
libr/core/cmd.c
View File

@ -5517,19 +5517,19 @@ R_API char *r_core_cmd_strf(RCore *core, const char *fmt, ...) {
/* return: pointer to a buffer with the output of the command */
R_API char *r_core_cmd_str(RCore *core, const char *cmd) {
r_cons_push ();
r_cons_singleton ()->noflush = true;
core->in_cmdstr++;
core->cons->context->noflush = true;
core->cons->context->cmd_str_depth++;
if (r_core_cmd (core, cmd, 0) == -1) {
//eprintf ("Invalid command: %s\n", cmd);
if (--core->in_cmdstr == 0) {
r_cons_singleton ()->noflush = false;
if (--core->cons->context->cmd_str_depth == 0) {
core->cons->context->noflush = false;
r_cons_flush ();
}
r_cons_pop ();
return NULL;
}
if (--core->in_cmdstr == 0) {
r_cons_singleton ()->noflush = false;
if (--core->cons->context->cmd_str_depth == 0) {
core->cons->context->noflush = false;
}
r_cons_filter ();
const char *static_str = r_cons_get_buffer ();

4
libr/core/visual.c
View File

@ -4103,7 +4103,7 @@ static void visual_refresh(RCore *core) {
}
r_cons_flush ();
r_cons_print_clear ();
r_cons_singleton ()->noflush = true;
core->cons->context->noflush = true;
int hex_cols = r_config_get_i (core->config, "hex.cols");
int split_w = 12 + 4 + hex_cols + (hex_cols * 3);
@ -4201,7 +4201,7 @@ static void visual_refresh(RCore *core) {
}
#endif
blocksize = core->num->value? core->num->value: core->blocksize;
r_cons_singleton ()->noflush = false;
core->cons->context->noflush = false;
/* this is why there's flickering */
if (core->print->vflush) {
r_cons_visual_flush ();

3
libr/include/r_cons.h
View File

@ -394,6 +394,8 @@ typedef struct r_cons_context_t {
RConsEvent event_interrupt;
void *event_interrupt_data;
int cmd_depth;
int cmd_str_depth;
bool noflush;
// Used for per-task logging redirection
RLogCallback log_callback; // TODO: RList of callbacks
@ -436,7 +438,6 @@ typedef struct r_cons_t {
int fix_rows;
int fix_columns;
bool break_lines;
int noflush;
int optimize;
bool show_autocomplete_widget;
FILE *fdin; // FILE? and then int ??

1
libr/include/r_core.h
View File

@ -350,7 +350,6 @@ struct r_core_t {
bool log_events; // core.c:cb_event_handler : log actions from events if cfg.log.events is set
RList *ropchain;
char *theme;
int in_cmdstr;
bool marks_init;
ut64 marks[UT8_MAX + 1];