summaryrefslogtreecommitdiff
path: root/src/xkbcomp
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-10-22 20:49:44 +0200
committerRan Benita <ran234@gmail.com>2012-10-22 21:48:40 +0200
commit6a94b122a4dde3e8f59d69f9a388e9a77c343326 (patch)
treea8ac8a9f103ffe866c29f666408ab8849ae48a19 /src/xkbcomp
parent3a5f87b8e9856a69c8978f8baf0954e08679c974 (diff)
Split the mods, layout, leds parts of xkb_state_components
Note first: This commits breaks the ABI somewhat. If an application is run against this commit without recompiling against the updated header, these break: - xkb_state_layout_*_is_active always retuns false. - xkb_state_serialize_mods always returns 0. So it might break layout switching in some applications. However, xkbcommon-compat.h provides the necessary fixes, so recompiling should work (though updating the application is even better). Split the enum to its individual components, which enables us to refer to them individually. We will use that later for reporting which components of the state have changed after update. Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp')
-rw-r--r--src/xkbcomp/compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index fb654a6..ddd7583 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -1037,9 +1037,9 @@ CopyIndicatorMapDefs(CompatInfo *info)
*im = led->im;
if (im->groups != 0 && im->which_groups == 0)
- im->which_groups = XKB_STATE_EFFECTIVE;
+ im->which_groups = XKB_STATE_LAYOUT_EFFECTIVE;
if (im->mods.mods != 0 && im->which_mods == 0)
- im->which_mods = XKB_STATE_EFFECTIVE;
+ im->which_mods = XKB_STATE_MODS_EFFECTIVE;
}
}