[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/11] ps2: add support for mice with extra/side b
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 02/11] ps2: add support for mice with extra/side buttons |
Date: |
Tue, 31 Jan 2017 16:50:22 +0100 |
From: Fabian Lesniak <address@hidden>
This enables the ps2 controller to process mouse events for buttons 4 and 5.
Additionally, distinct definitions for the ps2 mouse button state are
introduced. The legacy definitions from console.h are not used anymore.
Signed-off-by: Fabian Lesniak <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/input/ps2.c | 8 +++++---
include/hw/input/ps2.h | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 8485a4e..1d3a440 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -881,9 +881,11 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole
*src,
InputEvent *evt)
{
static const int bmap[INPUT_BUTTON__MAX] = {
- [INPUT_BUTTON_LEFT] = MOUSE_EVENT_LBUTTON,
- [INPUT_BUTTON_MIDDLE] = MOUSE_EVENT_MBUTTON,
- [INPUT_BUTTON_RIGHT] = MOUSE_EVENT_RBUTTON,
+ [INPUT_BUTTON_LEFT] = PS2_MOUSE_BUTTON_LEFT,
+ [INPUT_BUTTON_MIDDLE] = PS2_MOUSE_BUTTON_MIDDLE,
+ [INPUT_BUTTON_RIGHT] = PS2_MOUSE_BUTTON_RIGHT,
+ [INPUT_BUTTON_SIDE] = PS2_MOUSE_BUTTON_SIDE,
+ [INPUT_BUTTON_EXTRA] = PS2_MOUSE_BUTTON_EXTRA,
};
PS2MouseState *s = (PS2MouseState *)dev;
InputMoveEvent *move;
diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h
index b9ceee4..0fec91c 100644
--- a/include/hw/input/ps2.h
+++ b/include/hw/input/ps2.h
@@ -25,6 +25,12 @@
#ifndef HW_PS2_H
#define HW_PS2_H
+#define PS2_MOUSE_BUTTON_LEFT 0x01
+#define PS2_MOUSE_BUTTON_MIDDLE 0x02
+#define PS2_MOUSE_BUTTON_RIGHT 0x04
+#define PS2_MOUSE_BUTTON_SIDE 0x08
+#define PS2_MOUSE_BUTTON_EXTRA 0x10
+
/* ps2.c */
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
--
1.8.3.1
- [Qemu-devel] [PULL v2 05/11] sdl2: set window ID, (continued)
[Qemu-devel] [PULL v2 09/11] ui/vnc: Fix problem with sending too many bytes as server name, Gerd Hoffmann, 2017/01/09
Re: [Qemu-devel] [PULL v2 00/11] ui patch queue, Peter Maydell, 2017/01/09
[Qemu-devel] [PULL v2 00/11] ui patch queue, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 02/11] ps2: add support for mice with extra/side buttons,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 03/11] ui: add support for mice with extra/side buttons, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 01/11] qapi: add support for mice with extra/side buttons, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 11/11] console: fix console resize, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 07/11] ui/gtk.c: add ctrl-alt-= support for zoom in acceleration, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 05/11] ui/gtk: Fix mouse wheel on 3.4.0 or later, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 09/11] vnc: fix overflow in vnc_update_stats, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 10/11] gtk: Hardcode LC_CTYPE as C.utf-8, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 06/11] ui: fix format specfier in vnc to avoid break in build., Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 04/11] vnc: track LED state separately, Gerd Hoffmann, 2017/01/31
- [Qemu-devel] [PULL v2 08/11] spice: wakeup QXL worker to pick up mouse changes, Gerd Hoffmann, 2017/01/31