Restructure

20 files changed, 212 insertions, 84 deletions

diff --git a/YATmsg/main.cpp b/YATmsg/main.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/YATmsg/main.cpp
diff --git a/compile_commands.json b/compile_commands.json
index 3997f42..aa66e68 100644
--- a/compile_commands.json
+++ b/compile_commands.json
@@ -1,128 +1,128 @@
 [
   {
     "arguments": [
-      "/usr/bin/g++",
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
       "-std=c++17",
-      "-I/usr/include/gdk-pixbuf-2.0",
-      "-I/usr/include/glib-2.0",
-      "-I/usr/lib64/glib-2.0/include",
-      "-I/usr/include/sysprof-4",
-      "-I/usr/include/libpng16",
-      "-I/usr/include/libmount",
-      "-I/usr/include/blkid",
-      "-pthread",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
       "-c",
       "-o",
-      "ewmh.o",
-      "ewmh.cpp"
+      "build/config.o",
+      "src/config.cpp"
     ],
     "directory": "/home/boss/Documents/Coding/WM/YATwm",
-    "file": "/home/boss/Documents/Coding/WM/YATwm/ewmh.cpp",
-    "output": "/home/boss/Documents/Coding/WM/YATwm/ewmh.o"
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/config.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/config.o"
   },
   {
     "arguments": [
-      "/usr/bin/g++",
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
       "-std=c++17",
-      "-I/usr/include/gdk-pixbuf-2.0",
-      "-I/usr/include/glib-2.0",
-      "-I/usr/lib64/glib-2.0/include",
-      "-I/usr/include/sysprof-4",
-      "-I/usr/include/libpng16",
-      "-I/usr/include/libmount",
-      "-I/usr/include/blkid",
-      "-pthread",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
       "-c",
       "-o",
-      "main.o",
-      "main.cpp"
+      "build/ewmh.o",
+      "src/ewmh.cpp"
     ],
     "directory": "/home/boss/Documents/Coding/WM/YATwm",
-    "file": "/home/boss/Documents/Coding/WM/YATwm/main.cpp",
-    "output": "/home/boss/Documents/Coding/WM/YATwm/main.o"
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/ewmh.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/ewmh.o"
   },
   {
     "arguments": [
-      "/usr/bin/g++",
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
       "-std=c++17",
-      "-I/usr/include/gdk-pixbuf-2.0",
-      "-I/usr/include/glib-2.0",
-      "-I/usr/lib64/glib-2.0/include",
-      "-I/usr/include/sysprof-4",
-      "-I/usr/include/libpng16",
-      "-I/usr/include/libmount",
-      "-I/usr/include/blkid",
-      "-pthread",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
       "-c",
       "-o",
-      "util.o",
-      "util.cpp"
+      "build/main.o",
+      "src/main.cpp"
     ],
     "directory": "/home/boss/Documents/Coding/WM/YATwm",
-    "file": "/home/boss/Documents/Coding/WM/YATwm/util.cpp",
-    "output": "/home/boss/Documents/Coding/WM/YATwm/util.o"
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/main.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/main.o"
   },
   {
     "arguments": [
-      "/usr/bin/g++",
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
       "-std=c++17",
-      "-I/usr/include/gdk-pixbuf-2.0",
-      "-I/usr/include/glib-2.0",
-      "-I/usr/lib64/glib-2.0/include",
-      "-I/usr/include/sysprof-4",
-      "-I/usr/include/libpng16",
-      "-I/usr/include/libmount",
-      "-I/usr/include/blkid",
-      "-pthread",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
       "-c",
       "-o",
-      "config.o",
-      "config.cpp"
+      "build/IPC.o",
+      "src/IPC.cpp"
     ],
     "directory": "/home/boss/Documents/Coding/WM/YATwm",
-    "file": "/home/boss/Documents/Coding/WM/YATwm/config.cpp",
-    "output": "/home/boss/Documents/Coding/WM/YATwm/config.o"
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/IPC.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/IPC.o"
   },
   {
     "arguments": [
-      "/usr/bin/g++",
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
       "-std=c++17",
-      "-I/usr/include/gdk-pixbuf-2.0",
-      "-I/usr/include/glib-2.0",
-      "-I/usr/lib64/glib-2.0/include",
-      "-I/usr/include/sysprof-4",
-      "-I/usr/include/libpng16",
-      "-I/usr/include/libmount",
-      "-I/usr/include/blkid",
-      "-pthread",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
       "-c",
       "-o",
-      "keybinds.o",
-      "keybinds.cpp"
+      "build/util.o",
+      "src/util.cpp"
     ],
     "directory": "/home/boss/Documents/Coding/WM/YATwm",
-    "file": "/home/boss/Documents/Coding/WM/YATwm/keybinds.cpp",
-    "output": "/home/boss/Documents/Coding/WM/YATwm/keybinds.o"
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/util.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/util.o"
   },
   {
     "arguments": [
-      "/usr/bin/g++",
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
       "-std=c++17",
-      "-I/usr/include/gdk-pixbuf-2.0",
-      "-I/usr/include/glib-2.0",
-      "-I/usr/lib64/glib-2.0/include",
-      "-I/usr/include/sysprof-4",
-      "-I/usr/include/libpng16",
-      "-I/usr/include/libmount",
-      "-I/usr/include/blkid",
-      "-pthread",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
       "-c",
       "-o",
-      "commands.o",
-      "commands.cpp"
+      "build/keybinds.o",
+      "src/keybinds.cpp"
     ],
     "directory": "/home/boss/Documents/Coding/WM/YATwm",
-    "file": "/home/boss/Documents/Coding/WM/YATwm/commands.cpp",
-    "output": "/home/boss/Documents/Coding/WM/YATwm/commands.o"
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/keybinds.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/keybinds.o"
+  },
+  {
+    "arguments": [
+      "/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/g++",
+      "-std=c++17",
+      "-I/nix/store/drrf5w7pcc5q9h4si9i8vm2hclg0zijg-libnotify-0.8.3-dev/include",
+      "-I/nix/store/a45ri2jgzpv6q36va2y6wq471y88hpnl-gdk-pixbuf-2.42.10-dev/include/gdk-pixbuf-2.0",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include",
+      "-I/nix/store/s0nl17v1827bl7qyjgkkar90c2a40ykb-glib-2.78.4-dev/include/glib-2.0",
+      "-I/nix/store/k1qjs35nw1lbssg1l1xpmh0082hy7wl4-glib-2.78.4/lib/glib-2.0/include",
+      "-c",
+      "-o",
+      "build/commands.o",
+      "src/commands.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/src/commands.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/build/commands.o"
   }
 ]
diff --git a/makefile b/makefile
index 68e0560..883bc26 100644
--- a/makefile
+++ b/makefile
@@ -2,9 +2,9 @@
 CXX := g++
 CXXFLAGS := -std=c++17 `pkg-config --cflags --libs libnotify`# -g -fsanitize=address -fno-omit-frame-pointer
 LINKFLAGS := -lX11 -lXrandr
-OBJS_DIR := .
-OUT_DIR := .
-SOURCE_DIR := .
+OBJS_DIR := build
+OUT_DIR := out
+SOURCE_DIR := src
 EXEC := YATwm
 SOURCE_FILES := $(wildcard $(SOURCE_DIR)/*.cpp)
 SOURCE_HEADERS := $(wildcard $(SOURCE_DIR)/*.h)
@@ -12,7 +12,7 @@ OBJS := $(subst $(SOURCE_DIR),$(OBJS_DIR), $(patsubst %.cpp,%.o,$(SOURCE_FILES))
 INSTALL_DIR = /
 
 $(EXEC): $(OBJS)
-	$(CXX) $(OBJS) $(CXXFLAGS) $(LINKFLAGS) -o $(OUT_DIR)/$(EXEC)
+	$(CXX) $(OBJS) $(CXXFLAGS) $(LINKFLAGS) -o $(EXEC)
 
 $(OBJS_DIR)/%.o : $(SOURCE_DIR)/%.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -39,4 +39,4 @@ $(OBJS_DIR)/ipc.o: $(SOURCE_DIR)/ipc.cpp $(SOURCE_DIR)/ipc.h $(SOURCE_DIR)/comma
 
 clean:
 	rm $(OBJS_DIR)/*.o 
-	rm $(OUT_DIR)/$(EXEC)
+	rm $(EXEC)
diff --git a/old.compile_commands.json b/old.compile_commands.json
new file mode 100644
index 0000000..3997f42
--- /dev/null
+++ b/old.compile_commands.json
@@ -0,0 +1,128 @@
+[
+  {
+    "arguments": [
+      "/usr/bin/g++",
+      "-std=c++17",
+      "-I/usr/include/gdk-pixbuf-2.0",
+      "-I/usr/include/glib-2.0",
+      "-I/usr/lib64/glib-2.0/include",
+      "-I/usr/include/sysprof-4",
+      "-I/usr/include/libpng16",
+      "-I/usr/include/libmount",
+      "-I/usr/include/blkid",
+      "-pthread",
+      "-c",
+      "-o",
+      "ewmh.o",
+      "ewmh.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/ewmh.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/ewmh.o"
+  },
+  {
+    "arguments": [
+      "/usr/bin/g++",
+      "-std=c++17",
+      "-I/usr/include/gdk-pixbuf-2.0",
+      "-I/usr/include/glib-2.0",
+      "-I/usr/lib64/glib-2.0/include",
+      "-I/usr/include/sysprof-4",
+      "-I/usr/include/libpng16",
+      "-I/usr/include/libmount",
+      "-I/usr/include/blkid",
+      "-pthread",
+      "-c",
+      "-o",
+      "main.o",
+      "main.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/main.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/main.o"
+  },
+  {
+    "arguments": [
+      "/usr/bin/g++",
+      "-std=c++17",
+      "-I/usr/include/gdk-pixbuf-2.0",
+      "-I/usr/include/glib-2.0",
+      "-I/usr/lib64/glib-2.0/include",
+      "-I/usr/include/sysprof-4",
+      "-I/usr/include/libpng16",
+      "-I/usr/include/libmount",
+      "-I/usr/include/blkid",
+      "-pthread",
+      "-c",
+      "-o",
+      "util.o",
+      "util.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/util.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/util.o"
+  },
+  {
+    "arguments": [
+      "/usr/bin/g++",
+      "-std=c++17",
+      "-I/usr/include/gdk-pixbuf-2.0",
+      "-I/usr/include/glib-2.0",
+      "-I/usr/lib64/glib-2.0/include",
+      "-I/usr/include/sysprof-4",
+      "-I/usr/include/libpng16",
+      "-I/usr/include/libmount",
+      "-I/usr/include/blkid",
+      "-pthread",
+      "-c",
+      "-o",
+      "config.o",
+      "config.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/config.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/config.o"
+  },
+  {
+    "arguments": [
+      "/usr/bin/g++",
+      "-std=c++17",
+      "-I/usr/include/gdk-pixbuf-2.0",
+      "-I/usr/include/glib-2.0",
+      "-I/usr/lib64/glib-2.0/include",
+      "-I/usr/include/sysprof-4",
+      "-I/usr/include/libpng16",
+      "-I/usr/include/libmount",
+      "-I/usr/include/blkid",
+      "-pthread",
+      "-c",
+      "-o",
+      "keybinds.o",
+      "keybinds.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/keybinds.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/keybinds.o"
+  },
+  {
+    "arguments": [
+      "/usr/bin/g++",
+      "-std=c++17",
+      "-I/usr/include/gdk-pixbuf-2.0",
+      "-I/usr/include/glib-2.0",
+      "-I/usr/lib64/glib-2.0/include",
+      "-I/usr/include/sysprof-4",
+      "-I/usr/include/libpng16",
+      "-I/usr/include/libmount",
+      "-I/usr/include/blkid",
+      "-pthread",
+      "-c",
+      "-o",
+      "commands.o",
+      "commands.cpp"
+    ],
+    "directory": "/home/boss/Documents/Coding/WM/YATwm",
+    "file": "/home/boss/Documents/Coding/WM/YATwm/commands.cpp",
+    "output": "/home/boss/Documents/Coding/WM/YATwm/commands.o"
+  }
+]
diff --git a/IPC.cpp b/src/IPC.cpp
index 0aed97e..0aed97e 100644
--- a/IPC.cpp
+++ b/src/IPC.cpp
diff --git a/IPC.h b/src/IPC.h
index 89e67e5..89e67e5 100644
--- a/IPC.h
+++ b/src/IPC.h
diff --git a/commands.cpp b/src/commands.cpp
index 57cfd0b..57cfd0b 100644
--- a/commands.cpp
+++ b/src/commands.cpp
diff --git a/commands.h b/src/commands.h
index af4a4a0..af4a4a0 100644
--- a/commands.h
+++ b/src/commands.h
diff --git a/config.cpp b/src/config.cpp
index 3af2491..3af2491 100644
--- a/config.cpp
+++ b/src/config.cpp
diff --git a/config.h b/src/config.h
index 452db9c..452db9c 100644
--- a/config.h
+++ b/src/config.h
diff --git a/error.h b/src/error.h
index f0a67a5..f0a67a5 100644
--- a/error.h
+++ b/src/error.h
diff --git a/ewmh.cpp b/src/ewmh.cpp
index a3cc505..a3cc505 100644
--- a/ewmh.cpp
+++ b/src/ewmh.cpp
diff --git a/ewmh.h b/src/ewmh.h
index 9473d5d..9473d5d 100644
--- a/ewmh.h
+++ b/src/ewmh.h
diff --git a/keybinds.cpp b/src/keybinds.cpp
index c41452f..c41452f 100644
--- a/keybinds.cpp
+++ b/src/keybinds.cpp
diff --git a/keybinds.h b/src/keybinds.h
index a742240..a742240 100644
--- a/keybinds.h
+++ b/src/keybinds.h
diff --git a/main.cpp b/src/main.cpp
index 1f3edc2..1f3edc2 100644
--- a/main.cpp
+++ b/src/main.cpp
diff --git a/structs.h b/src/structs.h
index 8215bf5..8215bf5 100644
--- a/structs.h
+++ b/src/structs.h
diff --git a/util.cpp b/src/util.cpp
index 58116d0..58116d0 100644
--- a/util.cpp
+++ b/src/util.cpp
diff --git a/util.h b/src/util.h
index 66ecf76..66ecf76 100644
--- a/util.h
+++ b/src/util.h
diff --git a/test b/test
index 49cbf49..fba98d4 100644
--- a/test
+++ b/test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 make