Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Colorize pxr + use color palette for visual types menu #10799

Merged
merged 2 commits into from Jul 23, 2018
Merged

Colorize pxr + use color palette for visual types menu #10799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e40170
Updated all color themes for ai.* colors
cyanpencil Jul 22, 2018
1fa52cf
Added color palette support to visual types menu
cyanpencil Jul 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions libr/cons/d/bold
View file
Open in desktop
Expand Up @@ -60,3 +60,9 @@ ec linehl rgb:008
ec func_var yellow . bold
ec func_var_type blue . bold
ec func_var_addr cyan . bold

ec ai.read white . bold
ec ai.write white . bold
ec ai.exec red . bold
ec ai.seq green . bold
ec ai.ascii yellow . bold
6 changes: 6 additions & 0 deletions libr/cons/d/consonance
View file
Open in desktop
Expand Up @@ -51,3 +51,9 @@ ec graph.traced rgb:090
ec func_var rgb:fcc
ec func_var_type rgb:f2a
ec func_var_addr white

ec ai.read rgb:fcc
ec ai.write rgb:f2a
ec ai.exec rgb:f2a
ec ai.seq rgb:f0f
ec ai.ascii rgb:fff
6 changes: 6 additions & 0 deletions libr/cons/d/cutter
View file
Open in desktop
Expand Up @@ -46,3 +46,9 @@ ec graph.traced rgb:e33
ec func_var rgb:d38
ec func_var_type blue
ec func_var_addr rgb:bbb

ec ai.read rgb:18d
ec ai.write rgb:28d
ec ai.exec rgb:b80
ec ai.seq rgb:d38
ec ai.ascii black
6 changes: 6 additions & 0 deletions libr/cons/d/dark
View file
Open in desktop
Expand Up @@ -47,3 +47,9 @@ ec graph.traced rgb:bbb
ec func_var rgb:99a
ec func_var_type rgb:636
ec func_var_addr rgb:366

ec ai.read rgb:266
ec ai.write rgb:366
ec ai.exec rgb:368
ec ai.seq rgb:d38
ec ai.ascii rgb:99a
6 changes: 6 additions & 0 deletions libr/cons/d/darkda
View file
Open in desktop
Expand Up @@ -48,3 +48,9 @@ ec graph.current rgb:fff
ec func_var rgb:99a
ec func_var_type rgb:df077e
ec func_var_addr rgb:ababab

ec ai.read rgb:be077e
ec ai.write rgb:df077e
ec ai.exec rgb:9dd600
ec ai.seq rgb:9dd600
ec ai.ascii rgb:d25032
6 changes: 6 additions & 0 deletions libr/cons/d/defragger
View file
Open in desktop
Expand Up @@ -58,3 +58,9 @@ ec gui.border rgb:5fd700
ec func_var rgb:64604f
ec func_var_type rgb:00afd7
ec func_var_addr rgb:afafaf

ec ai.read rgb:a55f00
ec ai.write rgb:d75f00
ec ai.exec rgb:ff5f87
ec ai.seq rgb:9dd600
ec ai.ascii rgb:d25032
6 changes: 6 additions & 0 deletions libr/cons/d/focus
View file
Open in desktop
Expand Up @@ -48,3 +48,9 @@ ec graph.traced red
ec func_var cyan
ec func_var_type rgb:f3f
ec func_var_addr white

ec ai.read rgb:8f0
ec ai.write rgb:6f0
ec ai.exec rgb:f3f
ec ai.seq white
ec ai.ascii yellow
6 changes: 6 additions & 0 deletions libr/cons/d/lima
View file
Open in desktop
Expand Up @@ -52,3 +52,9 @@ ec graph.traced rgb:090
ec func_var yellow
ec func_var_type green
ec func_var_addr yellow

ec ai.read rgb:8e2
ec ai.write rgb:9e2
ec ai.exec rgb:af2
ec ai.seq rgb:ef0
ec ai.ascii rgb:ef0
6 changes: 6 additions & 0 deletions libr/cons/d/matrix
View file
Open in desktop
Expand Up @@ -48,3 +48,9 @@ ec graph.traced rgb:060
ec func_var rgb:060
ec func_var_type rgb:383
ec func_var_addr rgb:060

