rebuilt SDL2 for windows and macosx from SDL hg rev. 10668

(the osx leak from https://bugzilla.libsdl.org/show_bug.cgi?id=2157
is still there.)


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1360 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2016-12-01 15:28:13 +00:00
parent 5955fd38ed
commit bad6a88a08
126 changed files with 484 additions and 352 deletions

View file

@ -26,8 +26,8 @@
*/ */
#ifndef _SDL_H #ifndef SDL_h_
#define _SDL_H #define SDL_h_
#include "SDL_main.h" #include "SDL_main.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -127,6 +127,6 @@ extern DECLSPEC void SDLCALL SDL_Quit(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_H */ #endif /* SDL_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_assert_h #ifndef SDL_assert_h_
#define _SDL_assert_h #define SDL_assert_h_
#include "SDL_config.h" #include "SDL_config.h"
@ -201,7 +201,7 @@ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)(
* *
* This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
* *
* \return SDL_AssertState value of how to handle the assertion failure. * Return SDL_AssertState value of how to handle the assertion failure.
* *
* \param handler Callback function, called when an assertion fails. * \param handler Callback function, called when an assertion fails.
* \param userdata A pointer passed to the callback as-is. * \param userdata A pointer passed to the callback as-is.
@ -250,7 +250,7 @@ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puse
* <code> * <code>
* const SDL_AssertData *item = SDL_GetAssertionReport(); * const SDL_AssertData *item = SDL_GetAssertionReport();
* while (item) { * while (item) {
* printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n",
* item->condition, item->function, item->filename, * item->condition, item->function, item->filename,
* item->linenum, item->trigger_count, * item->linenum, item->trigger_count,
* item->always_ignore ? "yes" : "no"); * item->always_ignore ? "yes" : "no");
@ -284,6 +284,6 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_assert_h */ #endif /* SDL_assert_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -56,8 +56,8 @@
* All of the atomic operations that modify memory are full memory barriers. * All of the atomic operations that modify memory are full memory barriers.
*/ */
#ifndef _SDL_atomic_h_ #ifndef SDL_atomic_h_
#define _SDL_atomic_h_ #define SDL_atomic_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_platform.h" #include "SDL_platform.h"
@ -263,6 +263,6 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_atomic_h_ */ #endif /* SDL_atomic_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Access to the raw audio mixing buffer for the SDL library. * Access to the raw audio mixing buffer for the SDL library.
*/ */
#ifndef _SDL_audio_h #ifndef SDL_audio_h_
#define _SDL_audio_h #define SDL_audio_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -667,6 +667,6 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_audio_h */ #endif /* SDL_audio_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Functions for fiddling with bits and bitmasks. * Functions for fiddling with bits and bitmasks.
*/ */
#ifndef _SDL_bits_h #ifndef SDL_bits_h_
#define _SDL_bits_h #define SDL_bits_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -92,6 +92,6 @@ SDL_MostSignificantBitIndex32(Uint32 x)
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_bits_h */ #endif /* SDL_bits_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Header file declaring the SDL_BlendMode enumeration * Header file declaring the SDL_BlendMode enumeration
*/ */
#ifndef _SDL_blendmode_h #ifndef SDL_blendmode_h_
#define _SDL_blendmode_h #define SDL_blendmode_h_
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
@ -58,6 +58,6 @@ typedef enum
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_blendmode_h */ #endif /* SDL_blendmode_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL clipboard handling * Include file for SDL clipboard handling
*/ */
#ifndef _SDL_clipboard_h #ifndef SDL_clipboard_h_
#define _SDL_clipboard_h #define SDL_clipboard_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -66,6 +66,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_clipboard_h */ #endif /* SDL_clipboard_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -20,8 +20,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
/** /**
* \file SDL_config.h.in * \file SDL_config.h.in
@ -174,6 +174,7 @@
#define HAVE_PTHREAD_SETNAME_NP 1 #define HAVE_PTHREAD_SETNAME_NP 1
/* #undef HAVE_PTHREAD_SET_NAME_NP */ /* #undef HAVE_PTHREAD_SET_NAME_NP */
/* #undef HAVE_SEM_TIMEDWAIT */ /* #undef HAVE_SEM_TIMEDWAIT */
/* #undef HAVE_GETAUXVAL */
#else #else
#define HAVE_STDARG_H 1 #define HAVE_STDARG_H 1
@ -360,4 +361,7 @@
/* Enable ime support */ /* Enable ime support */
/* #undef SDL_USE_IME */ /* #undef SDL_USE_IME */
#endif /* _SDL_config_h */ /* Enable dynamic udev support */
/* #undef SDL_UDEV_DYNAMIC */
#endif /* SDL_config_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -29,9 +29,7 @@
*/ */
/* Add any platform that doesn't build using the configure system. */ /* Add any platform that doesn't build using the configure system. */
#ifdef USING_PREMAKE_CONFIG_H #if defined(__WIN32__)
#include "SDL_config_premake.h"
#elif defined(__WIN32__)
#include "SDL_config_windows.h" #include "SDL_config_windows.h"
#elif defined(__WINRT__) #elif defined(__WINRT__)
#include "SDL_config_winrt.h" #include "SDL_config_winrt.h"
@ -52,4 +50,4 @@
#error Wrong SDL_config.h, check your include path? #error Wrong SDL_config.h, check your include path?
#endif #endif
#endif /* _SDL_config_h */ #endif /* SDL_config_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_android_h #ifndef SDL_config_android_h_
#define _SDL_config_android_h #define SDL_config_android_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -145,4 +145,4 @@
/* Enable the filesystem driver */ /* Enable the filesystem driver */
#define SDL_FILESYSTEM_ANDROID 1 #define SDL_FILESYSTEM_ANDROID 1
#endif /* _SDL_config_android_h */ #endif /* SDL_config_android_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_iphoneos_h #ifndef SDL_config_iphoneos_h_
#define _SDL_config_iphoneos_h #define SDL_config_iphoneos_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -155,4 +155,4 @@
/* enable filesystem support */ /* enable filesystem support */
#define SDL_FILESYSTEM_COCOA 1 #define SDL_FILESYSTEM_COCOA 1
#endif /* _SDL_config_iphoneos_h */ #endif /* SDL_config_iphoneos_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_macosx_h #ifndef SDL_config_macosx_h_
#define _SDL_config_macosx_h #define SDL_config_macosx_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -185,4 +185,4 @@
#define SDL_ALTIVEC_BLITTERS 1 #define SDL_ALTIVEC_BLITTERS 1
#endif #endif
#endif /* _SDL_config_macosx_h */ #endif /* SDL_config_macosx_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_minimal_h #ifndef SDL_config_minimal_h_
#define _SDL_config_minimal_h #define SDL_config_minimal_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -78,4 +78,4 @@ typedef unsigned long uintptr_t;
/* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */ /* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
#define SDL_FILESYSTEM_DUMMY 1 #define SDL_FILESYSTEM_DUMMY 1
#endif /* _SDL_config_minimal_h */ #endif /* SDL_config_minimal_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
@ -124,4 +124,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1
#endif /* _SDL_config_h */ #endif /* SDL_config_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_psp_h #ifndef SDL_config_psp_h_
#define _SDL_config_psp_h #define SDL_config_psp_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -140,4 +140,4 @@
#define SDL_LOADSO_DISABLED 1 #define SDL_LOADSO_DISABLED 1
#endif /* _SDL_config_psp_h */ #endif /* SDL_config_psp_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_windows_h #ifndef SDL_config_windows_h_
#define _SDL_config_windows_h #define SDL_config_windows_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -218,4 +218,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1
#endif #endif
#endif /* _SDL_config_windows_h */ #endif /* SDL_config_windows_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_winrt_h #ifndef SDL_config_winrt_h_
#define _SDL_config_winrt_h #define SDL_config_winrt_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -211,4 +211,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1
#endif #endif
#endif /* _SDL_config_winrt_h */ #endif /* SDL_config_winrt_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
@ -117,4 +117,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1
#endif /* _SDL_config_h */ #endif /* SDL_config_h_ */

View file

@ -25,8 +25,8 @@
* CPU feature detection for SDL. * CPU feature detection for SDL.
*/ */
#ifndef _SDL_cpuinfo_h #ifndef SDL_cpuinfo_h_
#define _SDL_cpuinfo_h #define SDL_cpuinfo_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -144,6 +144,11 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void);
*/ */
extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void);
/**
* This function returns true if the CPU has NEON (ARM SIMD) features.
*/
extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void);
/** /**
* This function returns the amount of RAM configured in the system, in MB. * This function returns the amount of RAM configured in the system, in MB.
*/ */
@ -156,6 +161,6 @@ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_cpuinfo_h */ #endif /* SDL_cpuinfo_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Functions for reading and writing endian-specific values * Functions for reading and writing endian-specific values
*/ */
#ifndef _SDL_endian_h #ifndef SDL_endian_h_
#define _SDL_endian_h #define SDL_endian_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -234,6 +234,6 @@ SDL_SwapFloat(float x)
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_endian_h */ #endif /* SDL_endian_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Simple error message routines for SDL. * Simple error message routines for SDL.
*/ */
#ifndef _SDL_error_h #ifndef SDL_error_h_
#define _SDL_error_h #define SDL_error_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -71,6 +71,6 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_error_h */ #endif /* SDL_error_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL event handling. * Include file for SDL event handling.
*/ */
#ifndef _SDL_events_h #ifndef SDL_events_h_
#define _SDL_events_h #define SDL_events_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -431,7 +431,7 @@ typedef struct SDL_MultiGestureEvent
{ {
Uint32 type; /**< ::SDL_MULTIGESTURE */ Uint32 type; /**< ::SDL_MULTIGESTURE */
Uint32 timestamp; Uint32 timestamp;
SDL_TouchID touchId; /**< The touch device index */ SDL_TouchID touchId; /**< The touch device id */
float dTheta; float dTheta;
float dDist; float dDist;
float x; float x;
@ -749,6 +749,6 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_events_h */ #endif /* SDL_events_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* \brief Include file for filesystem SDL API functions * \brief Include file for filesystem SDL API functions
*/ */
#ifndef _SDL_filesystem_h #ifndef SDL_filesystem_h_
#define _SDL_filesystem_h #define SDL_filesystem_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -131,6 +131,6 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_filesystem_h */ #endif /* SDL_filesystem_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL game controller event handling * Include file for SDL game controller event handling
*/ */
#ifndef _SDL_gamecontroller_h #ifndef SDL_gamecontroller_h_
#define _SDL_gamecontroller_h #define SDL_gamecontroller_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -51,7 +51,9 @@ extern "C" {
* SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
*/ */
/* The gamecontroller structure used to identify an SDL game controller */ /**
* The gamecontroller structure used to identify an SDL game controller
*/
struct _SDL_GameController; struct _SDL_GameController;
typedef struct _SDL_GameController SDL_GameController; typedef struct _SDL_GameController SDL_GameController;
@ -133,6 +135,20 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw,
*/ */
extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString);
/**
* Get the number of mappings installed
*
* \return the number of mappings
*/
extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings();
/**
* Get the mapping at a particular index.
*
* \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range.
*/
extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index);
/** /**
* Get a mapping string for a GUID * Get a mapping string for a GUID
* *
@ -335,6 +351,6 @@ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecon
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_gamecontroller_h */ #endif /* SDL_gamecontroller_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL gesture event handling. * Include file for SDL gesture event handling.
*/ */
#ifndef _SDL_gesture_h #ifndef SDL_gesture_h_
#define _SDL_gesture_h #define SDL_gesture_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -82,6 +82,6 @@ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWo
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_gesture_h */ #endif /* SDL_gesture_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -104,8 +104,8 @@
* \endcode * \endcode
*/ */
#ifndef _SDL_haptic_h #ifndef SDL_h_aptic_h
#define _SDL_haptic_h #define SDL_h_aptic_h
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -1218,6 +1218,6 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_haptic_h */ #endif /* SDL_h_aptic_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -36,8 +36,8 @@
* to how they would like the library to work. * to how they would like the library to work.
*/ */
#ifndef _SDL_hints_h #ifndef SDL_h_ints_h
#define _SDL_hints_h #define SDL_h_ints_h
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -401,6 +401,33 @@ extern "C" {
#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" #define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION"
/**
* \brief A variable describing the content orientation on QtWayland-based platforms.
*
* On QtWayland platforms, windows are rotated client-side to allow for custom
* transitions. In order to correctly position overlays (e.g. volume bar) and
* gestures (e.g. events view, close/minimize gestures), the system needs to
* know in which orientation the application is currently drawing its contents.
*
* This does not cause the window to be rotated or resized, the application
* needs to take care of drawing the content in the right orientation (the
* framebuffer is always in portrait mode).
*
* This variable can be one of the following values:
* "primary" (default), "portrait", "landscape", "inverted-portrait", "inverted-landscape"
*/
#define SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION "SDL_QTWAYLAND_CONTENT_ORIENTATION"
/**
* \brief Flags to set on QtWayland windows to integrate with the native window manager.
*
* On QtWayland platforms, this hint controls the flags to set on the windows.
* For example, on Sailfish OS "OverridesSystemGestures" disables swipe gestures.
*
* This variable is a space-separated list of the following values (empty = no flags):
* "OverridesSystemGestures", "StaysOnTop", "BypassWindowManager"
*/
#define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS"
/** /**
* \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size
@ -753,6 +780,11 @@ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name);
*/ */
extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value);
/**
* \brief type definition of the hint callback function.
*/
typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
/** /**
* \brief Add a function to watch a particular hint * \brief Add a function to watch a particular hint
* *
@ -760,7 +792,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool d
* \param callback The function to call when the hint value changes * \param callback The function to call when the hint value changes
* \param userdata A pointer to pass to the callback function * \param userdata A pointer to pass to the callback function
*/ */
typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name,
SDL_HintCallback callback, SDL_HintCallback callback,
void *userdata); void *userdata);
@ -790,6 +821,6 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_hints_h */ #endif /* SDL_h_ints_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -36,8 +36,8 @@
* *
*/ */
#ifndef _SDL_joystick_h #ifndef SDL_joystick_h_
#define _SDL_joystick_h #define SDL_joystick_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -60,7 +60,9 @@ extern "C" {
* SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
*/ */
/* The joystick structure used to identify an SDL joystick */ /**
* The joystick structure used to identify an SDL joystick
*/
struct _SDL_Joystick; struct _SDL_Joystick;
typedef struct _SDL_Joystick SDL_Joystick; typedef struct _SDL_Joystick SDL_Joystick;
@ -308,6 +310,6 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_joystick_h */ #endif /* SDL_joystick_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL keyboard event handling * Include file for SDL keyboard event handling
*/ */
#ifndef _SDL_keyboard_h #ifndef SDL_keyboard_h_
#define _SDL_keyboard_h #define SDL_keyboard_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -212,6 +212,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_keyboard_h */ #endif /* SDL_keyboard_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Defines constants which identify keyboard keys and modifiers. * Defines constants which identify keyboard keys and modifiers.
*/ */
#ifndef _SDL_keycode_h #ifndef SDL_keycode_h_
#define _SDL_keycode_h #define SDL_keycode_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_scancode.h" #include "SDL_scancode.h"
@ -336,6 +336,6 @@ typedef enum
#define KMOD_ALT (KMOD_LALT|KMOD_RALT) #define KMOD_ALT (KMOD_LALT|KMOD_RALT)
#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) #define KMOD_GUI (KMOD_LGUI|KMOD_RGUI)
#endif /* _SDL_keycode_h */ #endif /* SDL_keycode_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -38,8 +38,8 @@
* the results you expect. :) * the results you expect. :)
*/ */
#ifndef _SDL_loadso_h #ifndef SDL_loadso_h_
#define _SDL_loadso_h #define SDL_loadso_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -76,6 +76,6 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_loadso_h */ #endif /* SDL_loadso_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -34,8 +34,8 @@
* Others: standard error output (stderr) * Others: standard error output (stderr)
*/ */
#ifndef _SDL_log_h #ifndef SDL_log_h_
#define _SDL_log_h #define SDL_log_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -206,6 +206,6 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_log_h */ #endif /* SDL_log_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_main_h #ifndef SDL_main_h_
#define _SDL_main_h #define SDL_main_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -156,6 +156,6 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), v
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_main_h */ #endif /* SDL_main_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_messagebox_h #ifndef SDL_messagebox_h_
#define _SDL_messagebox_h #define SDL_messagebox_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_video.h" /* For SDL_Window */ #include "SDL_video.h" /* For SDL_Window */
@ -139,6 +139,6 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_messagebox_h */ #endif /* SDL_messagebox_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL mouse event handling. * Include file for SDL mouse event handling.
*/ */
#ifndef _SDL_mouse_h #ifndef SDL_mouse_h_
#define _SDL_mouse_h #define SDL_mouse_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -297,6 +297,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_mouse_h */ #endif /* SDL_mouse_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_mutex_h #ifndef SDL_mutex_h_
#define _SDL_mutex_h #define SDL_mutex_h_
/** /**
* \file SDL_mutex.h * \file SDL_mutex.h
@ -246,6 +246,6 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_mutex_h */ #endif /* SDL_mutex_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDLname_h_ #ifndef SDLname_h_
#define _SDLname_h_ #define SDLname_h_
#if defined(__STDC__) || defined(__cplusplus) #if defined(__STDC__) || defined(__cplusplus)
#define NeedFunctionPrototypes 1 #define NeedFunctionPrototypes 1
@ -28,6 +28,6 @@
#define SDL_NAME(X) SDL_##X #define SDL_NAME(X) SDL_##X
#endif /* _SDLname_h_ */ #endif /* SDLname_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -32,8 +32,8 @@
* version included in SDL_opengl.h. * version included in SDL_opengl.h.
*/ */
#ifndef _SDL_opengl_h #ifndef SDL_opengl_h_
#define _SDL_opengl_h #define SDL_opengl_h_
#include "SDL_config.h" #include "SDL_config.h"
@ -2171,6 +2171,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t
#endif /* !__IPHONEOS__ */ #endif /* !__IPHONEOS__ */
#endif /* _SDL_opengl_h */ #endif /* SDL_opengl_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Header for the enumerated pixel format definitions. * Header for the enumerated pixel format definitions.
*/ */
#ifndef _SDL_pixels_h #ifndef SDL_pixels_h_
#define _SDL_pixels_h #define SDL_pixels_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_endian.h" #include "SDL_endian.h"
@ -463,6 +463,6 @@ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_pixels_h */ #endif /* SDL_pixels_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Try to get a standard set of platform defines. * Try to get a standard set of platform defines.
*/ */
#ifndef _SDL_platform_h #ifndef SDL_platform_h_
#define _SDL_platform_h #define SDL_platform_h_
#if defined(_AIX) #if defined(_AIX)
#undef __AIX__ #undef __AIX__
@ -180,6 +180,6 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_platform_h */ #endif /* SDL_platform_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_power_h #ifndef SDL_power_h_
#define _SDL_power_h #define SDL_power_h_
/** /**
* \file SDL_power.h * \file SDL_power.h
@ -70,6 +70,6 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_power_h */ #endif /* SDL_power_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL quit event handling. * Include file for SDL quit event handling.
*/ */
#ifndef _SDL_quit_h #ifndef SDL_quit_h_
#define _SDL_quit_h #define SDL_quit_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -55,4 +55,4 @@
#define SDL_QuitRequested() \ #define SDL_QuitRequested() \
(SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
#endif /* _SDL_quit_h */ #endif /* SDL_quit_h_ */

View file

@ -25,8 +25,8 @@
* Header file for SDL_rect definition and management functions. * Header file for SDL_rect definition and management functions.
*/ */
#ifndef _SDL_rect_h #ifndef SDL_rect_h_
#define _SDL_rect_h #define SDL_rect_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -143,6 +143,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect *
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_rect_h */ #endif /* SDL_rect_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -45,8 +45,8 @@
* See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995 * See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995
*/ */
#ifndef _SDL_render_h #ifndef SDL_render_h_
#define _SDL_render_h #define SDL_render_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_rect.h" #include "SDL_rect.h"
@ -900,6 +900,6 @@ extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_render_h */ #endif /* SDL_render_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -1,2 +1,2 @@
#define SDL_REVISION "hg-10602:20855a38e048" #define SDL_REVISION "hg-10668:1889c850fafc"
#define SDL_REVISION_NUMBER 10602 #define SDL_REVISION_NUMBER 10668

View file

@ -26,8 +26,8 @@
* data streams. It can easily be extended to files, memory, etc. * data streams. It can easily be extended to files, memory, etc.
*/ */
#ifndef _SDL_rwops_h #ifndef SDL_rwops_h_
#define _SDL_rwops_h #define SDL_rwops_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -226,6 +226,6 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_rwops_h */ #endif /* SDL_rwops_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Defines keyboard scancodes. * Defines keyboard scancodes.
*/ */
#ifndef _SDL_scancode_h #ifndef SDL_scancode_h_
#define _SDL_scancode_h #define SDL_scancode_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -396,6 +396,6 @@ typedef enum
for array bounds */ for array bounds */
} SDL_Scancode; } SDL_Scancode;
#endif /* _SDL_scancode_h */ #endif /* SDL_scancode_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_shape_h #ifndef SDL_shape_h_
#define _SDL_shape_h #define SDL_shape_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_pixels.h" #include "SDL_pixels.h"
@ -140,4 +140,4 @@ extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_Windo
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_shape_h */ #endif /* SDL_shape_h_ */

