Il 28/01/2014 10:57, Gerd Hoffmann ha scritto:
Transform absolute mouse events according to graphic_rotate.
Legacy input code does it for both absolute and relative events,
but the logic is broken for relative coordinates, so this is
most likely not used anyway.
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
ui/input.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/ui/input.c b/ui/input.c
index a02172e..2c4d4d6 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -50,6 +50,33 @@ qemu_input_find_handler(uint32_t mask)
return NULL;
}
+static void qemu_input_transform_abs_rotate(InputEvent *evt)
+{
+ switch (graphic_rotate) {
+ case 90:
+ if (evt->abs->axis == INPUT_AXIS_X) {
+ evt->abs->axis = INPUT_AXIS_Y;
+ }
+ if (evt->abs->axis == INPUT_AXIS_Y) {
Need else here, same for "case 270".
+ evt->abs->axis = INPUT_AXIS_X;
+ evt->abs->axis = INPUT_EVENT_ABS_SIZE - 1 - evt->abs->axis;
->value here, not ->axis.
It looks like doing it right for relative is easy:
if (graphic_rotate == 0) {
return;
}
if (move->axis != INPUT_AXIS_X && move->axis != INPUT_AXIS_Y) {
return;
}
if ((graphic_rotate <= 180 && move->axis == INPUT_AXIS_X) ||
(graphic_rotate >= 180 && move->axis == INPUT_AXIS_Y)) {
if (kind == INPUT_EVENT_KIND_ABS) {
move->value = INPUT_EVENT_ABS_SIZE - 1 - move->value;
} else {
move->value = -move->value;
}
}
if (graphic_rotate == 90 || graphic_rotate == 270) {
move->axis ^= INPUT_AXIS_X ^ INPUT_AXIS_Y;
}
...
if (evt->kind == INPUT_EVENT_KIND_ABS) {
qemu_input_transform_rotate(evt->kind, &evt->abs);
} else if (evt->kind == INPUT_EVENT_KIND_REL) {
qemu_input_transform_rotate(evt->kind, &evt->rel);
}
Paolo
+ }
+ break;
+ case 180:
+ evt->abs->axis = INPUT_EVENT_ABS_SIZE - 1 - evt->abs->axis;
+ break;
+ case 270:
+ if (evt->abs->axis == INPUT_AXIS_X) {
+ evt->abs->axis = INPUT_AXIS_Y;
+ evt->abs->axis = INPUT_EVENT_ABS_SIZE - 1 - evt->abs->axis;
+ }
+ if (evt->abs->axis == INPUT_AXIS_Y) {
+ evt->abs->axis = INPUT_AXIS_X;
+ }
+ break;
+ }
+}
+
void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
{
QemuInputHandlerState *s;
@@ -58,6 +85,12 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
return;
}
+ /* pre processing */
+ if (graphic_rotate && (evt->kind == INPUT_EVENT_KIND_ABS)) {
+ qemu_input_transform_abs_rotate(evt);
+ }
+
+ /* send event */
s = qemu_input_find_handler(1 << evt->kind);
s->handler->event(s->dev, src, evt);
s->events++;
