On Wed, Jun 13, 2018 at 07:51:56PM -0400, Keno Fischer wrote:
> In appears the input keymap for osx was forgotten in the commit that
> converted the gtk frontend to keycodemapdb. Add it.
>
> Fixes: 2ec78706 ("ui: convert GTK and SDL1 frontends to keycodemapdb")
> CC: Daniel P. Berrange <berra...@redhat.com>
> Signed-off-by: Keno Fischer <k...@juliacomputing.com>
> ---
> Makefile | 1 +
> include/ui/input.h | 3 +++
> ui/input-keymap.c | 1 +
> 3 files changed, 5 insertions(+)
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
I guess this shows just how (in-)frequently people try to compile the GTK
frontend on OS-X :-(
>
> diff --git a/Makefile b/Makefile
> index 6a5fff0..1e79914 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -322,6 +322,7 @@ KEYCODEMAP_FILES = \
> ui/input-keymap-xorgkbd-to-qcode.c \
> ui/input-keymap-xorgxquartz-to-qcode.c \
> ui/input-keymap-xorgxwin-to-qcode.c \
> + ui/input-keymap-osx-to-qcode.c \
> $(NULL)
>
> GENERATED_FILES += $(KEYCODEMAP_FILES)
> diff --git a/include/ui/input.h b/include/ui/input.h
> index 16395ab..34ebc67 100644
> --- a/include/ui/input.h
> +++ b/include/ui/input.h
> @@ -116,4 +116,7 @@ extern const guint16
> qemu_input_map_xorgxquartz_to_qcode[];
> extern const guint qemu_input_map_xorgxwin_to_qcode_len;
> extern const guint16 qemu_input_map_xorgxwin_to_qcode[];
>
> +extern const guint qemu_input_map_osx_to_qcode_len;
> +extern const guint16 qemu_input_map_osx_to_qcode[];
> +
> #endif /* INPUT_H */
> diff --git a/ui/input-keymap.c b/ui/input-keymap.c
> index 87cc301..db5ccff 100644
> --- a/ui/input-keymap.c
> +++ b/ui/input-keymap.c
> @@ -21,6 +21,7 @@
> #include "ui/input-keymap-xorgkbd-to-qcode.c"
> #include "ui/input-keymap-xorgxquartz-to-qcode.c"
> #include "ui/input-keymap-xorgxwin-to-qcode.c"
> +#include "ui/input-keymap-osx-to-qcode.c"
>
> int qemu_input_linux_to_qcode(unsigned int lnx)
> {
> --
> 2.8.1
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
