author Ryan C. Gordon <>
Thu, 09 Apr 2015 22:28:37 -0400
changeset 9541 cf8fab52e33b
parent 9319 ad4f430cc9f5
child 9619 b94b6d0bff0f
permissions -rw-r--r--
Merged Alex Szpakowski's iOS-improvement branch to default.

Fixes Bugzilla #2798.
Fixes Bugzilla #2212.
Fixes Bugzilla #2826.
Fixes Bugzilla #2661.
Fixes Bugzilla #1885.
Fixes Bugzilla #1578.
Fixes Bugzilla #2751.


Notable changes, from Alex's notes:

- The SDL_WINDOW_ALLOW_HIGHDPI flag is now needed (along with SDL_GL_GetDrawableSize or SDL_GetRendererOutputSize) to use Retina / high DPI resolutions, bringing SDL’s Retina-related behavior on iOS in line with Mac OS X. Window dimensions and display modes are now in the “points” (non-high DPI) coordinate system rather than pixels, whereas SDL_GL_GetDrawableSize is in pixels.

- Reworked the custom extended launch screen code:
- It now hides after the first SDL_PumpEvents call rather than SDL_CreateWindow, and it fades out in a similar manner to the system launch screen behavior.
- It now mirrors the system launch screen behavior when deciding which image to display: it falls back to using the Launch Images dictionary in Info.plist if the iOS 8+ launch screen nib isn’t available, and if the Launch Images dictionary doesn’t exist it uses the old standard launch image names.
- The extended launch screen can now be disabled via the SDL_IPHONE_LAUNCHSCREEN define in SDL_config_iphoneos.h.


- Added access to a window view's renderbuffer and framebuffer to syswm.

- Added OpenGL ES debug labels for the Renderbuffer and Framebuffer Objects created with SDL_GL_CreateContext.

- Added support for sRGB OpenGL ES contexts on iOS 7+.

- Updated OpenGL ES contexts to support native-resolution rendering (when SDL_WINDOW_ALLOW_HIGHDPI is enabled) on the iPhone 6 Plus, i.e. 1080x1920 rather than 1242x2208.

- Updated SDL_GL_CreateContext, SDL_GL_SwapWindow, SDL_GL_MakeCurrent, and SDL_GL_DeleteContext to be more robust.

- Updated SDL windows to display a UIView at all times, even when an OpenGL context is not active. This allows rotation, touch events, and other windowing-related events to work properly without an active OpenGL context. It also makes it easier to use SDL_GetWindowWMInfo after creating a SDL window.

- Updated the iOS-specific Objective-C code to use cleaner and more modern language features and APIs, including ARC instead of manual reference counting.

- Updated SDL_HINT_ORIENTATIONS to allow disabling custom orientations if the hint is set with no valid orientation names.

- Fixed several rotation and orientation bugs with windows and display modes, especially in iOS 8+.

- Fixed SDL_SetWindowFullscreen failing to update the status bar visibility on iOS 7+.

- Fixed the orientation of the offset applied to the window’s view when the onscreen keyboard is shown in iOS 8+.

- Fixed SDL_IsScreenKeyboardShown (patch by Phil Hassey.)

- Fixed several major memory leaks caused by missing autorelease pool blocks in the iOS-specific Objective-C code.

- Removed several dead code paths.

- The iOS 7 SDK (Xcode 5) or newer is now required to build SDL for iOS.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2014 Sam Lantinga <>
     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.
     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:
    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_internal.h"
    23 #ifndef _SDL_x11window_h
    24 #define _SDL_x11window_h
    26 /* We need to queue the focus in/out changes because they may occur during
    27    video mode changes and we can respond to them by triggering more mode
    28    changes.
    29 */
    30 #define PENDING_FOCUS_TIME   200
    32 #if SDL_VIDEO_OPENGL_EGL   
    33 #include <EGL/egl.h>
    34 #endif
    36 typedef enum
    37 {
    39     PENDING_FOCUS_IN,
    41 } PendingFocusEnum;
    43 typedef struct
    44 {
    45     SDL_Window *window;
    46     Window xwindow;
    47     Window fswindow;  /* used if we can't have the WM handle fullscreen. */
    48     Visual *visual;
    49     Colormap colormap;
    50 #ifndef NO_SHARED_MEMORY
    51     /* MIT shared memory extension information */
    52     SDL_bool use_mitshm;
    53     XShmSegmentInfo shminfo;
    54 #endif
    55     XImage *ximage;
    56     GC gc;
    57     XIC ic;
    58     SDL_bool created;
    59     PendingFocusEnum pending_focus;
    60     Uint32 pending_focus_time;
    61     XConfigureEvent last_xconfigure;
    62     struct SDL_VideoData *videodata;
    63     Atom xdnd_req;
    64     Window xdnd_source;
    66     EGLSurface egl_surface;
    67 #endif
    68 } SDL_WindowData;
    70 extern void X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags);
    71 extern Uint32 X11_GetNetWMState(_THIS, Window xwindow);
    73 extern int X11_CreateWindow(_THIS, SDL_Window * window);
    74 extern int X11_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
    75 extern char *X11_GetWindowTitle(_THIS, Window xwindow);
    76 extern void X11_SetWindowTitle(_THIS, SDL_Window * window);
    77 extern void X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
    78 extern void X11_SetWindowPosition(_THIS, SDL_Window * window);
    79 extern void X11_SetWindowMinimumSize(_THIS, SDL_Window * window);
    80 extern void X11_SetWindowMaximumSize(_THIS, SDL_Window * window);
    81 extern void X11_SetWindowSize(_THIS, SDL_Window * window);
    82 extern void X11_ShowWindow(_THIS, SDL_Window * window);
    83 extern void X11_HideWindow(_THIS, SDL_Window * window);
    84 extern void X11_RaiseWindow(_THIS, SDL_Window * window);
    85 extern void X11_MaximizeWindow(_THIS, SDL_Window * window);
    86 extern void X11_MinimizeWindow(_THIS, SDL_Window * window);
    87 extern void X11_RestoreWindow(_THIS, SDL_Window * window);
    88 extern void X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
    89 extern void X11_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
    90 extern int X11_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp);
    91 extern void X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
    92 extern void X11_DestroyWindow(_THIS, SDL_Window * window);
    93 extern SDL_bool X11_GetWindowWMInfo(_THIS, SDL_Window * window,
    94                                     struct SDL_SysWMinfo *info);
    95 extern int X11_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
    97 #endif /* _SDL_x11window_h */
    99 /* vi: set ts=4 sw=4 expandtab: */