diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-08 08:28:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-08 08:28:34 +0200 |
| commit | 414e95994496b7026621c7e4f6d01b364b5252b7 (patch) | |
| tree | 23c211fb0873aaf6eb1be02a37c467f02e3bd40b /xorg-server/xkb | |
| parent | 4dc4001b1b78cc236548d9a01365ee4c04ee22a3 (diff) | |
| parent | adeb8256da9b636648178f729d7b3316a0a8e990 (diff) | |
| download | vcxsrv-414e95994496b7026621c7e4f6d01b364b5252b7.tar.gz vcxsrv-414e95994496b7026621c7e4f6d01b364b5252b7.tar.bz2 vcxsrv-414e95994496b7026621c7e4f6d01b364b5252b7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/libX11/AppC.xml
libX11/specs/libX11/AppD.xml
libX11/specs/libX11/CH02.xml
libX11/specs/libX11/CH03.xml
libX11/specs/libX11/CH04.xml
libX11/specs/libX11/CH05.xml
libX11/specs/libX11/CH06.xml
libX11/specs/libX11/CH07.xml
libX11/specs/libX11/CH08.xml
libX11/specs/libX11/CH09.xml
libX11/specs/libX11/CH11.xml
libX11/specs/libX11/CH13.xml
libX11/specs/libX11/CH14.xml
libX11/specs/libX11/CH15.xml
libX11/specs/libX11/CH16.xml
mesalib/src/mesa/main/fbobject.c
xorg-server/Xi/exevents.c
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/test/input.c
xorg-server/xkb/xkbfmisc.c
Diffstat (limited to 'xorg-server/xkb')
| -rw-r--r-- | xorg-server/xkb/xkbfmisc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/xkb/xkbfmisc.c b/xorg-server/xkb/xkbfmisc.c index 0d95b17ff..a2e4b50b9 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;
|