diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-07-10 15:16:50 +1000 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2020-08-30 21:49:41 +0300 |
| commit | 05d6efc41723601d4d38e0c43129d2ab9d53fa48 (patch) | |
| tree | 5a2ddfd43b5e36d97940dfc99896bfc58041b452 /src/xkbcomp/rules.c | |
| parent | bbc7005b2a6509e0723b57f54718ca4a3dc7b99b (diff) | |
| download | libxkbcommon-05d6efc41723601d4d38e0c43129d2ab9d53fa48.tar.gz libxkbcommon-05d6efc41723601d4d38e0c43129d2ab9d53fa48.tar.bz2 libxkbcommon-05d6efc41723601d4d38e0c43129d2ab9d53fa48.zip | |
xkbcomp: allow including kccgst files from other paths
Previously, a 'symbols/us' file in path A would shadow the same file in path B.
This is suboptimal, we rarely need to hide the system files - we care mostly
about *extending* them. By continuing to check other lookup paths, we make it
possible for a XDG_CONFIG_HOME/xkb/symbols/us file to have sections including
those from /usr/share/X11/xkb/symbols/us.
Note that this is not possible for rules files which need to be manually
controlled to get the right bits resolved.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/xkbcomp/rules.c')
| -rw-r--r-- | src/xkbcomp/rules.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xkbcomp/rules.c b/src/xkbcomp/rules.c index 80a1372..3359552 100644 --- a/src/xkbcomp/rules.c +++ b/src/xkbcomp/rules.c @@ -1104,8 +1104,9 @@ xkb_components_from_rules(struct xkb_context *ctx, char *path = NULL; struct matcher *matcher = NULL; struct matched_sval *mval; + unsigned int offset = 0; - file = FindFileInXkbPath(ctx, rmlvo->rules, FILE_TYPE_RULES, &path); + file = FindFileInXkbPath(ctx, rmlvo->rules, FILE_TYPE_RULES, &path, &offset); if (!file) goto err_out; |