Skip to content

Commit 3662e0c

Browse files
committed
Do not fall back on XCURSOR_{THEME,SIZE) env vars
...if not set in environment file
1 parent c1c9655 commit 3662e0c

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

src/settings.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ extern "C" {
88
#include "xml.h"
99
}
1010

11-
#define DEFAULT_XCURSOR_SIZE 24
12-
int xcursor_size(void)
13-
{
14-
bool success = false;
15-
int size = QString(qgetenv("XCURSOR_SIZE")).toInt(&success);
16-
return success ? size : DEFAULT_XCURSOR_SIZE;
17-
}
18-
#undef DEFAULT_XCURSOR_SIZE
19-
2011
void initSettings(std::vector<std::shared_ptr<Setting>> &settings)
2112
{
2213
// Appearance
@@ -36,11 +27,10 @@ void initSettings(std::vector<std::shared_ptr<Setting>> &settings)
3627

3728
// Mouse & Touchpad
3829
settings.push_back(std::make_shared<Setting>("XCURSOR_THEME", LAB_FILE_TYPE_ENVIRONMENT,
39-
LAB_VALUE_TYPE_STRING,
40-
getenv("XCURSOR_THEME") ?: (char *)"Adwaita"));
30+
LAB_VALUE_TYPE_STRING, ""));
4131

4232
settings.push_back(std::make_shared<Setting>("XCURSOR_SIZE", LAB_FILE_TYPE_ENVIRONMENT,
43-
LAB_VALUE_TYPE_INT, xcursor_size()));
33+
LAB_VALUE_TYPE_INT, 24));
4434

4535
settings.push_back(std::make_shared<Setting>("/labwc_config/libinput/device/naturalScroll",
4636
LAB_FILE_TYPE_RCXML, LAB_VALUE_TYPE_BOOL, 0));

0 commit comments

Comments
 (0)