Commit f5543f93b3f75c11f3a40bb4a9a7411caa9b1db7
2014-08-06T03:24:16
Updated the iOS backend code to use Objective-C's automatic reference counting (ARC).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943
diff --git a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
index 44055ca..747f150 100755
--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
@@ -1274,8 +1274,14 @@
FD6526640DE8FCCB002AD96B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
COPY_PHASE_STRIP = NO;
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
+ GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
+ GCC_WARN_STRICT_SELECTOR_MATCH = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
PRODUCT_NAME = SDL2;
SKIP_INSTALL = YES;
};
@@ -1284,8 +1290,14 @@
FD6526650DE8FCCB002AD96B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
COPY_PHASE_STRIP = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
+ GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
+ GCC_WARN_STRICT_SELECTOR_MATCH = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
PRODUCT_NAME = SDL2;
SKIP_INSTALL = YES;
};
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
index c81cd48..5359b5d 100644
--- a/include/SDL_syswm.h
+++ b/include/SDL_syswm.h
@@ -209,9 +209,9 @@ struct SDL_SysWMinfo
struct
{
#if defined(__OBJC__) && __has_feature(objc_arc)
- NSWindow __unsafe_unretained *window; /* The Cocoa window */
+ NSWindow * __unsafe_unretained window; /* The Cocoa window */
#else
- NSWindow *window; /* The Cocoa window */
+ NSWindow *window; /* The Cocoa window */
#endif
} cocoa;
#endif
@@ -219,9 +219,9 @@ struct SDL_SysWMinfo
struct
{
#if defined(__OBJC__) && __has_feature(objc_arc)
- UIWindow __unsafe_unretained *window; /* The UIKit window */
+ UIWindow * __unsafe_unretained window; /* The UIKit window */
#else
- UIWindow *window; /* The UIKit window */
+ UIWindow *window; /* The UIKit window */
#endif
} uikit;
#endif
diff --git a/src/file/cocoa/SDL_rwopsbundlesupport.m b/src/file/cocoa/SDL_rwopsbundlesupport.m
index fcab269..648aaff 100644
--- a/src/file/cocoa/SDL_rwopsbundlesupport.m
+++ b/src/file/cocoa/SDL_rwopsbundlesupport.m
@@ -50,8 +50,7 @@ FILE* SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode)
NSString* full_path_with_file_to_try = [resource_path stringByAppendingPathComponent:ns_string_file_component];
if([file_manager fileExistsAtPath:full_path_with_file_to_try]) {
fp = fopen([full_path_with_file_to_try fileSystemRepresentation], mode);
- }
- else {
+ } else {
fp = fopen(file, mode);
}
}
diff --git a/src/joystick/iphoneos/SDL_sysjoystick.m b/src/joystick/iphoneos/SDL_sysjoystick.m
index c08dec1..65e8ba7 100644
--- a/src/joystick/iphoneos/SDL_sysjoystick.m
+++ b/src/joystick/iphoneos/SDL_sysjoystick.m
@@ -176,10 +176,7 @@ void
SDL_SYS_JoystickQuit(void)
{
@autoreleasepool {
- if (motionManager != nil) {
- [motionManager release];
- motionManager = nil;
- }
+ motionManager = nil;
}
numjoysticks = 0;
diff --git a/src/video/uikit/SDL_uikitappdelegate.m b/src/video/uikit/SDL_uikitappdelegate.m
index ed01b70..c4a1999 100644
--- a/src/video/uikit/SDL_uikitappdelegate.m
+++ b/src/video/uikit/SDL_uikitappdelegate.m
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
/* Give over control to run loop, SDLUIKitDelegate will handle most things from here */
@autoreleasepool {
- UIApplicationMain(argc, argv, NULL, [SDLUIKitDelegate getAppDelegateClassName]);
+ UIApplicationMain(argc, argv, nil, [SDLUIKitDelegate getAppDelegateClassName]);
}
/* free the memory we used to hold copies of argc and argv */
@@ -94,26 +94,20 @@ SDL_IdleTimerDisabledChanged(void *userdata, const char *name, const char *oldVa
return nil;
}
- self->splash = [[UIImageView alloc] init];
- [self setView:self->splash];
+ splash = [[UIImageView alloc] init];
+ self.view = splash;
CGSize size = [UIScreen mainScreen].bounds.size;
float height = SDL_max(size.width, size.height);
- self->splashPortrait = [UIImage imageNamed:[NSString stringWithFormat:@"Default-%dh.png", (int)height]];
- if (!self->splashPortrait) {
- self->splashPortrait = [UIImage imageNamed:@"Default.png"];
+ splashPortrait = [UIImage imageNamed:[NSString stringWithFormat:@"Default-%dh.png", (int)height]];
+ if (!splashPortrait) {
+ splashPortrait = [UIImage imageNamed:@"Default.png"];
}
- self->splashLandscape = [UIImage imageNamed:@"Default-Landscape.png"];
- if (!self->splashLandscape && self->splashPortrait) {
- self->splashLandscape = [[UIImage alloc] initWithCGImage: self->splashPortrait.CGImage
- scale: 1.0
- orientation: UIImageOrientationRight];
- }
- if (self->splashPortrait) {
- [self->splashPortrait retain];
- }
- if (self->splashLandscape) {
- [self->splashLandscape retain];
+ splashLandscape = [UIImage imageNamed:@"Default-Landscape.png"];
+ if (!splashLandscape && splashPortrait) {
+ splashLandscape = [[UIImage alloc] initWithCGImage: splashPortrait.CGImage
+ scale: 1.0
+ orientation: UIImageOrientationRight];
}
[self updateSplashImage:[[UIApplication sharedApplication] statusBarOrientation]];
@@ -148,9 +142,9 @@ SDL_IdleTimerDisabledChanged(void *userdata, const char *name, const char *oldVa
UIImage *image;
if (UIInterfaceOrientationIsLandscape(interfaceOrientation)) {
- image = self->splashLandscape;
+ image = splashLandscape;
} else {
- image = self->splashPortrait;
+ image = splashPortrait;
}
if (image) {
@@ -192,8 +186,7 @@ SDL_IdleTimerDisabledChanged(void *userdata, const char *name, const char *oldVa
/* If we showed a splash image, clean it up */
if (launch_window) {
- [launch_window release];
- launch_window = NULL;
+ launch_window = nil;
}
/* exit, passing the return status from the user's application */
diff --git a/src/video/uikit/SDL_uikitmessagebox.m b/src/video/uikit/SDL_uikitmessagebox.m
index 1cb7344..9a99db1 100644
--- a/src/video/uikit/SDL_uikitmessagebox.m
+++ b/src/video/uikit/SDL_uikitmessagebox.m
@@ -76,13 +76,14 @@ UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
@autoreleasepool {
UIAlertView* alert = [[UIAlertView alloc] init];
+ UIKit_UIAlertViewDelegate *delegate = [[UIKit_UIAlertViewDelegate alloc] initWithButtonIndex:&clicked];
alert.title = @(messageboxdata->title);
alert.message = @(messageboxdata->message);
- alert.delegate = [[UIKit_UIAlertViewDelegate alloc] initWithButtonIndex:&clicked];
+ alert.delegate = delegate;
for (i = 0; i < messageboxdata->numbuttons; ++i) {
- [alert addButtonWithTitle:[[NSString alloc] initWithUTF8String:buttons[i].text]];
+ [alert addButtonWithTitle:@(buttons[i].text)];
}
/* Set up for showing the alert */
@@ -100,8 +101,7 @@ UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
*buttonid = messageboxdata->buttons[clicked].buttonid;
- [alert.delegate release];
- [alert release];
+ alert.delegate = nil;
}
return 0;
diff --git a/src/video/uikit/SDL_uikitmodes.h b/src/video/uikit/SDL_uikitmodes.h
index 2766850..65c185f 100644
--- a/src/video/uikit/SDL_uikitmodes.h
+++ b/src/video/uikit/SDL_uikitmodes.h
@@ -25,15 +25,17 @@
#include "SDL_uikitvideo.h"
-typedef struct
-{
- UIScreen *uiscreen;
-} SDL_DisplayData;
-
-typedef struct
-{
- UIScreenMode *uiscreenmode;
-} SDL_DisplayModeData;
+@interface SDL_DisplayData : NSObject
+
+@property (nonatomic, strong) UIScreen *uiscreen;
+
+@end
+
+@interface SDL_DisplayModeData : NSObject
+
+@property (nonatomic, strong) UIScreenMode *uiscreenmode;
+
+@end
extern SDL_bool UIKit_IsDisplayLandscape(UIScreen *uiscreen);
diff --git a/src/video/uikit/SDL_uikitmodes.m b/src/video/uikit/SDL_uikitmodes.m
index e17e16a..37792f1 100644
--- a/src/video/uikit/SDL_uikitmodes.m
+++ b/src/video/uikit/SDL_uikitmodes.m
@@ -25,25 +25,36 @@
#include "SDL_assert.h"
#include "SDL_uikitmodes.h"
+@implementation SDL_DisplayData
+
+@synthesize uiscreen;
+
+@end
+
+@implementation SDL_DisplayModeData
+
+@synthesize uiscreenmode;
+
+@end
+
static int
UIKit_AllocateDisplayModeData(SDL_DisplayMode * mode,
UIScreenMode * uiscreenmode)
{
- SDL_DisplayModeData *data = NULL;
+ SDL_DisplayModeData *data = nil;
if (uiscreenmode != nil) {
/* Allocate the display mode data */
- data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data));
+ data = [[SDL_DisplayModeData alloc] init];
if (!data) {
return SDL_OutOfMemory();
}
- data->uiscreenmode = uiscreenmode;
- [data->uiscreenmode retain];
+ data.uiscreenmode = uiscreenmode;
}
- mode->driverdata = data;
+ mode->driverdata = (void *) CFBridgingRetain(data);
return 0;
}
@@ -52,9 +63,7 @@ static void
UIKit_FreeDisplayModeData(SDL_DisplayMode * mode)
{
if (mode->driverdata != NULL) {
- SDL_DisplayModeData *data = (SDL_DisplayModeData *)mode->driverdata;
- [data->uiscreenmode release];
- SDL_free(data);
+ CFRelease(mode->driverdata);
mode->driverdata = NULL;
}
}
@@ -130,18 +139,18 @@ UIKit_AddDisplay(UIScreen *uiscreen)
display.current_mode = mode;
/* Allocate the display data */
- SDL_DisplayData *data = (SDL_DisplayData *) SDL_malloc(sizeof(*data));
+ SDL_DisplayData *data = [[SDL_DisplayData alloc] init];
if (!data) {
UIKit_FreeDisplayModeData(&display.desktop_mode);
return SDL_OutOfMemory();
}
- [uiscreen retain];
- data->uiscreen = uiscreen;
+ data.uiscreen = uiscreen;
- display.driverdata = data;
+ display.driverdata = (void *) CFBridgingRetain(data);
SDL_AddVideoDisplay(&display);
+
return 0;
}
@@ -173,14 +182,14 @@ UIKit_InitModes(_THIS)
void
UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
{
- SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
-
@autoreleasepool {
- SDL_bool isLandscape = UIKit_IsDisplayLandscape(data->uiscreen);
- SDL_bool addRotation = (data->uiscreen == [UIScreen mainScreen]);
- CGFloat scale = data->uiscreen.scale;
+ SDL_DisplayData *data = (__bridge SDL_DisplayData *) display->driverdata;
+
+ SDL_bool isLandscape = UIKit_IsDisplayLandscape(data.uiscreen);
+ SDL_bool addRotation = (data.uiscreen == [UIScreen mainScreen]);
+ CGFloat scale = data.uiscreen.scale;
- for (UIScreenMode *uimode in [data->uiscreen availableModes]) {
+ for (UIScreenMode *uimode in [data.uiscreen availableModes]) {
/* The size of a UIScreenMode is in pixels, but we deal exclusively in
* points (except in SDL_GL_GetDrawableSize.) */
CGSize size = [uimode size];
@@ -203,19 +212,19 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
int
UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
{
- SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
- SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)mode->driverdata;
-
@autoreleasepool {
- [data->uiscreen setCurrentMode:modedata->uiscreenmode];
+ SDL_DisplayData *data = (__bridge SDL_DisplayData *) display->driverdata;
+ SDL_DisplayModeData *modedata = (__bridge SDL_DisplayModeData *)mode->driverdata;
+
+ [data.uiscreen setCurrentMode:modedata.uiscreenmode];
- if (data->uiscreen == [UIScreen mainScreen]) {
+ if (data.uiscreen == [UIScreen mainScreen]) {
if (mode->w > mode->h) {
- if (!UIKit_IsDisplayLandscape(data->uiscreen)) {
+ if (!UIKit_IsDisplayLandscape(data.uiscreen)) {
[[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
}
} else if (mode->w < mode->h) {
- if (UIKit_IsDisplayLandscape(data->uiscreen)) {
+ if (UIKit_IsDisplayLandscape(data.uiscreen)) {
[[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait animated:NO];
}
}
@@ -240,10 +249,10 @@ UIKit_QuitModes(_THIS)
UIKit_FreeDisplayModeData(mode);
}
- SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
- [data->uiscreen release];
- SDL_free(data);
- display->driverdata = NULL;
+ if (display->driverdata != NULL) {
+ CFRelease(display->driverdata);
+ display->driverdata = NULL;
+ }
}
}
}
diff --git a/src/video/uikit/SDL_uikitopengles.m b/src/video/uikit/SDL_uikitopengles.m
index f17c831..50bb6a3 100644
--- a/src/video/uikit/SDL_uikitopengles.m
+++ b/src/video/uikit/SDL_uikitopengles.m
@@ -54,8 +54,8 @@ UIKit_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
{
@autoreleasepool {
if (context) {
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
- [data->view setCurrentContext];
+ SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
+ [data.view setCurrentContext];
}
else {
[EAGLContext setCurrentContext: nil];
@@ -67,14 +67,14 @@ UIKit_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
void UIKit_GL_GetDrawableSize(_THIS, SDL_Window * window, int * w, int * h)
{
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
-
@autoreleasepool {
+ SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
+
if (w) {
- *w = data->view.backingWidth;
+ *w = data.view.backingWidth;
}
if (h) {
- *h = data->view.backingHeight;
+ *h = data.view.backingHeight;
}
}
}
@@ -97,17 +97,17 @@ UIKit_GL_LoadLibrary(_THIS, const char *path)
void UIKit_GL_SwapWindow(_THIS, SDL_Window * window)
{
@autoreleasepool {
+ SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
+
#if SDL_POWER_UIKIT
/* Check once a frame to see if we should turn off the battery monitor. */
SDL_UIKit_UpdateBatteryMonitoring();
#endif
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
-
- if (nil == data->view) {
+ if (data.view == nil) {
return;
}
- [data->view swapBuffers];
+ [data.view swapBuffers];
/* You need to pump events in order for the OS to make changes visible.
We don't pump events here because we don't want iOS application events
@@ -121,8 +121,8 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window)
{
@autoreleasepool {
SDL_uikitopenglview *view;
- SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
- UIWindow *uiwindow = data->uiwindow;
+ SDL_WindowData *data = (__bridge SDL_WindowData *) window->driverdata;
+ UIWindow *uiwindow = data.uiwindow;
CGRect frame = UIKit_ComputeViewFrame(window, uiwindow.screen);
EAGLSharegroup *share_group = nil;
CGFloat scale = 1.0;
@@ -136,7 +136,7 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window)
}
if (_this->gl_config.share_with_current_context) {
- SDL_uikitopenglview *view = (SDL_uikitopenglview *) SDL_GL_GetCurrentContext();
+ SDL_uikitopenglview *view = (__bridge SDL_uikitopenglview *) SDL_GL_GetCurrentContext();
share_group = [view.context sharegroup];
}
@@ -157,21 +157,20 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window)
return NULL;
}
- data->view = view;
- view->viewcontroller = data->viewcontroller;
- if (view->viewcontroller != nil) {
- [view->viewcontroller setView:view];
- [view->viewcontroller retain];
+ data.view = view;
+ view.viewcontroller = data.viewcontroller;
+ if (view.viewcontroller != nil) {
+ view.viewcontroller.view = view;
}
[uiwindow addSubview: view];
/* The view controller needs to be the root in order to control rotation on iOS 6.0 */
if (uiwindow.rootViewController == nil) {
- uiwindow.rootViewController = view->viewcontroller;
+ uiwindow.rootViewController = view.viewcontroller;
}
- if (UIKit_GL_MakeCurrent(_this, window, view) < 0) {
- UIKit_GL_DeleteContext(_this, view);
+ if (UIKit_GL_MakeCurrent(_this, window, (__bridge SDL_GLContext)(view)) < 0) {
+ UIKit_GL_DeleteContext(_this, (SDL_GLContext) CFBridgingRetain(view));
return NULL;
}
@@ -181,7 +180,7 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window)
SDL_SetKeyboardFocus(window);
}
- return view;
+ return (SDL_GLContext) CFBridgingRetain(view);
}
}
@@ -190,17 +189,15 @@ UIKit_GL_DeleteContext(_THIS, SDL_GLContext context)
{
@autoreleasepool {
/* the delegate has retained the view, this will release him */
- SDL_uikitopenglview *view = (SDL_uikitopenglview *)context;
- if (view->viewcontroller) {
+ SDL_uikitopenglview *view = (SDL_uikitopenglview *)CFBridgingRelease(context);
+ if (view.viewcontroller) {
UIWindow *uiwindow = (UIWindow *)view.superview;
- if (uiwindow.rootViewController == view->viewcontroller) {
+ if (uiwindow.rootViewController == view.viewcontroller) {
uiwindow.rootViewController = nil;
}
- [view->viewcontroller setView:nil];
- [view->viewcontroller release];
+ view.viewcontroller.view = nil;
}
[view removeFromSuperview];
- [view release];
}
}
diff --git a/src/video/uikit/SDL_uikitopenglview.h b/src/video/uikit/SDL_uikitopenglview.h
index 4f40514..9bb8f0c 100644
--- a/src/video/uikit/SDL_uikitopenglview.h
+++ b/src/video/uikit/SDL_uikitopenglview.h
@@ -44,7 +44,7 @@
majorVersion:(int)majorVersion
shareGroup:(EAGLSharegroup*)shareGroup;
-@property (nonatomic, retain, readonly) EAGLContext *context;
+@property (nonatomic, strong, readonly) EAGLContext *context;
/* The width and height of the drawable in pixels (as opposed to points.) */
@property (nonatomic, readonly) int backingWidth;
diff --git a/src/video/uikit/SDL_uikitopenglview.m b/src/video/uikit/SDL_uikitopenglview.m
index 7daa12f..da724dc 100644
--- a/src/video/uikit/SDL_uikitopenglview.m
+++ b/src/video/uikit/SDL_uikitopenglview.m
@@ -85,7 +85,6 @@
context = [[EAGLContext alloc] initWithAPI:api sharegroup:shareGroup];
if (!context || ![EAGLContext setCurrentContext:context]) {
- [self release];
SDL_SetError("OpenGL ES %d not supported", majorVersion);
return nil;
}
@@ -118,7 +117,6 @@
glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
if (![context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:eaglLayer]) {
- [self release];
SDL_SetError("Failed creating OpenGL ES drawable");
return nil;
}
@@ -154,7 +152,6 @@
}
if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
- [self release];
SDL_SetError("Failed creating OpenGL ES framebuffer");
return nil;
}
@@ -268,12 +265,10 @@
- (void)dealloc
{
- [self destroyFramebuffer];
if ([EAGLContext currentContext] == context) {
+ [self destroyFramebuffer];
[EAGLContext setCurrentContext:nil];
}
- [context release];
- [super dealloc];
}
@end
diff --git a/src/video/uikit/SDL_uikitview.h b/src/video/uikit/SDL_uikitview.h
index 0deafdb..9824e78 100644
--- a/src/video/uikit/SDL_uikitview.h
+++ b/src/video/uikit/SDL_uikitview.h
@@ -31,13 +31,12 @@
#endif
#if SDL_IPHONE_KEYBOARD
-@interface SDL_uikitview : UIView<UITextFieldDelegate> {
+@interface SDL_uikitview : UIView <UITextFieldDelegate>
#else
-@interface SDL_uikitview : UIView {
+@interface SDL_uikitview : UIView
#endif
-@public
- SDL_uikitviewcontroller *viewcontroller;
-}
+
+@property (nonatomic, weak) SDL_uikitviewcontroller *viewcontroller;
- (CGPoint)touchLocation:(UITouch *)touch shouldNormalize:(BOOL)normalize;
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index 7267650..c7a77de 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -51,6 +51,8 @@ void _uikit_keyboard_init();
}
+@synthesize viewcontroller;
+
- (id)initWithFrame:(CGRect)frame
{
if (self = [super initWithFrame: frame]) {
@@ -88,10 +90,10 @@ void _uikit_keyboard_init();
CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
/* send moved event */
- SDL_SendMouseMotion(viewcontroller.window, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
+ SDL_SendMouseMotion(self.viewcontroller.window, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
/* send mouse down event */
- SDL_SendMouseButton(viewcontroller.window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
+ SDL_SendMouseButton(self.viewcontroller.window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
leftFingerDown = touch;
}
@@ -123,7 +125,7 @@ void _uikit_keyboard_init();
for (UITouch *touch in touches) {
if (touch == leftFingerDown) {
/* send mouse up */
- SDL_SendMouseButton(viewcontroller.window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
+ SDL_SendMouseButton(self.viewcontroller.window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
leftFingerDown = nil;
}
@@ -162,7 +164,7 @@ void _uikit_keyboard_init();
CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
/* send moved event */
- SDL_SendMouseMotion(viewcontroller.window, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
+ SDL_SendMouseMotion(self.viewcontroller.window, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
}
CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
@@ -212,7 +214,6 @@ void _uikit_keyboard_init();
keyboardVisible = NO;
/* add the UITextField (hidden) to our view */
[self addSubview: textField];
- [textField release];
_uikit_keyboard_init();
}
@@ -301,8 +302,8 @@ static SDL_uikitview * getWindowView(SDL_Window * window)
return nil;
}
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
- SDL_uikitview *view = data != NULL ? data->view : nil;
+ SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
+ SDL_uikitview *view = data != nil ? data.view : nil;
if (view == nil) {
SDL_SetError("Window has no view");
@@ -352,11 +353,11 @@ SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window)
void _uikit_keyboard_update() {
SDL_Window *window = SDL_GetFocusWindow();
if (!window) { return; }
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+ SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
if (!data) { return; }
- SDL_uikitview *view = data->view;
+ SDL_uikitview *view = data.view;
if (!view) { return; }
-
+
SDL_Rect r = view.textInputRect;
int height = view.keyboardHeight;
int offsetx = 0;
diff --git a/src/video/uikit/SDL_uikitwindow.h b/src/video/uikit/SDL_uikitwindow.h
index f6d67f0..17e9e1b 100644
--- a/src/video/uikit/SDL_uikitwindow.h
+++ b/src/video/uikit/SDL_uikitwindow.h
@@ -26,8 +26,6 @@
#import "SDL_uikitopenglview.h"
#import "SDL_uikitviewcontroller.h"
-typedef struct SDL_WindowData SDL_WindowData;
-
extern int UIKit_CreateWindow(_THIS, SDL_Window * window);
extern void UIKit_ShowWindow(_THIS, SDL_Window * window);
extern void UIKit_HideWindow(_THIS, SDL_Window * window);
@@ -44,12 +42,13 @@ extern SDL_bool UIKit_GetWindowWMInfo(_THIS, SDL_Window * window,
@end
-struct SDL_WindowData
-{
- SDL_uikitwindow *uiwindow;
- SDL_uikitopenglview *view;
- SDL_uikitviewcontroller *viewcontroller;
-};
+@interface SDL_WindowData : NSObject
+
+@property (nonatomic, strong) SDL_uikitwindow *uiwindow;
+@property (nonatomic, strong) SDL_uikitopenglview *view;
+@property (nonatomic, strong) SDL_uikitviewcontroller *viewcontroller;
+
+@end
#endif /* _SDL_uikitwindow_h */
diff --git a/src/video/uikit/SDL_uikitwindow.m b/src/video/uikit/SDL_uikitwindow.m
index aed4a31..a250ca5 100644
--- a/src/video/uikit/SDL_uikitwindow.m
+++ b/src/video/uikit/SDL_uikitwindow.m
@@ -56,35 +56,41 @@
@end
+@implementation SDL_WindowData
+
+@synthesize uiwindow;
+@synthesize view;
+@synthesize viewcontroller;
+
+@end
+
static int SetupWindowData(_THIS, SDL_Window *window, SDL_uikitwindow *uiwindow, SDL_bool created)
{
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
- SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
- SDL_WindowData *data;
+ SDL_DisplayData *displaydata = (__bridge SDL_DisplayData *) display->driverdata;
/* Allocate the window data */
- data = (SDL_WindowData *)SDL_malloc(sizeof(*data));
+ SDL_WindowData *data = [[SDL_WindowData alloc] init];
if (!data) {
return SDL_OutOfMemory();
}
- data->uiwindow = uiwindow;
- data->viewcontroller = nil;
- data->view = nil;
+
+ data.uiwindow = uiwindow;
/* Fill in the SDL window with the window data */
{
window->x = 0;
window->y = 0;
- CGRect frame = UIKit_ComputeViewFrame(window, displaydata->uiscreen);
+ CGRect frame = UIKit_ComputeViewFrame(window, displaydata.uiscreen);
/* Get frame dimensions */
int width = (int) frame.size.width;
int height = (int) frame.size.height;
/* Make sure the width/height are oriented correctly */
- if (UIKit_IsDisplayLandscape(displaydata->uiscreen) != (width > height)) {
+ if (UIKit_IsDisplayLandscape(displaydata.uiscreen) != (width > height)) {
int temp = width;
width = height;
height = temp;
@@ -94,7 +100,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, SDL_uikitwindow *uiwindow,
window->h = height;
}
- window->driverdata = data;
+ window->driverdata = (void *) CFBridgingRetain(data);
/* only one window on iOS, always shown */
window->flags &= ~SDL_WINDOW_HIDDEN;
@@ -103,7 +109,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, SDL_uikitwindow *uiwindow,
* This is only set if the window is on the main screen. Other screens
* just force the window to have the borderless flag.
*/
- if (displaydata->uiscreen == [UIScreen mainScreen]) {
+ if (displaydata.uiscreen == [UIScreen mainScreen]) {
window->flags |= SDL_WINDOW_INPUT_FOCUS; /* always has input focus */
/* This was setup earlier for our window, and in iOS 7 is controlled by the view, not the application
@@ -123,8 +129,8 @@ static int SetupWindowData(_THIS, SDL_Window *window, SDL_uikitwindow *uiwindow,
* device orientation changes. This will trigger resize events, if
* appropriate.
*/
- data->viewcontroller = [[SDL_uikitviewcontroller alloc] initWithSDLWindow:window];
- [data->viewcontroller setTitle:@"SDL App"]; /* !!! FIXME: hook up SDL_SetWindowTitle() */
+ data.viewcontroller = [[SDL_uikitviewcontroller alloc] initWithSDLWindow:window];
+ data.viewcontroller.title = @"SDL App"; /* !!! FIXME: hook up SDL_SetWindowTitle() */
return 0;
}
@@ -134,9 +140,9 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
{
@autoreleasepool {
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
- SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
- const BOOL external = ([UIScreen mainScreen] != data->uiscreen);
- const CGSize origsize = [[data->uiscreen currentMode] size];
+ SDL_DisplayData *data = (__bridge SDL_DisplayData *) display->driverdata;
+ const BOOL external = ([UIScreen mainScreen] != data.uiscreen);
+ const CGSize origsize = [[data.uiscreen currentMode] size];
/* SDL currently puts this window at the start of display's linked list. We rely on this. */
SDL_assert(_this->windows == window);
@@ -164,8 +170,8 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
}
if (bestmode) {
- SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)bestmode->driverdata;
- [data->uiscreen setCurrentMode:modedata->uiscreenmode];
+ SDL_DisplayModeData *modedata = (__bridge SDL_DisplayModeData *)bestmode->driverdata;
+ [data.uiscreen setCurrentMode:modedata.uiscreenmode];
/* desktop_mode doesn't change here (the higher level will
* use it to set all the screens back to their defaults
@@ -175,7 +181,7 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
}
}
- if (data->uiscreen == [UIScreen mainScreen]) {
+ if (data.uiscreen == [UIScreen mainScreen]) {
if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
[UIApplication sharedApplication].statusBarHidden = YES;
} else {
@@ -185,11 +191,11 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
if (window->w > window->h) {
- if (!UIKit_IsDisplayLandscape(data->uiscreen)) {
+ if (!UIKit_IsDisplayLandscape(data.uiscreen)) {
[[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
}
} else if (window->w < window->h) {
- if (UIKit_IsDisplayLandscape(data->uiscreen)) {
+ if (UIKit_IsDisplayLandscape(data.uiscreen)) {
[[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait animated:NO];
}
}
@@ -197,7 +203,7 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
/* ignore the size user requested, and make a fullscreen window */
/* !!! FIXME: can we have a smaller view? */
- SDL_uikitwindow *uiwindow = [[SDL_uikitwindow alloc] initWithFrame:data->uiscreen.bounds];
+ SDL_uikitwindow *uiwindow = [[SDL_uikitwindow alloc] initWithFrame:data.uiscreen.bounds];
/* put the window on an external display if appropriate. This implicitly
* does [uiwindow setframe:[uiscreen bounds]], so don't do it on the
@@ -205,13 +211,13 @@ UIKit_CreateWindow(_THIS, SDL_Window *window)
* status bar real estate.
*/
if (external) {
- [uiwindow setScreen:data->uiscreen];
+ [uiwindow setScreen:data.uiscreen];
}
if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) {
- [uiwindow release];
return -1;
}
+
}
return 1;
@@ -221,7 +227,7 @@ void
UIKit_ShowWindow(_THIS, SDL_Window * window)
{
@autoreleasepool {
- UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+ UIWindow *uiwindow = ((__bridge SDL_WindowData *) window->driverdata).uiwindow;
[uiwindow makeKeyAndVisible];
}
@@ -231,7 +237,7 @@ void
UIKit_HideWindow(_THIS, SDL_Window * window)
{
@autoreleasepool {
- UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+ UIWindow *uiwindow = ((__bridge SDL_WindowData *) window->driverdata).uiwindow;
uiwindow.hidden = YES;
}
@@ -251,11 +257,11 @@ UIKit_RaiseWindow(_THIS, SDL_Window * window)
static void
UIKit_UpdateWindowBorder(_THIS, SDL_Window * window)
{
- SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
- SDL_uikitviewcontroller *viewcontroller = windowdata->viewcontroller;
+ SDL_WindowData *windowdata = (__bridge SDL_WindowData *) window->driverdata;
+ SDL_uikitviewcontroller *viewcontroller = windowdata.viewcontroller;
CGRect frame;
- if (windowdata->uiwindow.screen == [UIScreen mainScreen]) {
+ if (windowdata.uiwindow.screen == [UIScreen mainScreen]) {
if (window->flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS)) {
[UIApplication sharedApplication].statusBarHidden = YES;
} else {
@@ -269,11 +275,11 @@ UIKit_UpdateWindowBorder(_THIS, SDL_Window * window)
}
/* Update the view's frame to account for the status bar change. */
- frame = UIKit_ComputeViewFrame(window, windowdata->uiwindow.screen);
+ frame = UIKit_ComputeViewFrame(window, windowdata.uiwindow.screen);
- windowdata->view.frame = frame;
- [windowdata->view setNeedsLayout];
- [windowdata->view layoutIfNeeded];
+ windowdata.view.frame = frame;
+ [windowdata.view setNeedsLayout];
+ [windowdata.view layoutIfNeeded];
/* Get frame dimensions */
int width = (int) frame.size.width;
@@ -308,13 +314,9 @@ UIKit_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
void
UIKit_DestroyWindow(_THIS, SDL_Window * window)
{
- SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
-
@autoreleasepool {
- if (data) {
- [data->viewcontroller release];
- [data->uiwindow release];
- SDL_free(data);
+ if (window->driverdata != NULL) {
+ CFRelease(window->driverdata);
}
}
@@ -325,7 +327,7 @@ SDL_bool
UIKit_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
{
@autoreleasepool {
- UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+ UIWindow *uiwindow = ((__bridge SDL_WindowData *) window->driverdata).uiwindow;
if (info->version.major <= SDL_MAJOR_VERSION) {
info->subsystem = SDL_SYSWM_UIKIT;
@@ -342,14 +344,14 @@ UIKit_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
int
SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam)
{
- SDL_WindowData *data = window ? (SDL_WindowData *)window->driverdata : NULL;
+ @autoreleasepool {
+ SDL_WindowData *data = window ? (__bridge SDL_WindowData *)window->driverdata : nil;
- if (!data || !data->view) {
- return SDL_SetError("Invalid window or view not set");
- }
+ if (!data || !data.view) {
+ return SDL_SetError("Invalid window or view not set");
+ }
- @autoreleasepool {
- [data->view setAnimationCallback:interval callback:callback callbackParam:callbackParam];
+ [data.view setAnimationCallback:interval callback:callback callbackParam:callbackParam];
}
return 0;