[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/20] ui/cocoa: pass horizontal scroll information to the device
From: |
Gerd Hoffmann |
Subject: |
[PULL 17/20] ui/cocoa: pass horizontal scroll information to the device code |
Date: |
Fri, 14 Jan 2022 07:53:23 +0100 |
From: Dmitry Petrov <dpetroff@gmail.com>
Signed-off-by: Dmitry Petrov <dpetroff@gmail.com>
Message-Id: <20220108153947.171861-3-dpetroff@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/cocoa.m | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 69745c483b45..ac18e14ce01c 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -970,21 +970,27 @@ QemuCocoaView *cocoaView;
*/
/*
- * When deltaY is zero, it means that this scrolling event was
- * either horizontal, or so fine that it only appears in
- * scrollingDeltaY. So we drop the event.
+ * We shouldn't have got a scroll event when deltaY and delta Y
+ * are zero, hence no harm in dropping the event
*/
- if ([event deltaY] != 0) {
+ if ([event deltaY] != 0 || [event deltaX] != 0) {
/* Determine if this is a scroll up or scroll down event */
- buttons = ([event deltaY] > 0) ?
+ if ([event deltaY] != 0) {
+ buttons = ([event deltaY] > 0) ?
INPUT_BUTTON_WHEEL_UP : INPUT_BUTTON_WHEEL_DOWN;
+ } else if ([event deltaX] != 0) {
+ buttons = ([event deltaX] > 0) ?
+ INPUT_BUTTON_WHEEL_LEFT : INPUT_BUTTON_WHEEL_RIGHT;
+ }
+
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
+ * Since deltaX/deltaY also report scroll wheel events we prevent
mouse
* movement code from executing.
*/
mouse_event = false;
--
2.34.1
- [PULL 10/20] hw/display: Rename VGA_ISA_MM -> VGA_MMIO, (continued)
- [PULL 10/20] hw/display: Rename VGA_ISA_MM -> VGA_MMIO, Gerd Hoffmann, 2022/01/14
- [PULL 04/20] jackaudio: use ifdefs to hide unavailable functions, Gerd Hoffmann, 2022/01/14
- [PULL 09/20] uas: add missing return, Gerd Hoffmann, 2022/01/14
- [PULL 06/20] hw/audio/intel-hda: fix stream reset, Gerd Hoffmann, 2022/01/14
- [PULL 11/20] hw/display/vga-mmio: Inline vga_mm_init(), Gerd Hoffmann, 2022/01/14
- [PULL 12/20] hw/display/vga-mmio: QOM'ify vga_mmio_init() as TYPE_VGA_MMIO, Gerd Hoffmann, 2022/01/14
- [PULL 15/20] edid: Added support for 4k@60 Hz monitor, Gerd Hoffmann, 2022/01/14
- [PULL 20/20] ui/input-legacy: pass horizontal scroll information, Gerd Hoffmann, 2022/01/14
- [PULL 07/20] ui/dbus: fix buffer-overflow detected by ASAN, Gerd Hoffmann, 2022/01/14
- [PULL 13/20] hw/mips/jazz: Inline vga_mmio_init() and remove it, Gerd Hoffmann, 2022/01/14
- [PULL 17/20] ui/cocoa: pass horizontal scroll information to the device code,
Gerd Hoffmann <=
- [PULL 14/20] edid: set default resolution to 1280x800 (WXGA), Gerd Hoffmann, 2022/01/14
- [PULL 16/20] ps2: Initial horizontal scroll support, Gerd Hoffmann, 2022/01/14
- [PULL 18/20] ui/gtk: pass horizontal scroll information to the device code, Gerd Hoffmann, 2022/01/14
- [PULL 19/20] ui/sdl2: pass horizontal scroll information to the device code, Gerd Hoffmann, 2022/01/14
- Re: [PULL 00/20] Kraxel 20220114 patches, Peter Maydell, 2022/01/14