diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-05-28 10:35:17 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-05-28 12:37:27 +0200 |
| commit | b18f267fabb2836ee98a461d0b119e89bef92c87 (patch) | |
| tree | a63b776c3267b1965117a17d512f3c63bcbccfc0 | |
| parent | 5bb69d7643374e85b3171d7ad88278aa5a1f1dd8 (diff) | |
| download | ayatana-indicator-keyboard-b18f267fabb2836ee98a461d0b119e89bef92c87.tar.gz ayatana-indicator-keyboard-b18f267fabb2836ee98a461d0b119e89bef92c87.tar.bz2 ayatana-indicator-keyboard-b18f267fabb2836ee98a461d0b119e89bef92c87.zip | |
src/keyboard-x11.c: Add ',' and '0-9' as allowed characters to regexp for XkbLayout.pr/support-more-characters-in-Xkb-parameters
| -rw-r--r-- | src/keyboard-x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c index 0c7ca55b..d0a445e8 100644 --- a/src/keyboard-x11.c +++ b/src/keyboard-x11.c @@ -671,17 +671,17 @@ static void keyboard_init(Keyboard *self) if (bDefaultLocation) { #if GLIB_CHECK_VERSION(2, 73, 0) - pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([a-zA-Z]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); + pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); #else - pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([a-zA-Z]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); + pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); #endif } else { #if GLIB_CHECK_VERSION(2, 73, 0) - pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([a-zA-Z]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); + pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); #else - pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([a-zA-Z]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); + pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); #endif } |