| Message ID | 1501081831-9587-3-git-send-email-owen.smith@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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);
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(-)