core-modules: linux: fix ram/swap query + use MAGIC_LINE for themes

Toni500github · Toni500github · commit 9d5fbaa3ee14 · 2025-07-22T14:07:49.000+02:00
diff --git a/include/config.hpp b/include/config.hpp
@@ -195,7 +195,7 @@ layout = [
 #if !CF_ANDROID
                                                R"#(
     "${auto}Theme: $<theme.gtk.all.name>",
-    "${auto}Icons: $<theme.gtk.all.icons>",
+    "${auto}Icons: $<theme.gtk.all.icon>",
     "${auto}Font: $<theme.gtk.all.font>",
     "${auto}Cursor: $<theme.cursor>",
     "${auto}WM: $<user.wm.name>",
diff --git a/src/core-modules/linux/ram.cc b/src/core-modules/linux/ram.cc
@@ -39,7 +39,7 @@ static double read_value(const std::string_view key)
 
     free(line);
     rewind(meminfo);
-    return std::stod(result);
+    return std::stod(result) * 1024.0f;
 }
 
 double ram_free()
diff --git a/src/core-modules/linux/theme.cc b/src/core-modules/linux/theme.cc
@@ -54,7 +54,7 @@ static std::string get_xsettings_xfce4(const std::string_view property, const st
         const std::string& path = configDir + "/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml";
         std::ifstream      f(path, std::ios::in);
         if (!f.is_open())
-            return UNKNOWN;
+            return MAGIC_LINE;
 
         buffer.assign(std::istreambuf_iterator<char>{ f }, std::istreambuf_iterator<char>());
         buffer.push_back('\0');
@@ -75,7 +75,7 @@ static std::string get_xsettings_xfce4(const std::string_view property, const st
             return node2->first_attribute("value")->value();
     }
 
-    return UNKNOWN;
+    return MAGIC_LINE;
 }
 
 static std::string get_auto_gtk_format(const std::string_view gtk2, const std::string_view gtk3,
@@ -125,7 +125,7 @@ static std::string get_auto_gtk_format(const std::string_view gtk2, const std::s
 //
 static CursorInfo get_cursor_xresources()
 {
-    std::string        cursor_name{ UNKNOWN }, cursor_size{ UNKNOWN };
+    std::string        cursor_name{ MAGIC_LINE }, cursor_size{ MAGIC_LINE };
     const std::string& path = expandVar("~/.Xresources");
     std::ifstream      f(path, std::ios::in);
     if (!f.is_open())
@@ -153,11 +153,11 @@ static CursorInfo get_cursor_xresources()
 
 static CursorInfo get_cursor_dconf()
 {
-    std::string cursor{ UNKNOWN }, cursor_size{ UNKNOWN };
+    std::string cursor{ MAGIC_LINE }, cursor_size{ MAGIC_LINE };
 #if USE_DCONF
     void* handle = LOAD_LIBRARY("libdconf.so");
     if (!handle)
-        return { UNKNOWN, UNKNOWN };
+        return { MAGIC_LINE, MAGIC_LINE };
 
     LOAD_LIB_SYMBOL(handle, DConfClient*, dconf_client_new, void);
     LOAD_LIB_SYMBOL(handle, GVariant*, dconf_client_read, DConfClient*, const char*);
@@ -182,7 +182,7 @@ static CursorInfo get_cursor_dconf()
 static CursorInfo get_cursor_gsettings()
 {
     const CursorInfo& dconf = get_cursor_dconf();
-    if (dconf != CursorInfo{ UNKNOWN, UNKNOWN })
+    if (dconf != CursorInfo{ MAGIC_LINE, MAGIC_LINE })
         return dconf;
 
     std::string cursor;
@@ -194,15 +194,15 @@ static CursorInfo get_cursor_gsettings()
     cursor_size.erase(std::remove(cursor_size.begin(), cursor_size.end(), '\''), cursor_size.end());
 
     if (cursor.empty())
-        cursor = UNKNOWN;
+        cursor = MAGIC_LINE;
     if (cursor_size.empty())
-        cursor_size = UNKNOWN;
+        cursor_size = MAGIC_LINE;
     return { cursor, cursor_size };
 }
 
 static CursorInfo get_gtk_cursor_config(const std::string_view path)
 {
-    std::string   cursor{ UNKNOWN }, cursor_size{ UNKNOWN };
+    std::string   cursor{ MAGIC_LINE }, cursor_size{ MAGIC_LINE };
     std::ifstream f(path.data(), std::ios::in);
     if (!f.is_open())
         return { cursor, cursor_size };
@@ -233,10 +233,10 @@ static CursorInfo get_cursor_from_gtk_configs(const std::uint8_t ver)
     for (const std::string& path : paths)
     {
         const CursorInfo& result = get_gtk_cursor_config(path);
-        if (result != CursorInfo{ UNKNOWN, UNKNOWN })
+        if (result != CursorInfo{ MAGIC_LINE, MAGIC_LINE })
             return result;
     }
-    return { UNKNOWN, UNKNOWN };
+    return { MAGIC_LINE, MAGIC_LINE };
 }
 
 static CursorInfo get_de_cursor(const std::string_view de_name)
@@ -250,7 +250,7 @@ static CursorInfo get_de_cursor(const std::string_view de_name)
             return { get_xsettings_xfce4("Gtk", "CursorThemeName"), get_xsettings_xfce4("Gtk", "CursorThemeSize") };
         }
     }
-    return { UNKNOWN, UNKNOWN };
+    return { MAGIC_LINE, MAGIC_LINE };
 }
 
 //
@@ -259,7 +259,7 @@ static CursorInfo get_de_cursor(const std::string_view de_name)
 //
 static ThemeInfo get_gtk_theme_config(const std::string_view path)
 {
-    std::string   theme{ UNKNOWN }, icon_theme{ UNKNOWN }, font{ UNKNOWN };
+    std::string   theme{ MAGIC_LINE }, icon_theme{ MAGIC_LINE }, font{ MAGIC_LINE };
     std::ifstream f(path.data(), std::ios::in);
     if (!f.is_open())
         return { theme, icon_theme, font };
@@ -283,7 +283,7 @@ static ThemeInfo get_gtk_theme_config(const std::string_view path)
 
 static ThemeInfo get_gtk_theme_dconf()
 {
-    std::string theme{ UNKNOWN }, icon_theme{ UNKNOWN }, font{ UNKNOWN };
+    std::string theme{ MAGIC_LINE }, icon_theme{ MAGIC_LINE }, font{ MAGIC_LINE };
 #if USE_DCONF
     void* handle = LOAD_LIBRARY("libdconf.so");
     if (!handle)
@@ -316,7 +316,7 @@ static ThemeInfo get_gtk_theme_dconf()
 static ThemeInfo get_gtk_theme_gsettings()
 {
     const ThemeInfo& dconf = get_gtk_theme_dconf();
-    if (dconf != ThemeInfo{ UNKNOWN, UNKNOWN, UNKNOWN })
+    if (dconf != ThemeInfo{ MAGIC_LINE, MAGIC_LINE, MAGIC_LINE })
         return dconf;
 
     std::string theme, icon_theme, font;
@@ -331,11 +331,11 @@ static ThemeInfo get_gtk_theme_gsettings()
     font.erase(std::remove(font.begin(), font.end(), '\''), font.end());
 
     if (theme.empty())
-        theme = UNKNOWN;
+        theme = MAGIC_LINE;
     if (icon_theme.empty())
-        icon_theme = UNKNOWN;
+        icon_theme = MAGIC_LINE;
     if (font.empty())
-        font = UNKNOWN;
+        font = MAGIC_LINE;
     return { theme, icon_theme, font };
 }
 
@@ -351,7 +351,7 @@ static ThemeInfo get_gtk_theme_from_configs(const std::uint8_t ver)
     for (const auto& path : paths)
     {
         const ThemeInfo& result = get_gtk_theme_config(path);
-        if (result != ThemeInfo{ UNKNOWN, UNKNOWN, UNKNOWN })
+        if (result != ThemeInfo{ MAGIC_LINE, MAGIC_LINE, MAGIC_LINE })
             return result;
     }
     return get_gtk_theme_gsettings();
@@ -386,7 +386,7 @@ MODFUNC(theme_gtk_name)
 
     const ThemeInfo& result = is_tty ? get_gtk_theme_from_configs(ver) : get_de_gtk_theme(wmde_name, ver);
 
-    return result[THEME_NAME] == UNKNOWN ? MAGIC_LINE : result[THEME_NAME];
+    return result[THEME_NAME];
 }
 
 MODFUNC(theme_gtk_icon)
@@ -400,7 +400,7 @@ MODFUNC(theme_gtk_icon)
 
     const ThemeInfo& result = is_tty ? get_gtk_theme_from_configs(ver) : get_de_gtk_theme(wmde_name, ver);
 
-    return result[THEME_ICON] == UNKNOWN ? MAGIC_LINE : result[THEME_ICON];
+    return result[THEME_ICON];
 }
 
 MODFUNC(theme_gtk_font)
@@ -414,7 +414,7 @@ MODFUNC(theme_gtk_font)
 
     const ThemeInfo& result = is_tty ? get_gtk_theme_from_configs(ver) : get_de_gtk_theme(wmde_name, ver);
 
-    return result[THEME_FONT] == UNKNOWN ? MAGIC_LINE : result[THEME_FONT];
+    return result[THEME_FONT];
 }
 
 MODFUNC(theme_gtk_all_name)