ec ai.read rgb:0a1
ec ai.write rgb:1a1
ec ai.exec rgb:383
ec ai.seq rgb:3f3
ec ai.ascii rgb:3f3
1 change: 1 addition & 0 deletions libr/cons/d/monokai
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ ec linehl rgb:008
ec ai.read rgb:66d
ec ai.write rgb:d66
ec ai.exec rgb:6d6
ec ai.ascii rgb:a398e5
ec graph.box rgb:66d9ef
ec graph.box2 rgb:ef8d1a
ec graph.box3 rgb:66d9ef
Expand Down
6 changes: 6 additions & 0 deletions libr/cons/d/ogray
View file
Open in desktop
Expand Up @@ -50,3 +50,9 @@ ec linehl rgb:111
ec func_var rgb:f72
ec func_var_type rgb:777
ec func_var_addr rgb:555

ec ai.read rgb:eee
ec ai.write rgb:ddd
ec ai.exec rgb:fff
ec ai.seq rgb:f72
ec ai.ascii rgb:f72
11 changes: 6 additions & 5 deletions libr/cons/d/pink
View file
Open in desktop
Expand Up @@ -45,14 +45,15 @@ ec graph.box4 rgb:f5d
ec gui.cflow rgb:f5d
ec gui.dataoffset rgb:f5d
ec gui.background black
## ai.read
## ai.write
## ai.exec
## ai.seq
## ai.ascii
## gui.alt_background
## gui.border

ec func_var rgb:72d
ec func_var_type blue
ec func_var_addr rgb:72d

ec ai.read rgb:f6e
ec ai.write rgb:f5d
ec ai.exec rgb:75a
ec ai.seq rgb:72d
ec ai.ascii rgb:72d
6 changes: 6 additions & 0 deletions libr/cons/d/rasta
View file
Open in desktop
Expand Up @@ -52,3 +52,9 @@ ec graph.traced yellow
ec func_var green
ec func_var_type red
ec func_var_addr yellow

ec ai.read green
ec ai.write green
ec ai.exec yellow
ec ai.seq red
ec ai.ascii red
6 changes: 6 additions & 0 deletions libr/cons/d/sepia
View file
Open in desktop
Expand Up @@ -49,3 +49,9 @@ ec graph.box4 rgb:ca6
ec func_var rgb:fd9
ec func_var_type rgb:850
ec func_var_addr rgb:960

ec ai.read rgb:cb7
ec ai.write rgb:ca6
ec ai.exec rgb:db7
ec ai.seq rgb:960
ec ai.ascii rgb:fec
2 changes: 2 additions & 0 deletions libr/cons/d/smyck
View file
Open in desktop
Expand Up @@ -37,6 +37,8 @@ ec linehl rgb:004
ec ai.read rgb:66d
ec ai.write rgb:d66
ec ai.exec rgb:6d6
ec ai.seq rgb:fd6
ec ai.ascii white
ec graph.box rgb:9df
ec graph.box2 rgb:9df
ec graph.box3 rgb:9df
Expand Down
6 changes: 6 additions & 0 deletions libr/cons/d/solarized
View file
Open in desktop
Expand Up @@ -48,5 +48,11 @@ ec func_var rgb:28d
ec func_var_type rgb:cc8
ec func_var_addr rgb:9aa

ec ai.read rgb:39e
ec ai.write rgb:577
ec ai.exec rgb:ab4
ec ai.seq rgb:899
ec ai.ascii rgb:899

# background of the terminal must be 134 o 033
# xterm -fn 10x20 -bg rgb:00/30/30 -fg rgb:e0/e0/e0 -e "r2 -c 'eco solarized' /bin/ls"
6 changes: 6 additions & 0 deletions libr/cons/d/tango
View file
Open in desktop
Expand Up @@ -65,3 +65,9 @@ ec graph.box4 rgb:950
ec func_var rgb:370
ec func_var_type rgb:a41
ec func_var_addr rgb:aaa

ec ai.read rgb:a81
ec ai.write rgb:a41
ec ai.exec rgb:c50
ec ai.seq rgb:ca0
ec ai.ascii rgb:ca0
6 changes: 6 additions & 0 deletions libr/cons/d/twilight
View file
Open in desktop
Expand Up @@ -51,3 +51,9 @@ ec graph.box4 rgb:b97
ec func_var rgb:c64
ec func_var_type rgb:aa6
ec func_var_addr rgb:788

