qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5d1b2e: ui/cocoa: Fix several full screen iss

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 5d1b2e: ui/cocoa: Fix several full screen issues on Mac OS...
Date: Tue, 19 May 2015 04:00:06 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5d1b2eef58632974494b4b94f8970846aa0bffb9
      
https://github.com/qemu/qemu/commit/5d1b2eef58632974494b4b94f8970846aa0bffb9
  Author: Programmingkid <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Fix several full screen issues on Mac OS X

This patch makes several changes:
- Minimizes distorted full screen display by respecting aspect
ratios.
- Makes full screen mode available on Mac OS 10.7 and higher.
- Allows user to decide if video should be stretched to fill the
screen, using a menu item called "Zoom To Fit".
- Hides the normalWindow so it won't show up in full screen mode.
- Allows user to exit full screen mode.

Signed-off-by: John Arbuckle <address@hidden>
[PMM: minor whitespace tweaks, remove incorrectly duplicated
 use of 'f' menu accelerator key]
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 43227af88a36faed50cedb0c7cef71a49c0be9d2
      
https://github.com/qemu/qemu/commit/43227af88a36faed50cedb0c7cef71a49c0be9d2
  Author: Programmingkid <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Make -full-screen option work on Mac OS X

This patch makes the -full-screen option actually instruct QEMU to
enter fullscreen at startup, on Mac OS X.

Signed-off-by: John Arbuckle <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 4e34017c21485e5606beda7e6218c36d3568b363
      
https://github.com/qemu/qemu/commit/4e34017c21485e5606beda7e6218c36d3568b363
  Author: Programmingkid <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M Makefile.target
    A pc-bios/qemu.rsrc

  Log Message:
  -----------
  Makefile.target: set icon for binary file on Mac OS X

Implements setting the icon for the binary file in Mac OS X.

Signed-off-by: John Arbuckle <address@hidden>
[PMM: tweaked makefile to use $@ and quiet-command]
Signed-off-by: Peter Maydell <address@hidden>


  Commit: b63901d84cc22a06f82900620fdbe01ff16511ec
      
https://github.com/qemu/qemu/commit/b63901d84cc22a06f82900620fdbe01ff16511ec
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Drop tests for CGImageCreateWithImageInRect support

The code that tries to test at both compiletime and runtime
for whether CGImageCreateWithImageInRect is supported provokes
a compile warning on OSX 10.3:

ui/cocoa.m:378:13: warning: comparison of function 
'CGImageCreateWithImageInRect'
      equal to a null pointer is always false[-Wtautological-pointer-compare]
  if (CGImageCreateWithImageInRect == NULL) { // test if 
"CGImageCreateWithImageInRect" is
supported on host at runtime
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~    ~~~~

The simplest way to deal with this is just to drop this code,
since we don't in practice support OSX 10.4 anyway. (10.5 was
released in 2007 and is the last PPC version, so is the earliest
we really need to continue to support at all.)

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden


  Commit: 89424ff32f5c106f90627c7abe019c81c716fd13
      
https://github.com/qemu/qemu/commit/89424ff32f5c106f90627c7abe019c81c716fd13
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Remove compatibility ifdefs for OSX 10.4

Remove compatibility ifdefs that work around OSX 10.4 not providing
various typedefs and functions.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden


  Commit: de1aadee289722478c19f211f0fa3a38e7e66b6f
      
https://github.com/qemu/qemu/commit/de1aadee289722478c19f211f0fa3a38e7e66b6f
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int

The type for openPanelDidEnd's returnCode argument should be NSInteger,
not int. This only matters for the OSX 10.5 code path where we pass
the method directly to an OSX function to call.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden


  Commit: 2a4c8c53dabf564142d5329b9ff8a82468324fd6
      
https://github.com/qemu/qemu/commit/2a4c8c53dabf564142d5329b9ff8a82468324fd6
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Declare that QemuCocoaAppController implements NSApplicationDelegate

