diff options
| author | Robert Tari <robert@tari.in> | 2024-06-13 08:44:34 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2024-06-13 08:44:34 +0200 |
| commit | a630e4bb274f4cc384a2a19a1b819d1834d57306 (patch) | |
| tree | a63b776c3267b1965117a17d512f3c63bcbccfc0 /src/keyboard-x11.c | |
| parent | fa22c11a102b14524da4989433be67ce35137549 (diff) | |
| parent | b18f267fabb2836ee98a461d0b119e89bef92c87 (diff) | |
| download | ayatana-indicator-keyboard-a630e4bb274f4cc384a2a19a1b819d1834d57306.tar.gz ayatana-indicator-keyboard-a630e4bb274f4cc384a2a19a1b819d1834d57306.tar.bz2 ayatana-indicator-keyboard-a630e4bb274f4cc384a2a19a1b819d1834d57306.zip | |
Merge branch 'sunweaver-pr/support-more-characters-in-Xkb-parameters'
Attributes GH PR #69: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/69
Diffstat (limited to 'src/keyboard-x11.c')
| -rw-r--r-- | src/keyboard-x11.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c index aa52fbea..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 } @@ -716,17 +716,17 @@ static void keyboard_init(Keyboard *self) if (bDefaultLocation) { #if GLIB_CHECK_VERSION(2, 73, 0) - pRegex = g_regex_new (" *XKBVARIANT *= *\"*([a-zA-Z]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); + pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); #else - pRegex = g_regex_new (" *XKBVARIANT *= *\"*([a-zA-Z]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); + pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); #endif } else { #if GLIB_CHECK_VERSION(2, 73, 0) - pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([a-zA-Z]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); + pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError); #else - pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([a-zA-Z]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); + pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError); #endif } |