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

Restyling graph backedges + bring back 't' and 'f' hints #10837

Merged
merged 3 commits into from Jul 29, 2018
Merged

Restyling graph backedges + bring back 't' and 'f' hints #10837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcb492f
Different dot style for backedges
cyanpencil Jul 27, 2018
f491e4b
Add '#' key to toggle graph hints
cyanpencil Jul 27, 2018
bdd0ff6
Adjust edge positioning if there is a graph title
cyanpencil Jul 28, 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
120 changes: 68 additions & 52 deletions libr/cons/canvas_line.c
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@
#define DOTTED_LINE_HORIZ "┄"
#define DOTTED_LINE_VERT "┊"

#define UTF8LINE_VERT() (dotted ? DOTTED_LINE_VERT : RUNECODESTR_LINE_VERT)
#define UTF8LINE_HORIZ() (dotted ? DOTTED_LINE_HORIZ : RUNECODESTR_LINE_HORIZ)
#define DASHED_LINE_VERT "╵"
#define DASHED_LINE_HORIZ "╴"

enum {
APEX_DOT = 0,
Expand All @@ -25,21 +25,40 @@ enum {
NRM_NRM
};

static char* utf8_line_vert (int dot_style) {
if (r_cons_singleton ()->dotted_lines) {
switch (dot_style) {
case DOT_STYLE_NORMAL: return RUNECODESTR_LINE_VERT;
case DOT_STYLE_CONDITIONAL: return DOTTED_LINE_VERT;
case DOT_STYLE_BACKEDGE: return DASHED_LINE_VERT;
}
}
return RUNECODESTR_LINE_VERT;
}

static char* utf8_line_horiz (int dot_style) {
if (r_cons_singleton ()->dotted_lines) {
switch (dot_style) {
case DOT_STYLE_NORMAL: return RUNECODESTR_LINE_HORIZ;
case DOT_STYLE_CONDITIONAL: return DOTTED_LINE_HORIZ;
case DOT_STYLE_BACKEDGE: return DASHED_LINE_HORIZ;
}
}
return RUNECODESTR_LINE_HORIZ;
}

static bool apply_line_style(RConsCanvas *c, int x, int y, int x2, int y2,
RCanvasLineStyle *style, int isvert) {
RCons *cons = r_cons_singleton ();
bool dotted = false;
switch (style->color) {
case LINE_UNCJMP:
c->attr = cons->pal.graph_trufae;
break;
case LINE_TRUE:
c->attr = cons->pal.graph_true;
dotted = true;
break;
case LINE_FALSE:
c->attr = cons->pal.graph_false;
dotted = true;
break;
case LINE_NONE:
default:
Expand All @@ -49,9 +68,6 @@ static bool apply_line_style(RConsCanvas *c, int x, int y, int x2, int y2,
if (!c->color) {
c->attr = Color_RESET;
}
if (!r_cons_singleton ()->dotted_lines) {
dotted = false;
}
switch (style->symbol) {
case LINE_UNCJMP:
if (G (x, y)) {
Expand All @@ -74,23 +90,23 @@ static bool apply_line_style(RConsCanvas *c, int x, int y, int x2, int y2,
break;
case LINE_NOSYM_VERT:
if (G (x, y)) {
W (useUtf8 ? UTF8LINE_VERT () : "|");
W (useUtf8 ? utf8_line_vert (style->dot_style) : "|");
}
break;
case LINE_NOSYM_HORIZ:
if (G (x, y)) {
W (useUtf8 ? UTF8LINE_HORIZ () : "-");
W (useUtf8 ? utf8_line_horiz (style->dot_style) : "-");
}
break;
case LINE_NONE:
default:
break;
}
return dotted;
}

R_API void r_cons_canvas_line_diagonal (RConsCanvas *c, int x, int y, int x2, int y2, RCanvasLineStyle *style) {
if (x == x2 || y == y2) {
style->dot_style = DOT_STYLE_NORMAL;
r_cons_canvas_line_square (c, x, y +1, x2, y2, style);
return;
}
Expand Down Expand Up @@ -154,7 +170,7 @@ R_API void r_cons_canvas_line_diagonal (RConsCanvas *c, int x, int y, int x2, in
c->attr = Color_RESET;
}

static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int style, bool dotted) {
static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int style, int dot_style) {
const char *l_corner = "?", *r_corner = "?";
int i;

Expand Down Expand Up @@ -227,7 +243,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
break;
case NRM_DOT:
if (useUtf8) {
l_corner = UTF8LINE_HORIZ ();
l_corner = utf8_line_horiz (dot_style);
if (useUtf8Curvy) {
r_corner = RUNECODESTR_CURVE_CORNER_TR;
} else {
Expand All @@ -240,7 +256,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
break;
case NRM_APEX:
if (useUtf8) {
l_corner = UTF8LINE_HORIZ ();
l_corner = utf8_line_horiz (dot_style);
if (useUtf8Curvy) {
r_corner = RUNECODESTR_CURVE_CORNER_BR;
} else {
Expand All @@ -258,7 +274,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
} else {
l_corner = RUNECODESTR_CORNER_TL;
}
r_corner = UTF8LINE_HORIZ ();
r_corner = utf8_line_horiz (dot_style);
} else {
l_corner = ".";
r_corner = "-";
Expand All @@ -271,7 +287,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
} else {
l_corner = RUNECODESTR_CORNER_BL;
}
r_corner = UTF8LINE_HORIZ ();
r_corner = utf8_line_horiz (dot_style);
} else {
l_corner = "`";
r_corner = "-";
Expand All @@ -280,7 +296,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
case NRM_NRM:
default:
if (useUtf8) {
l_corner = r_corner = UTF8LINE_HORIZ ();
l_corner = r_corner = utf8_line_horiz (dot_style);
} else {
l_corner = r_corner = "-";
}
Expand All @@ -291,7 +307,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
W (l_corner);
}

const char *hline = useUtf8 ? UTF8LINE_HORIZ () : "-";
const char *hline = useUtf8 ? utf8_line_horiz (dot_style) : "-";
r_cons_break_push (NULL, NULL);
for (i = x + 1; i < x + width - 1; i++) {
if (r_cons_is_breaked ()) {
Expand All @@ -308,7 +324,7 @@ static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int s
}
}

static void draw_vertical_line (RConsCanvas *c, int x, int y, int height, bool dotted) {
static void draw_vertical_line (RConsCanvas *c, int x, int y, int height, int dot_style) {
int i;
/* do not render offscreen vertical lines */
if (x + c->sx < 0) {
Expand All @@ -317,7 +333,7 @@ static void draw_vertical_line (RConsCanvas *c, int x, int y, int height, bool d
if (x + c->sx > c->w) {
return;
}
const char *vline = useUtf8 ? UTF8LINE_VERT () : "|";
const char *vline = useUtf8 ? utf8_line_vert (dot_style) : "|";
r_cons_break_push (NULL, NULL);
for (i = y; i < y + height; i++) {
if (r_cons_is_breaked ()) {
Expand All @@ -335,26 +351,26 @@ R_API void r_cons_canvas_line_square (RConsCanvas *c, int x, int y, int x2, int
int diff_x = R_ABS (x - x2);
int diff_y = R_ABS (y - y2);

bool dotted = apply_line_style (c, x, y, x2, y2, style, 1);
apply_line_style (c, x, y, x2, y2, style, 1);

// --
// TODO: find if there's any collision in this line
if (y2 - y > 1) {
int hl = diff_y / 2 - 1;
int hl2 = diff_y - hl;
int w = diff_x == 0 ? 0 : diff_x + 1;
int style = min_x == x ? APEX_DOT : DOT_APEX;
draw_vertical_line (c, x, y + 1, hl, dotted);
draw_vertical_line (c, x2, y + hl + 1, hl2, dotted);
draw_horizontal_line (c, min_x, y + hl + 1, w, style, dotted);
int apex_style = min_x == x ? APEX_DOT : DOT_APEX;
draw_vertical_line (c, x, y + 1, hl, style->dot_style);
draw_vertical_line (c, x2, y + hl + 1, hl2, style->dot_style);
draw_horizontal_line (c, min_x, y + hl + 1, w, apex_style, style->dot_style);
} else {
if (y2 == y) {
draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT, dotted);
draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT, style->dot_style);
} else {
if (x != x2) {
draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX, dotted);
draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX, style->dot_style);
}
draw_vertical_line (c, x2, y2, diff_y, dotted);
draw_vertical_line (c, x2, y2, diff_y, style->dot_style);
}
}
c->attr = Color_RESET;
Expand All @@ -370,44 +386,44 @@ R_API void r_cons_canvas_line_square_defined (RConsCanvas *c, int x, int y, int
int diff_y = R_ABS (y - y2);
int min_y = R_MIN (y, y2);

bool dotted = apply_line_style (c, x, y, x2, y2, style, isvert);
apply_line_style (c, x, y, x2, y2, style, isvert);

if (isvert) {
if (x2 == x) {
draw_vertical_line (c, x, y + 1, diff_y + 1, dotted);
draw_vertical_line (c, x, y + 1, diff_y + 1, style->dot_style);
} else if (y2 - y > 1) {
int h1 = 1 + bendpoint;
int h2 = diff_y - h1;
int w = diff_x == 0 ? 0 : diff_x + 1;
int style = min_x == x ? APEX_DOT : DOT_APEX;
draw_vertical_line (c, x, y + 1, h1, dotted);
draw_horizontal_line (c, min_x, y + bendpoint + 2, w, style, dotted);
draw_vertical_line (c, x2, y + h1 + 1 + 1, h2, dotted);
int apex_style = min_x == x ? APEX_DOT : DOT_APEX;
draw_vertical_line (c, x, y + 1, h1, style->dot_style);
draw_horizontal_line (c, min_x, y + bendpoint + 2, w, apex_style, style->dot_style);
draw_vertical_line (c, x2, y + h1 + 1 + 1, h2, style->dot_style);
} else {
//TODO: currently copy-pasted
if (y2 == y) {
draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT, dotted);
draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT, style->dot_style);
} else {
if (x != x2) {
draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX, dotted);
draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX, style->dot_style);
}
draw_vertical_line (c, x2, y2, diff_y-2, dotted);
draw_vertical_line (c, x2, y2, diff_y-2, style->dot_style);
}
}
} else {
if (y2 == y) {
draw_horizontal_line (c, min_x + 1, y, diff_x, NRM_NRM, dotted);
draw_horizontal_line (c, min_x + 1, y, diff_x, NRM_NRM, style->dot_style);
} else if (x2 - x > 1) {
int w1 = 1 + bendpoint;
int w2 = diff_x - w1;
//int h = diff_x;// == 0 ? 0 : diff_x + 1;
//int style = min_x == x ? APEX_DOT : DOT_APEX;
//draw_vertical_line (c, x, y + 1, h1);
draw_horizontal_line (c, x + 1, y, w1 + 1, y2 > y ? NRM_DOT : NRM_APEX, dotted);
draw_horizontal_line (c, x + 1, y, w1 + 1, y2 > y ? NRM_DOT : NRM_APEX, style->dot_style);
//draw_horizontal_line (c, min_x, y + bendpoint + 2, w, style);
draw_vertical_line (c, x + 1 + w1, min_y + 1, diff_y - 1, dotted);
draw_vertical_line (c, x + 1 + w1, min_y + 1, diff_y - 1, style->dot_style);
//draw_vertical_line (c, x2, y + h1 + 1 + 1, h2);
draw_horizontal_line (c, x + 1 + w1, y2, w2, y2 < y ? DOT_NRM : REV_APEX_NRM, dotted);
draw_horizontal_line (c, x + 1 + w1, y2, w2, y2 < y ? DOT_NRM : REV_APEX_NRM, style->dot_style);
}
}
c->attr = Color_RESET;
Expand All @@ -429,24 +445,24 @@ R_API void r_cons_canvas_line_back_edge (RConsCanvas *c, int x, int y, int x2, i
int w1 = diff_x1 == 0 ? 0 : diff_x1 + 1;
int w2 = diff_x2 == 0 ? 0 : diff_x2 + 1;

bool dotted = apply_line_style (c, x, y, x2, y2, style, isvert);
apply_line_style (c, x, y, x2, y2, style, isvert);

if (isvert) {
draw_vertical_line (c, x, y + 1, ybendpoint1 + 1, dotted);
draw_horizontal_line (c, min_x1, y + ybendpoint1 + 2, w1, REV_APEX_APEX, dotted);
draw_vertical_line (c, xbendpoint, y2 - ybendpoint2 + 1, diff_y - 1, dotted);
draw_horizontal_line (c, min_x2, y2 - ybendpoint2, w2, DOT_DOT, dotted);
draw_vertical_line (c, x2, y2 - ybendpoint2 + 1, ybendpoint2 + 1, dotted);
draw_vertical_line (c, x, y + 1, ybendpoint1 + 1, style->dot_style);
draw_horizontal_line (c, min_x1, y + ybendpoint1 + 2, w1, REV_APEX_APEX, style->dot_style);
draw_vertical_line (c, xbendpoint, y2 - ybendpoint2 + 1, diff_y - 1, style->dot_style);
draw_horizontal_line (c, min_x2, y2 - ybendpoint2, w2, DOT_DOT, style->dot_style);
draw_vertical_line (c, x2, y2 - ybendpoint2 + 1, ybendpoint2 + 1, style->dot_style);
} else {
int miny1 = R_MIN (y, xbendpoint);
int miny2 = R_MIN (y2, xbendpoint);
int diff_y1 = R_ABS (y - xbendpoint);
int diff_y2 = R_ABS (y2 - xbendpoint);

draw_horizontal_line (c, x + 1, y, 1 + ybendpoint1 + 1, xbendpoint > y ? NRM_DOT : NRM_APEX, dotted);
draw_vertical_line (c, x + 1 + ybendpoint1 + 1, miny1 + 1, diff_y1 - 1, dotted);
draw_horizontal_line (c, x2 - ybendpoint2, xbendpoint, (x + 1 + ybendpoint1 + 1) - (x2 - ybendpoint2) + 1, xbendpoint > y ? REV_APEX_APEX : DOT_DOT, dotted);
draw_vertical_line (c, x2 - ybendpoint2, miny2 + 1, diff_y2 - 1, dotted);
draw_horizontal_line (c, x2 - ybendpoint2, y2, ybendpoint2 + 1, xbendpoint > y ? DOT_NRM : REV_APEX_NRM, dotted);
draw_horizontal_line (c, x + 1, y, 1 + ybendpoint1 + 1, xbendpoint > y ? NRM_DOT : NRM_APEX, style->dot_style);
draw_vertical_line (c, x + 1 + ybendpoint1 + 1, miny1 + 1, diff_y1 - 1, style->dot_style);
draw_horizontal_line (c, x2 - ybendpoint2, xbendpoint, (x + 1 + ybendpoint1 + 1) - (x2 - ybendpoint2) + 1, xbendpoint > y ? REV_APEX_APEX : DOT_DOT, style->dot_style);
draw_vertical_line (c, x2 - ybendpoint2, miny2 + 1, diff_y2 - 1, style->dot_style);
draw_horizontal_line (c, x2 - ybendpoint2, y2, ybendpoint2 + 1, xbendpoint > y ? DOT_NRM : REV_APEX_NRM, style->dot_style);
}
}
1 change: 1 addition & 0 deletions libr/core/cconfig.c
View file
Open in desktop
Expand Up @@ -2854,6 +2854,7 @@ R_API int r_core_config_init(RCore *core) {
SETPREF ("graph.gv.graph", "", "Graphviz global style attributes. (bgcolor=white)");
SETPREF ("graph.gv.current", "false", "Highlight the current node in graphviz graph.");
SETPREF ("graph.nodejmps", "true", "Enables shortcuts for every node.");
SETPREF ("graph.hints", "true", "Show true (t) and false (f) hints for conditional edges in graph");
SETCB ("graph.dotted", "true", &cb_dotted, "Dotted lines for conditional jumps in graph");

/* hud */
Expand Down