* [Qemu-devel] [PATCH 0/2 v3] xenfb: rework xen vkbd backend
@ 2017-07-26 15:10 Owen Smith
2017-07-26 15:10 ` [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly Owen Smith
2017-07-26 15:10 ` [Qemu-devel] [PATCH 2/2 v3] xenfb: Add [feature|request]-raw-pointer Owen Smith
0 siblings, 2 replies; 8+ messages in thread
From: Owen Smith @ 2017-07-26 15:10 UTC (permalink / raw)
To: qemu-devel; +Cc: xen-devel, sstabellini, anthony.perard, Owen Smith
These patches are intended to allow PV frontends, like the Windows
frontend to use the backend provided by Qemu. The Windows frontend(1)
requires absolute mouse coordinates in a fixed range, which is not
possible under HVM guests, where the vfb and Qemu console is not
guaranteed to be available or report constant dimmensions.
(1) git://xenbits.xen.org/pvdrivers/win/xenvkbd.git
Fixes since v2:
Rebased to master
Reworked the input handler callbacks, simplifying the state
tracking and input event mapping.
Owen Smith (2):
xenfb: Use Input Handlers directly
xenfb: Add [feature|request]-raw-pointer
hw/display/xenfb.c | 412 +++++++++++++++++++++++++++++++++--------------------
1 file changed, 258 insertions(+), 154 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly
2017-07-26 15:10 [Qemu-devel] [PATCH 0/2 v3] xenfb: rework xen vkbd backend Owen Smith
@ 2017-07-26 15:10 ` Owen Smith
2017-08-21 23:12 ` Stefano Stabellini
2017-07-26 15:10 ` [Qemu-devel] [PATCH 2/2 v3] xenfb: Add [feature|request]-raw-pointer Owen Smith
1 sibling, 1 reply; 8+ messages in thread
From: Owen Smith @ 2017-07-26 15:10 UTC (permalink / raw)
To: qemu-devel; +Cc: xen-devel, sstabellini, anthony.perard, Owen Smith
Avoid the unneccessary calls through the input-legacy.c file by
using the qemu_input_handler_*() calls directly. This did require
reworking the event and sync handlers and a direct mapping from
QEMU's qcodes to linux KEY_* identifiers required by the ring
protocol. Removes the scancode2linux mapping, and supporting
documention.
Signed-off-by: Owen Smith <owen.smith@citrix.com>
---
hw/display/xenfb.c | 401 +++++++++++++++++++++++++++++++++--------------------
1 file changed, 247 insertions(+), 154 deletions(-)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index df8b78f..e412753 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -27,6 +27,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "ui/input.h"
#include "ui/console.h"
#include "hw/xen/xen_backend.h"
@@ -37,9 +38,7 @@
#include "trace.h"
-#ifndef BTN_LEFT
-#define BTN_LEFT 0x110 /* from <linux/input.h> */
-#endif
+#include "standard-headers/linux/input.h"
/* -------------------------------------------------------------------- */
@@ -51,9 +50,10 @@ struct common {
struct XenInput {
struct common c;
int abs_pointer_wanted; /* Whether guest supports absolute pointer */
- int button_state; /* Last seen pointer button state */
- int extended;
- QEMUPutMouseEntry *qmouse;
+ QemuInputHandlerState *qkbd;
+ QemuInputHandlerState *qmou;
+ int mouse_axes[INPUT_AXIS__MAX];
+ int mouse_wheel;
};
#define UP_QUEUE 8
@@ -120,77 +120,125 @@ static void common_unbind(struct common *c)
/* -------------------------------------------------------------------- */
-#if 0
-/*
- * These two tables are not needed any more, but left in here
- * intentionally as documentation, to show how scancode2linux[]
- * was generated.
- *
- * Tables to map from scancode to Linux input layer keycode.
- * Scancodes are hardware-specific. These maps assumes a
- * standard AT or PS/2 keyboard which is what QEMU feeds us.
- */
-const unsigned char atkbd_set2_keycode[512] = {
-
- 0, 67, 65, 63, 61, 59, 60, 88, 0, 68, 66, 64, 62, 15, 41,117,
- 0, 56, 42, 93, 29, 16, 2, 0, 0, 0, 44, 31, 30, 17, 3, 0,
- 0, 46, 45, 32, 18, 5, 4, 95, 0, 57, 47, 33, 20, 19, 6,183,
- 0, 49, 48, 35, 34, 21, 7,184, 0, 0, 50, 36, 22, 8, 9,185,
- 0, 51, 37, 23, 24, 11, 10, 0, 0, 52, 53, 38, 39, 25, 12, 0,
- 0, 89, 40, 0, 26, 13, 0, 0, 58, 54, 28, 27, 0, 43, 0, 85,
- 0, 86, 91, 90, 92, 0, 14, 94, 0, 79,124, 75, 71,121, 0, 0,
- 82, 83, 80, 76, 77, 72, 1, 69, 87, 78, 81, 74, 55, 73, 70, 99,
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125,
- 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127,
- 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142,
- 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0,
- 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112,
- 110,111,108,112,106,103, 0,119, 0,118,109, 0, 99,104,119, 0,
-
-};
-
-const unsigned char atkbd_unxlate_table[128] = {
-
- 0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,
- 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
- 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
- 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88, 5, 6, 4, 12, 3,
- 11, 2, 10, 1, 9,119,126,108,117,125,123,107,115,116,121,105,
- 114,122,112,113,127, 96, 97,120, 7, 15, 23, 31, 39, 47, 55, 63,
- 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,
- 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110
-
+static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = {
+ [Q_KEY_CODE_ESC] = KEY_ESC,
+ [Q_KEY_CODE_1] = KEY_1,
+ [Q_KEY_CODE_2] = KEY_2,
+ [Q_KEY_CODE_3] = KEY_3,
+ [Q_KEY_CODE_4] = KEY_4,
+ [Q_KEY_CODE_5] = KEY_5,
+ [Q_KEY_CODE_6] = KEY_6,
+ [Q_KEY_CODE_7] = KEY_7,
+ [Q_KEY_CODE_8] = KEY_8,
+ [Q_KEY_CODE_9] = KEY_9,
+ [Q_KEY_CODE_0] = KEY_0,
+ [Q_KEY_CODE_MINUS] = KEY_MINUS,
+ [Q_KEY_CODE_EQUAL] = KEY_EQUAL,
+ [Q_KEY_CODE_BACKSPACE] = KEY_BACKSPACE,
+
+ [Q_KEY_CODE_TAB] = KEY_TAB,
+ [Q_KEY_CODE_Q] = KEY_Q,
+ [Q_KEY_CODE_W] = KEY_W,
+ [Q_KEY_CODE_E] = KEY_E,
+ [Q_KEY_CODE_R] = KEY_R,
+ [Q_KEY_CODE_T] = KEY_T,
+ [Q_KEY_CODE_Y] = KEY_Y,
+ [Q_KEY_CODE_U] = KEY_U,
+ [Q_KEY_CODE_I] = KEY_I,
+ [Q_KEY_CODE_O] = KEY_O,
+ [Q_KEY_CODE_P] = KEY_P,
+ [Q_KEY_CODE_BRACKET_LEFT] = KEY_LEFTBRACE,
+ [Q_KEY_CODE_BRACKET_RIGHT] = KEY_RIGHTBRACE,
+ [Q_KEY_CODE_RET] = KEY_ENTER,
+
+ [Q_KEY_CODE_CTRL] = KEY_LEFTCTRL,
+ [Q_KEY_CODE_A] = KEY_A,
+ [Q_KEY_CODE_S] = KEY_S,
+ [Q_KEY_CODE_D] = KEY_D,
+ [Q_KEY_CODE_F] = KEY_F,
+ [Q_KEY_CODE_G] = KEY_G,
+ [Q_KEY_CODE_H] = KEY_H,
+ [Q_KEY_CODE_J] = KEY_J,
+ [Q_KEY_CODE_K] = KEY_K,
+ [Q_KEY_CODE_L] = KEY_L,
+ [Q_KEY_CODE_SEMICOLON] = KEY_SEMICOLON,
+ [Q_KEY_CODE_APOSTROPHE] = KEY_APOSTROPHE,
+ [Q_KEY_CODE_GRAVE_ACCENT] = KEY_GRAVE,
+
+ [Q_KEY_CODE_SHIFT] = KEY_LEFTSHIFT,
+ [Q_KEY_CODE_BACKSLASH] = KEY_BACKSLASH,
+ [Q_KEY_CODE_LESS] = KEY_102ND,
+ [Q_KEY_CODE_Z] = KEY_Z,
+ [Q_KEY_CODE_X] = KEY_X,
+ [Q_KEY_CODE_C] = KEY_C,
+ [Q_KEY_CODE_V] = KEY_V,
+ [Q_KEY_CODE_B] = KEY_B,
+ [Q_KEY_CODE_N] = KEY_N,
+ [Q_KEY_CODE_M] = KEY_M,
+ [Q_KEY_CODE_COMMA] = KEY_COMMA,
+ [Q_KEY_CODE_DOT] = KEY_DOT,
+ [Q_KEY_CODE_SLASH] = KEY_SLASH,
+ [Q_KEY_CODE_SHIFT_R] = KEY_RIGHTSHIFT,
+
+ [Q_KEY_CODE_ALT] = KEY_LEFTALT,
+ [Q_KEY_CODE_SPC] = KEY_SPACE,
+ [Q_KEY_CODE_CAPS_LOCK] = KEY_CAPSLOCK,
+
+ [Q_KEY_CODE_F1] = KEY_F1,
+ [Q_KEY_CODE_F2] = KEY_F2,
+ [Q_KEY_CODE_F3] = KEY_F3,
+ [Q_KEY_CODE_F4] = KEY_F4,
+ [Q_KEY_CODE_F5] = KEY_F5,
+ [Q_KEY_CODE_F6] = KEY_F6,
+ [Q_KEY_CODE_F7] = KEY_F7,
+ [Q_KEY_CODE_F8] = KEY_F8,
+ [Q_KEY_CODE_F9] = KEY_F9,
+ [Q_KEY_CODE_F10] = KEY_F10,
+ [Q_KEY_CODE_NUM_LOCK] = KEY_NUMLOCK,
+ [Q_KEY_CODE_SCROLL_LOCK] = KEY_SCROLLLOCK,
+
+ [Q_KEY_CODE_KP_0] = KEY_KP0,
+ [Q_KEY_CODE_KP_1] = KEY_KP1,
+ [Q_KEY_CODE_KP_2] = KEY_KP2,
+ [Q_KEY_CODE_KP_3] = KEY_KP3,
+ [Q_KEY_CODE_KP_4] = KEY_KP4,
+ [Q_KEY_CODE_KP_5] = KEY_KP5,
+ [Q_KEY_CODE_KP_6] = KEY_KP6,
+ [Q_KEY_CODE_KP_7] = KEY_KP7,
+ [Q_KEY_CODE_KP_8] = KEY_KP8,
+ [Q_KEY_CODE_KP_9] = KEY_KP9,
+ [Q_KEY_CODE_KP_SUBTRACT] = KEY_KPMINUS,
+ [Q_KEY_CODE_KP_ADD] = KEY_KPPLUS,
+ [Q_KEY_CODE_KP_DECIMAL] = KEY_KPDOT,
+ [Q_KEY_CODE_KP_ENTER] = KEY_KPENTER,
+ [Q_KEY_CODE_KP_DIVIDE] = KEY_KPSLASH,
+ [Q_KEY_CODE_KP_MULTIPLY] = KEY_KPASTERISK,
+
+ [Q_KEY_CODE_F11] = KEY_F11,
+ [Q_KEY_CODE_F12] = KEY_F12,
+
+ [Q_KEY_CODE_CTRL_R] = KEY_RIGHTCTRL,
+ [Q_KEY_CODE_SYSRQ] = KEY_SYSRQ,
+ [Q_KEY_CODE_PRINT] = KEY_SYSRQ,
+ [Q_KEY_CODE_PAUSE] = KEY_PAUSE,
+ [Q_KEY_CODE_ALT_R] = KEY_RIGHTALT,
+
+ [Q_KEY_CODE_HOME] = KEY_HOME,
+ [Q_KEY_CODE_UP] = KEY_UP,
+ [Q_KEY_CODE_PGUP] = KEY_PAGEUP,
+ [Q_KEY_CODE_LEFT] = KEY_LEFT,
+ [Q_KEY_CODE_RIGHT] = KEY_RIGHT,
+ [Q_KEY_CODE_END] = KEY_END,
+ [Q_KEY_CODE_DOWN] = KEY_DOWN,
+ [Q_KEY_CODE_PGDN] = KEY_PAGEDOWN,
+ [Q_KEY_CODE_INSERT] = KEY_INSERT,
+ [Q_KEY_CODE_DELETE] = KEY_DELETE,
+
+ [Q_KEY_CODE_META_L] = KEY_LEFTMETA,
+ [Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
+ [Q_KEY_CODE_MENU] = KEY_MENU,
};
-#endif
-/*
- * for (i = 0; i < 128; i++) {
- * scancode2linux[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];
- * scancode2linux[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];
- * }
- */
-static const unsigned char scancode2linux[512] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 99, 0, 86, 87, 88,117, 0, 0, 95,183,184,185,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 93, 0, 0, 89, 0, 0, 85, 91, 90, 92, 0, 94, 0,124,121, 0,
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 165, 0, 0, 0, 0, 0, 0, 0, 0,163, 0, 0, 96, 97, 0, 0,
- 113,140,164, 0,166, 0, 0, 0, 0, 0,255, 0, 0, 0,114, 0,
- 115, 0,150, 0, 0, 98,255, 99,100, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,119,119,102,103,104, 0,105,112,106,118,107,
- 108,109,110,111, 0, 0, 0, 0, 0, 0, 0,125,126,127,116,142,
- 0, 0, 0,143, 0,217,156,173,128,159,158,157,155,226, 0,112,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
/* Send an event to the keyboard frontend driver */
static int xenfb_kbd_event(struct XenInput *xenfb,
@@ -260,87 +308,123 @@ static int xenfb_send_position(struct XenInput *xenfb,
return xenfb_kbd_event(xenfb, &event);
}
-/*
- * Send a key event from the client to the guest OS
- * QEMU gives us a raw scancode from an AT / PS/2 style keyboard.
- * We have to turn this into a Linux Input layer keycode.
- *
- * Extra complexity from the fact that with extended scancodes
- * (like those produced by arrow keys) this method gets called
- * twice, but we only want to send a single event. So we have to
- * track the '0xe0' scancode state & collapse the extended keys
- * as needed.
- *
- * Wish we could just send scancodes straight to the guest which
- * already has code for dealing with this...
- */
-static void xenfb_key_event(void *opaque, int scancode)
+static void xenfb_key_event(DeviceState *dev, QemuConsole *src,
+ InputEvent *evt)
{
- struct XenInput *xenfb = opaque;
- int down = 1;
+ struct XenInput *in = (struct XenInput *)dev;
+ InputKeyEvent *key = evt->u.key.data;
+ int qcode = qemu_input_key_value_to_qcode(key->key);
- if (scancode == 0xe0) {
- xenfb->extended = 1;
- return;
- } else if (scancode & 0x80) {
- scancode &= 0x7f;
- down = 0;
+ if (qcode && keymap_qcode[qcode]) {
+ xenfb_send_key(in, key->down, keymap_qcode[qcode]);
}
- if (xenfb->extended) {
- scancode |= 0x80;
- xenfb->extended = 0;
+}
+
+static void xenfb_mouse_event(DeviceState *dev, QemuConsole *src,
+ InputEvent *evt)
+{
+ struct XenInput *in = (struct XenInput *)dev;
+ InputBtnEvent *btn;
+ InputMoveEvent *move;
+
+ switch (evt->type) {
+ case INPUT_EVENT_KIND_BTN:
+ btn = evt->u.btn.data;
+ switch (btn->button) {
+ case INPUT_BUTTON_LEFT:
+ xenfb_send_key(in, btn->down, BTN_LEFT);
+ break;
+ case INPUT_BUTTON_RIGHT:
+ xenfb_send_key(in, btn->down, BTN_RIGHT);
+ break;
+ case INPUT_BUTTON_MIDDLE:
+ xenfb_send_key(in, btn->down, BTN_MIDDLE);
+ break;
+ case INPUT_BUTTON_WHEEL_UP:
+ if (btn->down) {
+ in->mouse_wheel--;
+ }
+ break;
+ case INPUT_BUTTON_WHEEL_DOWN:
+ if (btn->down) {
+ in->mouse_wheel++;
+ }
+ break;
+ default:
+ break;
+ }
+ break;
+ case INPUT_EVENT_KIND_ABS:
+ move = evt->u.abs.data;
+ in->mouse_axes[move->axis] = move->value;
+ break;
+ case INPUT_EVENT_KIND_REL:
+ move = evt->u.rel.data;
+ in->mouse_axes[move->axis] += move->value;
+ break;
+ default:
+ break;
}
- xenfb_send_key(xenfb, down, scancode2linux[scancode]);
}
-/*
- * Send a mouse event from the client to the guest OS
- *
- * The QEMU mouse can be in either relative, or absolute mode.
- * Movement is sent separately from button state, which has to
- * be encoded as virtual key events. We also don't actually get
- * given any button up/down events, so have to track changes in
- * the button state.
- */
-static void xenfb_mouse_event(void *opaque,
- int dx, int dy, int dz, int button_state)
+static void xenfb_mouse_sync(DeviceState *dev)
{
- struct XenInput *xenfb = opaque;
- QemuConsole *con = qemu_console_lookup_by_index(0);
- DisplaySurface *surface;
- int dw, dh, i;
+ struct XenInput *in = (struct XenInput *)dev;
+ int dx, dy, dz;
- if (!con) {
- xen_pv_printf(&xenfb->c.xendev, 0, "No QEMU console available");
- return;
- }
+ dx = in->mouse_axes[INPUT_AXIS_X];
+ dy = in->mouse_axes[INPUT_AXIS_Y];
+ dz = in->mouse_wheel;
+
+ trace_xenfb_mouse_event(in, dx, dy, dz, 0,
+ in->abs_pointer_wanted);
+
+ if (in->abs_pointer_wanted) {
+ QemuConsole *con = qemu_console_lookup_by_index(0);
+ DisplaySurface *surface;
+ int dw, dh;
+
+ if (!con) {
+ xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
+ return;
+ }
- surface = qemu_console_surface(con);
- dw = surface_width(surface);
- dh = surface_height(surface);
-
- trace_xenfb_mouse_event(opaque, dx, dy, dz, button_state,
- xenfb->abs_pointer_wanted);
- if (xenfb->abs_pointer_wanted)
- xenfb_send_position(xenfb,
- dx * (dw - 1) / 0x7fff,
- dy * (dh - 1) / 0x7fff,
- dz);
- else
- xenfb_send_motion(xenfb, dx, dy, dz);
-
- for (i = 0 ; i < 8 ; i++) {
- int lastDown = xenfb->button_state & (1 << i);
- int down = button_state & (1 << i);
- if (down == lastDown)
- continue;
-
- if (xenfb_send_key(xenfb, down, BTN_LEFT+i) < 0)
- return;
+ surface = qemu_console_surface(con);
+ dw = surface_width(surface);
+ dh = surface_height(surface);
+
+ dx = dx * (dw - 1) / 0x7fff;
+ dy = dy * (dh - 1) / 0x7fff;
+
+ xenfb_send_position(in, dx, dy, dz);
+ } else {
+ xenfb_send_motion(in, dx, dy, dz);
+
+ in->mouse_axes[INPUT_AXIS_X] = 0;
+ in->mouse_axes[INPUT_AXIS_Y] = 0;
}
- xenfb->button_state = button_state;
+
+ in->mouse_wheel = 0;
}
+static QemuInputHandler xenfb_keyboard = {
+ .name = "Xen PVFB Keyboard",
+ .mask = INPUT_EVENT_MASK_KEY,
+ .event = xenfb_key_event,
+};
+static QemuInputHandler xenfb_abs_mouse = {
+ .name = "Xen PVFB Absolute Mouse",
+ .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_ABS,
+ .event = xenfb_mouse_event,
+ .sync = xenfb_mouse_sync
+};
+static QemuInputHandler xenfb_rel_mouse = {
+ .name = "Xen PVFB Mouse",
+ .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
+ .event = xenfb_mouse_event,
+ .sync = xenfb_mouse_sync,
+};
+
static int input_init(struct XenDevice *xendev)
{
xenstore_write_be_int(xendev, "feature-abs-pointer", 1);
@@ -356,7 +440,6 @@ static int input_initialise(struct XenDevice *xendev)
if (rc != 0)
return rc;
- qemu_add_kbd_event_handler(xenfb_key_event, in);
return 0;
}
@@ -369,24 +452,34 @@ static void input_connected(struct XenDevice *xendev)
in->abs_pointer_wanted = 0;
}
- if (in->qmouse) {
- qemu_remove_mouse_event_handler(in->qmouse);
+ if (in->qkbd) {
+ qemu_input_handler_unregister(in->qkbd);
+ }
+ if (in->qmou) {
+ qemu_input_handler_unregister(in->qmou);
}
trace_xenfb_input_connected(xendev, in->abs_pointer_wanted);
- in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in,
- in->abs_pointer_wanted,
- "Xen PVFB Mouse");
+
+ in->qkbd = qemu_input_handler_register((DeviceState *)in, &xenfb_keyboard);
+ in->qmou = qemu_input_handler_register((DeviceState *)in,
+ (in->abs_pointer_wanted ? &xenfb_abs_mouse : &xenfb_rel_mouse));
+
+ qemu_input_handler_activate(in->qkbd);
+ qemu_input_handler_activate(in->qmou);
}
static void input_disconnect(struct XenDevice *xendev)
{
struct XenInput *in = container_of(xendev, struct XenInput, c.xendev);
- if (in->qmouse) {
- qemu_remove_mouse_event_handler(in->qmouse);
- in->qmouse = NULL;
+ if (in->qkbd) {
+ qemu_input_handler_unregister(in->qkbd);
+ in->qkbd = NULL;
+ }
+ if (in->qmou) {
+ qemu_input_handler_unregister(in->qmou);
+ in->qmou = NULL;
}
- qemu_add_kbd_event_handler(NULL, NULL);
common_unbind(&in->c);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 2/2 v3] xenfb: Add [feature|request]-raw-pointer
2017-07-26 15:10 [Qemu-devel] [PATCH 0/2 v3] xenfb: rework xen vkbd backend Owen Smith
2017-07-26 15:10 ` [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly Owen Smith
@ 2017-07-26 15:10 ` Owen Smith
2017-08-21 23:13 ` Stefano Stabellini
1 sibling, 1 reply; 8+ messages in thread
From: Owen Smith @ 2017-07-26 15:10 UTC (permalink / raw)
To: qemu-devel; +Cc: xen-devel, sstabellini, anthony.perard, Owen Smith
Writes "feature-raw-pointer" during init to indicate the backend
can pass raw unscaled values for absolute axes to the frontend.
Frontends set "request-raw-pointer" to indicate the backend should
not attempt to scale absolute values to console size.
"request-raw-pointer" is only valid if "request-abs-pointer" is
also set. Raw unscaled pointer values are in the range [0, 0x7fff]
"feature-raw-pointer" and "request-raw-pointer" added to Xen
header in commit 7868654ff7fe5e4a2eeae2b277644fa884a5031e
Signed-off-by: Owen Smith <owen.smith@citrix.com>
---
hw/display/xenfb.c | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index e412753..f397f9a 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -50,6 +50,7 @@ struct common {
struct XenInput {
struct common c;
int abs_pointer_wanted; /* Whether guest supports absolute pointer */
+ int raw_pointer_wanted; /* Whether guest supports raw (unscaled) pointer */
QemuInputHandlerState *qkbd;
QemuInputHandlerState *qmou;
int mouse_axes[INPUT_AXIS__MAX];
@@ -380,21 +381,23 @@ static void xenfb_mouse_sync(DeviceState *dev)
in->abs_pointer_wanted);
if (in->abs_pointer_wanted) {
- QemuConsole *con = qemu_console_lookup_by_index(0);
- DisplaySurface *surface;
- int dw, dh;
-
- if (!con) {
- xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
- return;
- }
+ if (!in->raw_pointer_wanted) {
+ QemuConsole *con = qemu_console_lookup_by_index(0);
+ DisplaySurface *surface;
+ int dw, dh;
+
+ if (!con) {
+ xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
+ return;
+ }
- surface = qemu_console_surface(con);
- dw = surface_width(surface);
- dh = surface_height(surface);
+ surface = qemu_console_surface(con);
+ dw = surface_width(surface);
+ dh = surface_height(surface);
- dx = dx * (dw - 1) / 0x7fff;
- dy = dy * (dh - 1) / 0x7fff;
+ dx = dx * (dw - 1) / 0x7fff;
+ dy = dy * (dh - 1) / 0x7fff;
+ }
xenfb_send_position(in, dx, dy, dz);
} else {
@@ -428,6 +431,7 @@ static QemuInputHandler xenfb_rel_mouse = {
static int input_init(struct XenDevice *xendev)
{
xenstore_write_be_int(xendev, "feature-abs-pointer", 1);
+ xenstore_write_be_int(xendev, "feature-raw-pointer", 1);
return 0;
}
@@ -451,6 +455,13 @@ static void input_connected(struct XenDevice *xendev)
&in->abs_pointer_wanted) == -1) {
in->abs_pointer_wanted = 0;
}
+ if (xenstore_read_fe_int(xendev, "request-raw-pointer",
+ &in->raw_pointer_wanted) == -1) {
+ in->raw_pointer_wanted = 0;
+ }
+ if (in->raw_pointer_wanted && !in->abs_pointer_wanted) {
+ xen_pv_printf(xendev, 0, "raw pointer set without absolute pointer.");
+ }
if (in->qkbd) {
qemu_input_handler_unregister(in->qkbd);
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly
2017-07-26 15:10 ` [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly Owen Smith
@ 2017-08-21 23:12 ` Stefano Stabellini
2017-08-23 9:11 ` Owen Smith
2017-09-07 14:56 ` Anthony PERARD
0 siblings, 2 replies; 8+ messages in thread
From: Stefano Stabellini @ 2017-08-21 23:12 UTC (permalink / raw)
To: Owen Smith; +Cc: qemu-devel, xen-devel, sstabellini, anthony.perard
Anthony,
The code looks good. I tested this patch with Linux guests and seems to
work OK, can you also confirm?
One comment below.
On Wed, 26 Jul 2017, Owen Smith wrote:
> Avoid the unneccessary calls through the input-legacy.c file by
> using the qemu_input_handler_*() calls directly. This did require
> reworking the event and sync handlers and a direct mapping from
> QEMU's qcodes to linux KEY_* identifiers required by the ring
> protocol. Removes the scancode2linux mapping, and supporting
> documention.
>
> Signed-off-by: Owen Smith <owen.smith@citrix.com>
> ---
> hw/display/xenfb.c | 401 +++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 247 insertions(+), 154 deletions(-)
>
> diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
> index df8b78f..e412753 100644
> --- a/hw/display/xenfb.c
> +++ b/hw/display/xenfb.c
> @@ -27,6 +27,7 @@
> #include "qemu/osdep.h"
>
> #include "hw/hw.h"
> +#include "ui/input.h"
> #include "ui/console.h"
> #include "hw/xen/xen_backend.h"
>
> @@ -37,9 +38,7 @@
>
> #include "trace.h"
>
> -#ifndef BTN_LEFT
> -#define BTN_LEFT 0x110 /* from <linux/input.h> */
> -#endif
> +#include "standard-headers/linux/input.h"
>
> /* -------------------------------------------------------------------- */
>
> @@ -51,9 +50,10 @@ struct common {
> struct XenInput {
> struct common c;
> int abs_pointer_wanted; /* Whether guest supports absolute pointer */
> - int button_state; /* Last seen pointer button state */
> - int extended;
> - QEMUPutMouseEntry *qmouse;
> + QemuInputHandlerState *qkbd;
> + QemuInputHandlerState *qmou;
> + int mouse_axes[INPUT_AXIS__MAX];
> + int mouse_wheel;
> };
>
> #define UP_QUEUE 8
> @@ -120,77 +120,125 @@ static void common_unbind(struct common *c)
>
> /* -------------------------------------------------------------------- */
>
> -#if 0
> -/*
> - * These two tables are not needed any more, but left in here
> - * intentionally as documentation, to show how scancode2linux[]
> - * was generated.
> - *
> - * Tables to map from scancode to Linux input layer keycode.
> - * Scancodes are hardware-specific. These maps assumes a
> - * standard AT or PS/2 keyboard which is what QEMU feeds us.
> - */
> -const unsigned char atkbd_set2_keycode[512] = {
> -
> - 0, 67, 65, 63, 61, 59, 60, 88, 0, 68, 66, 64, 62, 15, 41,117,
> - 0, 56, 42, 93, 29, 16, 2, 0, 0, 0, 44, 31, 30, 17, 3, 0,
> - 0, 46, 45, 32, 18, 5, 4, 95, 0, 57, 47, 33, 20, 19, 6,183,
> - 0, 49, 48, 35, 34, 21, 7,184, 0, 0, 50, 36, 22, 8, 9,185,
> - 0, 51, 37, 23, 24, 11, 10, 0, 0, 52, 53, 38, 39, 25, 12, 0,
> - 0, 89, 40, 0, 26, 13, 0, 0, 58, 54, 28, 27, 0, 43, 0, 85,
> - 0, 86, 91, 90, 92, 0, 14, 94, 0, 79,124, 75, 71,121, 0, 0,
> - 82, 83, 80, 76, 77, 72, 1, 69, 87, 78, 81, 74, 55, 73, 70, 99,
> -
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125,
> - 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127,
> - 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142,
> - 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0,
> - 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112,
> - 110,111,108,112,106,103, 0,119, 0,118,109, 0, 99,104,119, 0,
> -
> -};
> -
> -const unsigned char atkbd_unxlate_table[128] = {
> -
> - 0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,
> - 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
> - 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
> - 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88, 5, 6, 4, 12, 3,
> - 11, 2, 10, 1, 9,119,126,108,117,125,123,107,115,116,121,105,
> - 114,122,112,113,127, 96, 97,120, 7, 15, 23, 31, 39, 47, 55, 63,
> - 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,
> - 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110
> -
> +static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = {
> + [Q_KEY_CODE_ESC] = KEY_ESC,
> + [Q_KEY_CODE_1] = KEY_1,
> + [Q_KEY_CODE_2] = KEY_2,
> + [Q_KEY_CODE_3] = KEY_3,
> + [Q_KEY_CODE_4] = KEY_4,
> + [Q_KEY_CODE_5] = KEY_5,
> + [Q_KEY_CODE_6] = KEY_6,
> + [Q_KEY_CODE_7] = KEY_7,
> + [Q_KEY_CODE_8] = KEY_8,
> + [Q_KEY_CODE_9] = KEY_9,
> + [Q_KEY_CODE_0] = KEY_0,
> + [Q_KEY_CODE_MINUS] = KEY_MINUS,
> + [Q_KEY_CODE_EQUAL] = KEY_EQUAL,
> + [Q_KEY_CODE_BACKSPACE] = KEY_BACKSPACE,
> +
> + [Q_KEY_CODE_TAB] = KEY_TAB,
> + [Q_KEY_CODE_Q] = KEY_Q,
> + [Q_KEY_CODE_W] = KEY_W,
> + [Q_KEY_CODE_E] = KEY_E,
> + [Q_KEY_CODE_R] = KEY_R,
> + [Q_KEY_CODE_T] = KEY_T,
> + [Q_KEY_CODE_Y] = KEY_Y,
> + [Q_KEY_CODE_U] = KEY_U,
> + [Q_KEY_CODE_I] = KEY_I,
> + [Q_KEY_CODE_O] = KEY_O,
> + [Q_KEY_CODE_P] = KEY_P,
> + [Q_KEY_CODE_BRACKET_LEFT] = KEY_LEFTBRACE,
> + [Q_KEY_CODE_BRACKET_RIGHT] = KEY_RIGHTBRACE,
> + [Q_KEY_CODE_RET] = KEY_ENTER,
> +
> + [Q_KEY_CODE_CTRL] = KEY_LEFTCTRL,
> + [Q_KEY_CODE_A] = KEY_A,
> + [Q_KEY_CODE_S] = KEY_S,
> + [Q_KEY_CODE_D] = KEY_D,
> + [Q_KEY_CODE_F] = KEY_F,
> + [Q_KEY_CODE_G] = KEY_G,
> + [Q_KEY_CODE_H] = KEY_H,
> + [Q_KEY_CODE_J] = KEY_J,
> + [Q_KEY_CODE_K] = KEY_K,
> + [Q_KEY_CODE_L] = KEY_L,
> + [Q_KEY_CODE_SEMICOLON] = KEY_SEMICOLON,
> + [Q_KEY_CODE_APOSTROPHE] = KEY_APOSTROPHE,
> + [Q_KEY_CODE_GRAVE_ACCENT] = KEY_GRAVE,
> +
> + [Q_KEY_CODE_SHIFT] = KEY_LEFTSHIFT,
> + [Q_KEY_CODE_BACKSLASH] = KEY_BACKSLASH,
> + [Q_KEY_CODE_LESS] = KEY_102ND,
> + [Q_KEY_CODE_Z] = KEY_Z,
> + [Q_KEY_CODE_X] = KEY_X,
> + [Q_KEY_CODE_C] = KEY_C,
> + [Q_KEY_CODE_V] = KEY_V,
> + [Q_KEY_CODE_B] = KEY_B,
> + [Q_KEY_CODE_N] = KEY_N,
> + [Q_KEY_CODE_M] = KEY_M,
> + [Q_KEY_CODE_COMMA] = KEY_COMMA,
> + [Q_KEY_CODE_DOT] = KEY_DOT,
> + [Q_KEY_CODE_SLASH] = KEY_SLASH,
> + [Q_KEY_CODE_SHIFT_R] = KEY_RIGHTSHIFT,
> +
> + [Q_KEY_CODE_ALT] = KEY_LEFTALT,
> + [Q_KEY_CODE_SPC] = KEY_SPACE,
> + [Q_KEY_CODE_CAPS_LOCK] = KEY_CAPSLOCK,
> +
> + [Q_KEY_CODE_F1] = KEY_F1,
> + [Q_KEY_CODE_F2] = KEY_F2,
> + [Q_KEY_CODE_F3] = KEY_F3,
> + [Q_KEY_CODE_F4] = KEY_F4,
> + [Q_KEY_CODE_F5] = KEY_F5,
> + [Q_KEY_CODE_F6] = KEY_F6,
> + [Q_KEY_CODE_F7] = KEY_F7,
> + [Q_KEY_CODE_F8] = KEY_F8,
> + [Q_KEY_CODE_F9] = KEY_F9,
> + [Q_KEY_CODE_F10] = KEY_F10,
> + [Q_KEY_CODE_NUM_LOCK] = KEY_NUMLOCK,
> + [Q_KEY_CODE_SCROLL_LOCK] = KEY_SCROLLLOCK,
> +
> + [Q_KEY_CODE_KP_0] = KEY_KP0,
> + [Q_KEY_CODE_KP_1] = KEY_KP1,
> + [Q_KEY_CODE_KP_2] = KEY_KP2,
> + [Q_KEY_CODE_KP_3] = KEY_KP3,
> + [Q_KEY_CODE_KP_4] = KEY_KP4,
> + [Q_KEY_CODE_KP_5] = KEY_KP5,
> + [Q_KEY_CODE_KP_6] = KEY_KP6,
> + [Q_KEY_CODE_KP_7] = KEY_KP7,
> + [Q_KEY_CODE_KP_8] = KEY_KP8,
> + [Q_KEY_CODE_KP_9] = KEY_KP9,
> + [Q_KEY_CODE_KP_SUBTRACT] = KEY_KPMINUS,
> + [Q_KEY_CODE_KP_ADD] = KEY_KPPLUS,
> + [Q_KEY_CODE_KP_DECIMAL] = KEY_KPDOT,
> + [Q_KEY_CODE_KP_ENTER] = KEY_KPENTER,
> + [Q_KEY_CODE_KP_DIVIDE] = KEY_KPSLASH,
> + [Q_KEY_CODE_KP_MULTIPLY] = KEY_KPASTERISK,
> +
> + [Q_KEY_CODE_F11] = KEY_F11,
> + [Q_KEY_CODE_F12] = KEY_F12,
> +
> + [Q_KEY_CODE_CTRL_R] = KEY_RIGHTCTRL,
> + [Q_KEY_CODE_SYSRQ] = KEY_SYSRQ,
> + [Q_KEY_CODE_PRINT] = KEY_SYSRQ,
I take that KEY_PRINT is not supported by the protocol?
> + [Q_KEY_CODE_PAUSE] = KEY_PAUSE,
> + [Q_KEY_CODE_ALT_R] = KEY_RIGHTALT,
> +
> + [Q_KEY_CODE_HOME] = KEY_HOME,
> + [Q_KEY_CODE_UP] = KEY_UP,
> + [Q_KEY_CODE_PGUP] = KEY_PAGEUP,
> + [Q_KEY_CODE_LEFT] = KEY_LEFT,
> + [Q_KEY_CODE_RIGHT] = KEY_RIGHT,
> + [Q_KEY_CODE_END] = KEY_END,
> + [Q_KEY_CODE_DOWN] = KEY_DOWN,
> + [Q_KEY_CODE_PGDN] = KEY_PAGEDOWN,
> + [Q_KEY_CODE_INSERT] = KEY_INSERT,
> + [Q_KEY_CODE_DELETE] = KEY_DELETE,
> +
> + [Q_KEY_CODE_META_L] = KEY_LEFTMETA,
> + [Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
> + [Q_KEY_CODE_MENU] = KEY_MENU,
> };
> -#endif
>
> -/*
> - * for (i = 0; i < 128; i++) {
> - * scancode2linux[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];
> - * scancode2linux[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];
> - * }
> - */
> -static const unsigned char scancode2linux[512] = {
> - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
> - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
> - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
> - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
> - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
> - 80, 81, 82, 83, 99, 0, 86, 87, 88,117, 0, 0, 95,183,184,185,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 93, 0, 0, 89, 0, 0, 85, 91, 90, 92, 0, 94, 0,124,121, 0,
> -
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 165, 0, 0, 0, 0, 0, 0, 0, 0,163, 0, 0, 96, 97, 0, 0,
> - 113,140,164, 0,166, 0, 0, 0, 0, 0,255, 0, 0, 0,114, 0,
> - 115, 0,150, 0, 0, 98,255, 99,100, 0, 0, 0, 0, 0, 0, 0,
> - 0, 0, 0, 0, 0,119,119,102,103,104, 0,105,112,106,118,107,
> - 108,109,110,111, 0, 0, 0, 0, 0, 0, 0,125,126,127,116,142,
> - 0, 0, 0,143, 0,217,156,173,128,159,158,157,155,226, 0,112,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> -};
>
> /* Send an event to the keyboard frontend driver */
> static int xenfb_kbd_event(struct XenInput *xenfb,
> @@ -260,87 +308,123 @@ static int xenfb_send_position(struct XenInput *xenfb,
> return xenfb_kbd_event(xenfb, &event);
> }
>
> -/*
> - * Send a key event from the client to the guest OS
> - * QEMU gives us a raw scancode from an AT / PS/2 style keyboard.
> - * We have to turn this into a Linux Input layer keycode.
> - *
> - * Extra complexity from the fact that with extended scancodes
> - * (like those produced by arrow keys) this method gets called
> - * twice, but we only want to send a single event. So we have to
> - * track the '0xe0' scancode state & collapse the extended keys
> - * as needed.
> - *
> - * Wish we could just send scancodes straight to the guest which
> - * already has code for dealing with this...
> - */
> -static void xenfb_key_event(void *opaque, int scancode)
> +static void xenfb_key_event(DeviceState *dev, QemuConsole *src,
> + InputEvent *evt)
> {
> - struct XenInput *xenfb = opaque;
> - int down = 1;
> + struct XenInput *in = (struct XenInput *)dev;
> + InputKeyEvent *key = evt->u.key.data;
> + int qcode = qemu_input_key_value_to_qcode(key->key);
>
> - if (scancode == 0xe0) {
> - xenfb->extended = 1;
> - return;
> - } else if (scancode & 0x80) {
> - scancode &= 0x7f;
> - down = 0;
> + if (qcode && keymap_qcode[qcode]) {
> + xenfb_send_key(in, key->down, keymap_qcode[qcode]);
> }
> - if (xenfb->extended) {
> - scancode |= 0x80;
> - xenfb->extended = 0;
> +}
> +
> +static void xenfb_mouse_event(DeviceState *dev, QemuConsole *src,
> + InputEvent *evt)
> +{
> + struct XenInput *in = (struct XenInput *)dev;
> + InputBtnEvent *btn;
> + InputMoveEvent *move;
> +
> + switch (evt->type) {
> + case INPUT_EVENT_KIND_BTN:
> + btn = evt->u.btn.data;
> + switch (btn->button) {
> + case INPUT_BUTTON_LEFT:
> + xenfb_send_key(in, btn->down, BTN_LEFT);
> + break;
> + case INPUT_BUTTON_RIGHT:
> + xenfb_send_key(in, btn->down, BTN_RIGHT);
> + break;
> + case INPUT_BUTTON_MIDDLE:
> + xenfb_send_key(in, btn->down, BTN_MIDDLE);
> + break;
> + case INPUT_BUTTON_WHEEL_UP:
> + if (btn->down) {
> + in->mouse_wheel--;
> + }
> + break;
> + case INPUT_BUTTON_WHEEL_DOWN:
> + if (btn->down) {
> + in->mouse_wheel++;
> + }
> + break;
> + default:
> + break;
> + }
> + break;
> + case INPUT_EVENT_KIND_ABS:
> + move = evt->u.abs.data;
> + in->mouse_axes[move->axis] = move->value;
> + break;
> + case INPUT_EVENT_KIND_REL:
> + move = evt->u.rel.data;
> + in->mouse_axes[move->axis] += move->value;
> + break;
> + default:
> + break;
> }
> - xenfb_send_key(xenfb, down, scancode2linux[scancode]);
> }
>
> -/*
> - * Send a mouse event from the client to the guest OS
> - *
> - * The QEMU mouse can be in either relative, or absolute mode.
> - * Movement is sent separately from button state, which has to
> - * be encoded as virtual key events. We also don't actually get
> - * given any button up/down events, so have to track changes in
> - * the button state.
> - */
> -static void xenfb_mouse_event(void *opaque,
> - int dx, int dy, int dz, int button_state)
> +static void xenfb_mouse_sync(DeviceState *dev)
> {
> - struct XenInput *xenfb = opaque;
> - QemuConsole *con = qemu_console_lookup_by_index(0);
> - DisplaySurface *surface;
> - int dw, dh, i;
> + struct XenInput *in = (struct XenInput *)dev;
> + int dx, dy, dz;
>
> - if (!con) {
> - xen_pv_printf(&xenfb->c.xendev, 0, "No QEMU console available");
> - return;
> - }
> + dx = in->mouse_axes[INPUT_AXIS_X];
> + dy = in->mouse_axes[INPUT_AXIS_Y];
> + dz = in->mouse_wheel;
> +
> + trace_xenfb_mouse_event(in, dx, dy, dz, 0,
> + in->abs_pointer_wanted);
> +
> + if (in->abs_pointer_wanted) {
> + QemuConsole *con = qemu_console_lookup_by_index(0);
> + DisplaySurface *surface;
> + int dw, dh;
> +
> + if (!con) {
> + xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
> + return;
> + }
>
> - surface = qemu_console_surface(con);
> - dw = surface_width(surface);
> - dh = surface_height(surface);
> -
> - trace_xenfb_mouse_event(opaque, dx, dy, dz, button_state,
> - xenfb->abs_pointer_wanted);
> - if (xenfb->abs_pointer_wanted)
> - xenfb_send_position(xenfb,
> - dx * (dw - 1) / 0x7fff,
> - dy * (dh - 1) / 0x7fff,
> - dz);
> - else
> - xenfb_send_motion(xenfb, dx, dy, dz);
> -
> - for (i = 0 ; i < 8 ; i++) {
> - int lastDown = xenfb->button_state & (1 << i);
> - int down = button_state & (1 << i);
> - if (down == lastDown)
> - continue;
> -
> - if (xenfb_send_key(xenfb, down, BTN_LEFT+i) < 0)
> - return;
> + surface = qemu_console_surface(con);
> + dw = surface_width(surface);
> + dh = surface_height(surface);
> +
> + dx = dx * (dw - 1) / 0x7fff;
> + dy = dy * (dh - 1) / 0x7fff;
> +
> + xenfb_send_position(in, dx, dy, dz);
> + } else {
> + xenfb_send_motion(in, dx, dy, dz);
> +
> + in->mouse_axes[INPUT_AXIS_X] = 0;
> + in->mouse_axes[INPUT_AXIS_Y] = 0;
> }
> - xenfb->button_state = button_state;
> +
> + in->mouse_wheel = 0;
> }
>
> +static QemuInputHandler xenfb_keyboard = {
> + .name = "Xen PVFB Keyboard",
> + .mask = INPUT_EVENT_MASK_KEY,
> + .event = xenfb_key_event,
> +};
> +static QemuInputHandler xenfb_abs_mouse = {
> + .name = "Xen PVFB Absolute Mouse",
> + .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_ABS,
> + .event = xenfb_mouse_event,
> + .sync = xenfb_mouse_sync
> +};
> +static QemuInputHandler xenfb_rel_mouse = {
> + .name = "Xen PVFB Mouse",
> + .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
> + .event = xenfb_mouse_event,
> + .sync = xenfb_mouse_sync,
> +};
> +
> static int input_init(struct XenDevice *xendev)
> {
> xenstore_write_be_int(xendev, "feature-abs-pointer", 1);
> @@ -356,7 +440,6 @@ static int input_initialise(struct XenDevice *xendev)
> if (rc != 0)
> return rc;
>
> - qemu_add_kbd_event_handler(xenfb_key_event, in);
> return 0;
> }
>
> @@ -369,24 +452,34 @@ static void input_connected(struct XenDevice *xendev)
> in->abs_pointer_wanted = 0;
> }
>
> - if (in->qmouse) {
> - qemu_remove_mouse_event_handler(in->qmouse);
> + if (in->qkbd) {
> + qemu_input_handler_unregister(in->qkbd);
> + }
> + if (in->qmou) {
> + qemu_input_handler_unregister(in->qmou);
> }
> trace_xenfb_input_connected(xendev, in->abs_pointer_wanted);
> - in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in,
> - in->abs_pointer_wanted,
> - "Xen PVFB Mouse");
> +
> + in->qkbd = qemu_input_handler_register((DeviceState *)in, &xenfb_keyboard);
> + in->qmou = qemu_input_handler_register((DeviceState *)in,
> + (in->abs_pointer_wanted ? &xenfb_abs_mouse : &xenfb_rel_mouse));
> +
> + qemu_input_handler_activate(in->qkbd);
> + qemu_input_handler_activate(in->qmou);
> }
>
> static void input_disconnect(struct XenDevice *xendev)
> {
> struct XenInput *in = container_of(xendev, struct XenInput, c.xendev);
>
> - if (in->qmouse) {
> - qemu_remove_mouse_event_handler(in->qmouse);
> - in->qmouse = NULL;
> + if (in->qkbd) {
> + qemu_input_handler_unregister(in->qkbd);
> + in->qkbd = NULL;
> + }
> + if (in->qmou) {
> + qemu_input_handler_unregister(in->qmou);
> + in->qmou = NULL;
> }
> - qemu_add_kbd_event_handler(NULL, NULL);
> common_unbind(&in->c);
> }
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2 v3] xenfb: Add [feature|request]-raw-pointer
2017-07-26 15:10 ` [Qemu-devel] [PATCH 2/2 v3] xenfb: Add [feature|request]-raw-pointer Owen Smith
@ 2017-08-21 23:13 ` Stefano Stabellini
0 siblings, 0 replies; 8+ messages in thread
From: Stefano Stabellini @ 2017-08-21 23:13 UTC (permalink / raw)
To: Owen Smith; +Cc: qemu-devel, xen-devel, sstabellini, anthony.perard
On Wed, 26 Jul 2017, Owen Smith wrote:
> Writes "feature-raw-pointer" during init to indicate the backend
> can pass raw unscaled values for absolute axes to the frontend.
> Frontends set "request-raw-pointer" to indicate the backend should
> not attempt to scale absolute values to console size.
> "request-raw-pointer" is only valid if "request-abs-pointer" is
> also set. Raw unscaled pointer values are in the range [0, 0x7fff]
>
> "feature-raw-pointer" and "request-raw-pointer" added to Xen
> header in commit 7868654ff7fe5e4a2eeae2b277644fa884a5031e
>
> Signed-off-by: Owen Smith <owen.smith@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> hw/display/xenfb.c | 37 ++++++++++++++++++++++++-------------
> 1 file changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
> index e412753..f397f9a 100644
> --- a/hw/display/xenfb.c
> +++ b/hw/display/xenfb.c
> @@ -50,6 +50,7 @@ struct common {
> struct XenInput {
> struct common c;
> int abs_pointer_wanted; /* Whether guest supports absolute pointer */
> + int raw_pointer_wanted; /* Whether guest supports raw (unscaled) pointer */
> QemuInputHandlerState *qkbd;
> QemuInputHandlerState *qmou;
> int mouse_axes[INPUT_AXIS__MAX];
> @@ -380,21 +381,23 @@ static void xenfb_mouse_sync(DeviceState *dev)
> in->abs_pointer_wanted);
>
> if (in->abs_pointer_wanted) {
> - QemuConsole *con = qemu_console_lookup_by_index(0);
> - DisplaySurface *surface;
> - int dw, dh;
> -
> - if (!con) {
> - xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
> - return;
> - }
> + if (!in->raw_pointer_wanted) {
> + QemuConsole *con = qemu_console_lookup_by_index(0);
> + DisplaySurface *surface;
> + int dw, dh;
> +
> + if (!con) {
> + xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
> + return;
> + }
>
> - surface = qemu_console_surface(con);
> - dw = surface_width(surface);
> - dh = surface_height(surface);
> + surface = qemu_console_surface(con);
> + dw = surface_width(surface);
> + dh = surface_height(surface);
>
> - dx = dx * (dw - 1) / 0x7fff;
> - dy = dy * (dh - 1) / 0x7fff;
> + dx = dx * (dw - 1) / 0x7fff;
> + dy = dy * (dh - 1) / 0x7fff;
> + }
>
> xenfb_send_position(in, dx, dy, dz);
> } else {
> @@ -428,6 +431,7 @@ static QemuInputHandler xenfb_rel_mouse = {
> static int input_init(struct XenDevice *xendev)
> {
> xenstore_write_be_int(xendev, "feature-abs-pointer", 1);
> + xenstore_write_be_int(xendev, "feature-raw-pointer", 1);
> return 0;
> }
>
> @@ -451,6 +455,13 @@ static void input_connected(struct XenDevice *xendev)
> &in->abs_pointer_wanted) == -1) {
> in->abs_pointer_wanted = 0;
> }
> + if (xenstore_read_fe_int(xendev, "request-raw-pointer",
> + &in->raw_pointer_wanted) == -1) {
> + in->raw_pointer_wanted = 0;
> + }
> + if (in->raw_pointer_wanted && !in->abs_pointer_wanted) {
> + xen_pv_printf(xendev, 0, "raw pointer set without absolute pointer.");
> + }
>
> if (in->qkbd) {
> qemu_input_handler_unregister(in->qkbd);
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly
2017-08-21 23:12 ` Stefano Stabellini
@ 2017-08-23 9:11 ` Owen Smith
2017-09-07 14:56 ` Anthony PERARD
1 sibling, 0 replies; 8+ messages in thread
From: Owen Smith @ 2017-08-23 9:11 UTC (permalink / raw)
To: Stefano Stabellini
Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org,
Anthony Perard
> -----Original Message-----
> From: Stefano Stabellini [mailto:sstabellini@kernel.org]
> Sent: 22 August 2017 00:12
> To: Owen Smith <owen.smith@citrix.com>
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org;
> sstabellini@kernel.org; Anthony Perard <anthony.perard@citrix.com>
> Subject: Re: [PATCH 1/2 v3] xenfb: Use Input Handlers directly
>
> Anthony,
>
> The code looks good. I tested this patch with Linux guests and seems to work
> OK, can you also confirm?
>
> One comment below.
>
>
> On Wed, 26 Jul 2017, Owen Smith wrote:
> > Avoid the unneccessary calls through the input-legacy.c file by using
> > the qemu_input_handler_*() calls directly. This did require reworking
> > the event and sync handlers and a direct mapping from QEMU's qcodes to
> > linux KEY_* identifiers required by the ring protocol. Removes the
> > scancode2linux mapping, and supporting documention.
> >
> > Signed-off-by: Owen Smith <owen.smith@citrix.com>
> > ---
> > hw/display/xenfb.c | 401
> > +++++++++++++++++++++++++++++++++--------------------
> > 1 file changed, 247 insertions(+), 154 deletions(-)
> >
> > diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index
> > df8b78f..e412753 100644
> > --- a/hw/display/xenfb.c
> > +++ b/hw/display/xenfb.c
> > @@ -27,6 +27,7 @@
> > #include "qemu/osdep.h"
> >
> > #include "hw/hw.h"
> > +#include "ui/input.h"
> > #include "ui/console.h"
> > #include "hw/xen/xen_backend.h"
> >
> > @@ -37,9 +38,7 @@
> >
> > #include "trace.h"
> >
> > -#ifndef BTN_LEFT
> > -#define BTN_LEFT 0x110 /* from <linux/input.h> */ -#endif
> > +#include "standard-headers/linux/input.h"
> >
> > /*
> > --------------------------------------------------------------------
> > */
> >
> > @@ -51,9 +50,10 @@ struct common {
> > struct XenInput {
> > struct common c;
> > int abs_pointer_wanted; /* Whether guest supports absolute pointer */
> > - int button_state; /* Last seen pointer button state */
> > - int extended;
> > - QEMUPutMouseEntry *qmouse;
> > + QemuInputHandlerState *qkbd;
> > + QemuInputHandlerState *qmou;
> > + int mouse_axes[INPUT_AXIS__MAX];
> > + int mouse_wheel;
> > };
> >
> > #define UP_QUEUE 8
> > @@ -120,77 +120,125 @@ static void common_unbind(struct common *c)
> >
> > /*
> > --------------------------------------------------------------------
> > */
> >
> > -#if 0
> > -/*
> > - * These two tables are not needed any more, but left in here
> > - * intentionally as documentation, to show how scancode2linux[]
> > - * was generated.
> > - *
> > - * Tables to map from scancode to Linux input layer keycode.
> > - * Scancodes are hardware-specific. These maps assumes a
> > - * standard AT or PS/2 keyboard which is what QEMU feeds us.
> > - */
> > -const unsigned char atkbd_set2_keycode[512] = {
> > -
> > - 0, 67, 65, 63, 61, 59, 60, 88, 0, 68, 66, 64, 62, 15, 41,117,
> > - 0, 56, 42, 93, 29, 16, 2, 0, 0, 0, 44, 31, 30, 17, 3, 0,
> > - 0, 46, 45, 32, 18, 5, 4, 95, 0, 57, 47, 33, 20, 19, 6,183,
> > - 0, 49, 48, 35, 34, 21, 7,184, 0, 0, 50, 36, 22, 8, 9,185,
> > - 0, 51, 37, 23, 24, 11, 10, 0, 0, 52, 53, 38, 39, 25, 12, 0,
> > - 0, 89, 40, 0, 26, 13, 0, 0, 58, 54, 28, 27, 0, 43, 0, 85,
> > - 0, 86, 91, 90, 92, 0, 14, 94, 0, 79,124, 75, 71,121, 0, 0,
> > - 82, 83, 80, 76, 77, 72, 1, 69, 87, 78, 81, 74, 55, 73, 70, 99,
> > -
> > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> > - 217,100,255, 0, 97,165, 0, 0,156, 0, 0, 0, 0, 0, 0,125,
> > - 173,114, 0,113, 0, 0, 0,126,128, 0, 0,140, 0, 0, 0,127,
> > - 159, 0,115, 0,164, 0, 0,116,158, 0,150,166, 0, 0, 0,142,
> > - 157, 0, 0, 0, 0, 0, 0, 0,155, 0, 98, 0, 0,163, 0, 0,
> > - 226, 0, 0, 0, 0, 0, 0, 0, 0,255, 96, 0, 0, 0,143, 0,
> > - 0, 0, 0, 0, 0, 0, 0, 0, 0,107, 0,105,102, 0, 0,112,
> > - 110,111,108,112,106,103, 0,119, 0,118,109, 0, 99,104,119, 0,
> > -
> > -};
> > -
> > -const unsigned char atkbd_unxlate_table[128] = {
> > -
> > - 0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,
> > - 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
> > - 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
> > - 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88, 5, 6, 4, 12, 3,
> > - 11, 2, 10, 1, 9,119,126,108,117,125,123,107,115,116,121,105,
> > - 114,122,112,113,127, 96, 97,120, 7, 15, 23, 31, 39, 47, 55, 63,
> > - 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,
> > - 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110
> > -
> > +static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = {
> > + [Q_KEY_CODE_ESC] = KEY_ESC,
> > + [Q_KEY_CODE_1] = KEY_1,
> > + [Q_KEY_CODE_2] = KEY_2,
> > + [Q_KEY_CODE_3] = KEY_3,
> > + [Q_KEY_CODE_4] = KEY_4,
> > + [Q_KEY_CODE_5] = KEY_5,
> > + [Q_KEY_CODE_6] = KEY_6,
> > + [Q_KEY_CODE_7] = KEY_7,
> > + [Q_KEY_CODE_8] = KEY_8,
> > + [Q_KEY_CODE_9] = KEY_9,
> > + [Q_KEY_CODE_0] = KEY_0,
> > + [Q_KEY_CODE_MINUS] = KEY_MINUS,
> > + [Q_KEY_CODE_EQUAL] = KEY_EQUAL,
> > + [Q_KEY_CODE_BACKSPACE] = KEY_BACKSPACE,
> > +
> > + [Q_KEY_CODE_TAB] = KEY_TAB,
> > + [Q_KEY_CODE_Q] = KEY_Q,
> > + [Q_KEY_CODE_W] = KEY_W,
> > + [Q_KEY_CODE_E] = KEY_E,
> > + [Q_KEY_CODE_R] = KEY_R,
> > + [Q_KEY_CODE_T] = KEY_T,
> > + [Q_KEY_CODE_Y] = KEY_Y,
> > + [Q_KEY_CODE_U] = KEY_U,
> > + [Q_KEY_CODE_I] = KEY_I,
> > + [Q_KEY_CODE_O] = KEY_O,
> > + [Q_KEY_CODE_P] = KEY_P,
> > + [Q_KEY_CODE_BRACKET_LEFT] = KEY_LEFTBRACE,
> > + [Q_KEY_CODE_BRACKET_RIGHT] = KEY_RIGHTBRACE,
> > + [Q_KEY_CODE_RET] = KEY_ENTER,
> > +
> > + [Q_KEY_CODE_CTRL] = KEY_LEFTCTRL,
> > + [Q_KEY_CODE_A] = KEY_A,
> > + [Q_KEY_CODE_S] = KEY_S,
> > + [Q_KEY_CODE_D] = KEY_D,
> > + [Q_KEY_CODE_F] = KEY_F,
> > + [Q_KEY_CODE_G] = KEY_G,
> > + [Q_KEY_CODE_H] = KEY_H,
> > + [Q_KEY_CODE_J] = KEY_J,
> > + [Q_KEY_CODE_K] = KEY_K,
> > + [Q_KEY_CODE_L] = KEY_L,
> > + [Q_KEY_CODE_SEMICOLON] = KEY_SEMICOLON,
> > + [Q_KEY_CODE_APOSTROPHE] = KEY_APOSTROPHE,
> > + [Q_KEY_CODE_GRAVE_ACCENT] = KEY_GRAVE,
> > +
> > + [Q_KEY_CODE_SHIFT] = KEY_LEFTSHIFT,
> > + [Q_KEY_CODE_BACKSLASH] = KEY_BACKSLASH,
> > + [Q_KEY_CODE_LESS] = KEY_102ND,
> > + [Q_KEY_CODE_Z] = KEY_Z,
> > + [Q_KEY_CODE_X] = KEY_X,
> > + [Q_KEY_CODE_C] = KEY_C,
> > + [Q_KEY_CODE_V] = KEY_V,
> > + [Q_KEY_CODE_B] = KEY_B,
> > + [Q_KEY_CODE_N] = KEY_N,
> > + [Q_KEY_CODE_M] = KEY_M,
> > + [Q_KEY_CODE_COMMA] = KEY_COMMA,
> > + [Q_KEY_CODE_DOT] = KEY_DOT,
> > + [Q_KEY_CODE_SLASH] = KEY_SLASH,
> > + [Q_KEY_CODE_SHIFT_R] = KEY_RIGHTSHIFT,
> > +
> > + [Q_KEY_CODE_ALT] = KEY_LEFTALT,
> > + [Q_KEY_CODE_SPC] = KEY_SPACE,
> > + [Q_KEY_CODE_CAPS_LOCK] = KEY_CAPSLOCK,
> > +
> > + [Q_KEY_CODE_F1] = KEY_F1,
> > + [Q_KEY_CODE_F2] = KEY_F2,
> > + [Q_KEY_CODE_F3] = KEY_F3,
> > + [Q_KEY_CODE_F4] = KEY_F4,
> > + [Q_KEY_CODE_F5] = KEY_F5,
> > + [Q_KEY_CODE_F6] = KEY_F6,
> > + [Q_KEY_CODE_F7] = KEY_F7,
> > + [Q_KEY_CODE_F8] = KEY_F8,
> > + [Q_KEY_CODE_F9] = KEY_F9,
> > + [Q_KEY_CODE_F10] = KEY_F10,
> > + [Q_KEY_CODE_NUM_LOCK] = KEY_NUMLOCK,
> > + [Q_KEY_CODE_SCROLL_LOCK] = KEY_SCROLLLOCK,
> > +
> > + [Q_KEY_CODE_KP_0] = KEY_KP0,
> > + [Q_KEY_CODE_KP_1] = KEY_KP1,
> > + [Q_KEY_CODE_KP_2] = KEY_KP2,
> > + [Q_KEY_CODE_KP_3] = KEY_KP3,
> > + [Q_KEY_CODE_KP_4] = KEY_KP4,
> > + [Q_KEY_CODE_KP_5] = KEY_KP5,
> > + [Q_KEY_CODE_KP_6] = KEY_KP6,
> > + [Q_KEY_CODE_KP_7] = KEY_KP7,
> > + [Q_KEY_CODE_KP_8] = KEY_KP8,
> > + [Q_KEY_CODE_KP_9] = KEY_KP9,
> > + [Q_KEY_CODE_KP_SUBTRACT] = KEY_KPMINUS,
> > + [Q_KEY_CODE_KP_ADD] = KEY_KPPLUS,
> > + [Q_KEY_CODE_KP_DECIMAL] = KEY_KPDOT,
> > + [Q_KEY_CODE_KP_ENTER] = KEY_KPENTER,
> > + [Q_KEY_CODE_KP_DIVIDE] = KEY_KPSLASH,
> > + [Q_KEY_CODE_KP_MULTIPLY] = KEY_KPASTERISK,
> > +
> > + [Q_KEY_CODE_F11] = KEY_F11,
> > + [Q_KEY_CODE_F12] = KEY_F12,
> > +
> > + [Q_KEY_CODE_CTRL_R] = KEY_RIGHTCTRL,
> > + [Q_KEY_CODE_SYSRQ] = KEY_SYSRQ,
> > + [Q_KEY_CODE_PRINT] = KEY_SYSRQ,
>
> I take that KEY_PRINT is not supported by the protocol?
>
KEY_PRINT should be supported - I think I made a copy/paste error here, as
it's supposed to be the reverse of the mapping done by qemu_input_linux_to_qcode()
>
> > + [Q_KEY_CODE_PAUSE] = KEY_PAUSE,
> > + [Q_KEY_CODE_ALT_R] = KEY_RIGHTALT,
> > +
> > + [Q_KEY_CODE_HOME] = KEY_HOME,
> > + [Q_KEY_CODE_UP] = KEY_UP,
> > + [Q_KEY_CODE_PGUP] = KEY_PAGEUP,
> > + [Q_KEY_CODE_LEFT] = KEY_LEFT,
> > + [Q_KEY_CODE_RIGHT] = KEY_RIGHT,
> > + [Q_KEY_CODE_END] = KEY_END,
> > + [Q_KEY_CODE_DOWN] = KEY_DOWN,
> > + [Q_KEY_CODE_PGDN] = KEY_PAGEDOWN,
> > + [Q_KEY_CODE_INSERT] = KEY_INSERT,
> > + [Q_KEY_CODE_DELETE] = KEY_DELETE,
> > +
> > + [Q_KEY_CODE_META_L] = KEY_LEFTMETA,
> > + [Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
> > + [Q_KEY_CODE_MENU] = KEY_MENU,
> > };
> > -#endif
> >
> > -/*
> > - * for (i = 0; i < 128; i++) {
> > - * scancode2linux[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];
> > - * scancode2linux[i | 0x80] =
> atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];
> > - * }
> > - */
> > -static const unsigned char scancode2linux[512] = {
> > - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
> > - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
> > - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
> > - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
> > - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
> > - 80, 81, 82, 83, 99, 0, 86, 87, 88,117, 0, 0, 95,183,184,185,
> > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> > - 93, 0, 0, 89, 0, 0, 85, 91, 90, 92, 0, 94, 0,124,121, 0,
> > -
> > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> > - 165, 0, 0, 0, 0, 0, 0, 0, 0,163, 0, 0, 96, 97, 0, 0,
> > - 113,140,164, 0,166, 0, 0, 0, 0, 0,255, 0, 0, 0,114, 0,
> > - 115, 0,150, 0, 0, 98,255, 99,100, 0, 0, 0, 0, 0, 0, 0,
> > - 0, 0, 0, 0, 0,119,119,102,103,104, 0,105,112,106,118,107,
> > - 108,109,110,111, 0, 0, 0, 0, 0, 0, 0,125,126,127,116,142,
> > - 0, 0, 0,143, 0,217,156,173,128,159,158,157,155,226, 0,112,
> > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> > -};
> >
> > /* Send an event to the keyboard frontend driver */ static int
> > xenfb_kbd_event(struct XenInput *xenfb, @@ -260,87 +308,123 @@ static
> > int xenfb_send_position(struct XenInput *xenfb,
> > return xenfb_kbd_event(xenfb, &event); }
> >
> > -/*
> > - * Send a key event from the client to the guest OS
> > - * QEMU gives us a raw scancode from an AT / PS/2 style keyboard.
> > - * We have to turn this into a Linux Input layer keycode.
> > - *
> > - * Extra complexity from the fact that with extended scancodes
> > - * (like those produced by arrow keys) this method gets called
> > - * twice, but we only want to send a single event. So we have to
> > - * track the '0xe0' scancode state & collapse the extended keys
> > - * as needed.
> > - *
> > - * Wish we could just send scancodes straight to the guest which
> > - * already has code for dealing with this...
> > - */
> > -static void xenfb_key_event(void *opaque, int scancode)
> > +static void xenfb_key_event(DeviceState *dev, QemuConsole *src,
> > + InputEvent *evt)
> > {
> > - struct XenInput *xenfb = opaque;
> > - int down = 1;
> > + struct XenInput *in = (struct XenInput *)dev;
> > + InputKeyEvent *key = evt->u.key.data;
> > + int qcode = qemu_input_key_value_to_qcode(key->key);
> >
> > - if (scancode == 0xe0) {
> > - xenfb->extended = 1;
> > - return;
> > - } else if (scancode & 0x80) {
> > - scancode &= 0x7f;
> > - down = 0;
> > + if (qcode && keymap_qcode[qcode]) {
> > + xenfb_send_key(in, key->down, keymap_qcode[qcode]);
> > }
> > - if (xenfb->extended) {
> > - scancode |= 0x80;
> > - xenfb->extended = 0;
> > +}
> > +
> > +static void xenfb_mouse_event(DeviceState *dev, QemuConsole *src,
> > + InputEvent *evt) {
> > + struct XenInput *in = (struct XenInput *)dev;
> > + InputBtnEvent *btn;
> > + InputMoveEvent *move;
> > +
> > + switch (evt->type) {
> > + case INPUT_EVENT_KIND_BTN:
> > + btn = evt->u.btn.data;
> > + switch (btn->button) {
> > + case INPUT_BUTTON_LEFT:
> > + xenfb_send_key(in, btn->down, BTN_LEFT);
> > + break;
> > + case INPUT_BUTTON_RIGHT:
> > + xenfb_send_key(in, btn->down, BTN_RIGHT);
> > + break;
> > + case INPUT_BUTTON_MIDDLE:
> > + xenfb_send_key(in, btn->down, BTN_MIDDLE);
> > + break;
> > + case INPUT_BUTTON_WHEEL_UP:
> > + if (btn->down) {
> > + in->mouse_wheel--;
> > + }
> > + break;
> > + case INPUT_BUTTON_WHEEL_DOWN:
> > + if (btn->down) {
> > + in->mouse_wheel++;
> > + }
> > + break;
> > + default:
> > + break;
> > + }
> > + break;
> > + case INPUT_EVENT_KIND_ABS:
> > + move = evt->u.abs.data;
> > + in->mouse_axes[move->axis] = move->value;
> > + break;
> > + case INPUT_EVENT_KIND_REL:
> > + move = evt->u.rel.data;
> > + in->mouse_axes[move->axis] += move->value;
> > + break;
> > + default:
> > + break;
> > }
> > - xenfb_send_key(xenfb, down, scancode2linux[scancode]);
> > }
> >
> > -/*
> > - * Send a mouse event from the client to the guest OS
> > - *
> > - * The QEMU mouse can be in either relative, or absolute mode.
> > - * Movement is sent separately from button state, which has to
> > - * be encoded as virtual key events. We also don't actually get
> > - * given any button up/down events, so have to track changes in
> > - * the button state.
> > - */
> > -static void xenfb_mouse_event(void *opaque,
> > - int dx, int dy, int dz, int button_state)
> > +static void xenfb_mouse_sync(DeviceState *dev)
> > {
> > - struct XenInput *xenfb = opaque;
> > - QemuConsole *con = qemu_console_lookup_by_index(0);
> > - DisplaySurface *surface;
> > - int dw, dh, i;
> > + struct XenInput *in = (struct XenInput *)dev;
> > + int dx, dy, dz;
> >
> > - if (!con) {
> > - xen_pv_printf(&xenfb->c.xendev, 0, "No QEMU console available");
> > - return;
> > - }
> > + dx = in->mouse_axes[INPUT_AXIS_X];
> > + dy = in->mouse_axes[INPUT_AXIS_Y];
> > + dz = in->mouse_wheel;
> > +
> > + trace_xenfb_mouse_event(in, dx, dy, dz, 0,
> > + in->abs_pointer_wanted);
> > +
> > + if (in->abs_pointer_wanted) {
> > + QemuConsole *con = qemu_console_lookup_by_index(0);
> > + DisplaySurface *surface;
> > + int dw, dh;
> > +
> > + if (!con) {
> > + xen_pv_printf(&in->c.xendev, 0, "No QEMU console available");
> > + return;
> > + }
> >
> > - surface = qemu_console_surface(con);
> > - dw = surface_width(surface);
> > - dh = surface_height(surface);
> > -
> > - trace_xenfb_mouse_event(opaque, dx, dy, dz, button_state,
> > - xenfb->abs_pointer_wanted);
> > - if (xenfb->abs_pointer_wanted)
> > - xenfb_send_position(xenfb,
> > - dx * (dw - 1) / 0x7fff,
> > - dy * (dh - 1) / 0x7fff,
> > - dz);
> > - else
> > - xenfb_send_motion(xenfb, dx, dy, dz);
> > -
> > - for (i = 0 ; i < 8 ; i++) {
> > - int lastDown = xenfb->button_state & (1 << i);
> > - int down = button_state & (1 << i);
> > - if (down == lastDown)
> > - continue;
> > -
> > - if (xenfb_send_key(xenfb, down, BTN_LEFT+i) < 0)
> > - return;
> > + surface = qemu_console_surface(con);
> > + dw = surface_width(surface);
> > + dh = surface_height(surface);
> > +
> > + dx = dx * (dw - 1) / 0x7fff;
> > + dy = dy * (dh - 1) / 0x7fff;
> > +
> > + xenfb_send_position(in, dx, dy, dz);
> > + } else {
> > + xenfb_send_motion(in, dx, dy, dz);
> > +
> > + in->mouse_axes[INPUT_AXIS_X] = 0;
> > + in->mouse_axes[INPUT_AXIS_Y] = 0;
> > }
> > - xenfb->button_state = button_state;
> > +
> > + in->mouse_wheel = 0;
> > }
> >
> > +static QemuInputHandler xenfb_keyboard = {
> > + .name = "Xen PVFB Keyboard",
> > + .mask = INPUT_EVENT_MASK_KEY,
> > + .event = xenfb_key_event,
> > +};
> > +static QemuInputHandler xenfb_abs_mouse = {
> > + .name = "Xen PVFB Absolute Mouse",
> > + .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_ABS,
> > + .event = xenfb_mouse_event,
> > + .sync = xenfb_mouse_sync
> > +};
> > +static QemuInputHandler xenfb_rel_mouse = {
> > + .name = "Xen PVFB Mouse",
> > + .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
> > + .event = xenfb_mouse_event,
> > + .sync = xenfb_mouse_sync,
> > +};
> > +
> > static int input_init(struct XenDevice *xendev) {
> > xenstore_write_be_int(xendev, "feature-abs-pointer", 1); @@
> > -356,7 +440,6 @@ static int input_initialise(struct XenDevice *xendev)
> > if (rc != 0)
> > return rc;
> >
> > - qemu_add_kbd_event_handler(xenfb_key_event, in);
> > return 0;
> > }
> >
> > @@ -369,24 +452,34 @@ static void input_connected(struct XenDevice
> *xendev)
> > in->abs_pointer_wanted = 0;
> > }
> >
> > - if (in->qmouse) {
> > - qemu_remove_mouse_event_handler(in->qmouse);
> > + if (in->qkbd) {
> > + qemu_input_handler_unregister(in->qkbd);
> > + }
> > + if (in->qmou) {
> > + qemu_input_handler_unregister(in->qmou);
> > }
> > trace_xenfb_input_connected(xendev, in->abs_pointer_wanted);
> > - in->qmouse =
> qemu_add_mouse_event_handler(xenfb_mouse_event, in,
> > - in->abs_pointer_wanted,
> > - "Xen PVFB Mouse");
> > +
> > + in->qkbd = qemu_input_handler_register((DeviceState *)in,
> &xenfb_keyboard);
> > + in->qmou = qemu_input_handler_register((DeviceState *)in,
> > + (in->abs_pointer_wanted ? &xenfb_abs_mouse :
> > + &xenfb_rel_mouse));
> > +
> > + qemu_input_handler_activate(in->qkbd);
> > + qemu_input_handler_activate(in->qmou);
> > }
> >
> > static void input_disconnect(struct XenDevice *xendev) {
> > struct XenInput *in = container_of(xendev, struct XenInput,
> > c.xendev);
> >
> > - if (in->qmouse) {
> > - qemu_remove_mouse_event_handler(in->qmouse);
> > - in->qmouse = NULL;
> > + if (in->qkbd) {
> > + qemu_input_handler_unregister(in->qkbd);
> > + in->qkbd = NULL;
> > + }
> > + if (in->qmou) {
> > + qemu_input_handler_unregister(in->qmou);
> > + in->qmou = NULL;
> > }
> > - qemu_add_kbd_event_handler(NULL, NULL);
> > common_unbind(&in->c);
> > }
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly
2017-08-21 23:12 ` Stefano Stabellini
2017-08-23 9:11 ` Owen Smith
@ 2017-09-07 14:56 ` Anthony PERARD
2017-09-20 17:15 ` Stefano Stabellini
1 sibling, 1 reply; 8+ messages in thread
From: Anthony PERARD @ 2017-09-07 14:56 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: Owen Smith, qemu-devel, xen-devel
On Mon, Aug 21, 2017 at 04:12:27PM -0700, Stefano Stabellini wrote:
> Anthony,
>
> The code looks good. I tested this patch with Linux guests and seems to
> work OK, can you also confirm?
I've tested with Linux as well, an HVM guess, I did not spot any issue.
But, the code compiles with warnings...
In file included from /root/build/qemu/include/standard-headers/linux/input.h:16:0,
from hw/display/xenfb.c:41:
/root/build/qemu/include/standard-headers/linux/input-event-codes.h:88:0: error: "KEY_BACKSPACE" redefined [-Werror]
#define KEY_BACKSPACE 14
In file included from /root/build/qemu/include/ui/console.h:342:0,
from hw/display/xenfb.c:31:
/usr/include/curses.h:1494:0: note: this is the location of the previous definition
#define KEY_BACKSPACE 0407 /* backspace key */
In file included from /root/build/qemu/include/standard-headers/linux/input.h:16:0,
from hw/display/xenfb.c:41:
/root/build/qemu/include/standard-headers/linux/input-event-codes.h:102:0: error: "KEY_ENTER" redefined [-Werror]
#define KEY_ENTER 28
In file included from /root/build/qemu/include/ui/console.h:342:0,
from hw/display/xenfb.c:31:
/usr/include/curses.h:1512:0: note: this is the location of the previous definition
#define KEY_ENTER 0527 /* enter/send key */
In file included from /root/build/qemu/include/standard-headers/linux/input.h:16:0,
from hw/display/xenfb.c:41:
/root/build/qemu/include/standard-headers/linux/input-event-codes.h:107:0: error: "KEY_F" redefined [-Werror]
#define KEY_F 33
In file included from /root/build/qemu/include/ui/console.h:342:0,
from hw/display/xenfb.c:31:
/usr/include/curses.h:1496:0: note: this is the location of the previous definition
#define KEY_F(n) (KEY_F0+(n)) /* Value of function key n */
[...]
And a lot more...
--
Anthony PERARD
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly
2017-09-07 14:56 ` Anthony PERARD
@ 2017-09-20 17:15 ` Stefano Stabellini
0 siblings, 0 replies; 8+ messages in thread
From: Stefano Stabellini @ 2017-09-20 17:15 UTC (permalink / raw)
To: owen.smith; +Cc: Stefano Stabellini, qemu-devel, xen-devel, anthony.perard
Ping?
On Thu, 7 Sep 2017, Anthony PERARD wrote:
> On Mon, Aug 21, 2017 at 04:12:27PM -0700, Stefano Stabellini wrote:
> > Anthony,
> >
> > The code looks good. I tested this patch with Linux guests and seems to
> > work OK, can you also confirm?
>
> I've tested with Linux as well, an HVM guess, I did not spot any issue.
>
> But, the code compiles with warnings...
>
> In file included from /root/build/qemu/include/standard-headers/linux/input.h:16:0,
> from hw/display/xenfb.c:41:
> /root/build/qemu/include/standard-headers/linux/input-event-codes.h:88:0: error: "KEY_BACKSPACE" redefined [-Werror]
> #define KEY_BACKSPACE 14
>
> In file included from /root/build/qemu/include/ui/console.h:342:0,
> from hw/display/xenfb.c:31:
> /usr/include/curses.h:1494:0: note: this is the location of the previous definition
> #define KEY_BACKSPACE 0407 /* backspace key */
>
> In file included from /root/build/qemu/include/standard-headers/linux/input.h:16:0,
> from hw/display/xenfb.c:41:
> /root/build/qemu/include/standard-headers/linux/input-event-codes.h:102:0: error: "KEY_ENTER" redefined [-Werror]
> #define KEY_ENTER 28
>
> In file included from /root/build/qemu/include/ui/console.h:342:0,
> from hw/display/xenfb.c:31:
> /usr/include/curses.h:1512:0: note: this is the location of the previous definition
> #define KEY_ENTER 0527 /* enter/send key */
>
> In file included from /root/build/qemu/include/standard-headers/linux/input.h:16:0,
> from hw/display/xenfb.c:41:
> /root/build/qemu/include/standard-headers/linux/input-event-codes.h:107:0: error: "KEY_F" redefined [-Werror]
> #define KEY_F 33
>
> In file included from /root/build/qemu/include/ui/console.h:342:0,
> from hw/display/xenfb.c:31:
> /usr/include/curses.h:1496:0: note: this is the location of the previous definition
> #define KEY_F(n) (KEY_F0+(n)) /* Value of function key n */
> [...]
>
> And a lot more...
>
> --
> Anthony PERARD
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-09-20 17:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-26 15:10 [Qemu-devel] [PATCH 0/2 v3] xenfb: rework xen vkbd backend Owen Smith
2017-07-26 15:10 ` [Qemu-devel] [PATCH 1/2 v3] xenfb: Use Input Handlers directly Owen Smith
2017-08-21 23:12 ` Stefano Stabellini
2017-08-23 9:11 ` Owen Smith
2017-09-07 14:56 ` Anthony PERARD
2017-09-20 17:15 ` Stefano Stabellini
2017-07-26 15:10 ` [Qemu-devel] [PATCH 2/2 v3] xenfb: Add [feature|request]-raw-pointer Owen Smith
2017-08-21 23:13 ` Stefano Stabellini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).