diff mbox

[for-2.5] ui/cocoa.m: Prevent activation clicks from going to guest

Message ID 1448551168-13196-1-git-send-email-peter.maydell@linaro.org
State Accepted
Commit 8d3a5d9b0f76e3f965ce2b845f6e9027fd98fd30
Headers show

Commit Message

Peter Maydell Nov. 26, 2015, 3:19 p.m. UTC 
When QEMU is brought to the foreground, the click event that activates QEMU
should not go to the guest. Accidents happen when they do go to the guest
without giving the user a chance to handle them. In particular, if the
guest input device is not an absolute-position one then the location of
the guest cursor (and thus the click) will likely not be the location of
the host cursor when it is clicked, and could be completely obscured
below another window. Don't send mouse clicks to QEMU unless the
window either has focus or has grabbed mouse events.

Reported-by: John Arbuckle <programmingkidx@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: John Arbuckle <programmingkidx@gmail.com>

---
 ui/cocoa.m | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
2.6.2

Comments

Peter Maydell Dec. 2, 2015, 10:18 a.m. UTC | #1 
On 26 November 2015 at 15:19, Peter Maydell <peter.maydell@linaro.org> wrote:
> When QEMU is brought to the foreground, the click event that activates QEMU

> should not go to the guest. Accidents happen when they do go to the guest

> without giving the user a chance to handle them. In particular, if the

> guest input device is not an absolute-position one then the location of

> the guest cursor (and thus the click) will likely not be the location of

> the host cursor when it is clicked, and could be completely obscured

> below another window. Don't send mouse clicks to QEMU unless the

> window either has focus or has grabbed mouse events.

>

> Reported-by: John Arbuckle <programmingkidx@gmail.com>

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> Reviewed-by: John Arbuckle <programmingkidx@gmail.com>

> ---


Applied to master.

thanks
-- PMM
diff mbox

Patch

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 1554331..d76b942 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -724,7 +724,15 @@  QemuCocoaView *cocoaView;
     }
 
     if (mouse_event) {
-        if (last_buttons != buttons) {
+        /* Don't send button events to the guest unless we've got a
+         * mouse grab or window focus. If we have neither then this event
+         * is the user clicking on the background window to activate and
+         * bring us to the front, which will be done by the sendEvent
+         * call below. We definitely don't want to pass that click through
+         * to the guest.
+         */
+        if ((isMouseGrabbed || [[self window] isKeyWindow]) &&
+            (last_buttons != buttons)) {
             static uint32_t bmap[INPUT_BUTTON_MAX] = {
                 [INPUT_BUTTON_LEFT]       = MOUSE_EVENT_LBUTTON,
                 [INPUT_BUTTON_MIDDLE]     = MOUSE_EVENT_MBUTTON,