cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: correct tar command for xz compression & fix typos (#11213)

Browse source
This commit is contained in:
xqso 2025-07-25 15:19:23 +00:00 • committed by GitHub
parent fd0c1f2ab4
commit 5c8d675eed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/protocols/ColorManagement.cpp
View file

@ -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));

2
src/protocols/DRMLease.cpp
View file

@ -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);
});
}

2
src/protocols/DRMSyncobj.cpp
View file

@ -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;
}

2
src/protocols/DRMSyncobj.hpp
View file

@ -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();

20
src/protocols/FocusGrab.cpp
View file

@ -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);

4
src/protocols/FocusGrab.hpp
View file

@ -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);

4
src/protocols/GlobalShortcuts.cpp
View file

@ -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;

20
src/protocols/LinuxDMABUF.cpp
View file

@ -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(),
};

2
src/protocols/LinuxDMABUF.hpp
View file

@ -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 {

4
src/protocols/Screencopy.cpp
View file

@ -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;

4
src/protocols/SessionLock.cpp
View file

@ -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;

4
src/protocols/XXColorManagement.cpp
View file

@ -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));

2
src/protocols/types/SurfaceState.cpp
View file

@ -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();
}