Commit 6996a002 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20150925-1' into staging 



cocoa queue:
 * fix stuck-key bug if keys were down when QEMU lost focus
 * prompt the user whether they really meant to quit
 * remove the 'open image file' dialog box we used to display
   if the user started QEMU without arguments

# gpg: Signature made Fri 25 Sep 2015 23:17:19 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"

* remotes/pmaydell/tags/pull-cocoa-20150925-1:
  ui/cocoa.m: remove open dialog code
  ui/cocoa.m: prevent stuck key situation
  ui/cocoa.m: verify with user before quitting QEMU

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9e071429 365d7f3c

ui/cocoa.m

+65 −54
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static void handleAnyDeviceErrors(Error * err) 
- (float) cdx;

- (float) cdy;

- (QEMUScreen) gscreen;

- (void) raiseAllKeys;

@end



QemuCocoaView *cocoaView;
@@ -798,6 +799,24 @@ QemuCocoaView *cocoaView; 
- (float) cdx {return cdx;}

- (float) cdy {return cdy;}

- (QEMUScreen) gscreen {return screen;}



/*

 * Makes the target think all down keys are being released.

 * This prevents a stuck key problem, since we will not see

 * key up events for those keys after we have lost focus.

 */

- (void) raiseAllKeys

{

    int index;

    const int max_index = ARRAY_SIZE(modifiers_state);



   for (index = 0; index < max_index; index++) {

       if (modifiers_state[index]) {

           modifiers_state[index] = 0;

           qemu_input_event_send_key_number(dcl->con, index, false);

       }

   }

}

@end
@@ -809,12 +828,11 @@ QemuCocoaView *cocoaView; 
*/

@interface QemuCocoaAppController : NSObject

#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)

                                             <NSApplicationDelegate>

                                       <NSWindowDelegate, NSApplicationDelegate>

#endif

{

}

- (void)startEmulationWithArgc:(int)argc argv:(char**)argv;

- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;

- (void)doToggleFullScreen:(id)sender;

- (void)toggleFullScreen:(id)sender;

- (void)showQEMUDoc:(id)sender;
@@ -829,6 +847,7 @@ QemuCocoaView *cocoaView; 
- (void)powerDownQEMU:(id)sender;

- (void)ejectDeviceMedia:(id)sender;

- (void)changeDeviceMedia:(id)sender;

- (BOOL)verifyQuit;

@end



@implementation QemuCocoaAppController
@@ -862,6 +881,7 @@ QemuCocoaView *cocoaView; 
#endif

        [normalWindow makeKeyAndOrderFront:self];

        [normalWindow center];

        [normalWindow setDelegate: self];

        stretch_video = false;



        /* Used for displaying pause on the screen */
@@ -895,30 +915,9 @@ QemuCocoaView *cocoaView; 
- (void)applicationDidFinishLaunching: (NSNotification *) note

{

    COCOA_DEBUG("QemuCocoaAppController: applicationDidFinishLaunching\n");



    // Display an open dialog box if no arguments were passed or

    // if qemu was launched from the finder ( the Finder passes "-psn" )

    if( gArgc <= 1 || strncmp ((char *)gArgv[1], "-psn", 4) == 0) {

        NSOpenPanel *op = [[NSOpenPanel alloc] init];

        [op setPrompt:@"Boot image"];

        [op setMessage:@"Select the disk image you want to boot.\n\nHit the \"Cancel\" button to quit"];

#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)

        [op setAllowedFileTypes:supportedImageFileTypes];

        [op beginSheetModalForWindow:normalWindow

            completionHandler:^(NSInteger returnCode)

            { [self openPanelDidEnd:op

                  returnCode:returnCode contextInfo:NULL ]; } ];

#else

        // Compatibility code for pre-10.6, using deprecated method

        [op beginSheetForDirectory:nil file:nil types:filetypes

              modalForWindow:normalWindow modalDelegate:self

              didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:NULL];

#endif

    } else {

        // or launch QEMU, with the global args

    // launch QEMU, with the global args

    [self startEmulationWithArgc:gArgc argv:(char **)gArgv];

}

}



- (void)applicationWillTerminate:(NSNotification *)aNotification

{
@@ -933,43 +932,40 @@ QemuCocoaView *cocoaView; 
    return YES;

}



- (void)startEmulationWithArgc:(int)argc argv:(char**)argv

- (NSApplicationTerminateReply)applicationShouldTerminate:

                                                         (NSApplication *)sender

{

    COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");



    int status;

    status = qemu_main(argc, argv, *_NSGetEnviron());

    exit(status);

    COCOA_DEBUG("QemuCocoaAppController: applicationShouldTerminate\n");

    return [self verifyQuit];

}



- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo

/* Called when the user clicks on a window's close button */

- (BOOL)windowShouldClose:(id)sender

{

    COCOA_DEBUG("QemuCocoaAppController: openPanelDidEnd\n");



    /* The NSFileHandlingPanelOKButton/NSFileHandlingPanelCancelButton values for

     * returnCode strictly only apply for the 10.6-and-up beginSheetModalForWindow

     * API. For the legacy pre-10.6 beginSheetForDirectory API they are NSOKButton

     * and NSCancelButton. However conveniently the values are the same.

     * We use the non-legacy names because the others are deprecated in OSX 10.10.

    COCOA_DEBUG("QemuCocoaAppController: windowShouldClose\n");

    [NSApp terminate: sender];

    /* If the user allows the application to quit then the call to

     * NSApp terminate will never return. If we get here then the user

     * cancelled the quit, so we should return NO to not permit the

     * closing of this window.

     */

    if (returnCode == NSFileHandlingPanelCancelButton) {

        exit(0);

    } else if (returnCode == NSFileHandlingPanelOKButton) {

        char *img = (char*)[ [ [ sheet URL ] path ] cStringUsingEncoding:NSASCIIStringEncoding];



        char **argv = g_new(char *, 4);



        [sheet close];

    return NO;

}



        argv[0] = g_strdup(gArgv[0]);

        argv[1] = g_strdup("-hda");

        argv[2] = g_strdup(img);

        argv[3] = NULL;

/* Called when QEMU goes into the background */

- (void) applicationWillResignActive: (NSNotification *)aNotification

{

    COCOA_DEBUG("QemuCocoaAppController: applicationWillResignActive\n");

    [cocoaView raiseAllKeys];

}



        // printf("Using argc %d argv %s -hda %s\n", 3, gArgv[0], img);

- (void)startEmulationWithArgc:(int)argc argv:(char**)argv

{

    COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");



        [self startEmulationWithArgc:3 argv:(char**)argv];

    }

    int status;

    status = qemu_main(argc, argv, *_NSGetEnviron());

    exit(status);

}



/* We abstract the method called by the Enter Fullscreen menu item
@@ -1125,6 +1121,21 @@ QemuCocoaView *cocoaView; 
    }

}



/* Verifies if the user really wants to quit */

- (BOOL)verifyQuit

{

    NSAlert *alert = [NSAlert new];

    [alert autorelease];

    [alert setMessageText: @"Are you sure you want to quit QEMU?"];

    [alert addButtonWithTitle: @"Cancel"];

    [alert addButtonWithTitle: @"Quit"];

    if([alert runModal] == NSAlertSecondButtonReturn) {

        return YES;

    } else {

        return NO;

    }

}



@end