[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] cocoa.m: Fix scroll wheel support
From: |
John Arbuckle |
Subject: |
[Qemu-devel] [PATCH] cocoa.m: Fix scroll wheel support |
Date: |
Sat, 30 Dec 2017 11:30:12 -0500 |
When using a mouse's scroll wheel in a guest with the cocoa front-end, the
mouse pointer moves up and down instead of scrolling the window. This patch
fixes this problem.
Signed-off-by: John Arbuckle <address@hidden>
---
ui/cocoa.m | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 330ccebf90..d2e5f80b74 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -786,11 +786,18 @@ - (void) handleEvent:(NSEvent *)event
mouse_event = true;
break;
case NSEventTypeScrollWheel:
- if (isMouseGrabbed) {
- buttons |= ([event deltaY] < 0) ?
- MOUSE_EVENT_WHEELUP : MOUSE_EVENT_WHEELDN;
- }
- mouse_event = true;
+ /* Determine if this is a scroll up or scroll down event */
+ buttons = ([event scrollingDeltaY] > 0) ?
+ INPUT_BUTTON_WHEEL_UP : INPUT_BUTTON_WHEEL_DOWN;
+ qemu_input_queue_btn(dcl->con, buttons, true);
+ qemu_input_event_sync();
+ qemu_input_queue_btn(dcl->con, buttons, false);
+ qemu_input_event_sync();
+ /*
+ * Since deltaY also reports scroll wheel events we prevent mouse
+ * movement code from executing.
+ */
+ mouse_event = false;
break;
default:
[NSApp sendEvent:event];
--
2.14.3 (Apple Git-98)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH] cocoa.m: Fix scroll wheel support,
John Arbuckle <=