diff options
| author | xqso <69903545+xqso@users.noreply.github.com> | 2025-07-25 15:19:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 17:19:23 +0200 |
| commit | 5c8d675eedcd836cbb0d4eeadf203efc7f73752b (patch) | |
| tree | 568ef38b465157d9b019032589f744def3ab930b /src/protocols | |
| parent | fd0c1f2ab492e8977305b6d00a6ea1cc293d6b6b (diff) | |
ci: correct tar command for xz compression & fix typos (#11213)
Diffstat (limited to 'src/protocols')
| -rw-r--r-- | src/protocols/ColorManagement.cpp | 4 | ||||
| -rw-r--r-- | src/protocols/DRMLease.cpp | 2 | ||||
| -rw-r--r-- | src/protocols/DRMSyncobj.cpp | 2 | ||||
| -rw-r--r-- | src/protocols/DRMSyncobj.hpp | 2 | ||||
| -rw-r--r-- | src/protocols/FocusGrab.cpp | 20 | ||||
| -rw-r--r-- | src/protocols/FocusGrab.hpp | 4 | ||||
| -rw-r--r-- | src/protocols/GlobalShortcuts.cpp | 4 | ||||
| -rw-r--r-- | src/protocols/LinuxDMABUF.cpp | 20 | ||||
| -rw-r--r-- | src/protocols/LinuxDMABUF.hpp | 2 | ||||
| -rw-r--r-- | src/protocols/Screencopy.cpp | 4 | ||||
| -rw-r--r-- | src/protocols/SessionLock.cpp | 4 | ||||
| -rw-r--r-- | src/protocols/XXColorManagement.cpp | 4 | ||||
| -rw-r--r-- | src/protocols/types/SurfaceState.cpp | 2 |
13 files changed, 37 insertions, 37 deletions
diff --git a/src/protocols/ColorManagement.cpp b/src/protocols/ColorManagement.cpp index 7cfcbbbc..215ab5ac 100644 --- a/src/protocols/ColorManagement.cpp +++ b/src/protocols/ColorManagement.cpp @@ -247,7 +247,7 @@ wl_client* CColorManagementOutput::client() { } CColorManagementSurface::CColorManagementSurface(SP<CWLSurfaceResource> surface_) : m_surface(surface_) { - // only for frog cm untill wayland cm is adopted + // only for frog cm until wayland cm is adopted } CColorManagementSurface::CColorManagementSurface(SP<CWpColorManagementSurfaceV1> resource, SP<CWLSurfaceResource> surface_) : m_surface(surface_), m_resource(resource) { @@ -766,7 +766,7 @@ CColorManagementImageDescriptionInfo::CColorManagementImageDescriptionInfo(SP<CW m_resource->sendTfNamed(m_settings.transferFunction); m_resource->sendLuminances(std::round(m_settings.luminances.min * 10000), m_settings.luminances.max, m_settings.luminances.reference); - // send expexted display paramateres + // send expected display paramateres m_resource->sendTargetPrimaries(toProto(m_settings.masteringPrimaries.red.x), toProto(m_settings.masteringPrimaries.red.y), toProto(m_settings.masteringPrimaries.green.x), toProto(m_settings.masteringPrimaries.green.y), toProto(m_settings.masteringPrimaries.blue.x), toProto(m_settings.masteringPrimaries.blue.y), toProto(m_settings.masteringPrimaries.white.x), toProto(m_settings.masteringPrimaries.white.y)); diff --git a/src/protocols/DRMLease.cpp b/src/protocols/DRMLease.cpp index d64555f2..3d958015 100644 --- a/src/protocols/DRMLease.cpp +++ b/src/protocols/DRMLease.cpp @@ -137,7 +137,7 @@ CDRMLeaseRequestResource::CDRMLeaseRequestResource(WP<CDRMLeaseDeviceResource> p PROTO::lease.at(m_parent->m_deviceName)->m_leases.emplace_back(RESOURCE); - // per protcol, after submit, this is dead. + // per protocol, after submit, this is dead. PROTO::lease.at(m_parent->m_deviceName)->destroyResource(this); }); } diff --git a/src/protocols/DRMSyncobj.cpp b/src/protocols/DRMSyncobj.cpp index 2f5c3e14..762708e5 100644 --- a/src/protocols/DRMSyncobj.cpp +++ b/src/protocols/DRMSyncobj.cpp @@ -32,7 +32,7 @@ bool CDRMSyncPointState::addWaiter(const std::function<void()>& waiter) { return m_timeline->addWaiter(waiter, m_point, 0u); } -bool CDRMSyncPointState::comitted() { +bool CDRMSyncPointState::committed() { return m_acquireCommitted; } diff --git a/src/protocols/DRMSyncobj.hpp b/src/protocols/DRMSyncobj.hpp index ed15b199..b330818d 100644 --- a/src/protocols/DRMSyncobj.hpp +++ b/src/protocols/DRMSyncobj.hpp @@ -21,7 +21,7 @@ class CDRMSyncPointState { WP<CSyncTimeline> timeline(); Hyprutils::Memory::CUniquePointer<CSyncReleaser> createSyncRelease(); bool addWaiter(const std::function<void()>& waiter); - bool comitted(); + bool committed(); Hyprutils::OS::CFileDescriptor exportAsFD(); void signal(); diff --git a/src/protocols/FocusGrab.cpp b/src/protocols/FocusGrab.cpp index 3ab8d1e2..c6530826 100644 --- a/src/protocols/FocusGrab.cpp +++ b/src/protocols/FocusGrab.cpp @@ -35,12 +35,12 @@ bool CFocusGrab::good() { return m_resource->resource(); } -bool CFocusGrab::isSurfaceComitted(SP<CWLSurfaceResource> surface) { +bool CFocusGrab::isSurfaceCommitted(SP<CWLSurfaceResource> surface) { auto iter = std::ranges::find_if(m_surfaces, [surface](const auto& o) { return o.first == surface; }); if (iter == m_surfaces.end()) return false; - return iter->second->m_state == CFocusGrabSurfaceState::Comitted; + return iter->second->m_state == CFocusGrabSurfaceState::Committed; } void CFocusGrab::start() { @@ -49,7 +49,7 @@ void CFocusGrab::start() { g_pSeatManager->setGrab(m_grab); } - // Ensure new surfaces are focused if under the mouse when comitted. + // Ensure new surfaces are focused if under the mouse when committed. g_pInputManager->simulateMouseMovement(); refocusKeyboard(); } @@ -92,12 +92,12 @@ void CFocusGrab::eraseSurface(SP<CWLSurfaceResource> surface) { void CFocusGrab::refocusKeyboard() { auto keyboardSurface = g_pSeatManager->m_state.keyboardFocus; - if (keyboardSurface && isSurfaceComitted(keyboardSurface.lock())) + if (keyboardSurface && isSurfaceCommitted(keyboardSurface.lock())) return; SP<CWLSurfaceResource> surface = nullptr; for (auto const& [surf, state] : m_surfaces) { - if (state->m_state == CFocusGrabSurfaceState::Comitted) { + if (state->m_state == CFocusGrabSurfaceState::Committed) { surface = surf.lock(); break; } @@ -111,7 +111,7 @@ void CFocusGrab::refocusKeyboard() { void CFocusGrab::commit(bool removeOnly) { auto surfacesChanged = false; - auto anyComitted = false; + auto anyCommitted = false; for (auto iter = m_surfaces.begin(); iter != m_surfaces.end();) { switch (iter->second->m_state) { case CFocusGrabSurfaceState::PendingRemoval: @@ -121,20 +121,20 @@ void CFocusGrab::commit(bool removeOnly) { continue; case CFocusGrabSurfaceState::PendingAddition: if (!removeOnly) { - iter->second->m_state = CFocusGrabSurfaceState::Comitted; + iter->second->m_state = CFocusGrabSurfaceState::Committed; m_grab->add(iter->first.lock()); surfacesChanged = true; - anyComitted = true; + anyCommitted = true; } break; - case CFocusGrabSurfaceState::Comitted: anyComitted = true; break; + case CFocusGrabSurfaceState::Committed: anyCommitted = true; break; } iter++; } if (surfacesChanged) { - if (anyComitted) + if (anyCommitted) start(); else finish(true); diff --git a/src/protocols/FocusGrab.hpp b/src/protocols/FocusGrab.hpp index 6fb27b86..f02f97fc 100644 --- a/src/protocols/FocusGrab.hpp +++ b/src/protocols/FocusGrab.hpp @@ -20,7 +20,7 @@ class CFocusGrabSurfaceState { enum State { PendingAddition, PendingRemoval, - Comitted, + Committed, } m_state = PendingAddition; private: @@ -35,7 +35,7 @@ class CFocusGrab { ~CFocusGrab(); bool good(); - bool isSurfaceComitted(SP<CWLSurfaceResource> surface); + bool isSurfaceCommitted(SP<CWLSurfaceResource> surface); void start(); void finish(bool sendCleared); diff --git a/src/protocols/GlobalShortcuts.cpp b/src/protocols/GlobalShortcuts.cpp index 50e7434d..ee961b74 100644 --- a/src/protocols/GlobalShortcuts.cpp +++ b/src/protocols/GlobalShortcuts.cpp @@ -40,9 +40,9 @@ CGlobalShortcutsProtocol::CGlobalShortcutsProtocol(const wl_interface* iface, co } void CGlobalShortcutsProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { - const auto RESROUCE = m_clients.emplace_back(makeShared<CShortcutClient>(makeShared<CHyprlandGlobalShortcutsManagerV1>(client, ver, id))); + const auto RESOURCE = m_clients.emplace_back(makeShared<CShortcutClient>(makeShared<CHyprlandGlobalShortcutsManagerV1>(client, ver, id))); - if UNLIKELY (!RESROUCE->good()) { + if UNLIKELY (!RESOURCE->good()) { wl_client_post_no_memory(client); m_clients.pop_back(); return; diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp index a949d6a1..c45da4e0 100644 --- a/src/protocols/LinuxDMABUF.cpp +++ b/src/protocols/LinuxDMABUF.cpp @@ -32,14 +32,14 @@ CDMABUFFormatTable::CDMABUFFormatTable(SDMABUFTranche _rendererTranche, std::vec // insert formats into vec if they got inserted into set, meaning they're unique size_t i = 0; - m_rendererTranche.indicies.clear(); + m_rendererTranche.indices.clear(); for (auto const& fmt : m_rendererTranche.formats) { for (auto const& mod : fmt.modifiers) { auto format = std::make_pair<>(fmt.drmFormat, mod); auto [_, inserted] = formats.insert(format); if (inserted) { // if it was inserted into set, then its unique and will have a new index in vec - m_rendererTranche.indicies.push_back(i++); + m_rendererTranche.indices.push_back(i++); formatsVec.push_back(SDMABUFFormatTableEntry{ .fmt = fmt.drmFormat, .modifier = mod, @@ -47,29 +47,29 @@ CDMABUFFormatTable::CDMABUFFormatTable(SDMABUFTranche _rendererTranche, std::vec } else { // if it wasn't inserted then find its index in vec auto it = std::ranges::find_if(formatsVec, [fmt, mod](const SDMABUFFormatTableEntry& oth) { return oth.fmt == fmt.drmFormat && oth.modifier == mod; }); - m_rendererTranche.indicies.push_back(it - formatsVec.begin()); + m_rendererTranche.indices.push_back(it - formatsVec.begin()); } } } for (auto& [monitor, tranche] : m_monitorTranches) { - tranche.indicies.clear(); + tranche.indices.clear(); for (auto const& fmt : tranche.formats) { for (auto const& mod : fmt.modifiers) { - // apparently these can implode on planes, so dont use them + // apparently these can implode on planes, so don't use them if (mod == DRM_FORMAT_MOD_INVALID || mod == DRM_FORMAT_MOD_LINEAR) continue; auto format = std::make_pair<>(fmt.drmFormat, mod); auto [_, inserted] = formats.insert(format); if (inserted) { - tranche.indicies.push_back(i++); + tranche.indices.push_back(i++); formatsVec.push_back(SDMABUFFormatTableEntry{ .fmt = fmt.drmFormat, .modifier = mod, }); } else { auto it = std::ranges::find_if(formatsVec, [fmt, mod](const SDMABUFFormatTableEntry& oth) { return oth.fmt == fmt.drmFormat && oth.modifier == mod; }); - tranche.indicies.push_back(it - formatsVec.begin()); + tranche.indices.push_back(it - formatsVec.begin()); } } } @@ -318,8 +318,8 @@ void CLinuxDMABUFFeedbackResource::sendTranche(SDMABUFTranche& tranche) { m_resource->sendTrancheFlags((zwpLinuxDmabufFeedbackV1TrancheFlags)tranche.flags); wl_array indices = { - .size = tranche.indicies.size() * sizeof(tranche.indicies.at(0)), - .data = tranche.indicies.data(), + .size = tranche.indices.size() * sizeof(tranche.indices.at(0)), + .data = tranche.indices.data(), }; m_resource->sendTrancheFormats(&indices); m_resource->sendTrancheDone(); @@ -421,7 +421,7 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const SDMABUFTranche eglTranche = { .device = m_mainDevice, - .flags = 0, // renderer isnt for ds so dont set flag. + .flags = 0, // renderer isn't for ds so don't set flag. .formats = g_pHyprOpenGL->getDRMFormats(), }; diff --git a/src/protocols/LinuxDMABUF.hpp b/src/protocols/LinuxDMABUF.hpp index ea2c9457..296ef04d 100644 --- a/src/protocols/LinuxDMABUF.hpp +++ b/src/protocols/LinuxDMABUF.hpp @@ -43,7 +43,7 @@ struct SDMABUFTranche { dev_t device = 0; uint32_t flags = 0; std::vector<SDRMFormat> formats; - std::vector<uint16_t> indicies; + std::vector<uint16_t> indices; }; class CDMABUFFormatTable { diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index a86a74d3..e98b216d 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -26,7 +26,7 @@ CScreencopyFrame::CScreencopyFrame(SP<CZwlrScreencopyFrameV1> resource_, int32_t m_monitor = CWLOutputResource::fromResource(output)->m_monitor; if (!m_monitor) { - LOGM(ERR, "Client requested sharing of a monitor that doesnt exist"); + LOGM(ERR, "Client requested sharing of a monitor that doesn't exist"); m_resource->sendFailed(); return; } @@ -48,7 +48,7 @@ CScreencopyFrame::CScreencopyFrame(SP<CZwlrScreencopyFrameV1> resource_, int32_t return; } - // TODO: hack, we can't bit flip so we'll format flip heh, GL_BGRA_EXT wont work here + // TODO: hack, we can't bit flip so we'll format flip heh, GL_BGRA_EXT won't work here if (m_shmFormat == DRM_FORMAT_XRGB2101010 || m_shmFormat == DRM_FORMAT_ARGB2101010) m_shmFormat = DRM_FORMAT_XBGR2101010; diff --git a/src/protocols/SessionLock.cpp b/src/protocols/SessionLock.cpp index 64c0569b..66e10311 100644 --- a/src/protocols/SessionLock.cpp +++ b/src/protocols/SessionLock.cpp @@ -121,8 +121,8 @@ CSessionLock::CSessionLock(SP<CExtSessionLockV1> resource_) : m_resource(resourc m_events.unlockAndDestroy.emit(); - // if lock tools have hidden it and doesnt restore it, we wont recieve a new cursor until the cursorshape protocol gives us one. - // so set it to left_ptr so the "desktop/wallpaper" doesnt end up missing a cursor until hover over a window sending us a shape. + // if lock tools have hidden it and doesn't restore it, we won't receive a new cursor until the cursorshape protocol gives us one. + // so set it to left_ptr so the "desktop/wallpaper" doesn't end up missing a cursor until hover over a window sending us a shape. g_pHyprRenderer->setCursorFromName("left_ptr"); m_inert = true; diff --git a/src/protocols/XXColorManagement.cpp b/src/protocols/XXColorManagement.cpp index d01e367a..08f2fe70 100644 --- a/src/protocols/XXColorManagement.cpp +++ b/src/protocols/XXColorManagement.cpp @@ -194,7 +194,7 @@ wl_client* CXXColorManagementOutput::client() { } CXXColorManagementSurface::CXXColorManagementSurface(SP<CWLSurfaceResource> surface_) : m_surface(surface_) { - // only for frog cm untill wayland cm is adopted + // only for frog cm until wayland cm is adopted } CXXColorManagementSurface::CXXColorManagementSurface(SP<CXxColorManagementSurfaceV4> resource_, SP<CWLSurfaceResource> surface_) : m_surface(surface_), m_resource(resource_) { @@ -600,7 +600,7 @@ CXXColorManagementImageDescriptionInfo::CXXColorManagementImageDescriptionInfo(S m_resource->sendTfNamed(m_settings.transferFunction); m_resource->sendLuminances(std::round(m_settings.luminances.min * 10000), m_settings.luminances.max, m_settings.luminances.reference); - // send expexted display paramateres + // send expected display paramateres m_resource->sendTargetPrimaries(toProto(m_settings.masteringPrimaries.red.x), toProto(m_settings.masteringPrimaries.red.y), toProto(m_settings.masteringPrimaries.green.x), toProto(m_settings.masteringPrimaries.green.y), toProto(m_settings.masteringPrimaries.blue.x), toProto(m_settings.masteringPrimaries.blue.y), toProto(m_settings.masteringPrimaries.white.x), toProto(m_settings.masteringPrimaries.white.y)); diff --git a/src/protocols/types/SurfaceState.cpp b/src/protocols/types/SurfaceState.cpp index e60bf64d..a1195439 100644 --- a/src/protocols/types/SurfaceState.cpp +++ b/src/protocols/types/SurfaceState.cpp @@ -57,7 +57,7 @@ void SSurfaceState::reset() { // applies only to the buffer that is attached to the surface acquire = {}; - // wl_surface.commit assings pending ... and clears pending damage. + // wl_surface.commit assigns pending ... and clears pending damage. damage.clear(); bufferDamage.clear(); } |
