[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/38] input: mouse: switch cocoa ui to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 25/38] input: mouse: switch cocoa ui to new core |
Date: |
Fri, 28 Feb 2014 15:06:36 +0100 |
Build fixes by Peter Maydell.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 2 ++
ui/cocoa.m | 63 ++++++++++++++++++++++++++++++++++------------------
2 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 8543d18..a3062d0 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -14,6 +14,8 @@
#define MOUSE_EVENT_LBUTTON 0x01
#define MOUSE_EVENT_RBUTTON 0x02
#define MOUSE_EVENT_MBUTTON 0x04
+#define MOUSE_EVENT_WHEELUP 0x08
+#define MOUSE_EVENT_WHEELDN 0x10
/* identical to the ps/2 keyboard bits */
#define QEMU_SCROLL_LOCK_LED (1 << 0)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index d4af3e5..f20fd1f 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -27,6 +27,7 @@
#include "qemu-common.h"
#include "ui/console.h"
+#include "ui/input.h"
#include "sysemu/sysemu.h"
#ifndef MAC_OS_X_VERSION_10_4
@@ -49,14 +50,6 @@
#endif
#define cgrect(nsrect) (*(CGRect *)&(nsrect))
-#define COCOA_MOUSE_EVENT \
- if (isTabletEnabled) { \
- kbd_mouse_event((int)(p.x * 0x7FFF / (screen.width - 1)),
(int)((screen.height - p.y) * 0x7FFF / (screen.height - 1)), 0, buttons); \
- } else if (isMouseGrabbed) { \
- kbd_mouse_event((int)[event deltaX], (int)[event deltaY], 0,
buttons); \
- } else { \
- [NSApp sendEvent:event]; \
- }
typedef struct {
int width;
@@ -67,6 +60,7 @@ typedef struct {
NSWindow *normalWindow;
static DisplayChangeListener *dcl;
+static int last_buttons;
int gArgc;
char **gArgv;
@@ -501,6 +495,7 @@ QemuCocoaView *cocoaView;
int buttons = 0;
int keycode;
+ bool mouse_event = false;
NSPoint p = [event locationInWindow];
switch ([event type]) {
@@ -620,7 +615,7 @@ QemuCocoaView *cocoaView;
}
}
}
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSLeftMouseDown:
if ([event modifierFlags] & NSCommandKeyMask) {
@@ -628,15 +623,15 @@ QemuCocoaView *cocoaView;
} else {
buttons |= MOUSE_EVENT_LBUTTON;
}
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSRightMouseDown:
buttons |= MOUSE_EVENT_RBUTTON;
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSOtherMouseDown:
buttons |= MOUSE_EVENT_MBUTTON;
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSLeftMouseDragged:
if ([event modifierFlags] & NSCommandKeyMask) {
@@ -644,19 +639,19 @@ QemuCocoaView *cocoaView;
} else {
buttons |= MOUSE_EVENT_LBUTTON;
}
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSRightMouseDragged:
buttons |= MOUSE_EVENT_RBUTTON;
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSOtherMouseDragged:
buttons |= MOUSE_EVENT_MBUTTON;
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSLeftMouseUp:
if (isTabletEnabled) {
- COCOA_MOUSE_EVENT
+ mouse_event = true;
} else if (!isMouseGrabbed) {
if (p.x > -1 && p.x < screen.width && p.y > -1 && p.y <
screen.height) {
[self grabMouse];
@@ -664,18 +659,20 @@ QemuCocoaView *cocoaView;
[NSApp sendEvent:event];
}
} else {
- COCOA_MOUSE_EVENT
+ mouse_event = true;
}
break;
case NSRightMouseUp:
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSOtherMouseUp:
- COCOA_MOUSE_EVENT
+ mouse_event = true;
break;
case NSScrollWheel:
if (isTabletEnabled || isMouseGrabbed) {
- kbd_mouse_event(0, 0, -[event deltaY], 0);
+ buttons |= ([event deltaY] < 0) ?
+ MOUSE_EVENT_WHEELUP : MOUSE_EVENT_WHEELDN;
+ mouse_event = true;
} else {
[NSApp sendEvent:event];
}
@@ -683,6 +680,30 @@ QemuCocoaView *cocoaView;
default:
[NSApp sendEvent:event];
}
+
+ if (mouse_event) {
+ if (last_buttons != buttons) {
+ static uint32_t bmap[INPUT_BUTTON_MAX] = {
+ [INPUT_BUTTON_LEFT] = MOUSE_EVENT_LBUTTON,
+ [INPUT_BUTTON_MIDDLE] = MOUSE_EVENT_MBUTTON,
+ [INPUT_BUTTON_RIGHT] = MOUSE_EVENT_RBUTTON,
+ [INPUT_BUTTON_WHEEL_UP] = MOUSE_EVENT_WHEELUP,
+ [INPUT_BUTTON_WHEEL_DOWN] = MOUSE_EVENT_WHEELDN,
+ };
+ qemu_input_update_buttons(dcl->con, bmap, last_buttons, buttons);
+ last_buttons = buttons;
+ }
+ if (isTabletEnabled) {
+ qemu_input_queue_abs(dcl->con, INPUT_AXIS_X, p.x, screen.width);
+ qemu_input_queue_abs(dcl->con, INPUT_AXIS_Y, p.y, screen.height);
+ } else if (isMouseGrabbed) {
+ qemu_input_queue_rel(dcl->con, INPUT_AXIS_X, (int)[event deltaX]);
+ qemu_input_queue_rel(dcl->con, INPUT_AXIS_Y, (int)[event deltaY]);
+ } else {
+ [NSApp sendEvent:event];
+ }
+ qemu_input_event_sync();
+ }
}
- (void) grabMouse
@@ -1017,7 +1038,7 @@ static void cocoa_refresh(DisplayChangeListener *dcl)
COCOA_DEBUG("qemu_cocoa: cocoa_refresh\n");
- if (kbd_mouse_is_absolute()) {
+ if (qemu_input_is_absolute()) {
if (![cocoaView isAbsoluteEnabled]) {
if ([cocoaView isMouseGrabbed]) {
[cocoaView ungrabMouse];
--
1.8.3.1
- [Qemu-devel] [PULL 21/38] input: mouse: switch vnc ui to new core, (continued)
- [Qemu-devel] [PULL 21/38] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 31/38] input: move mouse mode notifier to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 29/38] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 26/38] input: trace events, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 30/38] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 35/38] input: remove index_from_keycode (no users), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 34/38] input: move do_mouse_set to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 28/38] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 25/38] input: mouse: switch cocoa ui to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 32/38] input: add input_mouse_mode tracepoint, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 37/38] console: add QemuUIInfo, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 36/38] console: add head to index to qemu consoles., Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 02/38] input: rename file to legacy, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 06/38] input: add core bits of the new input layer, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 17/38] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 20/38] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 22/38] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/02/28