xserver: Branch 'xwayland-23.1'

[GitLab Mirror]

 xkb/xkbUtils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 77d77c8b4438973b37775e665ff694d7f11c15ad
Author: Benno Schulenberg <bensberg at telfort.nl>
Date:   Mon Mar 27 20:03:56 2023 +0200

    xkbUtils: use existing symbol names instead of deleted deprecated ones
    
    Symbols `XK_Cyrillic_DZHE` and `XK_Serbian_DZE` were pure synonyms.
    
    (cherry picked from commit 6153c71cfb4698f1a416266564ecc748e4a25f2c)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 3f5791a18..df2a584bd 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -901,9 +901,9 @@ XkbConvertCase(register KeySym sym, KeySym * lower, KeySym * upper)
         break;
     case 6:                    /* Cyrillic */
         /* Assume the KeySym is a legal value (ignore discontinuities) */
-        if (sym >= XK_Serbian_DJE && sym <= XK_Serbian_DZE)
+        if (sym >= XK_Serbian_DJE && sym <= XK_Cyrillic_DZHE)
             *lower -= (XK_Serbian_DJE - XK_Serbian_dje);
-        else if (sym >= XK_Serbian_dje && sym <= XK_Serbian_dze)
+        else if (sym >= XK_Serbian_dje && sym <= XK_Cyrillic_dzhe)
             *upper += (XK_Serbian_DJE - XK_Serbian_dje);
         else if (sym >= XK_Cyrillic_YU && sym <= XK_Cyrillic_HARDSIGN)
             *lower -= (XK_Cyrillic_YU - XK_Cyrillic_yu);