Merge 15f9e1bea7 into acb92944d4

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-09-03 20:41:49 +00:00 · 2025-08-19 21:22:03 +02: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
@ -1722,11 +1722,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	52b789c994	Merge `15f9e1bea7` into `acb92944d4`	2025-08-19 21:22:03 +02: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