From b8b13ebe079905b303c20113bb59e0def06c4b1b Mon Sep 17 00:00:00 2001
From: Paul Breugnot <paul.breugnot@inria.fr>
Date: Thu, 26 Dec 2024 16:38:27 +0100
Subject: [PATCH] :truck: Merges src and include

---
 CMakeLists.txt                                 |  3 +--
 src/aswm/aswm.c                                | 18 ++++++++++++------
 {include => src}/aswm/aswm.h                   |  4 +++-
 src/aswm/event_handlers/configure.c            |  2 +-
 .../aswm/event_handlers/configure.h            |  0
 src/aswm/event_handlers/create.c               |  2 +-
 {include => src}/aswm/event_handlers/create.h  |  0
 src/aswm/event_handlers/destroy.c              |  2 +-
 {include => src}/aswm/event_handlers/destroy.h |  0
 src/aswm/event_handlers/map.c                  |  2 +-
 {include => src}/aswm/event_handlers/map.h     |  0
 src/aswm/event_handlers/reparent.c             |  2 +-
 .../aswm/event_handlers/reparent.h             |  0
 src/aswm/event_handlers/unmap.c                |  2 +-
 {include => src}/aswm/event_handlers/unmap.h   |  0
 src/aswm/main.c                                |  7 -------
 src/aswm/mapper/mapper.c                       |  5 -----
 {include => src}/aswm/mapper/mapper.h          |  0
 18 files changed, 22 insertions(+), 27 deletions(-)
 rename {include => src}/aswm/aswm.h (75%)
 rename {include => src}/aswm/event_handlers/configure.h (100%)
 rename {include => src}/aswm/event_handlers/create.h (100%)
 rename {include => src}/aswm/event_handlers/destroy.h (100%)
 rename {include => src}/aswm/event_handlers/map.h (100%)
 rename {include => src}/aswm/event_handlers/reparent.h (100%)
 rename {include => src}/aswm/event_handlers/unmap.h (100%)
 delete mode 100644 src/aswm/main.c
 rename {include => src}/aswm/mapper/mapper.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b8e223..5fa353b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,6 @@ find_package(X11 REQUIRED)
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address")
 
 add_executable(aswm
-	src/aswm/main.c
 	src/aswm/aswm.c
 	src/aswm/mapper/mapper.c
 	src/aswm/event_handlers/create.c
@@ -17,5 +16,5 @@ add_executable(aswm
 	src/aswm/event_handlers/reparent.c
 	src/aswm/event_handlers/destroy.c
 	src/aswm/event_handlers/map.c)
-target_include_directories(aswm PUBLIC ${X11_INCLUDE_DIR} include)
+target_include_directories(aswm PUBLIC ${X11_INCLUDE_DIR} src)
 target_link_libraries(aswm ${X11_LIBRARIES})
diff --git a/src/aswm/aswm.c b/src/aswm/aswm.c
index ce9d359..e787c62 100644
--- a/src/aswm/aswm.c
+++ b/src/aswm/aswm.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
-#include "aswm/aswm.h"
-#include "aswm/event_handlers/create.h"
-#include "aswm/event_handlers/configure.h"
-#include "aswm/event_handlers/map.h"
-#include "aswm/event_handlers/reparent.h"
-#include "aswm/event_handlers/destroy.h"
+#include "aswm.h"
+#include "event_handlers/create.h"
+#include "event_handlers/configure.h"
+#include "event_handlers/map.h"
+#include "event_handlers/reparent.h"
+#include "event_handlers/destroy.h"
 
 Aswm _aswm;
 
@@ -53,3 +53,9 @@ void aswm_close() {
 	aswm_free_tile(_aswm.root_tile);
 	XCloseDisplay(_aswm.display);
 }
+
+int main(int argc, char** argv) {
+	aswm_open();
+	aswm_event_loop();
+	aswm_close();
+}
diff --git a/include/aswm/aswm.h b/src/aswm/aswm.h
similarity index 75%
rename from include/aswm/aswm.h
rename to src/aswm/aswm.h
index 1d538b3..0358410 100644
--- a/include/aswm/aswm.h
+++ b/src/aswm/aswm.h
@@ -1,7 +1,7 @@
 #ifndef ASWM
 #define ASWM
 
-#include "aswm/mapper/mapper.h"
+#include "mapper/mapper.h"
 
 typedef struct {
 	Display *display;
@@ -13,4 +13,6 @@ void aswm_open();
 void aswm_event_loop();
 void aswm_close();
 
+int main(int argc, char** argv);
+
 #endif
diff --git a/src/aswm/event_handlers/configure.c b/src/aswm/event_handlers/configure.c
index 8cb90fe..ec316a4 100644
--- a/src/aswm/event_handlers/configure.c
+++ b/src/aswm/event_handlers/configure.c
@@ -1,4 +1,4 @@
-#include "aswm/event_handlers/configure.h"
+#include "configure.h"
 #include <stdio.h>
 
 void OnConfigureRequest(const XConfigureRequestEvent* e) {
diff --git a/include/aswm/event_handlers/configure.h b/src/aswm/event_handlers/configure.h
similarity index 100%
rename from include/aswm/event_handlers/configure.h
rename to src/aswm/event_handlers/configure.h
diff --git a/src/aswm/event_handlers/create.c b/src/aswm/event_handlers/create.c
index 2254671..95c3052 100644
--- a/src/aswm/event_handlers/create.c
+++ b/src/aswm/event_handlers/create.c
@@ -1,4 +1,4 @@
-#include "aswm/event_handlers/create.h"
+#include "create.h"
 #include <stdio.h>
 
 void OnCreateNotify(const XCreateWindowEvent* e) {
diff --git a/include/aswm/event_handlers/create.h b/src/aswm/event_handlers/create.h
similarity index 100%
rename from include/aswm/event_handlers/create.h
rename to src/aswm/event_handlers/create.h
diff --git a/src/aswm/event_handlers/destroy.c b/src/aswm/event_handlers/destroy.c
index f1c0197..635c844 100644
--- a/src/aswm/event_handlers/destroy.c
+++ b/src/aswm/event_handlers/destroy.c
@@ -1,4 +1,4 @@
-#include "aswm/event_handlers/destroy.h"
+#include "destroy.h"
 #include <stdio.h>
 
 void OnDestroyNotify(const XDestroyWindowEvent* e) {
diff --git a/include/aswm/event_handlers/destroy.h b/src/aswm/event_handlers/destroy.h
similarity index 100%
rename from include/aswm/event_handlers/destroy.h
rename to src/aswm/event_handlers/destroy.h
diff --git a/src/aswm/event_handlers/map.c b/src/aswm/event_handlers/map.c
index a15fb92..896cb5f 100644
--- a/src/aswm/event_handlers/map.c
+++ b/src/aswm/event_handlers/map.c
@@ -1,4 +1,4 @@
-#include "aswm/event_handlers/map.h"
+#include "map.h"
 #include <stdio.h>
 #include <X11/Xutil.h>
 
diff --git a/include/aswm/event_handlers/map.h b/src/aswm/event_handlers/map.h
similarity index 100%
rename from include/aswm/event_handlers/map.h
rename to src/aswm/event_handlers/map.h
diff --git a/src/aswm/event_handlers/reparent.c b/src/aswm/event_handlers/reparent.c
index 9c6d14a..f2f3842 100644
--- a/src/aswm/event_handlers/reparent.c
+++ b/src/aswm/event_handlers/reparent.c
@@ -1,4 +1,4 @@
-#include "aswm/event_handlers/reparent.h"
+#include "reparent.h"
 #include <stdio.h>
 
 void OnReparentNotify(const XReparentEvent* e) {
diff --git a/include/aswm/event_handlers/reparent.h b/src/aswm/event_handlers/reparent.h
similarity index 100%
rename from include/aswm/event_handlers/reparent.h
rename to src/aswm/event_handlers/reparent.h
diff --git a/src/aswm/event_handlers/unmap.c b/src/aswm/event_handlers/unmap.c
index 26ecb2e..6f3ae67 100644
--- a/src/aswm/event_handlers/unmap.c
+++ b/src/aswm/event_handlers/unmap.c
@@ -1,4 +1,4 @@
-#include "aswm/event_handlers/unmap.h"
+#include "unmap.h"
 #include <stdio.h>
 
 void OnUnmapRequest(Window root, const XMapRequestEvent* e) {
diff --git a/include/aswm/event_handlers/unmap.h b/src/aswm/event_handlers/unmap.h
similarity index 100%
rename from include/aswm/event_handlers/unmap.h
rename to src/aswm/event_handlers/unmap.h
diff --git a/src/aswm/main.c b/src/aswm/main.c
deleted file mode 100644
index ce0202f..0000000
--- a/src/aswm/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "aswm/aswm.h"
-
-int main(int argc, char** argv) {
-	aswm_open();
-	aswm_event_loop();
-	aswm_close();
-}
diff --git a/src/aswm/mapper/mapper.c b/src/aswm/mapper/mapper.c
index f56a100..566cd9f 100644
--- a/src/aswm/mapper/mapper.c
+++ b/src/aswm/mapper/mapper.c
@@ -53,11 +53,6 @@ AswmTile* aswm_map_new_window(Display* display, Window window, AswmTile* tile) {
 		changes.width = tile->width;
 		changes.height = tile->height;
 
-		printf("\tx = %i\n", changes.x);
-		printf("\ty = %i\n", changes.y);
-		printf("\tw = %i\n", changes.width);
-		printf("\th = %i\n", changes.height);
-
 		XConfigureWindow(display, window, CWX | CWY | CWWidth | CWHeight, &changes);
 		return tile;
 	}
diff --git a/include/aswm/mapper/mapper.h b/src/aswm/mapper/mapper.h
similarity index 100%
rename from include/aswm/mapper/mapper.h
rename to src/aswm/mapper/mapper.h