From 09cbd2648db062d9b5dd5a505da33e231df706e4 Mon Sep 17 00:00:00 2001
From: Anton Kochkov <anton.kochkov@gmail.com>
Date: Mon, 18 Oct 2021 18:45:02 +0800
Subject: [PATCH] Move visual modes to `librz/core/tui/`

---
 librz/core/meson.build               | 16 ++++++++--------
 librz/core/{ => tui}/panels.c        |  2 +-
 librz/core/{ => tui}/vasm.c          |  0
 librz/core/{ => tui}/visual.c        |  2 +-
 librz/core/{ => tui}/visual_tabs.inc |  0
 librz/core/{ => tui}/vmenus.c        |  2 +-
 librz/core/{ => tui}/vmenus_graph.c  |  0
 librz/core/{ => tui}/vmenus_zigns.c  |  0
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename librz/core/{ => tui}/panels.c (99%)
 rename librz/core/{ => tui}/vasm.c (100%)
 rename librz/core/{ => tui}/visual.c (99%)
 rename librz/core/{ => tui}/visual_tabs.inc (100%)
 rename librz/core/{ => tui}/vmenus.c (99%)
 rename librz/core/{ => tui}/vmenus_graph.c (100%)
 rename librz/core/{ => tui}/vmenus_zigns.c (100%)

diff --git a/librz/core/meson.build b/librz/core/meson.build
index 934274240b..b37995a4b9 100644
--- a/librz/core/meson.build
+++ b/librz/core/meson.build
@@ -31,7 +31,6 @@ rz_core_sources = [
   'hack.c',
   'libs.c',
   #'linux_heap_glibc.c',
-  'panels.c',
   'cplugin.c',
   'project.c',
   'project_migrate.c',
@@ -40,12 +39,7 @@ rz_core_sources = [
   #'rtr_shell.c',
   'seek.c',
   'task.c',
-  'vasm.c',
-  'visual.c',
   'vmarks.c',
-  'vmenus.c',
-  'vmenus_graph.c',
-  'vmenus_zigns.c',
   'yank.c',
   'p/core_java.c',
   'cannotated_code.c',
@@ -53,7 +47,7 @@ rz_core_sources = [
   cmd_descs_ch,
   'cmd/cmd.c',
   #'cmd/cmd_analysis.c',
-  'cmd/cmd_api.c'
+  'cmd/cmd_api.c',
   #'cmd/cmd_cmp.c',
   #'cmd/cmd_debug.c',
   #'cmd/cmd_egg.c',
@@ -75,7 +69,13 @@ rz_core_sources = [
   #'cmd/cmd_seek.c',
   #'cmd/cmd_type.c',
   #'cmd/cmd_write.c',
-  #'cmd/cmd_zign.c'
+  #'cmd/cmd_zign.c',
+  'tui/visual.c',
+  'tui/vmenus.c',
+  'tui/vmenus_graph.c',
+  'tui/vmenus_zigns.c',
+  'tui/vasm.c',
+  'tui/panels.c'
 ]
 
 rz_core_inc = []
diff --git a/librz/core/panels.c b/librz/core/tui/panels.c
similarity index 99%
rename from librz/core/panels.c
rename to librz/core/tui/panels.c
index 54cdc3cd32..3db688d234 100644
--- a/librz/core/panels.c
+++ b/librz/core/tui/panels.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_core.h>
-#include "core_private.h"
+#include "../core_private.h"
 
 #define PANEL_NUM_LIMIT 9
 
diff --git a/librz/core/vasm.c b/librz/core/tui/vasm.c
similarity index 100%
rename from librz/core/vasm.c
rename to librz/core/tui/vasm.c
diff --git a/librz/core/visual.c b/librz/core/tui/visual.c
similarity index 99%
rename from librz/core/visual.c
rename to librz/core/tui/visual.c
index 69ced31dc5..1c0e8be415 100644
--- a/librz/core/visual.c
+++ b/librz/core/tui/visual.c
@@ -3,7 +3,7 @@
 
 #include <rz_core.h>
 #include <rz_cons.h>
-#include "core_private.h"
+#include "../core_private.h"
 
 #define NPF  5
 #define PIDX (RZ_ABS(core->printidx % NPF))
diff --git a/librz/core/visual_tabs.inc b/librz/core/tui/visual_tabs.inc
similarity index 100%
rename from librz/core/visual_tabs.inc
rename to librz/core/tui/visual_tabs.inc
diff --git a/librz/core/vmenus.c b/librz/core/tui/vmenus.c
similarity index 99%
rename from librz/core/vmenus.c
rename to librz/core/tui/vmenus.c
index 1785191c53..0fc228d72b 100644
--- a/librz/core/vmenus.c
+++ b/librz/core/tui/vmenus.c
@@ -6,7 +6,7 @@
 #include <rz_core.h>
 #include <rz_util.h>
 
-#include "core_private.h"
+#include "../core_private.h"
 
 #define MAX_FORMAT 3
 
diff --git a/librz/core/vmenus_graph.c b/librz/core/tui/vmenus_graph.c
similarity index 100%
rename from librz/core/vmenus_graph.c
rename to librz/core/tui/vmenus_graph.c
diff --git a/librz/core/vmenus_zigns.c b/librz/core/tui/vmenus_zigns.c
similarity index 100%
rename from librz/core/vmenus_zigns.c
rename to librz/core/tui/vmenus_zigns.c