aboutsummaryrefslogtreecommitdiff
path: root/pc-bios/keymaps
AgeCommit message (Collapse)AuthorFilesLines
2023-06-23pc-bios/keymaps: Use the official xkb name for Arabic layout, not the legacy ↵Peter Maydell1-1/+1
synonym The xkb official name for the Arabic keyboard layout is 'ara'. However xkb has for at least the past 15 years also permitted it to be named via the legacy synonym 'ar'. In xkeyboard-config 2.39 this synoynm was removed, which breaks compilation of QEMU: FAILED: pc-bios/keymaps/ar /home/fred/qemu-git/src/qemu/build-full/qemu-keymap -f pc-bios/keymaps/ar -l ar xkbcommon: ERROR: Couldn't find file "symbols/ar" in include paths xkbcommon: ERROR: 1 include paths searched: xkbcommon: ERROR: /usr/share/X11/xkb xkbcommon: ERROR: 3 include paths could not be added: xkbcommon: ERROR: /home/fred/.config/xkb xkbcommon: ERROR: /home/fred/.xkb xkbcommon: ERROR: /etc/xkb xkbcommon: ERROR: Abandoning symbols file "(unnamed)" xkbcommon: ERROR: Failed to compile xkb_symbols xkbcommon: ERROR: Failed to compile keymap The upstream xkeyboard-config change removing the compat mapping is: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/470ad2cd8fea84d7210377161d86b31999bb5ea6 Make QEMU always ask for the 'ara' xkb layout, which should work on both older and newer xkeyboard-config. We leave the QEMU name for this keyboard layout as 'ar'; it is not the only one where our name for it deviates from the xkb standard name. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-id: 20230620162024.1132013-1-peter.maydell@linaro.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1709
2023-06-09meson: install keyboard maps only if necessaryCarlos Santos1-2/+4
They are required only for system emulation (i.e. have_system is true). Signed-off-by: Carlos Santos <casantos@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2023-02-27meson: fix dependency on qemu-keymapSteve Sistare1-1/+1
When qemu-keymap is not available on the host, and enable-xkbcommon is specified, parallel make fails with: % make clean ... % make -j 32 ... FAILED: pc-bios/keymaps/is ./qemu-keymap -f pc-bios/keymaps/is -l is /bin/sh: ./qemu-keymap: No such file or directory ... many similar messages ... The code always runs find_program, rather than waiting to build qemu-keymap, because it looks for CONFIG_XKBCOMMON in config_host rather than config_host_data. Making serially succeeds, by soft linking files from pc-bios/keymaps, but that is not the desired result for enable-xkbcommon. Examining all occurrences of 'in config_host' for similar bugs shows one instance in the docs, which is also fixed here. Fixes: 4113f4cfee ("meson: move xkbcommon to meson") Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <1675708442-74966-1-git-send-email-steven.sistare@oracle.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
2022-09-01meson: remove dead codePaolo Bonzini1-1/+0
Found with "muon analyze". Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2022-07-13datadir: Use bundle mechanismAkihiko Odaki1-15/+6
softmmu/datadir.c had its own implementation to find files in the build tree, but now bundle mechanism provides the unified implementation which works for datadir and the other files. Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com> Message-Id: <20220624145039.49929-4-akihiko.odaki@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2021-09-13meson: look up cp and dtrace with find_program()Paolo Bonzini1-1/+2
Avoid that meson prints a "Program xyz found" test once per custom_target. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-10-13Remove superfluous .gitignore filesThomas Huth1-1/+0
Since we are now always doing out-of-tree builds, these gitignore files should not be necessary anymore. Message-Id: <20200919133637.72744-1-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
2020-09-30meson: fix installation of keymapsAnthony PERARD1-0/+2
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Message-Id: <20200918130354.1879275-1-anthony.perard@citrix.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-09-03meson: fix keymaps without qemu-keymapGerd Hoffmann1-9/+19
In case the qemu-keymap tool generating them is neither installed on the system nor built from sources (due to xkbcommon not being available) qemu will not find the keymaps when started directly from the build tree, This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink") removed the symlink to the source tree, and the special handling for install doesn't help in case we do not install qemu. Lets fix that by simply copying over the file from the source tree as fallback. Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-Id: <20200827102617.14448-1-kraxel@redhat.com> [thuth: Rebased, changed "config_host['qemu_datadir']" to "qemu_datadir", added Gerd's UNLINK fix to configure script] Signed-off-by: Thomas Huth <thuth@redhat.com>
2020-09-01meson: use meson datadir instead of qemu_datadirMarc-André Lureau1-3/+3
When cross-compiling, by default qemu_datadir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20200826110419.528931-6-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-08-21keymaps: updatePaolo Bonzini32-64/+7680
Looks like update-keymaps has not been run in a while. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-08-21meson: convert pc-bios/keymaps/MakefileMarc-André Lureau3-56/+57
Note that sl and sv keymaps were not created by qemu-keymap. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2019-03-18keymaps: regenerate keymapsGerd Hoffmann32-97/+321
Pick up the config updates. Also add a few keys to the maps which got a QKeyCode assigned since the last time we generated the maps (Hiragana_Katakana, Muhenkan). Sync with xkbcommon updates. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20190315110248.29208-3-kraxel@redhat.com
2019-03-18keymaps: use nodeadkeys variant for de and frGerd Hoffmann1-2/+2
The reverse keymap code can't handle dead keys. So use the nodeadkeys variant of the keyboard layout for the german and french maps. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20190315110248.29208-2-kraxel@redhat.com
2019-01-10keymaps: remove common includeGerd Hoffmann3-176/+351
Copy the content into the sl and sv files (the only ones left which are not generated by qemu-keymap). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20181116104319.10329-4-kraxel@redhat.com
2019-01-10keymaps: drop nl-be mapGerd Hoffmann1-3/+0
It doesn't define any keys, only includes "common". Which makes it effectively an "en-us" map. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20181116104319.10329-3-kraxel@redhat.com
2019-01-10keymaps: remove modifiers includeGerd Hoffmann2-19/+18
"common" is the only file using it, so we can just include it directly. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20181116104319.10329-2-kraxel@redhat.com
2017-10-16pc-bios/keymaps: keymaps updateGerd Hoffmann32-1717/+24007
Update the keymaps with the ones generated by qemu-keymap Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20171005153330.19210-4-kraxel@redhat.com
2017-10-16Add pc-bios/keymaps/MakefileGerd Hoffmann1-0/+56
Update files where I think I've figured the correct xkb maps. TODO: nl-be sl sv Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20171005153330.19210-3-kraxel@redhat.com
2017-07-20keymaps: fr-ca: more fixupsGerd Hoffmann1-1/+9
Fixes: https://bugs.launchpad.net/qemu/+bug/533613 Cc: Thomas Huth <thuth@redhat.com> Suggested-by: Jérôme Poulin <jeromepoulin@gmail.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20170717133444.16743-1-kraxel@redhat.com
2017-07-17keymaps: fr-ca: add missing keysGerd Hoffmann1-0/+2
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20170712072305.29233-1-kraxel@redhat.com
2015-03-10qemu-char: add cyrillic key 'numerosign' to Russian keymapWang Xin1-1/+1
numero sign is the number sign key of Russian keyboard layout, we get this key with 'shift + 3'. It's missing in current Russian keymap file, this patch fixes it. As number sign does not exsit in Russian keyboard layout[1][2], this patch also removes the 'numbersign' from Russian keymap. [1] http://en.wikipedia.org/wiki/Keyboard_layout#Russian [2] http://kbd-intl.narod.ru/english/layouts Signed-off-by: Wang Xin <wangxinxin.wang@huawei.com> Signed-off-by: Gonglei <arei.gonglei@huawei.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2013-11-13qemu-char: add Czech keymap fileJan Krupa1-0/+94
This patch adds Czech keyboard layout to available keymap files and Makefile. Signed-off-by: Jan Krupa <jkrupa@suse.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
2012-07-13qemu-keymaps: Finnish keyboard mapping brokenMichael Tokarev1-2/+0
As mentioned in http://bugs.debian.org/660154 , finnish keyboard mapping is kind of broken. Fix it as Timo Sirainen suggests in #660154. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
2011-12-06Convert keymap file to UTF-8 encodingStefan Weil1-1/+1
Most QEMU files either are pure ASCII or use UTF-8. Convert this keymap file which still used ISO-8859-1 to UTF-8. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
2011-01-20add bepo (french dvorak) keyboard layoutFred Boiteux1-0/+333
I'm using the Qemu program with VNC I/O, and I had some problems with my keyboard layout, so I've prepared a definition to be included in Qemu, built from Xorg description. Signed-off-by: Frédéric Boiteux <fboiteux@free.fr> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2009-05-28Move keymaps into pc-biosAnthony Liguori35-0/+3627
This isn't the most ideal layout, but it makes -L /path/to/git/pc-bios Just Work which is very convenient. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
generated by cgit v1.1 at 2024-10-17 04:04:42 +0000