Attachment 19077 Details for Bug 14373 – 0001-xkb-fix-core-keyboard-map-generation.-14373.patch

[patch] 0001-xkb-fix-core-keyboard-map-generation.-14373.patch

0001-xkb-fix-core-keyboard-map-generation.-14373.patch (text/plain), 2.56 KB, created by Peter Hutterer on 2008-09-21 20:34:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2008-09-21 20:34:31 UTC

Size: 2.56 KB

patch

obsolete

>From d9f2792dd4a6bc078bb58e22c55ee20c56aabe49 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@redhat.com>
>Date: Fri, 19 Sep 2008 18:27:24 +0930
>Subject: [PATCH] xkb: fix core keyboard map generation. #14373
>
>According to Section 12.4 of the XKB Protocol Spec, if a key only has a single
>group but the keyboard has multiple groups defined, the core description of
>the key is a duplication of the single group across all symbols. i.e.
>G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4
>
>The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to
>"invented" groups when the process is reversed.
>
>Note that this creates wrong key types on reconstruction from core to xkb,
>i.e. any single-group key with a key type that is not one of the canonical
>four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type
>for the other gruops.
>
>X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
>---
> xkb/xkbUtils.c |   39 ++++++++++++++++++++++++++++++++++-----
> 1 files changed, 34 insertions(+), 5 deletions(-)
>
>diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
>index 486446a..7e9f8d0 100644
>--- a/xkb/xkbUtils.c
>+++ b/xkb/xkbUtils.c
>@@ -504,6 +504,40 @@ CARD8			keysPerMod[XkbNumModifiers];
> 		if (groupWidth>2)
> 		    nOut= groupWidth;
> 	    }
>+
>+	    /* See XKB Protocol Sec, Section 12.4.
>+	       A 1-group key with ABCDE on a 2 group keyboard must be
>+	       duplicated across all groups as ABABCDECDE.
>+	     */
>+	    if (nGroups == 1)
>+	    {
>+		int idx;
>+
>+		groupWidth = XkbKeyGroupWidth(xkb, key, XkbGroup1Index);
>+
>+		/* AB..CDE... -> ABABCDE... */
>+		if (groupWidth > 0 && maxSymsPerKey >= 3)
>+		    pCore[2] = pCore[0];
>+		if (groupWidth > 1 && maxSymsPerKey >= 4)
>+		    pCore[3] = pCore[1];
>+
>+		/* ABABCDE... -> ABABCDECDE */
>+		idx = 2 + groupWidth;
>+		while (groupWidth > 2 &&
>+			idx < maxSymsPerKey &&
>+			idx < groupWidth * 2)
>+		{
>+		    pCore[idx] = pCore[idx - groupWidth + 2];
>+		    idx++;
>+		}
>+		idx = 2 * groupWidth;
>+		if (idx < 4)
>+		    idx = 4;
>+		/* 3 or more groups: ABABCDECDEABCDEABCDE */
>+		for (n = 0; n < groupWidth && idx < maxSymsPerKey; n++)
>+		    pCore[idx++] = pXKB[n];
>+	    }
>+
> 	    pXKB+= XkbKeyGroupsWidth(xkb,key);
> 	    nOut+= 2;
> 	    if (nGroups>1) {
>@@ -525,11 +559,6 @@ CARD8			keysPerMod[XkbNumModifiers];
> 		}
> 		pXKB+= XkbKeyGroupsWidth(xkb,key);
> 	    }
>-	    if (!pCore[2] && !pCore[3] && maxSymsPerKey >= 6 &&
>-                (pCore[4] || pCore[5])) {
>-                pCore[2] = pCore[4];
>-                pCore[3] = pCore[5];
>-	    }
> 	}
> 	if (keyc->modifierMap[key]!=0) {
> 	    register unsigned bit,i,mask;
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14373: 19077

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.