Our class QemuCocoaAppController implements the NSApplicationDelegate
interface, and we pass an object of this class to [NSApp setDelegate].
However, we weren't declaring in the class definition that we implemented
this interface; in OSX 10.10 this provokes the following (slighly
misleading) warning:
ui/cocoa.m:1031:24: warning: sending 'QemuCocoaAppController *' to parameter of
      incompatible type 'id<NSFileManagerDelegate>'
    [NSApp setDelegate:appController];
                 ^~~~~~~~~~~~~
/System/Library/Frameworks/Foundation.framework/Headers/NSFileManager.h:109:47:
note: passing argument to parameter 'delegate' here
@property (assign) id <NSFileManagerDelegate> delegate NS_AVAILABLE(10_5,
2_0);
                                        ^

Annoyingly, this interface wasn't formally defined until OSX 10.6, so we
have to surround the relevant part of the @interface line with an ifdef.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden


  Commit: 81801ae21333d81a8e7887bc6b11c601b6ecbee6
      
https://github.com/qemu/qemu/commit/81801ae21333d81a8e7887bc6b11c601b6ecbee6
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up

Starting in OSX 10.10, NSWindow useOptimizedDrawing is deprecated, so
don't use it there.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden


  Commit: 8617989eae7398e9e782a73857fc53a548692b31
      
https://github.com/qemu/qemu/commit/8617989eae7398e9e782a73857fc53a548692b31
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Avoid deprecated NSOKButton/NSCancelButton constants

In OSX 10.10, the NSOKButton and NSCancelButton constants are deprecated
and provoke compiler warnings. Avoid them by using the
NSFileHandlingPanelCancelButton and NSFileHandlingPanelOKButton constants
instead. These are the documented correct constants for the 10.6-and-up
beginSheetModalForWindow API we use. We also use the same method for
the pre-10.6 compatibility code path, but conveniently the constant
values are the same and the constant names have been present since 10.0.
Preferring the constant names that match the non-legacy API makes more
sense anyway.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden


  Commit: b4c6a112dcfa1d24b905e6cccc763e02000937f1
      
https://github.com/qemu/qemu/commit/b4c6a112dcfa1d24b905e6cccc763e02000937f1
  Author: Programmingkid <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Add console items to the View menu

Add any console that is available to the current emulator as a
menu item under the View menu.

Signed-off-by: John Arbuckle <address@hidden>
[PMM: Adjusted to apply after zoom-to-fit menu item was added;
 create the View menu at the same time as all the others, and only
 add the dynamically-determined items to it later]
Signed-off-by: Peter Maydell <address@hidden>


  Commit: faa261a7fb254866bdd5b6a25ad94677945f21b4
      
https://github.com/qemu/qemu/commit/faa261a7fb254866bdd5b6a25ad94677945f21b4
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M Makefile.target
    A pc-bios/qemu.rsrc
    M ui/cocoa.m

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20150519' into 
staging

cocoa queue:
 * fix various issues with full screen in the OSX UI
 * set an icon for our binary file
 * add entries to the View menu for QEMU consoles
 * fix various warnings that are produced when building on 10.10
   (largely deprecated interfaces)

# gpg: Signature made Tue May 19 09:17:23 2015 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"

* remotes/pmaydell/tags/pull-cocoa-20150519:
  ui/cocoa: Add console items to the View menu
  ui/cocoa: Avoid deprecated NSOKButton/NSCancelButton constants
  ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up
  ui/cocoa: Declare that QemuCocoaAppController implements NSApplicationDelegate
  ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int
  ui/cocoa: Remove compatibility ifdefs for OSX 10.4
  ui/cocoa: Drop tests for CGImageCreateWithImageInRect support
  Makefile.target: set icon for binary file on Mac OS X
  ui/cocoa: Make -full-screen option work on Mac OS X
  ui/cocoa: Fix several full screen issues on Mac OS X

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/62bf3df432d9...faa261a7fb25
reply via email to
[Prev in Thread] Current Thread [Next in Thread]