From bc4fe462c7f8f065d172869459d2a485968b8d3c Mon Sep 17 00:00:00 2001
From: Aswin C <realc@protonmail.com>
Date: Wed, 10 Feb 2021 17:56:29 +0530
Subject: [PATCH] Remove the configuration variable `graph.web` (#567)

---
 librz/core/cconfig.c      |  1 -
 librz/core/cmd_analysis.c | 36 +++++++++++++-----------------------
 librz/core/panels.c       | 12 ++----------
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/librz/core/cconfig.c b/librz/core/cconfig.c
index 4bed9c3970..87ea808cb6 100644
--- a/librz/core/cconfig.c
+++ b/librz/core/cconfig.c
@@ -3469,7 +3469,6 @@ RZ_API int rz_core_config_init(RzCore *core) {
 	SETPREF("graph.font", "Courier", "Font for dot graphs");
 	SETBPREF("graph.offset", "false", "Show offsets in graphs");
 	SETBPREF("graph.bytes", "false", "Show opcode bytes in graphs");
-	SETBPREF("graph.web", "false", "Display graph in web browser (VV)");
 	SETI("graph.from", UT64_MAX, "Lower bound address when drawing global graphs");
 	SETI("graph.to", UT64_MAX, "Upper bound address when drawing global graphs");
 	SETI("graph.scroll", 5, "Scroll speed in ascii-art graph");
diff --git a/librz/core/cmd_analysis.c b/librz/core/cmd_analysis.c
index f27e3414b1..b516be462a 100644
--- a/librz/core/cmd_analysis.c
+++ b/librz/core/cmd_analysis.c
@@ -548,7 +548,7 @@ static const char *help_msg_ag[] = {
 	"k", "", "SDB key-value",
 	"t", "", "Tiny ascii art",
 	"v", "", "Interactive ascii art",
-	"w", " [path]", "Write to path or display graph image (see graph.gv.format and graph.web)",
+	"w", " [path]", "Write to path or display graph image (see graph.gv.format)",
 	NULL
 };
 
@@ -8017,12 +8017,8 @@ RZ_API void rz_core_agraph_print(RzCore *core, int use_utf, const char *input) {
 		rz_cons_print("]\n");
 		break;
 	case 'w': { // "aggw"
-		if (rz_config_get_i(core->config, "graph.web")) {
-			rz_core_cmd0(core, "=H /graph/");
-		} else {
-			const char *filename = rz_str_trim_head_ro(input + 1);
-			convert_dotcmd_to_image(core, "aggd", filename);
-		}
+		const char *filename = rz_str_trim_head_ro(input + 1);
+		convert_dotcmd_to_image(core, "aggd", filename);
 		break;
 	}
 	default:
@@ -8262,15 +8258,12 @@ static void cmd_analysis_graph(RzCore *core, const char *input) {
 			rz_core_print_bb_custom(core, fcn);
 			break;
 		}
-		case 'w': // "agfw"
-			if (rz_config_get_i(core->config, "graph.web")) {
-				rz_core_cmd0(core, "=H /graph/");
-			} else {
-				char *cmdargs = rz_str_newf("agfd @ 0x%" PFMT64x, core->offset);
-				convert_dotcmd_to_image(core, cmdargs, input + 2);
-				free(cmdargs);
-			}
+		case 'w': { // "agfw"
+			char *cmdargs = rz_str_newf("agfd @ 0x%" PFMT64x, core->offset);
+			convert_dotcmd_to_image(core, cmdargs, input + 2);
+			free(cmdargs);
 			break;
+		}
 		default:
 			eprintf("Usage: see ag?\n");
 			break;
@@ -8512,15 +8505,12 @@ static void cmd_analysis_graph(RzCore *core, const char *input) {
 	case 'v': // "agv" alias for "agfv"
 		rz_core_cmdf(core, "agfv%s", input + 1);
 		break;
-	case 'w': // "agw"
-		if (rz_config_get_i(core->config, "graph.web")) {
-			rz_core_cmd0(core, "=H /graph/");
-		} else {
-			char *cmdargs = rz_str_newf("agfd @ 0x%" PFMT64x, core->offset);
-			convert_dotcmd_to_image(core, cmdargs, input + 1);
-			free(cmdargs);
-		}
+	case 'w': { // "agw"
+		char *cmdargs = rz_str_newf("agfd @ 0x%" PFMT64x, core->offset);
+		convert_dotcmd_to_image(core, cmdargs, input + 1);
+		free(cmdargs);
 		break;
+	}
 	default:
 		rz_core_cmd_help(core, help_msg_ag);
 		break;
diff --git a/librz/core/panels.c b/librz/core/panels.c
index 185fafa4cd..643c8a2ebc 100644
--- a/librz/core/panels.c
+++ b/librz/core/panels.c
@@ -6430,11 +6430,7 @@ repeat:
 		}
 		break;
 	case ' ':
-		if (rz_config_get_b(core->config, "graph.web")) {
-			rz_core_cmd0(core, "agv $$");
-		} else {
-			__call_visual_graph(core);
-		}
+		__call_visual_graph(core);
 		break;
 	case ':':
 		rz_core_visual_prompt_input(core);
@@ -6654,11 +6650,7 @@ repeat:
 		}
 		break;
 	case 'V':
-		if (rz_config_get_b(core->config, "graph.web")) {
-			rz_core_cmd0(core, "agv $$");
-		} else {
-			__call_visual_graph(core);
-		}
+		__call_visual_graph(core);
 		break;
 	case ']':
 		if (__check_panel_type(cur, PANEL_CMD_HEXDUMP)) {