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

config: add vrr per-display

Browse source
This commit is contained in:
vaxerski 2023-08-11 17:37:52 +02:00
parent 8a7ce59ad4
commit 3f7f4207a6
4 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/config/ConfigManager.cpp
View file

@ -660,6 +660,9 @@ void CConfigManager::handleMonitor(const std::string& command, const std::string
} else if (ARGS[argno] == "transform") {
newrule.transform = (wl_output_transform)std::stoi(ARGS[argno + 1]);
argno++;
} else if (ARGS[argno] == "vrr") {
newrule.vrr = std::stoi(ARGS[argno + 1]);
argno++;
} else if (ARGS[argno] == "workspace") {
std::string name = "";
int wsId = getWorkspaceIDFromString(ARGS[argno + 1], name);
@ -2070,7 +2073,9 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
if (!m->output)
return;
if (*PVRR == 0) {
const auto USEVRR = m->activeMonitorRule.vrr.has_value() ? m->activeMonitorRule.vrr.value() : *PVRR;
if (USEVRR == 0) {
if (m->vrrActive) {
wlr_output_enable_adaptive_sync(m->output, 0);
@ -2080,7 +2085,7 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
}
m->vrrActive = false;
return;
} else if (*PVRR == 1) {
} else if (USEVRR == 1) {
if (!m->vrrActive) {
wlr_output_enable_adaptive_sync(m->output, 1);
@ -2095,7 +2100,7 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
}
m->vrrActive = true;
return;
} else if (*PVRR == 2) {
} else if (USEVRR == 2) {
/* fullscreen */
m->vrrActive = true;

14
src/config/ConfigManager.hpp
View file

@ -14,6 +14,7 @@
#include <xf86drmMode.h>
#include "../Window.hpp"
#include "../helpers/WLClasses.hpp"
#include "../helpers/Monitor.hpp"
#include "defaultConfig.hpp"
#include "ConfigDataValues.hpp"
@ -35,19 +36,6 @@ struct SConfigValue {
bool set = false; // used for device configs
};
struct SMonitorRule {
std::string name = "";
Vector2D resolution = Vector2D(1280, 720);
Vector2D offset = Vector2D(0, 0);
float scale = 1;
float refreshRate = 60;
bool disabled = false;
wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;
std::string mirrorOf = "";
bool enable10bit = false;
drmModeModeInfo drmMode = {};
};
struct SWorkspaceRule {
std::string monitor = "";
std::string workspaceString = "";