summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2023-07-06 16:26:38 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2023-07-06 16:26:38 +0200
commite632bf176b04968ca6a22f6e5d5f1a7bf77b6fa6 (patch)
treeaa7eda563cb62c9bf937bbbdb468a55168fe73b7 /src/config
parent41358c6fb579e440ccb72bb79a7bfb859944b3a6 (diff)
config: fix reading touchpad values to non-touchpad per-device cfgs
Diffstat (limited to 'src/config')
-rw-r--r--src/config/ConfigManager.cpp18
-rw-r--r--src/config/ConfigManager.hpp8
2 files changed, 13 insertions, 13 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 822175ff..a4250293 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -1654,7 +1654,7 @@ SConfigValue CConfigManager::getConfigValueSafe(const std::string& val) {
return copy;
}
-SConfigValue CConfigManager::getConfigValueSafeDevice(const std::string& dev, const std::string& val) {
+SConfigValue CConfigManager::getConfigValueSafeDevice(const std::string& dev, const std::string& val, std::optional<bool> touchpad) {
std::lock_guard<std::mutex> lg(configmtx);
const auto it = deviceConfigs.find(dev);
@@ -1673,8 +1673,8 @@ SConfigValue CConfigManager::getConfigValueSafeDevice(const std::string& dev, co
if (foundIt == std::string::npos)
continue;
- if (cv.first == "input:" + val || cv.first == "input:touchpad:" + val || cv.first == "input:touchdevice:" + val || cv.first == "input:tablet:" + val ||
- cv.first == "input:tablet:" + val) {
+ if (cv.first == "input:" + val || (touchpad.value_or(true) && cv.first == "input:touchpad:" + val) || cv.first == "input:touchdevice:" + val ||
+ cv.first == "input:tablet:" + val || cv.first == "input:tablet:" + val) {
copy = cv.second;
}
}
@@ -1700,16 +1700,16 @@ std::string CConfigManager::getString(const std::string& v) {
return VAL;
}
-int CConfigManager::getDeviceInt(const std::string& dev, const std::string& v) {
- return getConfigValueSafeDevice(dev, v).intValue;
+int CConfigManager::getDeviceInt(const std::string& dev, const std::string& v, std::optional<bool> touchpad) {
+ return getConfigValueSafeDevice(dev, v, touchpad).intValue;
}
-float CConfigManager::getDeviceFloat(const std::string& dev, const std::string& v) {
- return getConfigValueSafeDevice(dev, v).floatValue;
+float CConfigManager::getDeviceFloat(const std::string& dev, const std::string& v, std::optional<bool> touchpad) {
+ return getConfigValueSafeDevice(dev, v, touchpad).floatValue;
}
-std::string CConfigManager::getDeviceString(const std::string& dev, const std::string& v) {
- auto VAL = getConfigValueSafeDevice(dev, v).strValue;
+std::string CConfigManager::getDeviceString(const std::string& dev, const std::string& v, std::optional<bool> touchpad) {
+ auto VAL = getConfigValueSafeDevice(dev, v, touchpad).strValue;
if (VAL == STRVAL_EMPTY)
return "";
diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp
index ea824a32..cd297ed3 100644
--- a/src/config/ConfigManager.hpp
+++ b/src/config/ConfigManager.hpp
@@ -167,9 +167,9 @@ class CConfigManager {
void setInt(const std::string&, int);
void setString(const std::string&, const std::string&);
- int getDeviceInt(const std::string&, const std::string&);
- float getDeviceFloat(const std::string&, const std::string&);
- std::string getDeviceString(const std::string&, const std::string&);
+ int getDeviceInt(const std::string&, const std::string&, std::optional<bool> touchpad = {});
+ float getDeviceFloat(const std::string&, const std::string&, std::optional<bool> touchpad = {});
+ std::string getDeviceString(const std::string&, const std::string&, std::optional<bool> touchpad = {});
bool deviceConfigExists(const std::string&);
bool shouldBlurLS(const std::string&);
@@ -262,7 +262,7 @@ class CConfigManager {
void applyUserDefinedVars(std::string&, const size_t);
void loadConfigLoadVars();
SConfigValue getConfigValueSafe(const std::string&);
- SConfigValue getConfigValueSafeDevice(const std::string&, const std::string&);
+ SConfigValue getConfigValueSafeDevice(const std::string&, const std::string&, std::optional<bool> touchpad);
void parseLine(std::string&);
void configSetValueSafe(const std::string&, const std::string&);
void handleDeviceConfig(const std::string&, const std::string&);