From 9de067aad4e8b0d928b7674f90fb4ecda737be33 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Mon, 27 Aug 2012 21:31:18 +0300 Subject: compat: ignore "group" (compatibility) statements Group compatibility statements are like the following: group 3 = AltGr; This currently results in: keymap->groups[2].mask = And we don't do any thing with this value later. The reason it exists in XKB is to support non-XKB clients (i.e. XKB support disabled entirely in the server), which do not know the concept of "group", and use some modifier to distinguish between the first and second keyboard layouts (usually with the AltGr key). We don't care about all of that, so we can forget about it. One artifact of this removal is that xkb_map_num_groups no longer works, because it counted through keymap->groups (this wasn't entirely correct BTW). Instead we add a new num_groups member to the keymap, which just hold the maximum among the xkb_key's num_groups. This also means we don't have to compute anything just to get the number of groups. Signed-off-by: Ran Benita --- test/data/keymaps/stringcomp.data | 3 --- 1 file changed, 3 deletions(-) (limited to 'test') diff --git a/test/data/keymaps/stringcomp.data b/test/data/keymaps/stringcomp.data index 110cece..42ff170 100644 --- a/test/data/keymaps/stringcomp.data +++ b/test/data/keymaps/stringcomp.data @@ -1050,9 +1050,6 @@ xkb_keymap { interpret Any+AnyOf(all) { action= SetMods(modifiers=modMapMods,clearLocks); }; - group 2 = AltGr; - group 3 = AltGr; - group 4 = AltGr; indicator "Caps Lock" { whichModState= locked; modifiers= Lock; -- cgit v1.2.3