@@ -447,31 +447,31 @@ MODFUNC(theme_gtk_all_font)
 MODFUNC(theme_gsettings_name)
 {
     const ThemeInfo& result = get_gtk_theme_gsettings();
-    return result[THEME_NAME] == UNKNOWN ? MAGIC_LINE : result[THEME_NAME];
+    return result[THEME_NAME];
 }
 
 MODFUNC(theme_gsettings_icon)
 {
     const ThemeInfo& result = get_gtk_theme_gsettings();
-    return result[THEME_ICON] == UNKNOWN ? MAGIC_LINE : result[THEME_ICON];
+    return result[THEME_ICON];
 }
 
 MODFUNC(theme_gsettings_font)
 {
     const ThemeInfo& result = get_gtk_theme_gsettings();
-    return result[THEME_FONT] == UNKNOWN ? MAGIC_LINE : result[THEME_FONT];
+    return result[THEME_FONT];
 }
 
 MODFUNC(theme_gsettings_cursor_name)
 {
     const CursorInfo& result = get_cursor_gsettings();
-    return result[CURSOR_NAME] == UNKNOWN ? MAGIC_LINE : result[CURSOR_NAME];
+    return result[CURSOR_NAME];
 }
 
 MODFUNC(theme_gsettings_cursor_size)
 {
     const CursorInfo& result = get_cursor_gsettings();
-    return result[CURSOR_SIZE] == UNKNOWN ? MAGIC_LINE : result[CURSOR_SIZE];
+    return result[CURSOR_SIZE];
 }
 
 const std::array<std::function<CursorInfo()>, 6> funcs{
@@ -490,11 +490,11 @@ MODFUNC(theme_cursor_name)
     for (const auto& method : funcs)
     {
         result = method();
-        if (result != CursorInfo{ UNKNOWN, UNKNOWN })
+        if (result != CursorInfo{ MAGIC_LINE, MAGIC_LINE })
             break;
     }
 
-    if (result[CURSOR_NAME] == UNKNOWN)
+    if (result[CURSOR_NAME] == MAGIC_LINE)
         return MAGIC_LINE;
 
     std::string& cursor_name = result[CURSOR_NAME];
@@ -514,11 +514,11 @@ MODFUNC(theme_cursor_size)
     for (const auto& method : funcs)
     {
         result = method();
-        if (result != CursorInfo{ UNKNOWN, UNKNOWN })
+        if (result != CursorInfo{ MAGIC_LINE, MAGIC_LINE })
             break;
     }
 
-    if (result[CURSOR_SIZE] == UNKNOWN)
+    if (result[CURSOR_SIZE] == MAGIC_LINE)
         return MAGIC_LINE;
 
     std::string& cursor_size = result[CURSOR_SIZE];

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ static double read_value(const std::string_view key)`
`39`	`39`
`40`	`40`	`free(line);`
`41`	`41`	`rewind(meminfo);`
`42`		`- return std::stod(result);`
	`42`	`+ return std::stod(result) * 1024.0f;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`double ram_free()`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static std::string get_xsettings_xfce4(const std::string_view property, const st`
`54`	`54`	`const std::string& path = configDir + "/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml";`
`55`	`55`	`std::ifstream f(path, std::ios::in);`
`56`	`56`	`if (!f.is_open())`
`57`		`- return UNKNOWN;`
	`57`	`+ return MAGIC_LINE;`
`58`	`58`
`59`	`59`	`buffer.assign(std::istreambuf_iterator<char>{ f }, std::istreambuf_iterator<char>());`
`60`	`60`	`buffer.push_back('\0');`
`@@ -75,7 +75,7 @@ static std::string get_xsettings_xfce4(const std::string_view property, const st`
`75`	`75`	`return node2->first_attribute("value")->value();`
`76`	`76`	`}`
`77`	`77`
`78`		`- return UNKNOWN;`
	`78`	`+ return MAGIC_LINE;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`static std::string get_auto_gtk_format(const std::string_view gtk2, const std::string_view gtk3,`
`@@ -125,7 +125,7 @@ static std::string get_auto_gtk_format(const std::string_view gtk2, const std::s`
`125`	`125`	`//`
`126`	`126`	`static CursorInfo get_cursor_xresources()`
`127`	`127`	`{`
`128`		`- std::string cursor_name{ UNKNOWN }, cursor_size{ UNKNOWN };`
	`128`	`+ std::string cursor_name{ MAGIC_LINE }, cursor_size{ MAGIC_LINE };`
`129`	`129`	`const std::string& path = expandVar("~/.Xresources");`
`130`	`130`	`std::ifstream f(path, std::ios::in);`
`131`	`131`	`if (!f.is_open())`
`@@ -153,11 +153,11 @@ static CursorInfo get_cursor_xresources()`
`153`	`153`
`154`	`154`	`static CursorInfo get_cursor_dconf()`
`155`	`155`	`{`
`156`		`- std::string cursor{ UNKNOWN }, cursor_size{ UNKNOWN };`
	`156`	`+ std::string cursor{ MAGIC_LINE }, cursor_size{ MAGIC_LINE };`
`157`	`157`	`#if USE_DCONF`
`158`	`158`	`void* handle = LOAD_LIBRARY("libdconf.so");`
`159`	`159`	`if (!handle)`
`160`		`- return { UNKNOWN, UNKNOWN };`
	`160`	`+ return { MAGIC_LINE, MAGIC_LINE };`
`161`	`161`
`162`	`162`	`LOAD_LIB_SYMBOL(handle, DConfClient*, dconf_client_new, void);`
`163`	`163`	`LOAD_LIB_SYMBOL(handle, GVariant, dconf_client_read, DConfClient, const char*);`
`@@ -182,7 +182,7 @@ static CursorInfo get_cursor_dconf()`
`182`	`182`	`static CursorInfo get_cursor_gsettings()`
`183`	`183`	`{`
`184`	`184`	`const CursorInfo& dconf = get_cursor_dconf();`
`185`		`- if (dconf != CursorInfo{ UNKNOWN, UNKNOWN })`
	`185`	`+ if (dconf != CursorInfo{ MAGIC_LINE, MAGIC_LINE })`
`186`	`186`	`return dconf;`
`187`	`187`
`188`	`188`	`std::string cursor;`
`@@ -194,15 +194,15 @@ static CursorInfo get_cursor_gsettings()`
`194`	`194`	`cursor_size.erase(std::remove(cursor_size.begin(), cursor_size.end(), '\''), cursor_size.end());`
`195`	`195`
`196`	`196`	`if (cursor.empty())`
`197`		`- cursor = UNKNOWN;`
	`197`	`+ cursor = MAGIC_LINE;`
`198`	`198`	`if (cursor_size.empty())`
`199`		`- cursor_size = UNKNOWN;`
	`199`	`+ cursor_size = MAGIC_LINE;`
`200`	`200`	`return { cursor, cursor_size };`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`static CursorInfo get_gtk_cursor_config(const std::string_view path)`
`204`	`204`	`{`
`205`		`- std::string cursor{ UNKNOWN }, cursor_size{ UNKNOWN };`
	`205`	`+ std::string cursor{ MAGIC_LINE }, cursor_size{ MAGIC_LINE };`
`206`	`206`	`std::ifstream f(path.data(), std::ios::in);`
`207`	`207`	`if (!f.is_open())`
`208`	`208`	`return { cursor, cursor_size };`
`@@ -233,10 +233,10 @@ static CursorInfo get_cursor_from_gtk_configs(const std::uint8_t ver)`
`233`	`233`	`for (const std::string& path : paths)`
`234`	`234`	`{`
`235`	`235`	`const CursorInfo& result = get_gtk_cursor_config(path);`
`236`		`- if (result != CursorInfo{ UNKNOWN, UNKNOWN })`
	`236`	`+ if (result != CursorInfo{ MAGIC_LINE, MAGIC_LINE })`
`237`	`237`	`return result;`
`238`	`238`	`}`
`239`		`- return { UNKNOWN, UNKNOWN };`
	`239`	`+ return { MAGIC_LINE, MAGIC_LINE };`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`static CursorInfo get_de_cursor(const std::string_view de_name)`
`@@ -250,7 +250,7 @@ static CursorInfo get_de_cursor(const std::string_view de_name)`
`250`	`250`	`return { get_xsettings_xfce4("Gtk", "CursorThemeName"), get_xsettings_xfce4("Gtk", "CursorThemeSize") };`
`251`	`251`	`}`
`252`	`252`	`}`
`253`		`- return { UNKNOWN, UNKNOWN };`
	`253`	`+ return { MAGIC_LINE, MAGIC_LINE };`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`//`
`@@ -259,7 +259,7 @@ static CursorInfo get_de_cursor(const std::string_view de_name)`
`259`	`259`	`//`
`260`	`260`	`static ThemeInfo get_gtk_theme_config(const std::string_view path)`
`261`	`261`	`{`
`262`		`- std::string theme{ UNKNOWN }, icon_theme{ UNKNOWN }, font{ UNKNOWN };`
	`262`	`+ std::string theme{ MAGIC_LINE }, icon_theme{ MAGIC_LINE }, font{ MAGIC_LINE };`
`263`	`263`	`std::ifstream f(path.data(), std::ios::in);`
`264`	`264`	`if (!f.is_open())`
`265`	`265`	`return { theme, icon_theme, font };`
`@@ -283,7 +283,7 @@ static ThemeInfo get_gtk_theme_config(const std::string_view path)`
`283`	`283`
`284`	`284`	`static ThemeInfo get_gtk_theme_dconf()`
`285`	`285`	`{`
`286`		`- std::string theme{ UNKNOWN }, icon_theme{ UNKNOWN }, font{ UNKNOWN };`
	`286`	`+ std::string theme{ MAGIC_LINE }, icon_theme{ MAGIC_LINE }, font{ MAGIC_LINE };`
`287`	`287`	`#if USE_DCONF`
`288`	`288`	`void* handle = LOAD_LIBRARY("libdconf.so");`
`289`	`289`	`if (!handle)`
`@@ -316,7 +316,7 @@ static ThemeInfo get_gtk_theme_dconf()`
`316`	`316`	`static ThemeInfo get_gtk_theme_gsettings()`
`317`	`317`	`{`
`318`	`318`	`const ThemeInfo& dconf = get_gtk_theme_dconf();`
`319`		`- if (dconf != ThemeInfo{ UNKNOWN, UNKNOWN, UNKNOWN })`
	`319`	`+ if (dconf != ThemeInfo{ MAGIC_LINE, MAGIC_LINE, MAGIC_LINE })`
`320`	`320`	`return dconf;`
`321`	`321`
`322`	`322`	`std::string theme, icon_theme, font;`
`@@ -331,11 +331,11 @@ static ThemeInfo get_gtk_theme_gsettings()`
`331`	`331`	`font.erase(std::remove(font.begin(), font.end(), '\''), font.end());`
`332`	`332`
`333`	`333`	`if (theme.empty())`
`334`		`- theme = UNKNOWN;`
	`334`	`+ theme = MAGIC_LINE;`
`335`	`335`	`if (icon_theme.empty())`
`336`		`- icon_theme = UNKNOWN;`
	`336`	`+ icon_theme = MAGIC_LINE;`
`337`	`337`	`if (font.empty())`
`338`		`- font = UNKNOWN;`
	`338`	`+ font = MAGIC_LINE;`
`339`	`339`	`return { theme, icon_theme, font };`
`340`	`340`	`}`
`341`	`341`
`@@ -351,7 +351,7 @@ static ThemeInfo get_gtk_theme_from_configs(const std::uint8_t ver)`
`351`	`351`	`for (const auto& path : paths)`
`352`	`352`	`{`
`353`	`353`	`const ThemeInfo& result = get_gtk_theme_config(path);`
`354`		`- if (result != ThemeInfo{ UNKNOWN, UNKNOWN, UNKNOWN })`
	`354`	`+ if (result != ThemeInfo{ MAGIC_LINE, MAGIC_LINE, MAGIC_LINE })`
`355`	`355`	`return result;`
`356`	`356`	`}`
`357`	`357`	`return get_gtk_theme_gsettings();`
`@@ -386,7 +386,7 @@ MODFUNC(theme_gtk_name)`
`386`	`386`
`387`	`387`	`const ThemeInfo& result = is_tty ? get_gtk_theme_from_configs(ver) : get_de_gtk_theme(wmde_name, ver);`
`388`	`388`
`389`		`- return result[THEME_NAME] == UNKNOWN ? MAGIC_LINE : result[THEME_NAME];`
	`389`	`+ return result[THEME_NAME];`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`MODFUNC(theme_gtk_icon)`
`@@ -400,7 +400,7 @@ MODFUNC(theme_gtk_icon)`
`400`	`400`
`401`	`401`	`const ThemeInfo& result = is_tty ? get_gtk_theme_from_configs(ver) : get_de_gtk_theme(wmde_name, ver);`
`402`	`402`
`403`		`- return result[THEME_ICON] == UNKNOWN ? MAGIC_LINE : result[THEME_ICON];`
	`403`	`+ return result[THEME_ICON];`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`MODFUNC(theme_gtk_font)`
`@@ -414,7 +414,7 @@ MODFUNC(theme_gtk_font)`
`414`	`414`
`415`	`415`	`const ThemeInfo& result = is_tty ? get_gtk_theme_from_configs(ver) : get_de_gtk_theme(wmde_name, ver);`
`416`	`416`
`417`		`- return result[THEME_FONT] == UNKNOWN ? MAGIC_LINE : result[THEME_FONT];`
	`417`	`+ return result[THEME_FONT];`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`MODFUNC(theme_gtk_all_name)`
`@@ -447,31 +447,31 @@ MODFUNC(theme_gtk_all_font)`
`447`	`447`	`MODFUNC(theme_gsettings_name)`
`448`	`448`	`{`
`449`	`449`	`const ThemeInfo& result = get_gtk_theme_gsettings();`
`450`		`- return result[THEME_NAME] == UNKNOWN ? MAGIC_LINE : result[THEME_NAME];`
	`450`	`+ return result[THEME_NAME];`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`MODFUNC(theme_gsettings_icon)`
`454`	`454`	`{`
`455`	`455`	`const ThemeInfo& result = get_gtk_theme_gsettings();`
`456`		`- return result[THEME_ICON] == UNKNOWN ? MAGIC_LINE : result[THEME_ICON];`
	`456`	`+ return result[THEME_ICON];`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`MODFUNC(theme_gsettings_font)`
`460`	`460`	`{`
`461`	`461`	`const ThemeInfo& result = get_gtk_theme_gsettings();`
`462`		`- return result[THEME_FONT] == UNKNOWN ? MAGIC_LINE : result[THEME_FONT];`
	`462`	`+ return result[THEME_FONT];`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`MODFUNC(theme_gsettings_cursor_name)`
`466`	`466`	`{`
`467`	`467`	`const CursorInfo& result = get_cursor_gsettings();`
`468`		`- return result[CURSOR_NAME] == UNKNOWN ? MAGIC_LINE : result[CURSOR_NAME];`
	`468`	`+ return result[CURSOR_NAME];`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`MODFUNC(theme_gsettings_cursor_size)`
`472`	`472`	`{`
`473`	`473`	`const CursorInfo& result = get_cursor_gsettings();`
`474`		`- return result[CURSOR_SIZE] == UNKNOWN ? MAGIC_LINE : result[CURSOR_SIZE];`
	`474`	`+ return result[CURSOR_SIZE];`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`const std::array<std::function<CursorInfo()>, 6> funcs{`
`@@ -490,11 +490,11 @@ MODFUNC(theme_cursor_name)`
`490`	`490`	`for (const auto& method : funcs)`
`491`	`491`	`{`
`492`	`492`	`result = method();`
`493`		`- if (result != CursorInfo{ UNKNOWN, UNKNOWN })`
	`493`	`+ if (result != CursorInfo{ MAGIC_LINE, MAGIC_LINE })`
`494`	`494`	`break;`
`495`	`495`	`}`
`496`	`496`
`497`		`- if (result[CURSOR_NAME] == UNKNOWN)`
	`497`	`+ if (result[CURSOR_NAME] == MAGIC_LINE)`
`498`	`498`	`return MAGIC_LINE;`
`499`	`499`
`500`	`500`	`std::string& cursor_name = result[CURSOR_NAME];`
`@@ -514,11 +514,11 @@ MODFUNC(theme_cursor_size)`
`514`	`514`	`for (const auto& method : funcs)`
`515`	`515`	`{`
`516`	`516`	`result = method();`
`517`		`- if (result != CursorInfo{ UNKNOWN, UNKNOWN })`
	`517`	`+ if (result != CursorInfo{ MAGIC_LINE, MAGIC_LINE })`
`518`	`518`	`break;`
`519`	`519`	`}`
`520`	`520`
`521`		`- if (result[CURSOR_SIZE] == UNKNOWN)`
	`521`	`+ if (result[CURSOR_SIZE] == MAGIC_LINE)`
`522`	`522`	`return MAGIC_LINE;`
`523`	`523`
`524`	`524`	`std::string& cursor_size = result[CURSOR_SIZE];`