View file

@ -25,8 +25,8 @@
* This is a general header that includes C language support. * This is a general header that includes C language support.
*/ */
#ifndef _SDL_stdinc_h #ifndef SDL_stdinc_h_
#define _SDL_stdinc_h #define SDL_stdinc_h_
#include "SDL_config.h" #include "SDL_config.h"
@ -526,6 +526,6 @@ SDL_FORCE_INLINE void *SDL_memcpy4(SDL_OUT_BYTECAP(dwords*4) void *dst, SDL_IN_B
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_stdinc_h */ #endif /* SDL_stdinc_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Header file for ::SDL_Surface definition and management functions. * Header file for ::SDL_Surface definition and management functions.
*/ */
#ifndef _SDL_surface_h #ifndef SDL_surface_h_
#define _SDL_surface_h #define SDL_surface_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_pixels.h" #include "SDL_pixels.h"
@ -508,6 +508,6 @@ extern DECLSPEC int SDLCALL SDL_LowerBlitScaled
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_surface_h */ #endif /* SDL_surface_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for platform specific SDL API functions * Include file for platform specific SDL API functions
*/ */
#ifndef _SDL_system_h #ifndef SDL_system_h_
#define _SDL_system_h #define SDL_system_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_keyboard.h" #include "SDL_keyboard.h"
@ -211,6 +211,6 @@ extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathT
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_system_h */ #endif /* SDL_system_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL custom system window manager hooks. * Include file for SDL custom system window manager hooks.
*/ */
#ifndef _SDL_syswm_h #ifndef SDL_syswm_h_
#define _SDL_syswm_h #define SDL_syswm_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -201,6 +201,7 @@ struct SDL_SysWMinfo
{ {
HWND window; /**< The window handle */ HWND window; /**< The window handle */
HDC hdc; /**< The window device context */ HDC hdc; /**< The window device context */
HINSTANCE hinstance; /**< The instance handle */
} win; } win;
#endif #endif
#if defined(SDL_VIDEO_DRIVER_WINRT) #if defined(SDL_VIDEO_DRIVER_WINRT)
@ -316,6 +317,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window,
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_syswm_h */ #endif /* SDL_syswm_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_thread_h #ifndef SDL_thread_h_
#define _SDL_thread_h #define SDL_thread_h_
/** /**
* \file SDL_thread.h * \file SDL_thread.h
@ -282,6 +282,6 @@ extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*d
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_thread_h */ #endif /* SDL_thread_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_timer_h #ifndef SDL_timer_h_
#define _SDL_timer_h #define SDL_timer_h_
/** /**
* \file SDL_timer.h * \file SDL_timer.h
@ -110,6 +110,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_timer_h */ #endif /* SDL_timer_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL touch event handling. * Include file for SDL touch event handling.
*/ */
#ifndef _SDL_touch_h #ifndef SDL_touch_h_
#define _SDL_touch_h #define SDL_touch_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -81,6 +81,6 @@ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_touch_h */ #endif /* SDL_touch_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* This header defines the current SDL version. * This header defines the current SDL version.
*/ */
#ifndef _SDL_version_h #ifndef SDL_version_h_
#define _SDL_version_h #define SDL_version_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -157,6 +157,6 @@ extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_version_h */ #endif /* SDL_version_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Header file for SDL video functions. * Header file for SDL video functions.
*/ */
#ifndef _SDL_video_h #ifndef SDL_video_h_
#define _SDL_video_h #define SDL_video_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_pixels.h" #include "SDL_pixels.h"
@ -1213,6 +1213,6 @@ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_video_h */ #endif /* SDL_video_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -134,6 +134,16 @@
#endif #endif
#endif /* SDL_FORCE_INLINE not defined */ #endif /* SDL_FORCE_INLINE not defined */
#ifndef SDL_NORETURN
#if defined(__GNUC__)
#define SDL_NORETURN __attribute__((noreturn))
#elif defined(_MSC_VER)
#define SDL_NORETURN __declspec(noreturn)
#else
#define SDL_NORETURN
#endif
#endif /* SDL_NORETURN not defined */
/* Apparently this is needed by several Windows compilers */ /* Apparently this is needed by several Windows compilers */
#if !defined(__MACH__) #if !defined(__MACH__)
#ifndef NULL #ifndef NULL

View file

@ -26,8 +26,8 @@
*/ */
#ifndef _SDL_H #ifndef SDL_h_
#define _SDL_H #define SDL_h_
#include "SDL_main.h" #include "SDL_main.h"
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -127,6 +127,6 @@ extern DECLSPEC void SDLCALL SDL_Quit(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_H */ #endif /* SDL_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_assert_h #ifndef SDL_assert_h_
#define _SDL_assert_h #define SDL_assert_h_
#include "SDL_config.h" #include "SDL_config.h"
@ -201,7 +201,7 @@ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)(
* *
* This callback is NOT reset to SDL's internal handler upon SDL_Quit()! * This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
* *
* \return SDL_AssertState value of how to handle the assertion failure. * Return SDL_AssertState value of how to handle the assertion failure.
* *
* \param handler Callback function, called when an assertion fails. * \param handler Callback function, called when an assertion fails.
* \param userdata A pointer passed to the callback as-is. * \param userdata A pointer passed to the callback as-is.
@ -250,7 +250,7 @@ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puse
* <code> * <code>
* const SDL_AssertData *item = SDL_GetAssertionReport(); * const SDL_AssertData *item = SDL_GetAssertionReport();
* while (item) { * while (item) {
* printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n",
* item->condition, item->function, item->filename, * item->condition, item->function, item->filename,
* item->linenum, item->trigger_count, * item->linenum, item->trigger_count,
* item->always_ignore ? "yes" : "no"); * item->always_ignore ? "yes" : "no");
@ -284,6 +284,6 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_assert_h */ #endif /* SDL_assert_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -56,8 +56,8 @@
* All of the atomic operations that modify memory are full memory barriers. * All of the atomic operations that modify memory are full memory barriers.
*/ */
#ifndef _SDL_atomic_h_ #ifndef SDL_atomic_h_
#define _SDL_atomic_h_ #define SDL_atomic_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_platform.h" #include "SDL_platform.h"
@ -263,6 +263,6 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_atomic_h_ */ #endif /* SDL_atomic_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Access to the raw audio mixing buffer for the SDL library. * Access to the raw audio mixing buffer for the SDL library.
*/ */
#ifndef _SDL_audio_h #ifndef SDL_audio_h_
#define _SDL_audio_h #define SDL_audio_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -667,6 +667,6 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_audio_h */ #endif /* SDL_audio_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Functions for fiddling with bits and bitmasks. * Functions for fiddling with bits and bitmasks.
*/ */
#ifndef _SDL_bits_h #ifndef SDL_bits_h_
#define _SDL_bits_h #define SDL_bits_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -92,6 +92,6 @@ SDL_MostSignificantBitIndex32(Uint32 x)
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_bits_h */ #endif /* SDL_bits_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Header file declaring the SDL_BlendMode enumeration * Header file declaring the SDL_BlendMode enumeration
*/ */
#ifndef _SDL_blendmode_h #ifndef SDL_blendmode_h_
#define _SDL_blendmode_h #define SDL_blendmode_h_
#include "begin_code.h" #include "begin_code.h"
/* Set up for C function definitions, even when using C++ */ /* Set up for C function definitions, even when using C++ */
@ -58,6 +58,6 @@ typedef enum
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_blendmode_h */ #endif /* SDL_blendmode_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL clipboard handling * Include file for SDL clipboard handling
*/ */
#ifndef _SDL_clipboard_h #ifndef SDL_clipboard_h_
#define _SDL_clipboard_h #define SDL_clipboard_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -66,6 +66,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_clipboard_h */ #endif /* SDL_clipboard_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -50,4 +50,4 @@
#error Wrong SDL_config.h, check your include path? #error Wrong SDL_config.h, check your include path?
#endif #endif
#endif /* _SDL_config_h */ #endif /* SDL_config_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_android_h #ifndef SDL_config_android_h_
#define _SDL_config_android_h #define SDL_config_android_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -145,4 +145,4 @@
/* Enable the filesystem driver */ /* Enable the filesystem driver */
#define SDL_FILESYSTEM_ANDROID 1 #define SDL_FILESYSTEM_ANDROID 1
#endif /* _SDL_config_android_h */ #endif /* SDL_config_android_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_iphoneos_h #ifndef SDL_config_iphoneos_h_
#define _SDL_config_iphoneos_h #define SDL_config_iphoneos_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -155,4 +155,4 @@
/* enable filesystem support */ /* enable filesystem support */
#define SDL_FILESYSTEM_COCOA 1 #define SDL_FILESYSTEM_COCOA 1
#endif /* _SDL_config_iphoneos_h */ #endif /* SDL_config_iphoneos_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_macosx_h #ifndef SDL_config_macosx_h_
#define _SDL_config_macosx_h #define SDL_config_macosx_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -185,4 +185,4 @@
#define SDL_ALTIVEC_BLITTERS 1 #define SDL_ALTIVEC_BLITTERS 1
#endif #endif
#endif /* _SDL_config_macosx_h */ #endif /* SDL_config_macosx_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_minimal_h #ifndef SDL_config_minimal_h_
#define _SDL_config_minimal_h #define SDL_config_minimal_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -78,4 +78,4 @@ typedef unsigned long uintptr_t;
/* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */ /* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
#define SDL_FILESYSTEM_DUMMY 1 #define SDL_FILESYSTEM_DUMMY 1
#endif /* _SDL_config_minimal_h */ #endif /* SDL_config_minimal_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
@ -124,4 +124,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1
#endif /* _SDL_config_h */ #endif /* SDL_config_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_psp_h #ifndef SDL_config_psp_h_
#define _SDL_config_psp_h #define SDL_config_psp_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -140,4 +140,4 @@
#define SDL_LOADSO_DISABLED 1 #define SDL_LOADSO_DISABLED 1
#endif /* _SDL_config_psp_h */ #endif /* SDL_config_psp_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_windows_h #ifndef SDL_config_windows_h_
#define _SDL_config_windows_h #define SDL_config_windows_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -218,4 +218,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1
#endif #endif
#endif /* _SDL_config_windows_h */ #endif /* SDL_config_windows_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_winrt_h #ifndef SDL_config_winrt_h_
#define _SDL_config_winrt_h #define SDL_config_winrt_h_
#include "SDL_platform.h" #include "SDL_platform.h"
@ -211,4 +211,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1
#endif #endif
#endif /* _SDL_config_winrt_h */ #endif /* SDL_config_winrt_h_ */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_config_h #ifndef SDL_config_h_
#define _SDL_config_h #define SDL_config_h_
/* This is a set of defines to configure the SDL features */ /* This is a set of defines to configure the SDL features */
@ -117,4 +117,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1
#endif /* _SDL_config_h */ #endif /* SDL_config_h_ */

View file

@ -25,8 +25,8 @@
* CPU feature detection for SDL. * CPU feature detection for SDL.
*/ */
#ifndef _SDL_cpuinfo_h #ifndef SDL_cpuinfo_h_
#define _SDL_cpuinfo_h #define SDL_cpuinfo_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -144,6 +144,11 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void);
*/ */
extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void); extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void);
/**
* This function returns true if the CPU has NEON (ARM SIMD) features.
*/
extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void);
/** /**
* This function returns the amount of RAM configured in the system, in MB. * This function returns the amount of RAM configured in the system, in MB.
*/ */
@ -156,6 +161,6 @@ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_cpuinfo_h */ #endif /* SDL_cpuinfo_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Functions for reading and writing endian-specific values * Functions for reading and writing endian-specific values
*/ */
#ifndef _SDL_endian_h #ifndef SDL_endian_h_
#define _SDL_endian_h #define SDL_endian_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -234,6 +234,6 @@ SDL_SwapFloat(float x)
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_endian_h */ #endif /* SDL_endian_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Simple error message routines for SDL. * Simple error message routines for SDL.
*/ */
#ifndef _SDL_error_h #ifndef SDL_error_h_
#define _SDL_error_h #define SDL_error_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -71,6 +71,6 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_error_h */ #endif /* SDL_error_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL event handling. * Include file for SDL event handling.
*/ */
#ifndef _SDL_events_h #ifndef SDL_events_h_
#define _SDL_events_h #define SDL_events_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -431,7 +431,7 @@ typedef struct SDL_MultiGestureEvent
{ {
Uint32 type; /**< ::SDL_MULTIGESTURE */ Uint32 type; /**< ::SDL_MULTIGESTURE */
Uint32 timestamp; Uint32 timestamp;
SDL_TouchID touchId; /**< The touch device index */ SDL_TouchID touchId; /**< The touch device id */
float dTheta; float dTheta;
float dDist; float dDist;
float x; float x;
@ -749,6 +749,6 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_events_h */ #endif /* SDL_events_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* \brief Include file for filesystem SDL API functions * \brief Include file for filesystem SDL API functions
*/ */
#ifndef _SDL_filesystem_h #ifndef SDL_filesystem_h_
#define _SDL_filesystem_h #define SDL_filesystem_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -131,6 +131,6 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_filesystem_h */ #endif /* SDL_filesystem_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL game controller event handling * Include file for SDL game controller event handling
*/ */
#ifndef _SDL_gamecontroller_h #ifndef SDL_gamecontroller_h_
#define _SDL_gamecontroller_h #define SDL_gamecontroller_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -51,7 +51,9 @@ extern "C" {
* SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
*/ */
/* The gamecontroller structure used to identify an SDL game controller */ /**
* The gamecontroller structure used to identify an SDL game controller
*/
struct _SDL_GameController; struct _SDL_GameController;
typedef struct _SDL_GameController SDL_GameController; typedef struct _SDL_GameController SDL_GameController;
@ -133,6 +135,20 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw,
*/ */
extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString); extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString);
/**
* Get the number of mappings installed
*
* \return the number of mappings
*/
extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings();
/**
* Get the mapping at a particular index.
*
* \return the mapping string. Must be freed with SDL_free(). Returns NULL if the index is out of range.
*/
extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index);
/** /**
* Get a mapping string for a GUID * Get a mapping string for a GUID
* *
@ -335,6 +351,6 @@ extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecon
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_gamecontroller_h */ #endif /* SDL_gamecontroller_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL gesture event handling. * Include file for SDL gesture event handling.
*/ */
#ifndef _SDL_gesture_h #ifndef SDL_gesture_h_
#define _SDL_gesture_h #define SDL_gesture_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -82,6 +82,6 @@ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWo
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_gesture_h */ #endif /* SDL_gesture_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -104,8 +104,8 @@
* \endcode * \endcode
*/ */
#ifndef _SDL_haptic_h #ifndef SDL_h_aptic_h
#define _SDL_haptic_h #define SDL_h_aptic_h
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -1218,6 +1218,6 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_haptic_h */ #endif /* SDL_h_aptic_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -36,8 +36,8 @@
* to how they would like the library to work. * to how they would like the library to work.
*/ */
#ifndef _SDL_hints_h #ifndef SDL_h_ints_h
#define _SDL_hints_h #define SDL_h_ints_h
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -401,6 +401,33 @@ extern "C" {
#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" #define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION"
/**
* \brief A variable describing the content orientation on QtWayland-based platforms.
*
* On QtWayland platforms, windows are rotated client-side to allow for custom
* transitions. In order to correctly position overlays (e.g. volume bar) and
* gestures (e.g. events view, close/minimize gestures), the system needs to
* know in which orientation the application is currently drawing its contents.
*
* This does not cause the window to be rotated or resized, the application
* needs to take care of drawing the content in the right orientation (the
* framebuffer is always in portrait mode).
*
* This variable can be one of the following values:
* "primary" (default), "portrait", "landscape", "inverted-portrait", "inverted-landscape"
*/
#define SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION "SDL_QTWAYLAND_CONTENT_ORIENTATION"
/**
* \brief Flags to set on QtWayland windows to integrate with the native window manager.
*
* On QtWayland platforms, this hint controls the flags to set on the windows.
* For example, on Sailfish OS "OverridesSystemGestures" disables swipe gestures.
*
* This variable is a space-separated list of the following values (empty = no flags):
* "OverridesSystemGestures", "StaysOnTop", "BypassWindowManager"
*/
#define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS"
/** /**
* \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size * \brief A string specifying SDL's threads stack size in bytes or "0" for the backend's default size
@ -753,6 +780,11 @@ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name);
*/ */
extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value);
/**
* \brief type definition of the hint callback function.
*/
typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
/** /**
* \brief Add a function to watch a particular hint * \brief Add a function to watch a particular hint
* *
@ -760,7 +792,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool d
* \param callback The function to call when the hint value changes * \param callback The function to call when the hint value changes
* \param userdata A pointer to pass to the callback function * \param userdata A pointer to pass to the callback function
*/ */
typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name,
SDL_HintCallback callback, SDL_HintCallback callback,
void *userdata); void *userdata);
@ -790,6 +821,6 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_hints_h */ #endif /* SDL_h_ints_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -36,8 +36,8 @@
* *
*/ */
#ifndef _SDL_joystick_h #ifndef SDL_joystick_h_
#define _SDL_joystick_h #define SDL_joystick_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -60,7 +60,9 @@ extern "C" {
* SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
*/ */
/* The joystick structure used to identify an SDL joystick */ /**
* The joystick structure used to identify an SDL joystick
*/
struct _SDL_Joystick; struct _SDL_Joystick;
typedef struct _SDL_Joystick SDL_Joystick; typedef struct _SDL_Joystick SDL_Joystick;
@ -308,6 +310,6 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_joystick_h */ #endif /* SDL_joystick_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL keyboard event handling * Include file for SDL keyboard event handling
*/ */
#ifndef _SDL_keyboard_h #ifndef SDL_keyboard_h_
#define _SDL_keyboard_h #define SDL_keyboard_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -212,6 +212,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_keyboard_h */ #endif /* SDL_keyboard_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Defines constants which identify keyboard keys and modifiers. * Defines constants which identify keyboard keys and modifiers.
*/ */
#ifndef _SDL_keycode_h #ifndef SDL_keycode_h_
#define _SDL_keycode_h #define SDL_keycode_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_scancode.h" #include "SDL_scancode.h"
@ -336,6 +336,6 @@ typedef enum
#define KMOD_ALT (KMOD_LALT|KMOD_RALT) #define KMOD_ALT (KMOD_LALT|KMOD_RALT)
#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) #define KMOD_GUI (KMOD_LGUI|KMOD_RGUI)
#endif /* _SDL_keycode_h */ #endif /* SDL_keycode_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -38,8 +38,8 @@
* the results you expect. :) * the results you expect. :)
*/ */
#ifndef _SDL_loadso_h #ifndef SDL_loadso_h_
#define _SDL_loadso_h #define SDL_loadso_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -76,6 +76,6 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_loadso_h */ #endif /* SDL_loadso_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -34,8 +34,8 @@
* Others: standard error output (stderr) * Others: standard error output (stderr)
*/ */
#ifndef _SDL_log_h #ifndef SDL_log_h_
#define _SDL_log_h #define SDL_log_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -206,6 +206,6 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_log_h */ #endif /* SDL_log_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_main_h #ifndef SDL_main_h_
#define _SDL_main_h #define SDL_main_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
@ -156,6 +156,6 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), v
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_main_h */ #endif /* SDL_main_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_messagebox_h #ifndef SDL_messagebox_h_
#define _SDL_messagebox_h #define SDL_messagebox_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_video.h" /* For SDL_Window */ #include "SDL_video.h" /* For SDL_Window */
@ -139,6 +139,6 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_messagebox_h */ #endif /* SDL_messagebox_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL mouse event handling. * Include file for SDL mouse event handling.
*/ */
#ifndef _SDL_mouse_h #ifndef SDL_mouse_h_
#define _SDL_mouse_h #define SDL_mouse_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -297,6 +297,6 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_mouse_h */ #endif /* SDL_mouse_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_mutex_h #ifndef SDL_mutex_h_
#define _SDL_mutex_h #define SDL_mutex_h_
/** /**
* \file SDL_mutex.h * \file SDL_mutex.h
@ -246,6 +246,6 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_mutex_h */ #endif /* SDL_mutex_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDLname_h_ #ifndef SDLname_h_
#define _SDLname_h_ #define SDLname_h_
#if defined(__STDC__) || defined(__cplusplus) #if defined(__STDC__) || defined(__cplusplus)
#define NeedFunctionPrototypes 1 #define NeedFunctionPrototypes 1
@ -28,6 +28,6 @@
#define SDL_NAME(X) SDL_##X #define SDL_NAME(X) SDL_##X
#endif /* _SDLname_h_ */ #endif /* SDLname_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -32,8 +32,8 @@
* version included in SDL_opengl.h. * version included in SDL_opengl.h.
*/ */
#ifndef _SDL_opengl_h #ifndef SDL_opengl_h_
#define _SDL_opengl_h #define SDL_opengl_h_
#include "SDL_config.h" #include "SDL_config.h"
@ -2171,6 +2171,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t
#endif /* !__IPHONEOS__ */ #endif /* !__IPHONEOS__ */
#endif /* _SDL_opengl_h */ #endif /* SDL_opengl_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Header for the enumerated pixel format definitions. * Header for the enumerated pixel format definitions.
*/ */
#ifndef _SDL_pixels_h #ifndef SDL_pixels_h_
#define _SDL_pixels_h #define SDL_pixels_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_endian.h" #include "SDL_endian.h"
@ -463,6 +463,6 @@ extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_pixels_h */ #endif /* SDL_pixels_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Try to get a standard set of platform defines. * Try to get a standard set of platform defines.
*/ */
#ifndef _SDL_platform_h #ifndef SDL_platform_h_
#define _SDL_platform_h #define SDL_platform_h_
#if defined(_AIX) #if defined(_AIX)
#undef __AIX__ #undef __AIX__
@ -180,6 +180,6 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_platform_h */ #endif /* SDL_platform_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef _SDL_power_h #ifndef SDL_power_h_
#define _SDL_power_h #define SDL_power_h_
/** /**
* \file SDL_power.h * \file SDL_power.h
@ -70,6 +70,6 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
#endif #endif
#include "close_code.h" #include "close_code.h"
#endif /* _SDL_power_h */ #endif /* SDL_power_h_ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

View file

@ -25,8 +25,8 @@
* Include file for SDL quit event handling. * Include file for SDL quit event handling.
*/ */
#ifndef _SDL_quit_h #ifndef SDL_quit_h_
#define _SDL_quit_h #define SDL_quit_h_
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_error.h" #include "SDL_error.h"
@ -55,4 +55,4 @@
#define SDL_QuitRequested() \ #define SDL_QuitRequested() \
(SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
#endif /* _SDL_quit_h */ #endif /* SDL_quit_h_ */

Some files were not shown because too many files have changed in this diff Show more