xserver: Branch 'master' - 4 commits

[Keith Packard]

 xkb/xkbfmisc.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 02d11af01211da55e9d93fe0e1851a0c6fe57472
Merge: bf9fd0a... ab0df72...
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jun 7 12:31:15 2011 -0700

    Merge remote-tracking branch 'kibi/master'

commit ab0df72cd33f011cc48736cfbfce9bbe9c359a80
Author: Cyril Brulebois <kibi at debian.org>
Date:   Sun Jun 5 03:21:18 2011 +0200

    xkb: Fix case checks for Latin 4.
    
    That one was missing _XkbKSLower:
      XK_kra: U+0138 LATIN SMALL LETTER KRA
    
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index e042671..d8202b4 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -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;
commit 9eb6e34c2dd09af714400ce6a1063477d7a64776
Author: Cyril Brulebois <kibi at debian.org>
Date:   Sun Jun 5 03:12:44 2011 +0200

    xkb: Fix case checks for Latin 2.
    
    Those ones were getting _XkbKSLower for no reasons:
      XK_ogonek: U+02DB OGONEK
      XK_doubleacute: U+02DD DOUBLE ACUTE ACCENT
    
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index c36cc7b..e042671 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -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;
 	    }
commit 2b88189863579eb377bca617465bb76b05fbdebd
Author: Cyril Brulebois <kibi at debian.org>
Date:   Sun Jun 5 03:03:47 2011 +0200

    xkb: Fix case checks for Latin 1.
    
    That one was missing _XkbKSLower:
      XK_ssharp: U+00DF LATIN SMALL LETTER SHARP S
    
    That one was getting _XkbKSLower for no reasons:
      XK_division: U+00F7 DIVISION SIGN
    
    For reference, XK_multiply was already excluded from the _XkbKSUpper
    check, it's no big surprise XK_division has to be excluded from the
    _XkbKSLower check.
    
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 1ac9d82..c36cc7b 100644
--- a/xkb/xkbfmisc.c
+++ b/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;