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

don't load cursor theme if already loaded

Browse source
This commit is contained in:
Vaxry 2022-12-28 23:26:58 +01:00
parent 60013ee655
commit aefd63876d
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Hyprpaper.cpp
View file

@ -9,7 +9,7 @@ void CHyprpaper::init() {
g_pConfigManager = std::make_unique<CConfigManager>(); g_pConfigManager = std::make_unique<CConfigManager>();
g_pIPCSocket = std::make_unique<CIPCSocket>(); g_pIPCSocket = std::make_unique<CIPCSocket>();
m_sDisplay = (wl_display *)wl_display_connect(nullptr); m_sDisplay = (wl_display*)wl_display_connect(nullptr);
if (!m_sDisplay) { if (!m_sDisplay) {
Debug::log(CRIT, "No wayland compositor running!"); Debug::log(CRIT, "No wayland compositor running!");
@ -22,13 +22,12 @@ void CHyprpaper::init() {
g_pIPCSocket->initialize(); g_pIPCSocket->initialize();
// run // run
wl_registry *registry = wl_display_get_registry(m_sDisplay); wl_registry* registry = wl_display_get_registry(m_sDisplay);
wl_registry_add_listener(registry, &Events::registryListener, nullptr); wl_registry_add_listener(registry, &Events::registryListener, nullptr);
while (wl_display_dispatch(m_sDisplay) != -1) { while (wl_display_dispatch(m_sDisplay) != -1) {
tick(true); tick(true);
} }
} }
void CHyprpaper::tick(bool force) { void CHyprpaper::tick(bool force) {
@ -46,7 +45,7 @@ void CHyprpaper::tick(bool force) {
} }
bool CHyprpaper::isPreloaded(const std::string& path) { bool CHyprpaper::isPreloaded(const std::string& path) {
for (auto&[pt, wt] : m_mWallpaperTargets) { for (auto& [pt, wt] : m_mWallpaperTargets) {
if (pt == path) if (pt == path)
return true; return true;
} }
@ -100,7 +99,7 @@ void CHyprpaper::preloadAllWallpapersFromConfig() {
// check if it doesnt exist // check if it doesnt exist
bool exists = false; bool exists = false;
for (auto&[ewp, cls] : m_mWallpaperTargets) { for (auto& [ewp, cls] : m_mWallpaperTargets) {
if (ewp == wp) { if (ewp == wp) {
Debug::log(LOG, "Ignoring request to preload %s as it already is preloaded!", ewp.c_str()); Debug::log(LOG, "Ignoring request to preload %s as it already is preloaded!", ewp.c_str());
exists = true; exists = true;
@ -135,19 +134,20 @@ void CHyprpaper::recheckMonitor(SMonitor* pMonitor) {
pMonitor->wantsACK = false; pMonitor->wantsACK = false;
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; if (!pMonitor->pCurrentLayerSurface->pCursorImg) {
if (const auto CURSORSIZENV = getenv("XCURSOR_SIZE"); CURSORSIZENV) { int XCURSOR_SIZE = 24;
try { if (const auto CURSORSIZENV = getenv("XCURSOR_SIZE"); CURSORSIZENV) {
if (XCURSOR_SIZE = std::stoi(CURSORSIZENV); XCURSOR_SIZE <= 0) { try {
throw std::exception(); 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;
} }
} 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];
} }
if (pMonitor->wantsReload) { if (pMonitor->wantsReload) {
@ -193,7 +193,7 @@ SMonitor* CHyprpaper::getMonitorFromName(const std::string& monname) {
void CHyprpaper::ensurePoolBuffersPresent() { void CHyprpaper::ensurePoolBuffersPresent() {
bool anyNewBuffers = false; bool anyNewBuffers = false;
for (auto&[file, wt] : m_mWallpaperTargets) { for (auto& [file, wt] : m_mWallpaperTargets) {
for (auto& m : m_vMonitors) { for (auto& m : m_vMonitors) {
if (m->size == Vector2D()) if (m->size == Vector2D())
@ -267,9 +267,9 @@ void CHyprpaper::ensureMonitorHasActiveWallpaper(SMonitor* pMonitor) {
return; // has return; // has
// get the target // get the target
for (auto&[mon, path1] : m_mMonitorActiveWallpapers) { for (auto& [mon, path1] : m_mMonitorActiveWallpapers) {
if (mon == pMonitor->name) { if (mon == pMonitor->name) {
for (auto&[path2, target] : m_mWallpaperTargets) { for (auto& [path2, target] : m_mWallpaperTargets) {
if (path1 == path2) { if (path1 == path2) {
it->second = &target; it->second = &target;
break; break;
@ -281,9 +281,9 @@ void CHyprpaper::ensureMonitorHasActiveWallpaper(SMonitor* pMonitor) {
if (!it->second) { if (!it->second) {
// try to find a wildcard // try to find a wildcard
for (auto&[mon, path1] : m_mMonitorActiveWallpapers) { for (auto& [mon, path1] : m_mMonitorActiveWallpapers) {
if (mon.empty()) { if (mon.empty()) {
for (auto&[path2, target] : m_mWallpaperTargets) { for (auto& [path2, target] : m_mWallpaperTargets) {
if (path1 == path2) { if (path1 == path2) {
it->second = &target; it->second = &target;
break; break;