diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-15 18:01:20 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-20 08:37:07 +0200 |
| commit | a136c2cdd84c93c2fa5e1cedb20f5acac80df5be (patch) | |
| tree | 41ac02f976d95fc2c40a2f6fe5db1d913b074f42 /hwdb.d/60-keyboard.hwdb | |
| parent | man: describe wildcards and range matches in hwdb syntax (diff) | |
| download | systemd-a136c2cdd84c93c2fa5e1cedb20f5acac80df5be.tar.xz systemd-a136c2cdd84c93c2fa5e1cedb20f5acac80df5be.zip | |
hwdb: drop quotes from XKB_FIXED_*= properties
The properties are not unquoted by udev, so the quotes effectively became part
of the value.
Even though those properties were added quite a while ago
(086c001e29a86287d7b639cb71d1fc6408920c53,
d7d31692bf7cde5dce7f4ed3cae429a5b302a9f0), they never started being used
(because of issues with having multiple layouts), see
https://gitlab.gnome.org/GNOME/mutter/-/issues/906,
https://bugzilla.gnome.org/show_bug.cgi?id=775681.
Let's remove the quotes while we still can.
From https://bugzilla.gnome.org/show_bug.cgi?id=775681#c7:
> Note to self: the values for XKB_FIXED_LAYOUT and XKB_FIXED_VARIANT are
> quoted, meaning that we need to remove the quotes before passing the values
> from udev_device_get_property_value() to xkb_keymap_new_from_names()
> otherwise the compilation of the keymap fails (please don't ask how I found
> out...)
Diffstat (limited to 'hwdb.d/60-keyboard.hwdb')
| -rw-r--r-- | hwdb.d/60-keyboard.hwdb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb index 66672c5b53..97800f4364 100644 --- a/hwdb.d/60-keyboard.hwdb +++ b/hwdb.d/60-keyboard.hwdb @@ -72,14 +72,14 @@ # A device with a fixed keyboard layout that must not be changed by # the desktop environment may specify that layout as: -# XKB_FIXED_LAYOUT="us" -# XKB_FIXED_VARIANT="" +# XKB_FIXED_LAYOUT=us +# XKB_FIXED_VARIANT= # Examples of such devices: the Yubikey or other key-code generating # devices. # A device where the scan code to key code mapping is insufficient and # requires a special key code to symbol configuration may specify that with: -# XKB_FIXED_MODEL="xkbmodel" +# XKB_FIXED_MODEL=xkbmodel # Examples of such devices: Chromebooks where the top row is used for both # media and F1-F10 keys. @@ -1796,8 +1796,8 @@ evdev:input:b0003v1050p0111:* evdev:input:b0003v1050p0116:* # OKE Electron Company USB barcode reader evdev:input:b0003v05FEp1010:* - XKB_FIXED_LAYOUT="us" - XKB_FIXED_VARIANT="" + XKB_FIXED_LAYOUT=us + XKB_FIXED_VARIANT= ######################### LACK OF MODIFIER LEDS ############################ # This section lists keyboard which do not have their own LEDs for some @@ -1846,4 +1846,4 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX1Carbon3rd:* # Chromebooks evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnFalco:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnPeppy:* - XKB_FIXED_MODEL="chromebook" + XKB_FIXED_MODEL=chromebook |