Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-04-18 09:29:57 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

ec line_highlight -> linehl

Browse Source
This commit is contained in:
Khairul Kasmiran 2018-06-04 18:27:42 +08:00 committed by radare
parent ed56aecbcc
commit 58e48c8267
27 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/cons/d/basic
View File

@ -36,7 +36,7 @@ ec call cyan
ec cjmp green
ec jmp green
ec pop yellow
ec line_highlight #00003f
ec linehl #00003f
ec graph.true green
ec graph.false red

2
libr/cons/d/behelit
View File

@ -49,7 +49,7 @@ ec graph.false rgb:ff005f
ec graph.trufae rgb:5f87ff
ec graph.current rgb:5f87ff
ec graph.traced rgb:ffff5f
ec line_highlight rgb:1f1f1f
ec linehl rgb:1f1f1f
# background of the terminal must be #121212
# foreground of the terminal must be #5fff5f

2
libr/cons/d/bold
View File

@ -55,4 +55,4 @@ ec gui.dataoffset rgb:f72
ec crypto rgb:f72
ec floc rgb:777
ec invalid red
ec line_highlight rgb:008
ec linehl rgb:008

2
libr/cons/d/cga
View File

@ -38,7 +38,7 @@ ec creg rgb:f0f
ec num rgb:0ff
ec help rgb:0ff
ec trap rgb:000 rgb:f0f
ec line_highlight rgb:008
ec linehl rgb:008
ec graph.box rgb:f0f
ec graph.box2 rgb:f0f

2
libr/cons/d/consonance
View File

@ -36,7 +36,7 @@ ec trap rgb:d41
ec swi rgb:f2a
ec creg rgb:789
ec flag rgb:4cf
ec line_highlight rgb:004
ec linehl rgb:004
ec graph.box rgb:789
ec graph.box2 rgb:d41

2
libr/cons/d/cutter
View File

@ -32,7 +32,7 @@ ec flow rgb:8d0
ec flow2 rgb:8d0
ec mov black
ec invalid rgb:e33
ec line_highlight rgb:efefef
ec linehl rgb:efefef
ec graph.box rgb:28d
ec graph.box2 rgb:8d0
ec graph.box3 rgb:e33

2
libr/cons/d/dark
View File

@ -33,7 +33,7 @@ ec creg rgb:368
ec trap rgb:000 rgb:
ec swi rgb:99a
ec invalid rgb:rgb:44f rgb:123
ec line_highlight rgb:004
ec linehl rgb:004
ec graph.box rgb:040
ec graph.box2 rgb:040
ec graph.box3 rgb:040

2
libr/cons/d/darkda
View File

@ -32,7 +32,7 @@ ec trap rgb:d66
ec swi rgb:df077e
ec creg rgb:69d200
ec flag rgb:00b1ab
ec line_highlight rgb:00007f
ec linehl rgb:00007f
ec ai.read rgb:66d
ec ai.write rgb:d66
ec ai.exec rgb:6d6

2
libr/cons/d/defragger
View File

@ -34,7 +34,7 @@ ec reg rgb:73adad
ec creg rgb:73adad
ec num rgb:d25032
ec mov rgb:ebebeb
ec line_highlight rgb:00003f
ec linehl rgb:00003f
ec ai.read rgb:00ff00
ec ai.write rgb:0000ff
ec ai.exec rgb:ff0000

2
libr/cons/d/focus
View File

@ -29,7 +29,7 @@ ec flow2 rgb:fff
ec mov rgb:888
ec swi rgb:000 rgb:fff
ec floc rgb:af2
ec line_highlight rgb:222
ec linehl rgb:222
ec ai.read green
ec ai.write blue
ec ai.exec red

2
libr/cons/d/lima
View File

@ -37,7 +37,7 @@ ec num rgb:ef0
ec help rgb:af2
ec invalid rgb:ef0
ec trap rgb:000 rgb:af2
ec line_highlight rgb:140
ec linehl rgb:140
ec graph.box rgb:af2
ec graph.box2 rgb:0a0

2
libr/cons/d/matrix
View File

