aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/xkbfmisc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-08 08:21:55 +0200
committermarha <marha@users.sourceforge.net>2011-06-08 08:21:55 +0200
commitadeb8256da9b636648178f729d7b3316a0a8e990 (patch)
treee257c9261b81b08242658404c16fcd6749fcd7d5 /xorg-server/xkb/xkbfmisc.c
parent09a5e4f06e54a817ecbb04b3e2bdc28f27fa3e61 (diff)
downloadvcxsrv-adeb8256da9b636648178f729d7b3316a0a8e990.tar.gz
vcxsrv-adeb8256da9b636648178f729d7b3316a0a8e990.tar.bz2
vcxsrv-adeb8256da9b636648178f729d7b3316a0a8e990.zip
xserver libX11 mesa git update 8 Jun 2011
Diffstat (limited to 'xorg-server/xkb/xkbfmisc.c')
-rw-r--r--xorg-server/xkb/xkbfmisc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/xkb/xkbfmisc.c b/xorg-server/xkb/xkbfmisc.c
index 1ac9d8262..d8202b496 100644
--- a/xorg-server/xkb/xkbfmisc.c
+++ b/xorg-server/xkb/xkbfmisc.c
@@ -62,7 +62,7 @@ unsigned set,rtrn;
rtrn|= _XkbKSUpper;
}
if (((ks>=XK_a)&&(ks<=XK_z))||
- ((ks>=XK_agrave)&&(ks<=XK_ydiaeresis))) {
+ ((ks>=XK_ssharp)&&(ks<=XK_ydiaeresis)&&(ks!=XK_division))) {
rtrn|= _XkbKSLower;
}
break;
@@ -71,7 +71,7 @@ unsigned set,rtrn;
((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) {
rtrn|= _XkbKSUpper;
}
- if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_caron))||
+ if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_ogonek)&&(ks!=XK_caron)&&(ks!=XK_doubleacute))||
((ks>=XK_racute)&&(ks<=XK_tcedilla))) {
rtrn|= _XkbKSLower;
}
@@ -92,7 +92,8 @@ unsigned set,rtrn;
((ks>=XK_Amacron)&&(ks<=XK_Umacron))) {
rtrn|= _XkbKSUpper;
}
- if (((ks>=XK_rcedilla)&&(ks<=XK_tslash))||
+ if ((ks==XK_kra)||
+ ((ks>=XK_rcedilla)&&(ks<=XK_tslash))||
(ks==XK_eng)||
((ks>=XK_amacron)&&(ks<=XK_umacron))) {
rtrn|= _XkbKSLower;