cocoa.m: Fix scroll wheel support
PATCH 1/1 cocoa.m: Fix scroll wheel support
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.
--- ui/cocoa.m | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
ui/cocoa.m +12 -5
@@ -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];
Signature · 1 line
2.14.3 (Apple Git-98)
Quoted 1 line · John Arbuckle
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.
Thanks for this patch. The code looks good to me, but you can now also remove the entries for INPUT_BUTTON_WHEEL_UP and INPUT_BUTTON_WHEEL_DOWN from the bmap[] array, because we can no longer get into that code with those button types.
I think it's also worth having a comment that we send wheel events to the guest regardless of window focus now (which is in line with standard OSX UI behaviour, so it seems like the right thing).
PS: can you line-wrap your commit messages, please?
Quoted 34 lines
Signed-off-by John Arbuckle <[email protected]>--- ui/cocoa.m | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)ui/cocoa.m +12
-6@@ -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]; --
Quoted 2 lines
2.14.3 (Apple Git-98)
thanks
-- PMM