diff --git a/bin/elementexplorer b/bin/elementexplorer index d746f40..9f4a99b 100755 Binary files a/bin/elementexplorer and b/bin/elementexplorer differ diff --git a/src/displays/app_description.c b/src/displays/app_description.c index 2068196..5368b08 100644 --- a/src/displays/app_description.c +++ b/src/displays/app_description.c @@ -1,5 +1,4 @@ -#include "color_codes.h" -#include "escape_sequence.h" +#include "../escape_sequence/escape_sequence.h" void app_description(void) { add_new_tab(); diff --git a/src/displays/app_exit.c b/src/displays/app_exit.c index 68553eb..9343a4c 100644 --- a/src/displays/app_exit.c +++ b/src/displays/app_exit.c @@ -1,4 +1,4 @@ -#include "escape_sequence.h" +#include "../escape_sequence/escape_sequence.h" void app_exit(void) { add_new_tab(); diff --git a/src/displays/color_codes.h b/src/displays/color_codes.h deleted file mode 100644 index 9148342..0000000 --- a/src/displays/color_codes.h +++ /dev/null @@ -1,5 +0,0 @@ -#define BLUE "\e[0;34m" -#define GREEN "\e[0;32m" -#define YELLOW "\e[0;33m" -#define RED "\e[0;31m" -#define RESET "\e[0m" diff --git a/src/displays/displays.h b/src/displays/displays.h index cfeec26..28d6a04 100644 --- a/src/displays/displays.h +++ b/src/displays/displays.h @@ -3,9 +3,11 @@ #include "./app_description.c" #include "./app_exit.c" #include "./clear_terminal.c" +#include "./element_not_found.c" extern void app_description(void); extern void app_exit(void); extern void clear_terminal(void); +extern void element_not_found(void); #endif diff --git a/src/displays/element_not_found.c b/src/displays/element_not_found.c index 55fab56..0854ebd 100644 --- a/src/displays/element_not_found.c +++ b/src/displays/element_not_found.c @@ -1,5 +1,4 @@ -#include "color_codes.h" -#include "escape_sequence.h" +#include "../escape_sequence/escape_sequence.h" void element_not_found(void) { add_new_tab(); diff --git a/src/displays/element_not_found.h b/src/displays/element_not_found.h deleted file mode 100644 index 5195c62..0000000 --- a/src/displays/element_not_found.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef ELEMENT_NOT_FOUND_H -#define ELEMENT_NOT_FOUND_H -#include "element_not_found.c" - -extern void element_not_found(void); - -#endif diff --git a/src/displays/escape_sequence.h b/src/displays/escape_sequence.h deleted file mode 100644 index 9f0fb29..0000000 --- a/src/displays/escape_sequence.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef ESCAPE_SEQUENCE_H -#define ESCAPE_SEQUENCE_H -#include "escape_sequence.c" - -extern void add_new_tab(void); -extern void add_new_line(void); - -#endif diff --git a/src/elements/get_element_details.c b/src/elements/get_element_details.c index d912674..fe4b6f8 100644 --- a/src/elements/get_element_details.c +++ b/src/elements/get_element_details.c @@ -1,5 +1,4 @@ -#include "../displays/color_codes.h" -#include "../displays/escape_sequence.h" +#include "../escape_sequence/escape_sequence.h" #include "element_type.h" void get_element_details(element_details *element) { diff --git a/src/displays/escape_sequence.c b/src/escape_sequence/add_new_line.c similarity index 60% rename from src/displays/escape_sequence.c rename to src/escape_sequence/add_new_line.c index 05c8b0c..1c4338f 100644 --- a/src/displays/escape_sequence.c +++ b/src/escape_sequence/add_new_line.c @@ -1,4 +1,3 @@ #include -void add_new_tab(void) { printf("\t"); } void add_new_line(void) { printf("\n"); } diff --git a/src/escape_sequence/add_new_tab.c b/src/escape_sequence/add_new_tab.c new file mode 100644 index 0000000..38c1a58 --- /dev/null +++ b/src/escape_sequence/add_new_tab.c @@ -0,0 +1,3 @@ +#include + +void add_new_tab(void) { printf("\t"); } diff --git a/src/escape_sequence/escape_sequence.h b/src/escape_sequence/escape_sequence.h new file mode 100644 index 0000000..386f32d --- /dev/null +++ b/src/escape_sequence/escape_sequence.h @@ -0,0 +1,17 @@ +#ifndef ESCAPE_SEQUNCE_H +#define ESCAPE_SEQUNCE_H +#include "./add_new_tab.c" +#include "./add_new_line.c" + +// Custom functions. +extern void add_new_tab(void); +extern void add_new_line(void); + +// Color codes. +#define BLUE "\e[0;34m" +#define GREEN "\e[0;32m" +#define YELLOW "\e[0;33m" +#define RED "\e[0;31m" +#define RESET "\e[0m" + +#endif diff --git a/src/inputs/get_input.c b/src/inputs/get_input.c index 8d1ce72..865c5fd 100644 --- a/src/inputs/get_input.c +++ b/src/inputs/get_input.c @@ -1,4 +1,4 @@ -#include "../displays/escape_sequence.h" +#include "../escape_sequence/escape_sequence.h" #include char *get_input(void) { diff --git a/src/inputs/get_retry_input.c b/src/inputs/get_retry_input.c index 92f583c..9f133fd 100644 --- a/src/inputs/get_retry_input.c +++ b/src/inputs/get_retry_input.c @@ -1,4 +1,4 @@ -#include "../displays/escape_sequence.h" +#include "../escape_sequence/escape_sequence.h" #include "get_lowercase_input.h" #include diff --git a/src/main.c b/src/main.c index a4590b0..84e9a0a 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,5 @@ #include "displays/displays.h" -#include "displays/element_not_found.h" -#include "displays/escape_sequence.h" +#include "escape_sequence/escape_sequence.h" #include "elements/element_array.h" #include "elements/element_input_match.h" #include "elements/element_type.h"