xkb: Replaced hardcoded values with compile time options

The core keyboard before this change always used a layout of "us" even if you
configured the build with another default layout.

Signed-off-by: Michael Dluhosch <michael.dluhosch@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1549>
(cherry picked from commit e61bd1e5fd)
This commit is contained in:
Michael Dluhosch
2024-05-15 19:37:19 +02:00
committed by Alan Coopersmith
parent e9819a1a75
commit 9ac7979cff

View File

@@ -893,7 +893,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
rules = "base";
/* Xkb default options. */
XkbInitRules(&set, rules, "pc105", "us", NULL, NULL);
XkbInitRules(&set, rules, XKB_DFLT_MODEL, XKB_DFLT_LAYOUT, NULL, NULL);
XkbSetRulesDflts(&set);
XkbFreeRMLVOSet(&set, FALSE);