Bug 5078

Summary:	[PATCH] Group shift_toggle and shifts_toggle in xkbdata
Product:	xkeyboard-config	Reporter:	Oldrich Jedlicka <oldium.pro>
Component:	doc	Assignee:	xkb
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	high	Keywords:	movetoxkc
Version:	unspecified
Hardware:	x86 (IA32)
OS:	Linux (All)
Whiteboard:
i915 platform:		i915 features:
Bug Depends on:
Bug Blocks:	5387
Attachments:	group(shifts_toggle) patch grp:shifts_toggle and group(shifts_toggle) together patch

Description Oldrich Jedlicka 2005-11-17 22:03:14 UTC

I discovered that group(shift_toggle) changed to group(shifts_toggle). There are
two problems:

1. grp:shift_toggle definition points to group(shift_toggle),
2. grp:shift_toggle may be replaced by grp:shifts_toggle (not necessarily)

Both possibilities are covered in attached patches. First patch handles only bad
group(shift_toggle) inclusion, while second patch renames shift_toggle in all
files to shifts_toggle in grp:* and group(*).

Comment 1 Oldrich Jedlicka 2005-11-17 22:05:02 UTC

Created attachment 3825 [details] [review]
group(shifts_toggle) patch

Patch changes only group(shift_toggle) into group(shifts_toggle). Old
grp:shift_toggle stays for example in rules/xfree86.

Comment 2 Oldrich Jedlicka 2005-11-17 22:07:18 UTC

Created attachment 3826 [details] [review]
grp:shifts_toggle and group(shifts_toggle) together patch

Patch replaces all grp:shift_toggle with grp:shifts_toggle and
group(shift_toggle) with group(shifts_toggle). This breaks compatibility in
rules/xfree86 for example, so this is only for consideration.

Comment 3 Sergey V. Udaltsov 2006-04-08 11:24:08 UTC

It should be ok in xkeyboard-config CVS. Could you please confirm?

Comment 4 Oldrich Jedlicka 2006-04-11 01:54:12 UTC

I can confirm this as soon as it is released, because I'm do not have CVS  
access and I wouldn't like to mess my installation with CVS parts. Better would  
be to confirm the solution of this bug by some tester. 
 
BTW: What was fixed? I proposed two different solutions.

Comment 5 Sergey V. Udaltsov 2006-04-12 07:57:45 UTC

Well, if you would just take the latest xkeyboard-config (0.8) - it all should
be there (no changes since). If it is still not working - feel free to complain.
It uses shifts_toggle everywhere (well, where I could find) - and has
compatibility rule for the old shift_toggle.

Comment 6 Oldrich Jedlicka 2006-04-12 18:22:44 UTC

Well, I finally found the version 0.8 at http://xlibs.freedesktop.org/xkbdesc/. 
I found the following problems with single `grep -r "group(shift_toggle)" *` 
command:

keymap/sgi_bndr/* refers to group(shift_toggle)
rules/sgi and rules/sun refers to group(shift_toggle)
rules/xfree86 refers to group(shift_toggle)

And you do not need to search for it, grep does the job for you :-)

Comment 7 Sergey V. Udaltsov 2006-04-13 04:27:07 UTC

Well, as I expected, you found the traces in the dark corners:)

> keymap/sgi_bndr/* refers to group(shift_toggle)
keymaps are badly supported, indeed. Especially vendor-specific
> rules/sgi and rules/sun refers to group(shift_toggle)
> rules/xfree86 refers to group(shift_toggle)
xfree98 probably?
Again, these rule files are mostly unmaintained. I'll fix shift_toggle since you
found them - but I would not recommend anyone using these sets of rules. No
guarantees at all.

Thanks for the help, anyway.

Comment 8 Oldrich Jedlicka 2006-04-13 04:32:35 UTC

Thanks for fixing this issue :-)

Comment 9 Sergey V. Udaltsov 2006-04-20 07:50:49 UTC

committed.

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.