diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-06 10:30:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-06 10:30:26 +0200 |
| commit | 416761431e76dcb053fa3447b6d53051579dad0a (patch) | |
| tree | 9c047860baa879a81b4c80036ec6ad815597a996 /xorg-server/xkb | |
| parent | 0e1ac54142d49051da9a74f37a792225a4e8d7b0 (diff) | |
| download | vcxsrv-416761431e76dcb053fa3447b6d53051579dad0a.tar.gz vcxsrv-416761431e76dcb053fa3447b6d53051579dad0a.tar.bz2 vcxsrv-416761431e76dcb053fa3447b6d53051579dad0a.zip | |
mesa xserver xkb git update 6 Jun 2011
Diffstat (limited to 'xorg-server/xkb')
| -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 dea347335..1ac9d8262 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; |