[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/44] input: mouse: switch vnc ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 26/44] input: mouse: switch vnc ui to new core |
Date: |
Mon, 24 Feb 2014 12:52:33 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 46 ++++++++++++++++++++++------------------------
ui/vnc.h | 1 +
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 4658559..7dfc94a 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1484,7 +1484,7 @@ static void client_cut_text(VncState *vs, size_t len,
uint8_t *text)
static void check_pointer_type_change(Notifier *notifier, void *data)
{
VncState *vs = container_of(notifier, VncState, mouse_mode_notifier);
- int absolute = kbd_mouse_is_absolute();
+ int absolute = qemu_input_is_absolute();
if (vnc_has_feature(vs, VNC_FEATURE_POINTER_TYPE_CHANGE) && vs->absolute
!= absolute) {
vnc_lock_output(vs);
@@ -1503,39 +1503,37 @@ static void check_pointer_type_change(Notifier
*notifier, void *data)
static void pointer_event(VncState *vs, int button_mask, int x, int y)
{
- int buttons = 0;
- int dz = 0;
+ static uint32_t bmap[INPUT_BUTTON_MAX] = {
+ [INPUT_BUTTON_LEFT] = 0x01,
+ [INPUT_BUTTON_MIDDLE] = 0x02,
+ [INPUT_BUTTON_RIGHT] = 0x04,
+ [INPUT_BUTTON_WHEEL_UP] = 0x08,
+ [INPUT_BUTTON_WHEEL_DOWN] = 0x10,
+ };
+ QemuConsole *con = vs->vd->dcl.con;
int width = surface_width(vs->vd->ds);
int height = surface_height(vs->vd->ds);
- if (button_mask & 0x01)
- buttons |= MOUSE_EVENT_LBUTTON;
- if (button_mask & 0x02)
- buttons |= MOUSE_EVENT_MBUTTON;
- if (button_mask & 0x04)
- buttons |= MOUSE_EVENT_RBUTTON;
- if (button_mask & 0x08)
- dz = -1;
- if (button_mask & 0x10)
- dz = 1;
+ if (vs->last_bmask != button_mask) {
+ qemu_input_update_buttons(con, bmap, vs->last_bmask, button_mask);
+ vs->last_bmask = button_mask;
+ }
if (vs->absolute) {
- kbd_mouse_event(width > 1 ? x * 0x7FFF / (width - 1) : 0x4000,
- height > 1 ? y * 0x7FFF / (height - 1) : 0x4000,
- dz, buttons);
+ qemu_input_queue_abs(con, INPUT_AXIS_X, x, width);
+ qemu_input_queue_abs(con, INPUT_AXIS_Y, y, height);
} else if (vnc_has_feature(vs, VNC_FEATURE_POINTER_TYPE_CHANGE)) {
- x -= 0x7FFF;
- y -= 0x7FFF;
-
- kbd_mouse_event(x, y, dz, buttons);
+ qemu_input_queue_rel(con, INPUT_AXIS_X, x - 0x7FFF);
+ qemu_input_queue_rel(con, INPUT_AXIS_Y, y - 0x7FFF);
} else {
- if (vs->last_x != -1)
- kbd_mouse_event(x - vs->last_x,
- y - vs->last_y,
- dz, buttons);
+ if (vs->last_x != -1) {
+ qemu_input_queue_rel(con, INPUT_AXIS_X, x - vs->last_x);
+ qemu_input_queue_rel(con, INPUT_AXIS_Y, y - vs->last_y);
+ }
vs->last_x = x;
vs->last_y = y;
}
+ qemu_input_event_sync();
}
static void reset_keys(VncState *vs)
diff --git a/ui/vnc.h b/ui/vnc.h
index 6e99213..e63c142 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -257,6 +257,7 @@ struct VncState
int absolute;
int last_x;
int last_y;
+ uint32_t last_bmask;
int client_width;
int client_height;
VncShareMode share_mode;
--
1.8.3.1
- [Qemu-devel] [PATCH 14/44] input: keyboard: switch sdl ui to new core, (continued)
- [Qemu-devel] [PATCH 14/44] input: keyboard: switch sdl ui to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 33/44] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 08/44] input: qapi: add pause key, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 11/44] input: keyboard: switch legacy handlers to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 34/44] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 18/44] input: keyboard: switch curses ui to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 27/44] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 35/44] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 42/44] input: remove index_from_keycode (no users), Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 24/44] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 26/44] input: mouse: switch vnc ui to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 32/44] input-legacy: remove kbd_put_keycode, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 30/44] input: mouse: switch cocoa ui to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 09/44] input: add core bits of the new input layer, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 01/44] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 25/44] sdl2: switch mouse handling to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 05/44] input: rename file to legacy, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 40/44] input: move qmp_query_mice to new core, Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 21/44] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2014/02/24
- [Qemu-devel] [PATCH 07/44] input: qapi: add unmapped key, Gerd Hoffmann, 2014/02/24