diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-06 10:36:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-06 10:36:17 +0200 |
| commit | 336e4aab196609a528213e9ecebcb30fce7aa654 (patch) | |
| tree | c8a72cf42c0bbe281dffdac04d60e758aeea345f /xorg-server/xkb/xkbfmisc.c | |
| parent | 097c0d8400d976c5c372db576a11764e87994c7f (diff) | |
| parent | 416761431e76dcb053fa3447b6d53051579dad0a (diff) | |
| download | vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.gz vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.bz2 vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/mach-startup/Makefile.am
xorg-server/test/xi2/protocol-common.c
xorg-server/xkb/xkbfmisc.c
Diffstat (limited to 'xorg-server/xkb/xkbfmisc.c')
| -rw-r--r-- | xorg-server/xkb/xkbfmisc.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/xorg-server/xkb/xkbfmisc.c b/xorg-server/xkb/xkbfmisc.c index 42b73012c..0d95b17ff 100644 --- a/xorg-server/xkb/xkbfmisc.c +++ b/xorg-server/xkb/xkbfmisc.c @@ -99,23 +99,34 @@ unsigned set,rtrn; }
break;
case 18: /* latin 8 */
- if ((ks==XK_Babovedot)||
- ((ks>=XK_Dabovedot)&&(ks<=XK_Wacute))||
- ((ks>=XK_Ygrave)&&(ks<=XK_Fabovedot))||
- (ks==XK_Mabovedot)||
- (ks==XK_Pabovedot)||
- (ks==XK_Sabovedot)||
- (ks==XK_Wdiaeresis)||
- ((ks>=XK_Wcircumflex)&&(ks<=XK_Ycircumflex))) {
+ if ((ks==XK_Wcircumflex)||
+ (ks==XK_Ycircumflex)||
+ (ks==XK_Babovedot)||
+ (ks==XK_Dabovedot)||
+ (ks==XK_Fabovedot)||
+ (ks==XK_Mabovedot)||
+ (ks==XK_Pabovedot)||
+ (ks==XK_Sabovedot)||
+ (ks==XK_Tabovedot)||
+ (ks==XK_Wgrave)||
+ (ks==XK_Wacute)||
+ (ks==XK_Wdiaeresis)||
+ (ks==XK_Ygrave)) {
rtrn|= _XkbKSUpper;
}
- if ((ks==XK_babovedot)||
- (ks==XK_dabovedot)||
- (ks==XK_fabovedot)||
- (ks==XK_mabovedot)||
- ((ks>=XK_wgrave)&&(ks<=XK_wacute))||
- (ks==XK_ygrave)||
- ((ks>=XK_wdiaeresis)&&(ks<=XK_ycircumflex))) {
+ if ((ks==XK_wcircumflex)||
+ (ks==XK_ycircumflex)||
+ (ks==XK_babovedot)||
+ (ks==XK_dabovedot)||
+ (ks==XK_fabovedot)||
+ (ks==XK_mabovedot)||
+ (ks==XK_pabovedot)||
+ (ks==XK_sabovedot)||
+ (ks==XK_tabovedot)||
+ (ks==XK_wgrave)||
+ (ks==XK_wacute)||
+ (ks==XK_wdiaeresis)||
+ (ks==XK_ygrave)) {
rtrn|= _XkbKSLower;
}
break;
|