Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-22 15:21:18 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Rename gui.alt_background -> gui.background2 ##cons

Browse Source 
* Fix tests
This commit is contained in:
pancake 2023-07-07 00:12:22 +02:00 committed by pancake
parent e1b8c12809
commit bed3f10aa5
17 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/cons/d/bluy
View File

@ -42,7 +42,7 @@ ec ai.ascii rgb:fff
ec gui.cflow rgb:09f
ec gui.dataoffset rgb:99a
ec gui.background rgb:7c5
ec gui.alt_background rgb:e34
ec gui.background2 rgb:e34
ec gui.border rgb:23f
ec graph.current rgb:aaf

2
libr/cons/d/bobcrawl
View File

@ -55,7 +55,7 @@ ec graph.traced rgb:ffff00
ec gui.cflow rgb:ffff00
ec gui.dataoffset rgb:ffff00
ec gui.background rgb:303030
ec gui.alt_background rgb:ffffff
ec gui.background2 rgb:ffffff
ec gui.border rgb:5fd700
ec var rgb:64604f

2
libr/cons/d/bright
View File

@ -49,7 +49,7 @@ ec ai.ascii rgb:ffff00
ec gui.cflow rgb:ffff00
ec gui.dataoffset rgb:ffff00
ec gui.background rgb:000000
ec gui.alt_background rgb:ffffff
ec gui.background2 rgb:ffffff
ec gui.border rgb:000000
ec wordhl rgb:ff0000
ec linehl rgb:000080

2
libr/cons/d/cga
View File

@ -56,7 +56,7 @@ ec graph.traced rgb:f0f
ec gui.cflow rgb:0ff
ec gui.dataoffset rgb:0ff
ec gui.background rgb:0ff
ec gui.alt_background rgb:0ff
ec gui.background2 rgb:0ff
ec gui.border rgb:0ff
ec ai.read rgb:0ff

2
libr/cons/d/gb
View File

@ -55,7 +55,7 @@ ec graph.traced rgb:86c06c
ec gui.cflow rgb:e0f8cf
ec gui.dataoffset rgb:e0f8cf
ec gui.background rgb:e0f8cf
ec gui.alt_background rgb:e0f8cf
ec gui.background2 rgb:e0f8cf
ec gui.border rgb:e0f8cf
ec ai.read rgb:e0f8cf

2
libr/cons/d/gentoo
View File

@ -59,7 +59,7 @@ ec graph.traced rgb:f00000
ec gui.cflow rgb:f03030
ec gui.dataoffset rgb:3030f0
ec gui.background rgb:000000
ec gui.alt_background rgb:ffffff
ec gui.background2 rgb:ffffff
ec gui.border rgb:000000
ec wordhl rgb:ff0000
ec linehl rgb:101010

2
libr/cons/d/iaito
View File

@ -61,7 +61,7 @@ ec graph.traced rgb:e03030
ec gui.cflow rgb:ffff00
ec gui.dataoffset rgb:ffff00
ec gui.background rgb:000000
ec gui.alt_background rgb:ffffff
ec gui.background2 rgb:ffffff
ec gui.border rgb:000000
ec wordhl rgb:ff0000
ec linehl rgb:efefef

2
libr/cons/d/onedark
View File

@ -51,7 +51,7 @@ ec ai.ascii rgb:ffff00
ec gui.cflow rgb:d19a66
ec gui.dataoffset rgb:d19a66
ec gui.background black
ec gui.alt_background white
ec gui.background2 white
ec gui.border black
ec linehl rgb:61afef
ec graph.box rgb:d19a66

2
libr/cons/d/pink
View File

@ -48,7 +48,7 @@ ec graph.box4 rgb:f5d
ec gui.cflow rgb:f5d
ec gui.dataoffset rgb:f5d
ec gui.background black
## gui.alt_background
ec gui.background2 magenta
## gui.border
ec var rgb:72d

2
libr/cons/d/sepia
View File

@ -52,8 +52,8 @@ ec graph.box3 rgb:ca6
ec graph.box4 rgb:ca6
ec gui.cflow rgb:ffff00
ec gui.dataoffset rgb:ffff00
ec gui.alt_background rgb:ffffff
ec gui.background rgb:000000
ec gui.background2 rgb:ffffff
ec gui.border rgb:000000
ec var rgb:fd9

20
libr/cons/d_themes.inc.c
View File

