xkbcomp: allow including kccgst files from other paths
authorPeter Hutterer <peter.hutterer@who-t.net>
Fri, 10 Jul 2020 05:16:50 +0000 (15:16 +1000)
committerRan Benita <ran@unusedvar.com>
Sun, 30 Aug 2020 18:49:41 +0000 (21:49 +0300)
commit05d6efc41723601d4d38e0c43129d2ab9d53fa48
tree5a2ddfd43b5e36d97940dfc99896bfc58041b452
parentbbc7005b2a6509e0723b57f54718ca4a3dc7b99b
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>
src/xkbcomp/include.c
src/xkbcomp/include.h
src/xkbcomp/rules.c