mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: mouse: switch cocoa ui to new core

Browse Source 
Build fixes by Peter Maydell.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-12-04 14:08:04 +01:00
parent 2e08c665cc
commit 21bae11a39
2 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/console.h
View File

@ -14,6 +14,8 @@
#define MOUSE_EVENT_LBUTTON 0x01 #define MOUSE_EVENT_LBUTTON 0x01
#define MOUSE_EVENT_RBUTTON 0x02 #define MOUSE_EVENT_RBUTTON 0x02
#define MOUSE_EVENT_MBUTTON 0x04 #define MOUSE_EVENT_MBUTTON 0x04
#define MOUSE_EVENT_WHEELUP 0x08
#define MOUSE_EVENT_WHEELDN 0x10
/* identical to the ps/2 keyboard bits */ /* identical to the ps/2 keyboard bits */
#define QEMU_SCROLL_LOCK_LED (1 << 0) #define QEMU_SCROLL_LOCK_LED (1 << 0)

63
ui/cocoa.m
View File

@ -27,6 +27,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "ui/console.h" #include "ui/console.h"
#include "ui/input.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#ifndef MAC_OS_X_VERSION_10_4 #ifndef MAC_OS_X_VERSION_10_4
@ -49,14 +50,6 @@
#endif #endif
#define cgrect(nsrect) (*(CGRect *)&(nsrect)) #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 { typedef struct {
int width; int width;
@ -67,6 +60,7 @@ typedef struct {
NSWindow *normalWindow; NSWindow *normalWindow;
static DisplayChangeListener *dcl; static DisplayChangeListener *dcl;
static int last_buttons;
int gArgc; int gArgc;
char **gArgv; char **gArgv;
@ -501,6 +495,7 @@ QemuCocoaView *cocoaView;
int buttons = 0; int buttons = 0;
int keycode; int keycode;
bool mouse_event = false;
NSPoint p = [event locationInWindow]; NSPoint p = [event locationInWindow];
switch ([event type]) { switch ([event type]) {
@ -620,7 +615,7 @@ QemuCocoaView *cocoaView;
} }
} }
} }
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSLeftMouseDown: case NSLeftMouseDown:
if ([event modifierFlags] & NSCommandKeyMask) { if ([event modifierFlags] & NSCommandKeyMask) {
@ -628,15 +623,15 @@ QemuCocoaView *cocoaView;
} else { } else {
buttons |= MOUSE_EVENT_LBUTTON; buttons |= MOUSE_EVENT_LBUTTON;
} }
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSRightMouseDown: case NSRightMouseDown:
buttons |= MOUSE_EVENT_RBUTTON; buttons |= MOUSE_EVENT_RBUTTON;
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSOtherMouseDown: case NSOtherMouseDown:
buttons |= MOUSE_EVENT_MBUTTON; buttons |= MOUSE_EVENT_MBUTTON;
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSLeftMouseDragged: case NSLeftMouseDragged:
if ([event modifierFlags] & NSCommandKeyMask) { if ([event modifierFlags] & NSCommandKeyMask) {
@ -644,19 +639,19 @@ QemuCocoaView *cocoaView;
} else { } else {
buttons |= MOUSE_EVENT_LBUTTON; buttons |= MOUSE_EVENT_LBUTTON;
} }
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSRightMouseDragged: case NSRightMouseDragged:
buttons |= MOUSE_EVENT_RBUTTON; buttons |= MOUSE_EVENT_RBUTTON;
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSOtherMouseDragged: case NSOtherMouseDragged:
buttons |= MOUSE_EVENT_MBUTTON; buttons |= MOUSE_EVENT_MBUTTON;
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSLeftMouseUp: case NSLeftMouseUp:
if (isTabletEnabled) { if (isTabletEnabled) {
COCOA_MOUSE_EVENT mouse_event = true;
} else if (!isMouseGrabbed) { } else if (!isMouseGrabbed) {
if (p.x > -1 && p.x < screen.width && p.y > -1 && p.y < screen.height) { if (p.x > -1 && p.x < screen.width && p.y > -1 && p.y < screen.height) {
[self grabMouse]; [self grabMouse];
@ -664,18 +659,20 @@ QemuCocoaView *cocoaView;
[NSApp sendEvent:event]; [NSApp sendEvent:event];
} }
} else { } else {
COCOA_MOUSE_EVENT mouse_event = true;
} }
break; break;
case NSRightMouseUp: case NSRightMouseUp:
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSOtherMouseUp: case NSOtherMouseUp:
COCOA_MOUSE_EVENT mouse_event = true;
break; break;
case NSScrollWheel: case NSScrollWheel:
if (isTabletEnabled || isMouseGrabbed) { 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 { } else {
[NSApp sendEvent:event]; [NSApp sendEvent:event];
} }
@ -683,6 +680,30 @@ QemuCocoaView *cocoaView;
default: default:
[NSApp sendEvent:event]; [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 - (void) grabMouse
@ -1017,7 +1038,7 @@ static void cocoa_refresh(DisplayChangeListener *dcl)
COCOA_DEBUG("qemu_cocoa: cocoa_refresh\n"); COCOA_DEBUG("qemu_cocoa: cocoa_refresh\n");
if (kbd_mouse_is_absolute()) { if (qemu_input_is_absolute()) {
if (![cocoaView isAbsoluteEnabled]) { if (![cocoaView isAbsoluteEnabled]) {
if ([cocoaView isMouseGrabbed]) { if ([cocoaView isMouseGrabbed]) {
[cocoaView ungrabMouse]; [cocoaView ungrabMouse];