@ -34,7 +34,7 @@ ec trap rgb:040
ec swi rgb:0b0
ec creg rgb:080
ec flag rgb:0f0
ec line_highlight rgb:020
ec linehl rgb:020
ec graph.box green
ec graph.box2 rgb:060
ec graph.box3 rgb:ff0000

2
libr/cons/d/monokai
View File

@ -32,7 +32,7 @@ ec trap rgb:d66
ec swi rgb:d66
ec creg rgb:df7
ec flag rgb:ef8d1a
ec line_highlight rgb:008
ec linehl rgb:008
ec ai.read rgb:66d
ec ai.write rgb:d66
ec ai.exec rgb:6d6

2
libr/cons/d/ogray
View File

@ -45,4 +45,4 @@ ec gui.cflow rgb:f72
ec gui.dataoffset rgb:f72
ec crypto rgb:f72
ec floc rgb:777
ec line_highlight rgb:111
ec linehl rgb:111

2
libr/cons/d/pink
View File

@ -32,7 +32,7 @@ ec reg rgb:f5d
ec creg rgb:f5d
ec num rgb:72d
ec crypto rgb:75d
ec line_highlight rgb:fdf
ec linehl rgb:fdf
ec graph.true rgb:f5d
ec graph.false rgb:715
ec graph.trufae rgb:f5d

2
libr/cons/d/rasta
View File

@ -38,7 +38,7 @@ ec trap red
ec swi red
ec creg green
ec flag yellow
ec line_highlight #00007f
ec linehl #00007f
ec graph.box yellow
ec graph.box2 green
ec graph.box3 red

2
libr/cons/d/sepia
View File

@ -35,7 +35,7 @@ ec trap rgb:431
ec swi rgb:bb7
ec creg rgb:960
ec flag rgb:ffd
ec line_highlight rgb:210
ec linehl rgb:210
ec graph.true rgb:fd9
ec graph.false rgb:431
ec graph.trufae rgb:fd9

2
libr/cons/d/smyck
View File

@ -33,7 +33,7 @@ ec trap rgb:d66
ec swi rgb:d66
ec creg rgb:df7
ec flag rgb:9df
ec line_highlight rgb:004
ec linehl rgb:004
ec ai.read rgb:66d
ec ai.write rgb:d66
ec ai.exec rgb:6d6

2
libr/cons/d/solarized
View File

@ -32,7 +32,7 @@ ec trap rgb:f00
ec swi rgb:f00
ec creg rgb:de8
ec flag rgb:c41
ec line_highlight rgb:004
ec linehl rgb:004
ec graph.box rgb:033
ec graph.box2 rgb:de8

2
libr/cons/d/tango
View File

@ -50,7 +50,7 @@ ec trap rgb:a00
ec swi rgb:950
ec creg rgb:590
ec flag rgb:950
ec line_highlight rgb:004
ec linehl rgb:004
ec graph.true rgb:370
ec graph.false rgb:a00

2
libr/cons/d/twilight
View File

@ -37,7 +37,7 @@ ec trap rgb:445
ec swi rgb:bb7
ec creg rgb:788
ec flag rgb:ffd
ec line_highlight rgb:004
ec linehl rgb:004
ec graph.true rgb:9b7
ec graph.false rgb:b97
ec graph.trufae rgb:64c

2
libr/cons/d/white
View File

@ -32,7 +32,7 @@ ec flow blue
ec flow2 green
ec mov black
ec invalid red
ec line_highlight rgb:ff0
ec linehl rgb:ff0
ec graph.box blue
ec graph.box2 green
ec graph.box3 red

2
libr/cons/d/xvilka
View File

@ -36,7 +36,7 @@ ec trap red
ec swi red
ec mov white
ec creg rgb:6f0
ec line_highlight rgb:004
ec linehl rgb:004
ec ai.read green
ec ai.write blue
ec ai.exec red

2
libr/cons/d/zenburn
View File

@ -36,7 +36,7 @@ ec trap rgb:d22
ec swi rgb:d22
ec creg rgb:ccc
ec flag rgb:d50
ec line_highlight rgb:004
ec linehl rgb:004
ec graph.box rgb:aaa
ec graph.box2 rgb:d52

4
libr/cons/pal.c
View File

