changes file structure

src/windows/CMakeLists.txt

@@ -2,13 +2,13 @@ add_library(windows STATIC)
 
 file(GLOB M_SOURCES "*.c")
 
-target_link_directories(windows 
-    PRIVATE 
-        "../widget/" 
-        "../widget_core/" 
-        "../lib/" 
-        "../utils/"
-)
+# target_link_directories(windows 
+#     PRIVATE 
+#         "../widget/" 
+#         "../widget_core/" 
+#         "../lib/" 
+#         "../utils/"
+# )
 
 target_link_libraries(windows 
     PRIVATE
@@ -16,6 +16,8 @@ target_link_libraries(windows
         widget_core
         bstring
         utils
+        core
+        common
 )
 
 target_sources(windows

src/windows/file_list.c

@@ -2,10 +2,8 @@
 /* Copyright (c) 2026 Oleksandr Zhylin */
 
 #include "file_list.h"
-#include "../app.h"
-#include "../file_processor.h"
-#include "../fs.h"
-#include "../server.h"
+#include <common.h>
+#include <core.h>
 #include "main_window.h"
 #include <bstrlib.h>
 #include <ncursesw/ncurses.h>

src/windows/file_list.h

@@ -4,7 +4,6 @@
 #ifndef W_FILE_LIST_H
 #define W_FILE_LIST_H
 
-#include "../app.h"
 #include <bstrlib.h>
 #include <stdint.h>
 #include <widget_core.h>

src/windows/fs_file_list.c

@@ -15,9 +15,11 @@
 #include <unistd.h>
 #include <utils.h>
 
-#include "../file_processor.h"
-#include "../fs.h"
-#include "../server.h"
+#include <core/file_processor.h>
+#include <core/fs.h>
+#include <core/server.h>
+#include <core/app.h>
+
 #include "alert.h"
 #include "fs_file_list.h"
 #include "main_window.h"

src/windows/fs_file_list.h

@@ -4,7 +4,6 @@
 #ifndef W_LFL_H /* LOCAL FILE LIST */
 #define W_LFL_H
 
-#include "../app.h"
 #include <stddef.h>
 #include <widget_core.h>
 #include <ncursesw/ncurses.h>

src/windows/main_window.c

@@ -6,6 +6,9 @@
 #include "fs_file_list.h"
 #include "text_edit.h"
 
+#include <core/app.h>
+#include <widget/dialogue.h>
+
 void main_window_set(app_t *app, enum main_window_type type) {
   if (app->main_ui.ui != NULL) {
     main_window_destroy(app);

src/windows/main_window.h

@@ -4,7 +4,7 @@
 #ifndef MAIN_WINDOW_H
 #define MAIN_WINDOW_H
 
-#include "../app.h"
+#include <common.h>
 
 void main_window_set(app_t *app, enum main_window_type type);
 void main_window_draw(app_t *app);

src/windows/text_edit.c

@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: MIT */
 /* Copyright (c) 2026 Oleksandr Zhylin */
 
-#include "../file_processor.h"
-#include "../server.h"
-#include "../windows/main_window.h"
 #include <dirent.h>
 #include <fcntl.h>
 #include <ncursesw/ncurses.h>
@@ -17,10 +14,15 @@
 #include <utils.h>
 #include <wchar.h>
 
+#include <core/file_processor.h>
+#include <core/server.h>
+#include <core/app.h>
+
 #include "d_array.h"
 #include "file_list.h"
 #include "text_edit.h"
 #include "widget_core.h"
+#include "main_window.h"
 
 /* TODO: расширять capacity линии при достижении лимита */
 

src/windows/text_edit.h

@@ -4,7 +4,6 @@
 #ifndef W_TEXT_EDIT_H /* LOCAL FILE LIST */
 #define W_TEXT_EDIT_H
 
-#include "../app.h"
 #include <ncursesw/ncurses.h>
 #include <stddef.h>
 #include <stdint.h>