[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3 v4] xenfb: Add [feature|request]-raw-pointer
From: |
Owen Smith |
Subject: |
[Qemu-devel] [PATCH 3/3 v4] xenfb: Add [feature|request]-raw-pointer |
Date: |
Tue, 26 Sep 2017 14:43:39 +0000 |
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]
Signed-off-by: Owen Smith <address@hidden>
---
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 33361b4..29428ae 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -52,6 +52,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];
@@ -264,21 +265,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 {
@@ -312,6 +315,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;
}
@@ -335,6 +339,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