mirrors/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-09-14 15:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protocols: implement protoLog

Browse Source
This commit is contained in:
Vaxry
2024-04-22 18:44:25 +01:00
parent 741c75d907
commit 012a2802e0
10 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/protocols/GammaControl.cpp
View File

@@ -4,6 +4,8 @@
#include "../helpers/Monitor.hpp"
#include "../Compositor.hpp"
#define LOGM PROTO::gamma->protoLog
CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* output) : resource(resource_) {
if (!resource_->resource())
return;
@@ -11,7 +13,7 @@ CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* out
wlr_output* wlrOutput = wlr_output_from_resource(output);
if (!wlrOutput) {
Debug::log(ERR, "[gamma] No wlr_output");
LOGM(ERR, "No wlr_output in CGammaControl");
resource->sendFailed();
return;
}
@@ -19,7 +21,7 @@ CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* out
pMonitor = g_pCompositor->getRealMonitorFromOutput(wlrOutput);
if (!pMonitor) {
Debug::log(ERR, "[gamma] No CMonitor");
LOGM(ERR, "No CMonitor");
resource->sendFailed();
return;
}
@@ -34,7 +36,7 @@ CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* out
gammaSize = wlr_output_get_gamma_size(wlrOutput);
if (gammaSize <= 0) {
Debug::log(ERR, "[gamma] Output {} doesn't support gamma", pMonitor->szName);
LOGM(ERR, "Output {} doesn't support gamma", pMonitor->szName);
resource->sendFailed();
return;
}
@@ -45,18 +47,18 @@ CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* out
resource->setOnDestroy([this](CZwlrGammaControlV1* gamma) { PROTO::gamma->destroyGammaControl(this); });
resource->setSetGamma([this](CZwlrGammaControlV1* gamma, int32_t fd) {
Debug::log(LOG, "[gamma] setGamma for {}", pMonitor->szName);
LOGM(LOG, "setGamma for {}", pMonitor->szName);
int fdFlags = fcntl(fd, F_GETFL, 0);
if (fdFlags < 0) {
Debug::log(ERR, "[gamma] Failed to get fd flags");
LOGM(ERR, "Failed to get fd flags");
resource->sendFailed();
close(fd);
return;
}
if (fcntl(fd, F_SETFL, fdFlags | O_NONBLOCK) < 0) {
Debug::log(ERR, "[gamma] Failed to set fd flags");
LOGM(ERR, "Failed to set fd flags");
resource->sendFailed();
close(fd);
return;
@@ -64,7 +66,7 @@ CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* out
ssize_t readBytes = pread(fd, gammaTable.data(), gammaTable.size() * sizeof(uint16_t), 0);
if (readBytes < 0 || (size_t)readBytes != gammaTable.size() * sizeof(uint16_t)) {
Debug::log(ERR, "[gamma] Failed to read bytes");
LOGM(ERR, "Failed to read bytes");
close(fd);
if ((size_t)readBytes != gammaTable.size() * sizeof(uint16_t)) {
@@ -103,7 +105,7 @@ void CGammaControl::applyToMonitor() {
if (!pMonitor)
return; // ??
Debug::log(LOG, "[gamma] setting to monitor {}", pMonitor->szName);
LOGM(LOG, "setting to monitor {}", pMonitor->szName);
if (!gammaTableSet) {
wlr_output_state_set_gamma_lut(pMonitor->state.wlr(), 0, nullptr, nullptr, nullptr);
@@ -117,7 +119,7 @@ void CGammaControl::applyToMonitor() {
wlr_output_state_set_gamma_lut(pMonitor->state.wlr(), gammaSize, red, green, blue);
if (!pMonitor->state.test()) {
Debug::log(LOG, "[gamma] setting to monitor {} failed", pMonitor->szName);
LOGM(LOG, "setting to monitor {} failed", pMonitor->szName);
wlr_output_state_set_gamma_lut(pMonitor->state.wlr(), 0, nullptr, nullptr, nullptr);
}