pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplied the code a bit in uikit/SDL_uikitvideo.m

Browse source
This commit is contained in:
Kees Bakker 2011-09-28 21:13:09 +02:00
parent 601a5ebf03
commit 7e6128661d
1 changed files with 11 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/video/uikit/SDL_uikitvideo.m
View file

@ -118,32 +118,6 @@ The main screen should list a AxB mode for portrait orientation, and then
*/ */
static CGSize
UIKit_ForcePortrait(const CGSize size)
{
CGSize retval;
if (size.width < size.height) { // portrait
retval = size;
} else { // landscape
retval.width = size.height;
retval.height = size.width;
}
return retval;
}
static CGSize
UIKit_ForceLandscape(const CGSize size)
{
CGSize retval;
if (size.width > size.height) { // landscape
retval = size;
} else { // portrait
retval.width = size.height;
retval.height = size.width;
}
return retval;
}
static void static void
UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display) UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
{ {
@ -156,18 +130,19 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
if (!SDL_UIKit_supports_multiple_displays) { if (!SDL_UIKit_supports_multiple_displays) {
const CGRect rect = [uiscreen bounds]; const CGRect rect = [uiscreen bounds];
mode.format = SDL_PIXELFORMAT_ABGR8888; mode.format = SDL_PIXELFORMAT_ABGR8888;
mode.w = (int) rect.size.width;
mode.h = (int) rect.size.height;
mode.refresh_rate = 0; mode.refresh_rate = 0;
mode.driverdata = NULL; mode.driverdata = NULL;
mode.w = (int) rect.size.width;
mode.h = (int) rect.size.height;
SDL_AddDisplayMode(display, &mode); SDL_AddDisplayMode(display, &mode);
mode.w = (int) rect.size.height; // swap the orientation, add again. mode.w = (int) rect.size.height; // swap the orientation, add again.
mode.h = (int) rect.size.width; mode.h = (int) rect.size.width;
SDL_AddDisplayMode(display, &mode); SDL_AddDisplayMode(display, &mode);
return; return;
} }
const BOOL ismain = (uiscreen == [UIScreen mainScreen]);
const NSArray *modes = [uiscreen availableModes]; const NSArray *modes = [uiscreen availableModes];
for (UIScreenMode *uimode in [uiscreen availableModes]) { for (UIScreenMode *uimode in [uiscreen availableModes]) {
CGSize size = [uimode size]; CGSize size = [uimode size];
@ -177,20 +152,12 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
mode.w = (int) size.width; mode.w = (int) size.width;
mode.h = (int) size.height; mode.h = (int) size.height;
if (SDL_AddDisplayMode(display, &mode)) if (SDL_AddDisplayMode(display, &mode))
[uimode retain]; [uimode retain]; // retain is needed because of mode.driverdata
if (ismain) { if (uiscreen == [UIScreen mainScreen]) {
// Add the mode twice, flipped to portrait and landscape. // Add the mode with swapped width/height
// SDL_AddDisplayMode() will ignore duplicates. mode.w = (int) size.height;
size = UIKit_ForcePortrait([uimode size]); mode.h = (int) size.width;
mode.w = (int) size.width;
mode.h = (int) size.height;
if (SDL_AddDisplayMode(display, &mode))
[uimode retain];
size = UIKit_ForceLandscape(size);
mode.w = (int) size.width;
mode.h = (int) size.height;
if (SDL_AddDisplayMode(display, &mode)) if (SDL_AddDisplayMode(display, &mode))
[uimode retain]; [uimode retain];
} }
@ -239,8 +206,8 @@ UIKit_VideoInit(_THIS)
// Just give 'em the whole main screen. // Just give 'em the whole main screen.
UIScreen *uiscreen = [UIScreen mainScreen]; UIScreen *uiscreen = [UIScreen mainScreen];
UIScreenMode *uiscreenmode = [uiscreen currentMode]; UIScreenMode *uiscreenmode = [uiscreen currentMode];
const CGRect rect = [uiscreen bounds]; const CGSize size = [uiscreen bounds].size;
UIKit_AddDisplay(uiscreen, uiscreenmode, (int)rect.size.width, (int)rect.size.height); UIKit_AddDisplay(uiscreen, uiscreenmode, (int)size.width, (int)size.height);
} else { } else {
for (UIScreen *uiscreen in [UIScreen screens]) { for (UIScreen *uiscreen in [UIScreen screens]) {
// the main screen is the first element in the array. // the main screen is the first element in the array.