@ -70,7 +70,7 @@ static struct {
{ "gui.alt_background", r_offsetof (RConsPrintablePalette, gui_alt_background), r_offsetof (RConsPalette, gui_alt_background) },
{ "gui.border", r_offsetof (RConsPrintablePalette, gui_border), r_offsetof (RConsPalette, gui_border) },
{ "highlight", r_offsetof (RConsPrintablePalette, highlight), r_offsetof (RConsPalette, highlight) },
{ "line_highlight", r_offsetof (RConsPrintablePalette, line_highlight), r_offsetof (RConsPalette, line_highlight) },
{ "linehl", r_offsetof (RConsPrintablePalette, linehl), r_offsetof (RConsPalette, linehl) },
{ NULL, 0, 0 }
};
@ -160,7 +160,7 @@ R_API void r_cons_pal_init() {
cons->cpal.gui_alt_background = (RColor) RColor_WHITE;
cons->cpal.gui_border = (RColor) RColor_BLACK;
cons->cpal.highlight = (RColor) RColor_BGRED;
cons->cpal.line_highlight = (RColor) RCOLOR (ALPHA_BG, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00);
cons->cpal.linehl = (RColor) RCOLOR (ALPHA_BG, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00);
cons->cpal.graph_box = (RColor) RColor_NULL;
cons->cpal.graph_box2 = (RColor) RColor_BLUE;

8
libr/core/disasm.c
View File

@ -207,7 +207,7 @@ typedef struct {
const char *color_gui_background;
const char *color_gui_alt_background;
const char *color_gui_border;
const char *color_line_highlight;
const char *color_linehl;
RFlagItem *lastflag;
RAnalHint *hint;
@ -558,7 +558,7 @@ static RDisasmState * ds_init(RCore *core) {
ds->color_gui_background = P(gui_background): Color_BLACK;
ds->color_gui_alt_background = P(gui_alt_background): Color_GRAY;
ds->color_gui_border = P(gui_border): Color_BGGRAY;
ds->color_line_highlight = P(line_highlight): Color_BGBLUE;
ds->color_linehl = P(linehl): Color_BGBLUE;
ds->immstr = r_config_get_i (core->config, "asm.imm.str");
ds->immtrim = r_config_get_i (core->config, "asm.imm.trim");
@ -890,7 +890,7 @@ static bool ds_must_strip(RDisasmState *ds) {
static void ds_highlight_word(RDisasmState * ds, char *word, char *color) {
char *source = ds->opstr? ds->opstr: ds->asmop.buf_asm;
const char *color_reset = line_highlighted (ds) ? ds->color_line_highlight : Color_RESET_BG;
const char *color_reset = line_highlighted (ds) ? ds->color_linehl : Color_RESET_BG;
char *asm_str = r_str_highlight (source, word, color, color_reset);
ds->opstr = asm_str? asm_str:source;
}
@ -4361,7 +4361,7 @@ static bool line_highlighted(RDisasmState *ds) {
static void ds_start_line_highlight(RDisasmState *ds) {
if (ds->show_color && line_highlighted (ds)) {
r_cons_strcat (ds->color_line_highlight);
r_cons_strcat (ds->color_linehl);
}
}

6
libr/include/r_cons.h
View File

@ -125,7 +125,7 @@ enum {
R_CONS_PAL_GUI_BACKGROUND,
R_CONS_PAL_GUI_ALT_BACKGROUND,
R_CONS_PAL_GUI_BORDER,
R_CONS_PAL_LINE_HIGHLIGHT,
R_CONS_PAL_LINEHL,
R_CONS_PAL_GRAPH_BOX,
R_CONS_PAL_GRAPH_BOX2,
R_CONS_PAL_GRAPH_BOX3,
@ -206,7 +206,7 @@ typedef struct r_cons_palette_t {
RColor gui_alt_background;
RColor gui_border;
RColor highlight;
RColor line_highlight;
RColor linehl;
/* Graph colors */
RColor graph_box;
@ -271,7 +271,7 @@ typedef struct r_cons_printable_palette_t {
char *gui_alt_background;
char *gui_border;
char *highlight;
char *line_highlight;
char *linehl;
/* graph colors */
char *graph_box;