[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] ui/kbd-state: QAPI'fy QKbdModifier
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 2/2] ui/kbd-state: QAPI'fy QKbdModifier |
Date: |
Fri, 24 Feb 2023 12:01:53 +0100 |
Let QAPI maintain the QKbdModifier enum values.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/ui/kbd-state.h | 16 ----------------
qapi/ui.json | 10 ++++++++++
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/include/ui/kbd-state.h b/include/ui/kbd-state.h
index 14ee2c59e4..83e869bc09 100644
--- a/include/ui/kbd-state.h
+++ b/include/ui/kbd-state.h
@@ -9,22 +9,6 @@
#include "qapi/qapi-types-ui.h"
-typedef enum QKbdModifier QKbdModifier;
-
-enum QKbdModifier {
- Q_KBD_MODIFIER_NONE = 0,
-
- Q_KBD_MODIFIER_SHIFT,
- Q_KBD_MODIFIER_CTRL,
- Q_KBD_MODIFIER_ALT,
- Q_KBD_MODIFIER_ALTGR,
-
- Q_KBD_MODIFIER_NUMLOCK,
- Q_KBD_MODIFIER_CAPSLOCK,
-
- Q_KBD_MODIFIER__MAX
-};
-
typedef struct QKbdState QKbdState;
/**
diff --git a/qapi/ui.json b/qapi/ui.json
index 0abba3e930..d3230a6bc7 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -920,6 +920,16 @@
'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks',
'lang1', 'lang2' ] }
+##
+# @QKbdModifier:
+#
+# An enumeration of keyboard modifier name.
+#
+# Since: 8.0
+##
+{ 'enum': 'QKbdModifier',
+ 'data': [ 'none', 'shift', 'ctrl', 'alt', 'altgr', 'numlock', 'capslock' ] }
+
##
# @KeyValueKind:
#
--
2.38.1