summaryrefslogtreecommitdiff
path: root/src/protocols
diff options
context:
space:
mode:
authoruser111111111111111111111111111111111 <192911676+user111111111111111111111111111111111@users.noreply.github.com>2025-01-17 15:21:35 +0000
committerGitHub <noreply@github.com>2025-01-17 15:21:35 +0000
commit2bad73354a5dbb9be8ba9a39b6238017a216a25b (patch)
tree47314035a3cc3ffc90a04730d2fea9453328c4c8 /src/protocols
parent0dc7367a7006cc3cc877d52bf34c4998144bff84 (diff)
core: cleanup header includes (#9088)
Cleanup some unneeded includes to speed up compilation
Diffstat (limited to 'src/protocols')
-rw-r--r--src/protocols/CTMControl.cpp1
-rw-r--r--src/protocols/DRMLease.cpp1
-rw-r--r--src/protocols/ForeignToplevel.cpp1
-rw-r--r--src/protocols/ForeignToplevelWlr.cpp1
-rw-r--r--src/protocols/GammaControl.cpp2
-rw-r--r--src/protocols/GlobalShortcuts.cpp1
-rw-r--r--src/protocols/LayerShell.cpp2
-rw-r--r--src/protocols/MesaDRM.cpp1
-rw-r--r--src/protocols/OutputManagement.cpp3
-rw-r--r--src/protocols/OutputPower.cpp2
-rw-r--r--src/protocols/PointerConstraints.cpp3
-rw-r--r--src/protocols/PointerGestures.cpp1
-rw-r--r--src/protocols/RelativePointer.cpp3
-rw-r--r--src/protocols/Screencopy.cpp4
-rw-r--r--src/protocols/SessionLock.cpp3
-rw-r--r--src/protocols/SinglePixel.cpp1
-rw-r--r--src/protocols/Tablet.cpp1
-rw-r--r--src/protocols/TearingControl.cpp1
-rw-r--r--src/protocols/TextInputV1.cpp1
-rw-r--r--src/protocols/ToplevelExport.cpp3
-rw-r--r--src/protocols/XDGOutput.cpp4
-rw-r--r--src/protocols/XDGShell.cpp1
-rw-r--r--src/protocols/core/DataDevice.cpp4
-rw-r--r--src/protocols/core/Shm.cpp2
-rw-r--r--src/protocols/types/DMABuffer.cpp1
-rw-r--r--src/protocols/types/WLBuffer.cpp1
26 files changed, 37 insertions, 12 deletions
diff --git a/src/protocols/CTMControl.cpp b/src/protocols/CTMControl.cpp
index fd7cdcd6..91e05ac4 100644
--- a/src/protocols/CTMControl.cpp
+++ b/src/protocols/CTMControl.cpp
@@ -4,6 +4,7 @@
#include "core/Output.hpp"
#include "../config/ConfigValue.hpp"
#include "managers/AnimationManager.hpp"
+#include "../helpers/Monitor.hpp"
CHyprlandCTMControlResource::CHyprlandCTMControlResource(SP<CHyprlandCtmControlManagerV1> resource_) : resource(resource_) {
if (!good())
diff --git a/src/protocols/DRMLease.cpp b/src/protocols/DRMLease.cpp
index be5a6985..4ab46a46 100644
--- a/src/protocols/DRMLease.cpp
+++ b/src/protocols/DRMLease.cpp
@@ -1,5 +1,6 @@
#include "DRMLease.hpp"
#include "../Compositor.hpp"
+#include "../helpers/Monitor.hpp"
#include "managers/eventLoop/EventLoopManager.hpp"
#include <aquamarine/backend/DRM.hpp>
#include <fcntl.h>
diff --git a/src/protocols/ForeignToplevel.cpp b/src/protocols/ForeignToplevel.cpp
index 38bb5e69..f6513a1d 100644
--- a/src/protocols/ForeignToplevel.cpp
+++ b/src/protocols/ForeignToplevel.cpp
@@ -1,5 +1,6 @@
#include "ForeignToplevel.hpp"
#include "../Compositor.hpp"
+#include "../managers/HookSystemManager.hpp"
CForeignToplevelHandle::CForeignToplevelHandle(SP<CExtForeignToplevelHandleV1> resource_, PHLWINDOW pWindow_) : resource(resource_), pWindow(pWindow_) {
if (!resource_->resource())
diff --git a/src/protocols/ForeignToplevelWlr.cpp b/src/protocols/ForeignToplevelWlr.cpp
index 6bbd377c..45ef3f93 100644
--- a/src/protocols/ForeignToplevelWlr.cpp
+++ b/src/protocols/ForeignToplevelWlr.cpp
@@ -3,6 +3,7 @@
#include "../Compositor.hpp"
#include "protocols/core/Output.hpp"
#include "render/Renderer.hpp"
+#include "../managers/HookSystemManager.hpp"
CForeignToplevelHandleWlr::CForeignToplevelHandleWlr(SP<CZwlrForeignToplevelHandleV1> resource_, PHLWINDOW pWindow_) : resource(resource_), pWindow(pWindow_) {
if (!resource_->resource())
diff --git a/src/protocols/GammaControl.cpp b/src/protocols/GammaControl.cpp
index 14c6596f..b0da29a2 100644
--- a/src/protocols/GammaControl.cpp
+++ b/src/protocols/GammaControl.cpp
@@ -2,8 +2,8 @@
#include <fcntl.h>
#include <unistd.h>
#include "../helpers/Monitor.hpp"
-#include "../Compositor.hpp"
#include "../protocols/core/Output.hpp"
+#include "../render/Renderer.hpp"
CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* output) : resource(resource_) {
if (!resource_->resource())
diff --git a/src/protocols/GlobalShortcuts.cpp b/src/protocols/GlobalShortcuts.cpp
index b02126ef..ca67f063 100644
--- a/src/protocols/GlobalShortcuts.cpp
+++ b/src/protocols/GlobalShortcuts.cpp
@@ -1,5 +1,4 @@
#include "GlobalShortcuts.hpp"
-#include "../Compositor.hpp"
CShortcutClient::CShortcutClient(SP<CHyprlandGlobalShortcutsManagerV1> resource_) : resource(resource_) {
if (!good())
diff --git a/src/protocols/LayerShell.cpp b/src/protocols/LayerShell.cpp
index 5ceae5f2..0777149f 100644
--- a/src/protocols/LayerShell.cpp
+++ b/src/protocols/LayerShell.cpp
@@ -1,8 +1,10 @@
#include "LayerShell.hpp"
#include "../Compositor.hpp"
+#include "../desktop/LayerSurface.hpp"
#include "XDGShell.hpp"
#include "core/Compositor.hpp"
#include "core/Output.hpp"
+#include "../helpers/Monitor.hpp"
void CLayerShellResource::SState::reset() {
anchor = 0;
diff --git a/src/protocols/MesaDRM.cpp b/src/protocols/MesaDRM.cpp
index b4efd2c8..41536988 100644
--- a/src/protocols/MesaDRM.cpp
+++ b/src/protocols/MesaDRM.cpp
@@ -3,6 +3,7 @@
#include <xf86drm.h>
#include "../Compositor.hpp"
#include "types/WLBuffer.hpp"
+#include "../render/OpenGL.hpp"
CMesaDRMBufferResource::CMesaDRMBufferResource(uint32_t id, wl_client* client, Aquamarine::SDMABUFAttrs attrs_) {
LOGM(LOG, "Creating a Mesa dmabuf, with id {}: size {}, fmt {}, planes {}", id, attrs_.size, attrs_.format, attrs_.planes);
diff --git a/src/protocols/OutputManagement.cpp b/src/protocols/OutputManagement.cpp
index 4f7d48c4..4a976021 100644
--- a/src/protocols/OutputManagement.cpp
+++ b/src/protocols/OutputManagement.cpp
@@ -1,6 +1,9 @@
#include "OutputManagement.hpp"
#include <algorithm>
#include "../Compositor.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../config/ConfigManager.hpp"
using namespace Aquamarine;
diff --git a/src/protocols/OutputPower.cpp b/src/protocols/OutputPower.cpp
index 257155e4..dd3e8e1a 100644
--- a/src/protocols/OutputPower.cpp
+++ b/src/protocols/OutputPower.cpp
@@ -1,6 +1,6 @@
#include "OutputPower.hpp"
-#include "../Compositor.hpp"
#include "core/Output.hpp"
+#include "../helpers/Monitor.hpp"
COutputPower::COutputPower(SP<CZwlrOutputPowerV1> resource_, PHLMONITOR pMonitor_) : resource(resource_), pMonitor(pMonitor_) {
if (!resource->resource())
diff --git a/src/protocols/PointerConstraints.cpp b/src/protocols/PointerConstraints.cpp
index 0a787414..e12fa75f 100644
--- a/src/protocols/PointerConstraints.cpp
+++ b/src/protocols/PointerConstraints.cpp
@@ -4,6 +4,9 @@
#include "../config/ConfigValue.hpp"
#include "../managers/SeatManager.hpp"
#include "core/Compositor.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../helpers/Monitor.hpp"
CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
resourceL(resource_), locked(true), lifetime(lifetime_) {
diff --git a/src/protocols/PointerGestures.cpp b/src/protocols/PointerGestures.cpp
index 4eb74102..5dfb9d51 100644
--- a/src/protocols/PointerGestures.cpp
+++ b/src/protocols/PointerGestures.cpp
@@ -1,5 +1,4 @@
#include "PointerGestures.hpp"
-#include "../Compositor.hpp"
#include "../managers/SeatManager.hpp"
#include "core/Seat.hpp"
#include "core/Compositor.hpp"
diff --git a/src/protocols/RelativePointer.cpp b/src/protocols/RelativePointer.cpp
index 16248c02..b7cf75c6 100644
--- a/src/protocols/RelativePointer.cpp
+++ b/src/protocols/RelativePointer.cpp
@@ -1,5 +1,4 @@
#include "RelativePointer.hpp"
-#include "../Compositor.hpp"
#include "../managers/SeatManager.hpp"
#include "core/Seat.hpp"
#include <algorithm>
@@ -71,4 +70,4 @@ void CRelativePointerProtocol::sendRelativeMotion(uint64_t time, const Vector2D&
rp->sendRelativeMotion(time, delta, deltaUnaccel);
}
-} \ No newline at end of file
+}
diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp
index 898a1d6b..da0a9412 100644
--- a/src/protocols/Screencopy.cpp
+++ b/src/protocols/Screencopy.cpp
@@ -2,6 +2,10 @@
#include "../Compositor.hpp"
#include "../managers/eventLoop/EventLoopManager.hpp"
#include "../managers/PointerManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../render/OpenGL.hpp"
+#include "../helpers/Monitor.hpp"
#include "core/Output.hpp"
#include "types/WLBuffer.hpp"
#include "types/Buffer.hpp"
diff --git a/src/protocols/SessionLock.cpp b/src/protocols/SessionLock.cpp
index 642a5b89..c3f19e53 100644
--- a/src/protocols/SessionLock.cpp
+++ b/src/protocols/SessionLock.cpp
@@ -4,6 +4,7 @@
#include "FractionalScale.hpp"
#include "core/Compositor.hpp"
#include "core/Output.hpp"
+#include "../helpers/Monitor.hpp"
CSessionLockSurface::CSessionLockSurface(SP<CExtSessionLockSurfaceV1> resource_, SP<CWLSurfaceResource> surface_, PHLMONITOR pMonitor_, WP<CSessionLock> owner_) :
resource(resource_), sessionLock(owner_), pSurface(surface_), pMonitor(pMonitor_) {
@@ -208,4 +209,4 @@ void CSessionLockProtocol::onGetLockSurface(CExtSessionLockV1* lock, uint32_t id
bool CSessionLockProtocol::isLocked() {
return locked;
-} \ No newline at end of file
+}
diff --git a/src/protocols/SinglePixel.cpp b/src/protocols/SinglePixel.cpp
index 41771ce2..91154671 100644
--- a/src/protocols/SinglePixel.cpp
+++ b/src/protocols/SinglePixel.cpp
@@ -1,4 +1,5 @@
#include "SinglePixel.hpp"
+#include "../desktop/LayerSurface.hpp"
#include <limits>
#include "render/Renderer.hpp"
diff --git a/src/protocols/Tablet.cpp b/src/protocols/Tablet.cpp
index b4ab6ea0..2fdd8731 100644
--- a/src/protocols/Tablet.cpp
+++ b/src/protocols/Tablet.cpp
@@ -2,6 +2,7 @@
#include "../devices/Tablet.hpp"
#include "../Compositor.hpp"
#include "../managers/SeatManager.hpp"
+#include "../managers/input/InputManager.hpp"
#include "core/Seat.hpp"
#include "core/Compositor.hpp"
#include <algorithm>
diff --git a/src/protocols/TearingControl.cpp b/src/protocols/TearingControl.cpp
index 66a4efd2..eb1a53cb 100644
--- a/src/protocols/TearingControl.cpp
+++ b/src/protocols/TearingControl.cpp
@@ -3,6 +3,7 @@
#include "../desktop/Window.hpp"
#include "../Compositor.hpp"
#include "core/Compositor.hpp"
+#include "../managers/HookSystemManager.hpp"
CTearingControlProtocol::CTearingControlProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
static auto P =
diff --git a/src/protocols/TextInputV1.cpp b/src/protocols/TextInputV1.cpp
index 6395e158..b8eb5835 100644
--- a/src/protocols/TextInputV1.cpp
+++ b/src/protocols/TextInputV1.cpp
@@ -1,6 +1,5 @@
#include "TextInputV1.hpp"
-#include "../Compositor.hpp"
#include "core/Compositor.hpp"
CTextInputV1::~CTextInputV1() {
diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp
index 73e5cad9..8e34cf4b 100644
--- a/src/protocols/ToplevelExport.cpp
+++ b/src/protocols/ToplevelExport.cpp
@@ -6,6 +6,9 @@
#include "types/WLBuffer.hpp"
#include "types/Buffer.hpp"
#include "../helpers/Format.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../render/Renderer.hpp"
#include <algorithm>
diff --git a/src/protocols/XDGOutput.cpp b/src/protocols/XDGOutput.cpp
index deb87829..fadc48a1 100644
--- a/src/protocols/XDGOutput.cpp
+++ b/src/protocols/XDGOutput.cpp
@@ -1,7 +1,7 @@
#include "XDGOutput.hpp"
-#include "../Compositor.hpp"
#include "../config/ConfigValue.hpp"
#include "../xwayland/XWayland.hpp"
+#include "../managers/HookSystemManager.hpp"
#include "core/Output.hpp"
#define OUTPUT_MANAGER_VERSION 3
@@ -119,4 +119,4 @@ void CXDGOutput::sendDetails() {
if (resource->version() < OUTPUT_DONE_DEPRECATED_SINCE_VERSION)
resource->sendDone();
-} \ No newline at end of file
+}
diff --git a/src/protocols/XDGShell.cpp b/src/protocols/XDGShell.cpp
index 6b7cb3c1..aabb225a 100644
--- a/src/protocols/XDGShell.cpp
+++ b/src/protocols/XDGShell.cpp
@@ -3,6 +3,7 @@
#include <algorithm>
#include "../Compositor.hpp"
#include "../managers/SeatManager.hpp"
+#include "../helpers/Monitor.hpp"
#include "core/Seat.hpp"
#include "core/Compositor.hpp"
#include "protocols/core/Output.hpp"
diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp
index 722eb9fd..fd3cd1fa 100644
--- a/src/protocols/core/DataDevice.cpp
+++ b/src/protocols/core/DataDevice.cpp
@@ -9,6 +9,10 @@
#include "Compositor.hpp"
#include "../../xwayland/XWayland.hpp"
#include "../../xwayland/Server.hpp"
+#include "../../managers/input/InputManager.hpp"
+#include "../../managers/HookSystemManager.hpp"
+#include "../../helpers/Monitor.hpp"
+#include "../../render/Renderer.hpp"
CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataSource> source_) : source(source_), resource(resource_) {
if (!good())
diff --git a/src/protocols/core/Shm.cpp b/src/protocols/core/Shm.cpp
index fddd4e9a..6365c5d6 100644
--- a/src/protocols/core/Shm.cpp
+++ b/src/protocols/core/Shm.cpp
@@ -5,8 +5,8 @@
#include <drm_fourcc.h>
#include "../../render/Texture.hpp"
#include "../types/WLBuffer.hpp"
-#include "../../Compositor.hpp"
#include "../../helpers/Format.hpp"
+#include "../../render/Renderer.hpp"
CWLSHMBuffer::CWLSHMBuffer(SP<CWLSHMPoolResource> pool_, uint32_t id, int32_t offset_, const Vector2D& size_, int32_t stride_, uint32_t fmt_) {
if (!pool_->pool->data)
diff --git a/src/protocols/types/DMABuffer.cpp b/src/protocols/types/DMABuffer.cpp
index ae684424..9f31f6a2 100644
--- a/src/protocols/types/DMABuffer.cpp
+++ b/src/protocols/types/DMABuffer.cpp
@@ -1,5 +1,6 @@
#include "DMABuffer.hpp"
#include "WLBuffer.hpp"
+#include "../../desktop/LayerSurface.hpp"
#include "../../render/Renderer.hpp"
#include "../../helpers/Format.hpp"
diff --git a/src/protocols/types/WLBuffer.cpp b/src/protocols/types/WLBuffer.cpp
index eb7d1fde..a9e6400a 100644
--- a/src/protocols/types/WLBuffer.cpp
+++ b/src/protocols/types/WLBuffer.cpp
@@ -3,7 +3,6 @@
#include "../core/Compositor.hpp"
#include "../DRMSyncobj.hpp"
#include "../../helpers/sync/SyncTimeline.hpp"
-#include "../../Compositor.hpp"
#include <xf86drm.h>
CWLBufferResource::CWLBufferResource(SP<CWlBuffer> resource_) : resource(resource_) {