Move some files around

BuddiesOfBudgie · Oct 13, 2023 · 7a354d7 · 7a354d7
1 parent 9727ba0
commit 7a354d7
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 18 deletions.
diff --git a/src/foreign_toplevel.cpp b/src/foreign_toplevel.cpp
@@ -2,7 +2,7 @@
 
 #include "output.hpp"
 #include "server.hpp"
-#include "view.hpp"
+#include "surface/view.hpp"
 
 static void foreign_toplevel_handle_request_maximize_notify(wl_listener* listener, void* data) {
 	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_activate);

diff --git a/src/input/cursor.cpp b/src/input/cursor.cpp
@@ -2,8 +2,8 @@
 
 #include "seat.hpp"
 #include "server.hpp"
-#include "surface.hpp"
-#include "view.hpp"
+#include "surface/surface.hpp"
+#include "surface/view.hpp"
 
 #include <iostream>
 

diff --git a/src/input/keyboard.cpp b/src/input/keyboard.cpp
@@ -2,7 +2,7 @@
 
 #include "seat.hpp"
 #include "server.hpp"
-#include "view.hpp"
+#include "surface/view.hpp"
 
 #include <algorithm>
 #include <xkbcommon/xkbcommon.h>

diff --git a/src/meson.build b/src/meson.build
@@ -1,17 +1,17 @@
 magpie_sources = [
     'main.cpp',
     'foreign_toplevel.cpp',
-    'layer.cpp',
     'output.cpp',
-    'popup.cpp',
     'server.cpp',
-    'view.cpp',
-    'xdg_view.cpp',
     'xwayland.cpp',
-    'xwayland_view.cpp',
     'input/cursor.cpp',
     'input/keyboard.cpp',
     'input/seat.cpp',
+    'surface/layer.cpp',
+    'surface/popup.cpp',
+    'surface/view.cpp',
+    'surface/xdg_view.cpp',
+    'surface/xwayland_view.cpp',
     xdg_shell_protocol,
     wlr_layer_shell_protocol,
     wlr_output_power_management_protocol,

diff --git a/src/output.cpp b/src/output.cpp
@@ -1,7 +1,7 @@
 #include "output.hpp"
 
-#include "layer.hpp"
 #include "server.hpp"
+#include "surface/layer.hpp"
 #include "types.hpp"
 
 #include <algorithm>

diff --git a/src/server.cpp b/src/server.cpp
@@ -1,12 +1,13 @@
 #include "server.hpp"
-#include "layer.hpp"
+
+#include "input/seat.hpp"
 #include "output.hpp"
-#include "popup.hpp"
-#include "surface.hpp"
+#include "surface/layer.hpp"
+#include "surface/popup.hpp"
+#include "surface/surface.hpp"
+#include "surface/view.hpp"
 #include "types.hpp"
-#include "view.hpp"
 #include "xwayland.hpp"
-#include "input/seat.hpp"
 
 #include <algorithm>
 #include <cassert>

diff --git a/src/layer.cpp → src/surface/layer.cpp b/src/layer.cpp → src/surface/layer.cpp
diff --git a/src/layer.hpp → src/surface/layer.hpp b/src/layer.hpp → src/surface/layer.hpp
diff --git a/src/popup.cpp → src/surface/popup.cpp b/src/popup.cpp → src/surface/popup.cpp
diff --git a/src/popup.hpp → src/surface/popup.hpp b/src/popup.hpp → src/surface/popup.hpp
diff --git a/src/surface.hpp → src/surface/surface.hpp b/src/surface.hpp → src/surface/surface.hpp
diff --git a/src/view.cpp → src/surface/view.cpp b/src/view.cpp → src/surface/view.cpp
diff --git a/src/view.hpp → src/surface/view.hpp b/src/view.hpp → src/surface/view.hpp
diff --git a/src/xdg_view.cpp → src/surface/xdg_view.cpp b/src/xdg_view.cpp → src/surface/xdg_view.cpp
diff --git a/src/xwayland_view.cpp → src/surface/xwayland_view.cpp b/src/xwayland_view.cpp → src/surface/xwayland_view.cpp
@@ -1,10 +1,10 @@
 #include "view.hpp"
 
 #include "foreign_toplevel.hpp"
+#include "input/seat.hpp"
 #include "server.hpp"
 #include "surface.hpp"
 #include "types.hpp"
-#include "input/seat.hpp"
 
 #include <cstdlib>
 #include <wayland-server-core.h>

diff --git a/src/xwayland.cpp b/src/xwayland.cpp
@@ -1,10 +1,11 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include "xwayland.hpp"
+
+#include "input/seat.hpp"
 #include "server.hpp"
 #include "types.hpp"
-#include "view.hpp"
-#include "input/seat.hpp"
+#include "surface/view.hpp"
 
 #include "wlr-wrap-start.hpp"
 #include <wlr/util/log.h>