ec ai.read rgb:db7
ec ai.write rgb:ca6
ec ai.exec rgb:ffd
ec ai.seq rgb:bb7
ec ai.ascii rgb:bb7
6 changes: 6 additions & 0 deletions libr/cons/d/white
View file
Open in desktop
Expand Up @@ -46,3 +46,9 @@ ec graph.traced red
ec func_var magenta
ec func_var_type blue
ec func_var_addr magenta

ec ai.read magenta
ec ai.write magenta
ec ai.exec blue
ec ai.seq black
ec ai.ascii black
6 changes: 6 additions & 0 deletions libr/cons/d/zenburn
View file
Open in desktop
Expand Up @@ -51,3 +51,9 @@ ec graph.traced red
ec func_var rgb:7a7
ec func_var_type rgb:eec
ec func_var_addr rgb:aaa

ec ai.read rgb:f87
ec ai.write rgb:c88
ec ai.exec rgb:cd9
ec ai.seq rgb:ddc
ec ai.ascii rgb:ddc
30 changes: 17 additions & 13 deletions libr/core/vmenus.c
View file
Open in desktop
Expand Up @@ -481,6 +481,7 @@ static int sdbforcb (void *p, const char *k, const char *v) {
const char *pre = " ";
RCoreVisualTypes *vt = (RCoreVisualTypes*)p;
bool use_color = vt->core->print->flags & R_PRINT_FLAGS_COLOR;
char *color_sel = vt->core->cons->pal.prompt;
if (vt->optword) {
if (!strcmp (vt->type, "struct")) {
char *s = r_str_newf ("struct.%s.", vt->optword);
Expand All @@ -494,7 +495,7 @@ static int sdbforcb (void *p, const char *k, const char *v) {
pre = ">";
}
if (use_color && *pre=='>')
r_cons_printf (Color_YELLOW" %s %s %s\n"
r_cons_printf ("%s %s %s %s\n", color_sel,
Color_RESET, pre, k+strlen (s), v);
else
r_cons_printf (" %s %s %s\n",
Expand All @@ -515,7 +516,7 @@ static int sdbforcb (void *p, const char *k, const char *v) {
pre = ">";
}
if (use_color && *pre=='>') {
r_cons_printf (Color_YELLOW" %s %s %s\n"
r_cons_printf ("%s %s %s %s\n", color_sel,
Color_RESET, pre, k, v);
} else {
r_cons_printf (" %s %s %s\n",
Expand All @@ -537,8 +538,8 @@ static int sdbforcb (void *p, const char *k, const char *v) {
pre = ">";
}
if (use_color && *pre=='>') {
r_cons_printf (Color_YELLOW" %s pf %3s %s\n"
Color_RESET,pre, fmt, k);
r_cons_printf ("%s %s pf %3s %s\n"Color_RESET,
color_sel, pre, fmt, k);
} else {
r_cons_printf (" %s pf %3s %s\n",
pre, fmt, k);
Expand All @@ -553,7 +554,7 @@ static int sdbforcb (void *p, const char *k, const char *v) {
pre = ">";
}
if (use_color && *pre == '>') {
r_cons_printf (Color_YELLOW" %s %s\n"Color_RESET,
r_cons_printf ("%s %s %s\n"Color_RESET, color_sel,
(vt->t_idx == vt->t_ctr)?
">":" ", k);
} else {
Expand Down Expand Up @@ -597,14 +598,17 @@ R_API int r_core_visual_types(RCore *core) {
for (;;) {
r_cons_clear00 ();
for (i = 0; opts[i]; i++) {
const char *fmt = use_color
? (h_opt == i)
? Color_BGREEN"[%s] "Color_RESET
: Color_GREEN" %s "Color_RESET
: (h_opt == i)
? "[%s] "
: " %s ";
r_cons_printf (fmt, opts[i]);
if (use_color) {
if (h_opt == i) {
r_cons_printf ("%s[%s]%s ", core->cons->pal.call,
opts[i], Color_RESET);
} else {
r_cons_printf ("%s%s%s ", core->cons->pal.other,
opts[i], Color_RESET);
}
} else {
r_cons_printf (h_opt == i ? "[%s] " : " %s ", opts[i]);
}
}
r_cons_newline ();
if (optword) {
Expand Down