OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

input: mouse: switch vnc ui to new core

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-12-02 15:17:45 +01:00
parent 3ab193e662
commit 14768eba46
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui/vnc.c
View File

@ -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) static void check_pointer_type_change(Notifier *notifier, void *data)
{ {
VncState *vs = container_of(notifier, VncState, mouse_mode_notifier); 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) { if (vnc_has_feature(vs, VNC_FEATURE_POINTER_TYPE_CHANGE) && vs->absolute != absolute) {
vnc_lock_output(vs); 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) static void pointer_event(VncState *vs, int button_mask, int x, int y)
{ {
int buttons = 0; static uint32_t bmap[INPUT_BUTTON_MAX] = {
int dz = 0; [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 width = surface_width(vs->vd->ds);
int height = surface_height(vs->vd->ds); int height = surface_height(vs->vd->ds);
if (button_mask & 0x01) if (vs->last_bmask != button_mask) {
buttons |= MOUSE_EVENT_LBUTTON; qemu_input_update_buttons(con, bmap, vs->last_bmask, button_mask);
if (button_mask & 0x02) vs->last_bmask = button_mask;
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->absolute) { if (vs->absolute) {
kbd_mouse_event(width > 1 ? x * 0x7FFF / (width - 1) : 0x4000, qemu_input_queue_abs(con, INPUT_AXIS_X, x, width);
height > 1 ? y * 0x7FFF / (height - 1) : 0x4000, qemu_input_queue_abs(con, INPUT_AXIS_Y, y, height);
dz, buttons);
} else if (vnc_has_feature(vs, VNC_FEATURE_POINTER_TYPE_CHANGE)) { } else if (vnc_has_feature(vs, VNC_FEATURE_POINTER_TYPE_CHANGE)) {
x -= 0x7FFF; qemu_input_queue_rel(con, INPUT_AXIS_X, x - 0x7FFF);
y -= 0x7FFF; qemu_input_queue_rel(con, INPUT_AXIS_Y, y - 0x7FFF);
kbd_mouse_event(x, y, dz, buttons);
} else { } else {
if (vs->last_x != -1) if (vs->last_x != -1) {
kbd_mouse_event(x - vs->last_x, qemu_input_queue_rel(con, INPUT_AXIS_X, x - vs->last_x);
y - vs->last_y, qemu_input_queue_rel(con, INPUT_AXIS_Y, y - vs->last_y);
dz, buttons); }
vs->last_x = x; vs->last_x = x;
vs->last_y = y; vs->last_y = y;
} }
qemu_input_event_sync();
} }
static void reset_keys(VncState *vs) static void reset_keys(VncState *vs)

1
ui/vnc.h
View File

@ -257,6 +257,7 @@ struct VncState
int absolute; int absolute;
int last_x; int last_x;
int last_y; int last_y;
uint32_t last_bmask;
int client_width; int client_width;
int client_height; int client_height;
VncShareMode share_mode; VncShareMode share_mode;