hyprwm/hyprpaper
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprpaper.git synced 2024-11-16 22:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #24 from vilari-mickopf/main

Browse source 
fix crash when XCURSOR_SIZE environment variable is set incorrectly
This commit is contained in:
Vaxry 2022-12-18 22:54:56 +00:00 committed by GitHub
commit 60013ee655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Hyprpaper.cpp
View file

@ -136,8 +136,15 @@ void CHyprpaper::recheckMonitor(SMonitor* pMonitor) {
zwlr_layer_surface_v1_ack_configure(pMonitor->pCurrentLayerSurface->pLayerSurface, pMonitor->configureSerial); zwlr_layer_surface_v1_ack_configure(pMonitor->pCurrentLayerSurface->pLayerSurface, pMonitor->configureSerial);
int XCURSOR_SIZE = 24; int XCURSOR_SIZE = 24;
if (getenv("XCURSOR_SIZE")) { if (const auto CURSORSIZENV = getenv("XCURSOR_SIZE"); CURSORSIZENV) {
XCURSOR_SIZE = std::stoi(getenv("XCURSOR_SIZE")); try {
if (XCURSOR_SIZE = std::stoi(CURSORSIZENV); XCURSOR_SIZE <= 0) {
throw std::exception();
}
} catch (...) {
Debug::log(WARN, "XCURSOR_SIZE environment variable is set incorrectly");
XCURSOR_SIZE = 24;
}
} }
pMonitor->pCurrentLayerSurface->pCursorImg = wl_cursor_theme_get_cursor(wl_cursor_theme_load(getenv("XCURSOR_THEME"), XCURSOR_SIZE * pMonitor->scale, m_sSHM), "left_ptr")->images[0]; pMonitor->pCurrentLayerSurface->pCursorImg = wl_cursor_theme_get_cursor(wl_cursor_theme_load(getenv("XCURSOR_THEME"), XCURSOR_SIZE * pMonitor->scale, m_sSHM), "left_ptr")->images[0];
@ -233,9 +240,9 @@ void CHyprpaper::clearWallpaperFromMonitor(const std::string& monname) {
if (it != m_mMonitorActiveWallpaperTargets.end()) if (it != m_mMonitorActiveWallpaperTargets.end())
m_mMonitorActiveWallpaperTargets.erase(it); m_mMonitorActiveWallpaperTargets.erase(it);
if (PMONITOR->pCurrentLayerSurface) { if (PMONITOR->pCurrentLayerSurface) {
PMONITOR->pCurrentLayerSurface = nullptr; PMONITOR->pCurrentLayerSurface = nullptr;
PMONITOR->wantsACK = false; PMONITOR->wantsACK = false;
@ -256,7 +263,7 @@ void CHyprpaper::ensureMonitorHasActiveWallpaper(SMonitor* pMonitor) {
it = m_mMonitorActiveWallpaperTargets.find(pMonitor); it = m_mMonitorActiveWallpaperTargets.find(pMonitor);
} }
if (it->second) if (it->second)
return; // has return; // has
// get the target // get the target
@ -296,7 +303,7 @@ void CHyprpaper::ensureMonitorHasActiveWallpaper(SMonitor* pMonitor) {
// create it for thy if it doesnt have // create it for thy if it doesnt have
if (!pMonitor->pCurrentLayerSurface) if (!pMonitor->pCurrentLayerSurface)
createLSForMonitor(pMonitor); createLSForMonitor(pMonitor);
else else
pMonitor->wantsReload = true; pMonitor->wantsReload = true;
} }