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

core: avoid .at() and use [] operator (#9347)

Browse source 
avoid .at() where it makes sense and use [] operator in loops.
This commit is contained in:
Tom Englund 2025-02-06 12:18:04 +01:00 • committed by GitHub
parent 868b2b544a
commit f1e32cd122
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/desktop/Window.cpp
View file

@ -1626,17 +1626,17 @@ PHLWINDOW CWindow::getSwallower() {
if (!(*PSWALLOWREGEX).empty()) if (!(*PSWALLOWREGEX).empty())
std::erase_if(candidates, [&](const auto& other) { return !RE2::FullMatch(other->m_szClass, *PSWALLOWREGEX); }); std::erase_if(candidates, [&](const auto& other) { return !RE2::FullMatch(other->m_szClass, *PSWALLOWREGEX); });
if (candidates.size() <= 0) if (candidates.size() == 0)
return nullptr; return nullptr;
if (!(*PSWALLOWEXREGEX).empty()) if (!(*PSWALLOWEXREGEX).empty())
std::erase_if(candidates, [&](const auto& other) { return RE2::FullMatch(other->m_szTitle, *PSWALLOWEXREGEX); }); std::erase_if(candidates, [&](const auto& other) { return RE2::FullMatch(other->m_szTitle, *PSWALLOWEXREGEX); });
if (candidates.size() <= 0) if (candidates.size() == 0)
return nullptr; return nullptr;
if (candidates.size() == 1) if (candidates.size() == 1)
return candidates.at(0); return candidates[0];
// walk up the focus history and find the last focused // walk up the focus history and find the last focused
for (auto const& w : g_pCompositor->m_vWindowFocusHistory) { for (auto const& w : g_pCompositor->m_vWindowFocusHistory) {
@ -1648,7 +1648,7 @@ PHLWINDOW CWindow::getSwallower() {
} }
// if none are found (??) then just return the first one // if none are found (??) then just return the first one
return candidates.at(0); return candidates[0];
} }
void CWindow::unsetWindowData(eOverridePriority priority) { void CWindow::unsetWindowData(eOverridePriority priority) {

20
src/devices/IKeyboard.cpp
View file

@ -126,14 +126,14 @@ void IKeyboard::setKeymap(const SStringRuleNames& rules) {
updateModifiers(0, 0, modifiersState.locked, modifiersState.group); updateModifiers(0, 0, modifiersState.locked, modifiersState.group);
} }
for (size_t i = 0; i < LEDNAMES.size(); ++i) { for (size_t i = 0; i < std::min(LEDNAMES.size(), ledIndexes.size()); ++i) {
ledIndexes.at(i) = xkb_map_led_get_index(xkbKeymap, LEDNAMES.at(i)); ledIndexes[i] = xkb_map_led_get_index(xkbKeymap, LEDNAMES[i]);
Debug::log(LOG, "xkb: LED index {} (name {}) got index {}", i, LEDNAMES.at(i), ledIndexes.at(i)); Debug::log(LOG, "xkb: LED index {} (name {}) got index {}", i, LEDNAMES[i], ledIndexes[i]);
} }
for (size_t i = 0; i < MODNAMES.size(); ++i) { for (size_t i = 0; i < std::min(MODNAMES.size(), modIndexes.size()); ++i) {
modIndexes.at(i) = xkb_map_mod_get_index(xkbKeymap, MODNAMES.at(i)); modIndexes[i] = xkb_map_mod_get_index(xkbKeymap, MODNAMES[i]);
Debug::log(LOG, "xkb: Mod index {} (name {}) got index {}", i, MODNAMES.at(i), modIndexes.at(i)); Debug::log(LOG, "xkb: Mod index {} (name {}) got index {}", i, MODNAMES[i], modIndexes[i]);
} }
updateKeymapFD(); updateKeymapFD();
@ -289,8 +289,8 @@ std::optional<uint32_t> IKeyboard::getLEDs() {
return {}; return {};
uint32_t leds = 0; uint32_t leds = 0;
for (uint32_t i = 0; i < LED_COUNT; ++i) { for (uint32_t i = 0; i < std::min((size_t)LED_COUNT, ledIndexes.size()); ++i) {
if (xkb_state_led_index_is_active(xkbState, ledIndexes.at(i))) if (xkb_state_led_index_is_active(xkbState, ledIndexes[i]))
leds |= (1 << i); leds |= (1 << i);
} }
@ -323,10 +323,10 @@ uint32_t IKeyboard::getModifiers() {
uint32_t modMask = modifiersState.depressed | modifiersState.latched; uint32_t modMask = modifiersState.depressed | modifiersState.latched;
uint32_t mods = 0; uint32_t mods = 0;
for (size_t i = 0; i < modIndexes.size(); ++i) { for (size_t i = 0; i < modIndexes.size(); ++i) {
if (modIndexes.at(i) == XKB_MOD_INVALID) if (modIndexes[i] == XKB_MOD_INVALID)
continue; continue;
if (!(modMask & (1 << modIndexes.at(i)))) if (!(modMask & (1 << modIndexes[i])))
continue; continue;
mods |= (1 << i); mods |= (1 << i);

2
src/layout/MasterLayout.cpp
View file

@ -1357,7 +1357,7 @@ void CHyprMasterLayout::runOrientationCycle(SLayoutMessageHeader& header, CVarLi
int nextOrPrev = 0; int nextOrPrev = 0;
for (size_t i = 0; i < cycle.size(); ++i) { for (size_t i = 0; i < cycle.size(); ++i) {
if (PWORKSPACEDATA->orientation == cycle.at(i)) { if (PWORKSPACEDATA->orientation == cycle[i]) {
nextOrPrev = i + direction; nextOrPrev = i + direction;
break; break;
} }

2
src/managers/PointerManager.cpp
View file

@ -475,7 +475,7 @@ SP<Aquamarine::IBuffer> CPointerManager::renderHWCursorBuffer(SP<CPointerManager
if (flipRB) { if (flipRB) {
for (size_t i = 0; i < shmBuffer.size(); i += 4) { for (size_t i = 0; i < shmBuffer.size(); i += 4) {
std::swap(shmBuffer.at(i), shmBuffer.at(i + 2)); // little-endian!!!!!! std::swap(shmBuffer[i], shmBuffer[i + 2]); // little-endian!!!!!!
} }
} }
} else { } else {

2
src/managers/XCursorManager.cpp
View file

@ -482,7 +482,7 @@ std::vector<SP<SXCursors>> CXCursorManager::loadStandardCursors(std::string cons
// load the default xcursor shapes that exist in the theme // load the default xcursor shapes that exist in the theme
for (size_t i = 0; i < XCURSOR_STANDARD_NAMES.size(); ++i) { for (size_t i = 0; i < XCURSOR_STANDARD_NAMES.size(); ++i) {
std::string shape{XCURSOR_STANDARD_NAMES.at(i)}; std::string shape{XCURSOR_STANDARD_NAMES[i]};
auto xImages = XcursorShapeLoadImages(i << 1 /* wtf xcursor? */, name.c_str(), size); auto xImages = XcursorShapeLoadImages(i << 1 /* wtf xcursor? */, name.c_str(), size);
if (!xImages) { if (!xImages) {

8
src/render/OpenGL.cpp
View file

@ -402,14 +402,14 @@ std::optional<std::vector<uint64_t>> CHyprOpenGLImpl::getModsForFormat(EGLint fo
result.reserve(mods.size()); result.reserve(mods.size());
bool linearIsExternal = false; bool linearIsExternal = false;
for (size_t i = 0; i < mods.size(); ++i) { for (size_t i = 0; i < std::min(mods.size(), external.size()); ++i) {
if (external.at(i)) { if (external[i]) {
if (mods.at(i) == DRM_FORMAT_MOD_LINEAR) if (mods[i] == DRM_FORMAT_MOD_LINEAR)
linearIsExternal = true; linearIsExternal = true;
continue; continue;
} }
result.push_back(mods.at(i)); result.push_back(mods[i]);
} }
// if the driver doesn't mark linear as external, add it. It's allowed unless the driver says otherwise. (e.g. nvidia) // if the driver doesn't mark linear as external, add it. It's allowed unless the driver says otherwise. (e.g. nvidia)

4
src/xwayland/XDataSource.cpp
View file

@ -57,8 +57,8 @@ void CXDataSource::send(const std::string& mime, CFileDescriptor fd) {
mimeAtom = HYPRATOMS["UTF8_STRING"]; mimeAtom = HYPRATOMS["UTF8_STRING"];
else { else {
for (size_t i = 0; i < mimeTypes.size(); ++i) { for (size_t i = 0; i < mimeTypes.size(); ++i) {
if (mimeTypes.at(i) == mime) { if (mimeTypes[i] == mime) {
mimeAtom = mimeAtoms.at(i); mimeAtom = mimeAtoms[i];
break; break;
} }
} }

4
src/xwayland/XWM.cpp
View file

@ -1051,13 +1051,13 @@ void CXWM::readWindowData(SP<CXWaylandSurface> surf) {
}; };
for (size_t i = 0; i < interestingProps.size(); i++) { for (size_t i = 0; i < interestingProps.size(); i++) {
xcb_get_property_cookie_t cookie = xcb_get_property(connection, 0, surf->xID, interestingProps.at(i), XCB_ATOM_ANY, 0, 2048); xcb_get_property_cookie_t cookie = xcb_get_property(connection, 0, surf->xID, interestingProps[i], XCB_ATOM_ANY, 0, 2048);
xcb_get_property_reply_t* reply = xcb_get_property_reply(connection, cookie, nullptr); xcb_get_property_reply_t* reply = xcb_get_property_reply(connection, cookie, nullptr);
if (!reply) { if (!reply) {
Debug::log(ERR, "[xwm] Failed to get window property"); Debug::log(ERR, "[xwm] Failed to get window property");
continue; continue;
} }
readProp(surf, interestingProps.at(i), reply); readProp(surf, interestingProps[i], reply);
free(reply); free(reply);
} }
} }