[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] ui: fix alphabetical ordering of keymaps
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/7] ui: fix alphabetical ordering of keymaps |
Date: |
Mon, 29 Jan 2018 11:23:19 +0100 |
From: "Daniel P. Berrange" <address@hidden>
The qcode-to-linux keymaps was accidentally added in the wrong place
by
commit de80d78594b4c3767a12d8d42debcf12cbf85a5b
Author: Owen Smith <address@hidden>
Date: Fri Nov 3 11:56:28 2017 +0000
ui: generate qcode to linux mappings
breaking the alphabetical ordering of keymaps
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
Makefile | 2 +-
include/ui/input.h | 6 +++---
ui/input-keymap.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index f9278f14c9..7073b3d842 100644
--- a/Makefile
+++ b/Makefile
@@ -237,10 +237,10 @@ KEYCODEMAP_FILES = \
ui/input-keymap-qcode-to-atset1.c \
ui/input-keymap-qcode-to-atset2.c \
ui/input-keymap-qcode-to-atset3.c \
+ ui/input-keymap-qcode-to-linux.c \
ui/input-keymap-qcode-to-qnum.c \
ui/input-keymap-qcode-to-sun.c \
ui/input-keymap-qnum-to-qcode.c \
- ui/input-keymap-qcode-to-linux.c \
ui/input-keymap-usb-to-qcode.c \
ui/input-keymap-win32-to-qcode.c \
ui/input-keymap-x11-to-qcode.c \
diff --git a/include/ui/input.h b/include/ui/input.h
index 7d6c92224e..ceb22b8eef 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -83,6 +83,9 @@ extern const guint16 qemu_input_map_qcode_to_atset2[];
extern const guint qemu_input_map_qcode_to_atset3_len;
extern const guint16 qemu_input_map_qcode_to_atset3[];
+extern const guint qemu_input_map_qcode_to_linux_len;
+extern const guint16 qemu_input_map_qcode_to_linux[];
+
extern const guint qemu_input_map_qcode_to_qnum_len;
extern const guint16 qemu_input_map_qcode_to_qnum[];
@@ -92,9 +95,6 @@ extern const guint16 qemu_input_map_qcode_to_sun[];
extern const guint qemu_input_map_qnum_to_qcode_len;
extern const guint16 qemu_input_map_qnum_to_qcode[];
-extern const guint qemu_input_map_qcode_to_linux_len;
-extern const guint16 qemu_input_map_qcode_to_linux[];
-
extern const guint qemu_input_map_usb_to_qcode_len;
extern const guint16 qemu_input_map_usb_to_qcode[];
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 7a9475abd9..3d4e66bab5 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -10,10 +10,10 @@
#include "ui/input-keymap-qcode-to-atset1.c"
#include "ui/input-keymap-qcode-to-atset2.c"
#include "ui/input-keymap-qcode-to-atset3.c"
+#include "ui/input-keymap-qcode-to-linux.c"
#include "ui/input-keymap-qcode-to-qnum.c"
#include "ui/input-keymap-qcode-to-sun.c"
#include "ui/input-keymap-qnum-to-qcode.c"
-#include "ui/input-keymap-qcode-to-linux.c"
#include "ui/input-keymap-usb-to-qcode.c"
#include "ui/input-keymap-win32-to-qcode.c"
#include "ui/input-keymap-x11-to-qcode.c"
--
2.9.3
- [Qemu-devel] [PULL 0/7] Input 20180129 v2 patches, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 5/7] hw: convert the escc device to keycodemapdb, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 2/7] input: virtio: don't send mouse wheel event twice, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 6/7] ui: fix alphabetical ordering of keymaps,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/7] input: add mouse side buttons to virtio input, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 4/7] hw: convert ps2 device to keycodemapdb, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 7/7] hw: convert virtio-input-hid device to keycodemapdb, Gerd Hoffmann, 2018/01/29
- [Qemu-devel] [PULL 3/7] ps2: check PS2Queue pointers in post_load routine, Gerd Hoffmann, 2018/01/29
- Re: [Qemu-devel] [PULL 0/7] Input 20180129 v2 patches, Peter Maydell, 2018/01/29