From 9a3161ad4c78dc420d1cbb3aae638222608c7de4 Mon Sep 17 00:00:00 2001 From: romanstingler Date: Wed, 21 Aug 2024 22:59:51 +0200 Subject: [PATCH] drm: fix typo in schedule (#62) Co-authored-by: Roman Stingler --- include/aquamarine/backend/DRM.hpp | 4 ++-- include/aquamarine/backend/Wayland.hpp | 2 +- include/aquamarine/backend/drm/Atomic.hpp | 2 +- include/aquamarine/backend/drm/Legacy.hpp | 2 +- include/aquamarine/output/Output.hpp | 2 +- src/backend/Wayland.cpp | 2 +- src/backend/drm/DRM.cpp | 4 ++-- src/backend/drm/impl/Atomic.cpp | 4 ++-- src/backend/drm/impl/Legacy.cpp | 4 ++-- src/output/Output.cpp | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/aquamarine/backend/DRM.hpp b/include/aquamarine/backend/DRM.hpp index 5c487d9..348bbaa 100644 --- a/include/aquamarine/backend/DRM.hpp +++ b/include/aquamarine/backend/DRM.hpp @@ -194,7 +194,7 @@ namespace Aquamarine { virtual bool test(); virtual Hyprutils::Memory::CSharedPointer getBackend(); virtual bool setCursor(Hyprutils::Memory::CSharedPointer buffer, const Hyprutils::Math::Vector2D& hotspot); - virtual void moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipShedule = false); + virtual void moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipSchedule = false); virtual void scheduleFrame(const scheduleFrameReason reason = AQ_SCHEDULE_UNKNOWN); virtual void setCursorVisible(bool visible); virtual Hyprutils::Math::Vector2D cursorPlaneSize(); @@ -328,7 +328,7 @@ namespace Aquamarine { virtual bool reset() = 0; // moving a cursor IIRC is almost instant on most hardware so we don't have to wait for a commit. - virtual bool moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipShedule = false) = 0; + virtual bool moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipSchedule = false) = 0; }; class CDRMBackend : public IBackendImplementation { diff --git a/include/aquamarine/backend/Wayland.hpp b/include/aquamarine/backend/Wayland.hpp index e2e1e20..ea71a0b 100644 --- a/include/aquamarine/backend/Wayland.hpp +++ b/include/aquamarine/backend/Wayland.hpp @@ -45,7 +45,7 @@ namespace Aquamarine { virtual bool test(); virtual Hyprutils::Memory::CSharedPointer getBackend(); virtual bool setCursor(Hyprutils::Memory::CSharedPointer buffer, const Hyprutils::Math::Vector2D& hotspot); - virtual void moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipShedule = false); + virtual void moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipSchedule = false); virtual void scheduleFrame(const scheduleFrameReason reason = AQ_SCHEDULE_UNKNOWN); virtual Hyprutils::Math::Vector2D cursorPlaneSize(); virtual bool destroy(); diff --git a/include/aquamarine/backend/drm/Atomic.hpp b/include/aquamarine/backend/drm/Atomic.hpp index e051e64..ce814ed 100644 --- a/include/aquamarine/backend/drm/Atomic.hpp +++ b/include/aquamarine/backend/drm/Atomic.hpp @@ -8,7 +8,7 @@ namespace Aquamarine { CDRMAtomicImpl(Hyprutils::Memory::CSharedPointer backend_); virtual bool commit(Hyprutils::Memory::CSharedPointer connector, SDRMConnectorCommitData& data); virtual bool reset(); - virtual bool moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipShedule = false); + virtual bool moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipSchedule = false); private: bool prepareConnector(Hyprutils::Memory::CSharedPointer connector, SDRMConnectorCommitData& data); diff --git a/include/aquamarine/backend/drm/Legacy.hpp b/include/aquamarine/backend/drm/Legacy.hpp index 12b36a0..812de5a 100644 --- a/include/aquamarine/backend/drm/Legacy.hpp +++ b/include/aquamarine/backend/drm/Legacy.hpp @@ -8,7 +8,7 @@ namespace Aquamarine { CDRMLegacyImpl(Hyprutils::Memory::CSharedPointer backend_); virtual bool commit(Hyprutils::Memory::CSharedPointer connector, SDRMConnectorCommitData& data); virtual bool reset(); - virtual bool moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipShedule = false); + virtual bool moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipSchedule = false); private: bool commitInternal(Hyprutils::Memory::CSharedPointer connector, SDRMConnectorCommitData& data); diff --git a/include/aquamarine/output/Output.hpp b/include/aquamarine/output/Output.hpp index 6474516..3441c35 100644 --- a/include/aquamarine/output/Output.hpp +++ b/include/aquamarine/output/Output.hpp @@ -123,7 +123,7 @@ namespace Aquamarine { virtual std::vector getRenderFormats() = 0; virtual Hyprutils::Memory::CSharedPointer preferredMode(); virtual bool setCursor(Hyprutils::Memory::CSharedPointer buffer, const Hyprutils::Math::Vector2D& hotspot); - virtual void moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipShedule = false); // includes the hotspot + virtual void moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipSchedule = false); // includes the hotspot virtual void setCursorVisible(bool visible); // moving the cursor will make it visible again without this util virtual Hyprutils::Math::Vector2D cursorPlaneSize(); // -1, -1 means no set size, 0, 0 means error virtual void scheduleFrame(const scheduleFrameReason reason = AQ_SCHEDULE_UNKNOWN); diff --git a/src/backend/Wayland.cpp b/src/backend/Wayland.cpp index bd8fb5b..8b3846f 100644 --- a/src/backend/Wayland.cpp +++ b/src/backend/Wayland.cpp @@ -725,7 +725,7 @@ bool Aquamarine::CWaylandOutput::setCursor(Hyprutils::Memory::CSharedPointer buffer, const Vector2D& hotsp return true; } -void Aquamarine::CDRMOutput::moveCursor(const Vector2D& coord, bool skipShedule) { +void Aquamarine::CDRMOutput::moveCursor(const Vector2D& coord, bool skipSchedule) { cursorPos = coord; // cursorVisible = true; - backend->impl->moveCursor(connector, skipShedule); + backend->impl->moveCursor(connector, skipSchedule); } void Aquamarine::CDRMOutput::scheduleFrame(const scheduleFrameReason reason) { diff --git a/src/backend/drm/impl/Atomic.cpp b/src/backend/drm/impl/Atomic.cpp index 7ca36e9..aa8d2e1 100644 --- a/src/backend/drm/impl/Atomic.cpp +++ b/src/backend/drm/impl/Atomic.cpp @@ -326,11 +326,11 @@ bool Aquamarine::CDRMAtomicImpl::reset() { return request.commit(DRM_MODE_ATOMIC_ALLOW_MODESET); } -bool Aquamarine::CDRMAtomicImpl::moveCursor(SP connector, bool skipShedule) { +bool Aquamarine::CDRMAtomicImpl::moveCursor(SP connector, bool skipSchedule) { if (!connector->output->cursorVisible || !connector->output->state->state().enabled || !connector->crtc || !connector->crtc->cursor) return true; - if (!skipShedule) { + if (!skipSchedule) { TRACE(connector->backend->log(AQ_LOG_TRACE, "atomic moveCursor")); connector->output->scheduleFrame(IOutput::AQ_SCHEDULE_CURSOR_MOVE); } diff --git a/src/backend/drm/impl/Legacy.cpp b/src/backend/drm/impl/Legacy.cpp index 17074b3..8b887b6 100644 --- a/src/backend/drm/impl/Legacy.cpp +++ b/src/backend/drm/impl/Legacy.cpp @@ -14,11 +14,11 @@ Aquamarine::CDRMLegacyImpl::CDRMLegacyImpl(Hyprutils::Memory::CSharedPointer connector, bool skipShedule) { +bool Aquamarine::CDRMLegacyImpl::moveCursor(Hyprutils::Memory::CSharedPointer connector, bool skipSchedule) { if (!connector->output->cursorVisible || !connector->output->state->state().enabled || !connector->crtc || !connector->crtc->cursor) return true; - if (!skipShedule) + if (!skipSchedule) connector->output->scheduleFrame(IOutput::AQ_SCHEDULE_CURSOR_MOVE); return true; diff --git a/src/output/Output.cpp b/src/output/Output.cpp index c6d242e..377dc01 100644 --- a/src/output/Output.cpp +++ b/src/output/Output.cpp @@ -11,7 +11,7 @@ Hyprutils::Memory::CSharedPointer Aquamarine::IOutput::preferredMod return nullptr; } -void Aquamarine::IOutput::moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipShedule) { +void Aquamarine::IOutput::moveCursor(const Hyprutils::Math::Vector2D& coord, bool skipSchedule) { ; }