On 1 January 2017 at 21:31, Programmingkid <programmingk...@gmail.com> wrote:
> The mouse down event should not be sent to the guest if the mouse down event
> causes QEMU to move the foreground from the background. This patch prevents
> these activation clicks from going to the guest.
>
> Signed-off-by: John Arbuckle <programmingk...@gmail.com>
> ---
> v2 changes:
> Fix a bug that caused fullscreen mode not to receive mouse events.
>
> ui/cocoa.m | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 26d4a1c..ae3f5a1 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -695,13 +695,13 @@ QemuCocoaView *cocoaView;
>
> if (mouse_event) {
> /* 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.
> + * mouse grab, window focus, or in fullscreen mode. 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]) &&
> + if (isMouseGrabbed && ([[self window] isKeyWindow] || isFullscreen)
> &&
> (last_buttons != buttons)) {
> static uint32_t bmap[INPUT_BUTTON__MAX] = {
> [INPUT_BUTTON_LEFT] = MOUSE_EVENT_LBUTTON,
Comment doesn't match code. The comment says "mouse grab, full screen
or focus", but the code is doing "mouse grab and (full screen or focus)".
Which is correct?
thanks
-- PMM
