Merge 15f9e1bea7 into 506c11ba43

Check whether locales are the empty string and ignore them if they are.
This fixes a confusing error in compiling the xkb compose table if LC_ALL, LC_CTYPE, or LANG are set to the empty string.
2025-07-15 12:10:06 +00:00 · 2025-07-05 20:19:00 +03:00 · 2025-06-20 22:05:11 +02:00
1 changed files with 3 additions and 3 deletions
--- a/src/wl_window.c
+++ b/src/wl_window.c
@ -1686,11 +1686,11 @@ static void keyboardHandleKeymap(void* userData,
    // Look up the preferred locale, falling back to "C" as default.
    locale = getenv("LC_ALL");
-    if (!locale)
+    if (!locale || strlen(locale) == 0)
        locale = getenv("LC_CTYPE");
-    if (!locale)
+    if (!locale || strlen(locale) == 0)
        locale = getenv("LANG");
-    if (!locale)
+    if (!locale || strlen(locale) == 0)
        locale = "C";
    composeTable =
Author	SHA1	Message	Date
Yukari Hafner	8cc6647fc3	Merge `15f9e1bea7` into `506c11ba43`	2025-07-05 20:19:00 +03:00
Yukari Hafner	15f9e1bea7	Check whether locales are the empty string and ignore them if they are. This fixes a confusing error in compiling the xkb compose table if LC_ALL, LC_CTYPE, or LANG are set to the empty string.	2025-06-20 22:05:11 +02:00