@ -231,7 +231,7 @@ static const char * const theme_bluy = \
"ec gui.cflow rgb:09f\n"
"ec gui.dataoffset rgb:99a\n"
"ec gui.background rgb:7c5\n"
"ec gui.alt_background rgb:e34\n"
"ec gui.background2 rgb:e34\n"
"ec gui.border rgb:23f\n"
"ec graph.current rgb:aaf\n"
"\n"
@ -302,7 +302,7 @@ static const char * const theme_bobcrawl = \
"ec gui.cflow rgb:ffff00\n"
"ec gui.dataoffset rgb:ffff00\n"
"ec gui.background rgb:303030\n"
"ec gui.alt_background rgb:ffffff\n"
"ec gui.background2 rgb:ffffff\n"
"ec gui.border rgb:5fd700\n"
"\n"
"ec var rgb:64604f\n"
@ -448,7 +448,7 @@ static const char * const theme_bright = \
"ec gui.cflow rgb:ffff00\n"
"ec gui.dataoffset rgb:ffff00\n"
"ec gui.background rgb:000000\n"
"ec gui.alt_background rgb:ffffff\n"
"ec gui.background2 rgb:ffffff\n"
"ec gui.border rgb:000000\n"
"ec wordhl rgb:ff0000\n"
"ec linehl rgb:000080\n"
@ -530,7 +530,7 @@ static const char * const theme_cga = \
"ec gui.cflow rgb:0ff\n"
"ec gui.dataoffset rgb:0ff\n"
"ec gui.background rgb:0ff\n"
"ec gui.alt_background rgb:0ff\n"
"ec gui.background2 rgb:0ff\n"
"ec gui.border rgb:0ff\n"
"\n"
"ec ai.read rgb:0ff\n"
@ -933,7 +933,7 @@ static const char * const theme_gb = \
"ec gui.cflow rgb:e0f8cf\n"
"ec gui.dataoffset rgb:e0f8cf\n"
"ec gui.background rgb:e0f8cf\n"
"ec gui.alt_background rgb:e0f8cf\n"
"ec gui.background2 rgb:e0f8cf\n"
"ec gui.border rgb:e0f8cf\n"
"\n"
"ec ai.read rgb:e0f8cf\n"
@ -1012,7 +1012,7 @@ static const char * const theme_gentoo = \
"ec gui.cflow rgb:f03030\n"
"ec gui.dataoffset rgb:3030f0\n"
"ec gui.background rgb:000000\n"
"ec gui.alt_background rgb:ffffff\n"
"ec gui.background2 rgb:ffffff\n"
"ec gui.border rgb:000000\n"
"ec wordhl rgb:ff0000\n"
"ec linehl rgb:101010\n"
@ -1151,7 +1151,7 @@ static const char * const theme_iaito = \
"ec gui.cflow rgb:ffff00\n"
"ec gui.dataoffset rgb:ffff00\n"
"ec gui.background rgb:000000\n"
"ec gui.alt_background rgb:ffffff\n"
"ec gui.background2 rgb:ffffff\n"
"ec gui.border rgb:000000\n"
"ec wordhl rgb:ff0000\n"
"ec linehl rgb:efefef\n"
@ -1474,7 +1474,7 @@ static const char * const theme_onedark = \
"ec gui.cflow rgb:d19a66\n"
"ec gui.dataoffset rgb:d19a66\n"
"ec gui.background black\n"
"ec gui.alt_background white\n"
"ec gui.background2 white\n"
"ec gui.border black\n"
"ec linehl rgb:61afef\n"
"ec graph.box rgb:d19a66\n"
@ -1542,7 +1542,7 @@ static const char * const theme_pink = \
"ec gui.cflow rgb:f5d\n"
"ec gui.dataoffset rgb:f5d\n"
"ec gui.background black\n"
"## gui.alt_background\n"
"ec gui.background2 magenta\n"
"## gui.border\n"
"\n"
"ec var rgb:72d\n"
@ -1683,8 +1683,8 @@ static const char * const theme_sepia = \
"ec graph.box4 rgb:ca6\n"
"ec gui.cflow rgb:ffff00\n"
"ec gui.dataoffset rgb:ffff00\n"
"ec gui.alt_background rgb:ffffff\n"
"ec gui.background rgb:000000\n"
"ec gui.background2 rgb:ffffff\n"
"ec gui.border rgb:000000\n"
"\n"
"ec var rgb:fd9\n"

10
libr/cons/pal.c
View File

