src/video/cocoa/SDL_cocoamessagebox.m
author Sam Lantinga
Thu, 29 Nov 2012 00:45:36 -0800
changeset 6714 146d1d7ecdc4
parent 6639 c7e81fae23c4
child 6832 156e608ec4ef
permissions -rw-r--r--
Fixed bug 1641 - avoid allocating nsstring from char*

Vittorio Giovara 2012-11-12 05:52:47 PST

Changesets 4f272256d172 and 42214b6959c5 introduce two neat features for
logging and alertbox on ios and osx.
However the NSString allocated (and a few other objects) are not freed by the
autorelease pool when created by +alloc and -initWithStuff: and this will
create leaks. While negligible on osx, on mobile it's better not to have leaks.
Attached is a patch that should take care of the problems on both platforms.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "SDL_config.h"
    22 
    23 #if SDL_VIDEO_DRIVER_COCOA
    24 
    25 #if defined(__APPLE__) && defined(__POWERPC__)
    26 #include <altivec.h>
    27 #undef bool
    28 #undef vector
    29 #undef pixel
    30 #endif
    31 
    32 #include "SDL_messagebox.h"
    33 #include "SDL_cocoavideo.h"
    34 
    35 
    36 /* Display a Cocoa message box */
    37 int
    38 Cocoa_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
    39 {
    40     Cocoa_RegisterApp();
    41 
    42     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
    43 
    44     NSAlert* alert = [[NSAlert alloc] init];
    45 
    46     if (messageboxdata->flags & SDL_MESSAGEBOX_ERROR) {
    47         [alert setAlertStyle:NSCriticalAlertStyle];
    48     } else if (messageboxdata->flags & SDL_MESSAGEBOX_WARNING) {
    49         [alert setAlertStyle:NSWarningAlertStyle];
    50     } else {
    51         [alert setAlertStyle:NSInformationalAlertStyle];
    52     }
    53 
    54     [alert setMessageText:[NSString stringWithUTF8String:messageboxdata->title]];
    55     [alert setInformativeText:[NSString stringWithUTF8String:messageboxdata->message]];
    56 
    57     const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
    58     int i;
    59     for (i = 0; i < messageboxdata->numbuttons; ++i) {
    60         NSButton *button = [alert addButtonWithTitle:[[NSString alloc] initWithUTF8String:buttons[i].text]];
    61         if (buttons[i].flags & SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT) {
    62             [button setKeyEquivalent:@"\r"];
    63         } else if (buttons[i].flags & SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT) {
    64             [button setKeyEquivalent:@"\033"];
    65         } else {
    66             [button setKeyEquivalent:@""];
    67         }
    68     }
    69 
    70     NSInteger clicked = [alert runModal];
    71     clicked -= NSAlertFirstButtonReturn;
    72     *buttonid = buttons[clicked].buttonid;
    73     [alert release];
    74 
    75     [pool release];
    76 
    77     return 0;
    78 }
    79 
    80 #endif /* SDL_VIDEO_DRIVER_COCOA */
    81 
    82 /* vi: set ts=4 sw=4 expandtab: */