@ -85,7 +85,7 @@ static struct {
{ "gui.cflow", r_offsetof (RConsPrintablePalette, gui_cflow), r_offsetof (RConsPalette, gui_cflow) },
{ "gui.dataoffset", r_offsetof (RConsPrintablePalette, gui_dataoffset), r_offsetof (RConsPalette, gui_dataoffset) },
{ "gui.background", r_offsetof (RConsPrintablePalette, gui_background), r_offsetof (RConsPalette, gui_background) },
{ "gui.alt_background", r_offsetof (RConsPrintablePalette, gui_alt_background), r_offsetof (RConsPalette, gui_alt_background) },
{ "gui.background2", r_offsetof (RConsPrintablePalette, gui_background2), r_offsetof (RConsPalette, gui_background2) },
{ "gui.border", r_offsetof (RConsPrintablePalette, gui_border), r_offsetof (RConsPalette, gui_border) },
{ "wordhl", r_offsetof (RConsPrintablePalette, wordhl), r_offsetof (RConsPalette, wordhl) },
{ "linehl", r_offsetof (RConsPrintablePalette, linehl), r_offsetof (RConsPalette, linehl) },
@ -227,7 +227,7 @@ R_API void r_cons_pal_init(RConsContext *ctx) {
ctx->cpal.gui_cflow = (RColor) RColor_YELLOW;
ctx->cpal.gui_dataoffset = (RColor) RColor_YELLOW;
ctx->cpal.gui_background = (RColor) RColor_BLACK;
ctx->cpal.gui_alt_background = (RColor) RColor_WHITE;
ctx->cpal.gui_background2 = (RColor) RColor_WHITE;
ctx->cpal.gui_border = (RColor) RColor_BLACK;
ctx->cpal.wordhl = (RColor) RColor_BGRED;
// No good choice for fallback ansi16 color
@ -238,9 +238,9 @@ R_API void r_cons_pal_init(RConsContext *ctx) {
#endif
ctx->cpal.var = (RColor) RColor_WHITE;
ctx->cpal.var_type = (RColor) RColor_BLUE;
ctx->cpal.var_name = (RColor) RColor_RED;
ctx->cpal.var_addr = (RColor) RColor_CYAN;
ctx->cpal.var_type = (RColor) RColor_CYAN;
ctx->cpal.var_name = (RColor) RColor_YELLOW;
ctx->cpal.var_addr = (RColor) RColor_GREEN;
ctx->cpal.widget_bg = (RColor) RCOLOR (ALPHA_BG, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0);
ctx->cpal.widget_sel = (RColor) RColor_BGRED;

4
libr/core/disasm.c
View File

@ -252,7 +252,7 @@ typedef struct r_disasm_state_t {
const char *color_gui_cflow;
const char *color_gui_dataoffset;
const char *color_gui_background;
const char *color_gui_alt_background;
const char *color_gui_background2;
const char *color_gui_border;
const char *color_linehl;
const char *color_var;
@ -665,7 +665,7 @@ static RDisasmState *ds_init(RCore *core) {
ds->color_gui_cflow = P(gui_cflow): Color_YELLOW;
ds->color_gui_dataoffset = P(gui_dataoffset): Color_YELLOW;
ds->color_gui_background = P(gui_background): Color_BLACK;
ds->color_gui_alt_background = P(gui_alt_background): Color_GRAY;
ds->color_gui_background2 = P(gui_background2): Color_GRAY;
ds->color_gui_border = P(gui_border): Color_BGGRAY;
ds->color_linehl = P(linehl): Color_BGBLUE;
ds->color_var = P(var): Color_WHITE;

4
libr/include/r_cons.h
View File

@ -204,7 +204,7 @@ typedef struct r_cons_palette_t {
RColor gui_cflow;
RColor gui_dataoffset;
RColor gui_background;
RColor gui_alt_background;
RColor gui_background2;
RColor gui_border;
RColor wordhl;
RColor linehl;
@ -282,7 +282,7 @@ typedef struct r_cons_printable_palette_t {
char *gui_cflow;
char *gui_dataoffset;
char *gui_background;
char *gui_alt_background;
char *gui_background2;
char *gui_border;
char *wordhl;
char *linehl;

63
test/db/cmd/cmd_ec
View File

@ -70,11 +70,12 @@ ec reg rgb:c0a060
ec creg rgb:906000
ec num rgb:906000
ec mov rgb:d0b070
ec func_var rgb:f0d090
ec func_var_type rgb:805000
ec func_var_addr rgb:906000
ec widget_bg rgb:d0b070 rgb:000000
ec widget_sel rgb:000000 rgb:f0e0c0
ec var rgb:f0d090
ec var.name rgb:f0d090
ec var.type rgb:805000
ec var.addr rgb:906000
ec widget.bg rgb:d0b070 rgb:000000
ec widget.sel rgb:000000 rgb:f0e0c0
ec ai.read rgb:c0b070
ec ai.write rgb:c0a060
ec ai.exec rgb:d0b070
@ -89,14 +90,14 @@ ec graph.false rgb:403010
ec graph.trufae rgb:f0d090
ec graph.current rgb:0000ff
ec graph.traced rgb:0000ff
ec graph.diff.unknown rgb:881798
ec graph.diff.new rgb:c50f1f
ec graph.diff.match rgb:767676
ec graph.diff.unmatch rgb:c19c00
ec diff.unknown rgb:881798
ec diff.new rgb:c50f1f
ec diff.match rgb:767676
ec diff.unmatch rgb:c19c00
ec gui.cflow rgb:ffff00
ec gui.dataoffset rgb:ffff00
ec gui.background rgb:000000
ec gui.alt_background rgb:ffffff
ec gui.background2 rgb:ffffff
ec gui.border rgb:000000
ec wordhl rgb:ff0000
ec linehl rgb:201000
@ -183,11 +184,12 @@ EXPECT=<<EOF
## creg
## num
## mov
## func_var
## func_var_type
## func_var_addr
## widget_bg
## widget_sel
## var
## var.name
## var.type
## var.addr
## widget.bg
## widget.sel
## ai.read
## ai.write
## ai.exec
@ -202,14 +204,14 @@ EXPECT=<<EOF
## graph.trufae
## graph.current
## graph.traced
## graph.diff.unknown
## graph.diff.new
## graph.diff.match
## graph.diff.unmatch
## diff.unknown
## diff.new
## diff.match
## diff.unmatch
## gui.cflow
## gui.dataoffset
## gui.background
## gui.alt_background
## gui.background2
## gui.border
## wordhl
## linehl
@ -254,11 +256,12 @@ EXPECT=<<EOF
## creg
## num
## mov
## func_var
## func_var_type
## func_var_addr
## widget_bg
## widget_sel
## var
## var.name
## var.type
## var.addr
## widget.bg
## widget.sel
## ai.read
## ai.write
## ai.exec
@ -273,14 +276,14 @@ EXPECT=<<EOF
## graph.trufae
## graph.current
## graph.traced
## graph.diff.unknown
## graph.diff.new
## graph.diff.match
## graph.diff.unmatch
## diff.unknown
## diff.new
## diff.match
## diff.unmatch
## gui.cflow
## gui.dataoffset
## gui.background
## gui.alt_background
## gui.background2
## gui.border
## wordhl
## linehl

6
test/db/cmd/cmd_pd_bugs
View File

@ -54,10 +54,10 @@ EXPECT=<<EOF
| entry0+0x16 488b0de79301. mov rcx, qword [0x0001f228] ; [0x1f228:8]=0x16e60
| entry0+0x1d 488b3de89301. mov rdi, qword [0x0001f230] ; [0x1f230:8]=0x3bd0 main
/ 41: entry0 (int64_t arg3, void *stack_end);
| ; arg int64_t arg3 @ rdx
| ; arg void *stack_end @ xmm0
| ; arg int64_t arg3 @ rdx
| ; arg void *stack_end @ xmm0
| entry0 31ed xor ebp, ebp
| entry0+0x2 4989d1 mov r9, rdx ; arg3
| entry0+0x2 4989d1 mov r9, rdx ; arg3
| entry0+0x5 5e pop rsi
| entry0+0x6 4889e2 mov rdx, rsp
| entry0+0x9 4883e4f0 and rsp, 0xfffffffffffffff0

4
test/db/cmd/cmd_px
View File

@ -388,10 +388,10 @@ EXPECT=<<EOF
0x00005b00 0048 8d3d 68e5 ffff ff15 0ac3 0100 f490 .H.=h...........
0x00005b10 488d 3d51 c701 0048 8d05 4ac7 0100 4839 H.=Q...H..J...H9
/ 46: entry0 (int64_t arg3);
| ; arg int64_t arg3 @ rdx
| ; arg int64_t arg3 @ rdx
| 0x00005ae0 f30f1efa endbr64
| 0x00005ae4 31ed xor ebp, ebp
| 0x00005ae6 4989d1 mov r9, rdx ; arg3
| 0x00005ae6 4989d1 mov r9, rdx ; arg3
| 0x00005ae9 5e pop rsi
| 0x00005aea 4889e2 mov rdx, rsp
| 0x00005aed 4883e4f0 and rsp, 0xfffffffffffffff0