diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h index 9d1ede33..7647b511 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h index 6889514d..402981f9 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h index bb01eb9e..56aa81df 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h index 359005d0..4f655214 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h index c62766d9..528da2ea 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h index c7fa09f7..56d8ad66 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h index 3ad20548..a5556f21 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h index 03adc13e..e74fb691 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h @@ -1,7 +1,7 @@ /* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig index eda76602..4270c78b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config.h.orig @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h index 8d5f1e5f..a388ba8d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_android.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h index 2d741c38..304c8920 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_iphoneos.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h index e4ce82fc..5c8b7e03 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h index 7721abc9..3c9d09af 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_minimal.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h index 530e78f1..7b51e571 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_pandora.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h index 26bf9d1a..a6e49609 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_psp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h index b3f9bbb1..4c2c7f62 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h index 29bf79fe..e392f773 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_winrt.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h index a5063ba7..e090a1a9 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_config_wiz.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h index 6fd65219..212da0ee 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h index 30d09cce..d0ba47bf 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h index 358d869b..bea2a6c0 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h index ec7841c4..9100b103 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h index 1720c43f..2f3b4b50 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h index 8a364c2a..1437f4c7 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h index 15bda498..02999ed2 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h index 5459387b..42087eea 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h index 44983486..3c29ca7a 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h index 0e6f523b..b36d78b1 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h index c28cbad8..3bd5435f 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h index 78176321..266f3b38 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h index 1ad58ee3..bbba0f07 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h index 66980cef..7be96357 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h index db7493ad..3d540bd7 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h index 6ffbfc99..09be1104 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h index c5168ba6..9ce3754e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h index 44d458f4..ec370dbb 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h index 1ae31269..ea9622f0 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h index 2765210a..b7e39734 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h index b6a413a2..06cd4a5e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h index aebe30eb..780919bc 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h index 49c709c1..bcc12777 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h index 13ebd9dc..edcd1a24 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h index ba24a47d..8499c328 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h index 75e4c653..c6c21398 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h index 89eb1718..24c05011 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h index 0108ff04..cc06f28d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h index ebe51674..bbcb9a3b 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h index de2749cc..e4ed2af6 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -215,7 +215,7 @@ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info); /** - * \brief Get the output size of a rendering context. + * \brief Get the output size in pixels of a rendering context. */ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h); diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h index f8851bd3..6d7163d4 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-9972:734c90ea9990" -#define SDL_REVISION_NUMBER 9972 +#define SDL_REVISION "hg-10001:e12c38730512" +#define SDL_REVISION_NUMBER 10001 diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h index c8b024be..f460ae7d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h index 4bf86180..0af1dd59 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h index 157d6127..db10a8f0 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h index c1f2b6dd..887bcd2d 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h index 3634f7d3..e63ca890 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h index bdc4f968..5da9adb4 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h index a3441fdc..1056e526 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h index 797767f8..377e6c73 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h index 1f2a0206..e0d3785e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h index 68ff1714..2643e367 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h index 1a1877fa..5118af21 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h index 0b364d07..de1f1605 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h index f466165b..52dbbc76 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -53,8 +53,8 @@ extern "C" { typedef struct { Uint32 format; /**< pixel format */ - int w; /**< width */ - int h; /**< height */ + int w; /**< width, in screen coordinates */ + int h; /**< height, in screen coordinates */ int refresh_rate; /**< refresh rate (or zero for unspecified) */ void *driverdata; /**< driver-specific data, initialize to 0 */ } SDL_DisplayMode; @@ -143,7 +143,9 @@ typedef enum SDL_WINDOWEVENT_MOVED, /**< Window has been moved to data1, data2 */ SDL_WINDOWEVENT_RESIZED, /**< Window has been resized to data1xdata2 */ - SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */ + SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as + a result of an API call or through the + system or user changing the window size. */ SDL_WINDOWEVENT_MINIMIZED, /**< Window has been minimized */ SDL_WINDOWEVENT_MAXIMIZED, /**< Window has been maximized */ SDL_WINDOWEVENT_RESTORED, /**< Window has been restored to normal size @@ -412,8 +414,8 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * ::SDL_WINDOWPOS_UNDEFINED. * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. + * \param w The width of the window, in screen coordinates. + * \param h The height of the window, in screen coordinates. * \param flags The flags for the window, a mask of any of the following: * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, @@ -423,6 +425,12 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * * \return The id of the window created, or zero if window creation failed. * + * If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size + * in pixels may differ from its size in screen coordinates on platforms with + * high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query + * the client area's size in screen coordinates, and SDL_GL_GetDrawableSize() + * or SDL_GetRendererOutputSize() to query the drawable size in pixels. + * * \sa SDL_DestroyWindow() */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, @@ -513,10 +521,10 @@ extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, * \brief Set the position of a window. * * \param window The window to reposition. - * \param x The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. + * \param x The x coordinate of the window in screen coordinates, or + * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. + * \param y The y coordinate of the window in screen coordinates, or + * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. * * \note The window coordinate origin is the upper left of the display. * @@ -529,8 +537,10 @@ extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, * \brief Get the position of a window. * * \param window The window to query. - * \param x Pointer to variable for storing the x position, may be NULL - * \param y Pointer to variable for storing the y position, may be NULL + * \param x Pointer to variable for storing the x position, in screen + * coordinates. May be NULL. + * \param y Pointer to variable for storing the y position, in screen + * coordinates. May be NULL. * * \sa SDL_SetWindowPosition() */ @@ -541,12 +551,17 @@ extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, * \brief Set the size of a window's client area. * * \param window The window to resize. - * \param w The width of the window, must be >0 - * \param h The height of the window, must be >0 + * \param w The width of the window, in screen coordinates. Must be >0. + * \param h The height of the window, in screen coordinates. Must be >0. * * \note You can't change the size of a fullscreen window, it automatically * matches the size of the display mode. * + * The window size in screen coordinates may differ from the size in pixels, if + * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with + * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * * \sa SDL_GetWindowSize() */ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, @@ -556,8 +571,15 @@ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, * \brief Get the size of a window's client area. * * \param window The window to query. - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL + * \param w Pointer to variable for storing the width, in screen + * coordinates. May be NULL. + * \param h Pointer to variable for storing the height, in screen + * coordinates. May be NULL. + * + * The window size in screen coordinates may differ from the size in pixels, if + * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with + * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. * * \sa SDL_SetWindowSize() */ @@ -1009,11 +1031,12 @@ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); /** - * \brief Get the size of a window's underlying drawable (for use with glViewport). + * \brief Get the size of a window's underlying drawable in pixels (for use + * with glViewport). * * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL + * \param w Pointer to variable for storing the width in pixels, may be NULL + * \param h Pointer to variable for storing the height in pixels, may be NULL * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h index c032400f..04e78c64 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h index 73f6c818..d908b00e 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Headers/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/Resources/Info.plist b/quakespasm/MacOSX/SDL2.framework/Versions/A/Resources/Info.plist index 2b29a06e..52aebff6 100644 --- a/quakespasm/MacOSX/SDL2.framework/Versions/A/Resources/Info.plist +++ b/quakespasm/MacOSX/SDL2.framework/Versions/A/Resources/Info.plist @@ -33,7 +33,7 @@ DTSDKBuild 13C64 DTSDKName - macosx10.9 + macosx10.8 DTXcode 0511 DTXcodeBuild diff --git a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 index b150f607..e60fda60 100755 Binary files a/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 and b/quakespasm/MacOSX/SDL2.framework/Versions/A/SDL2 differ diff --git a/quakespasm/Windows/SDL2/COPYING.txt b/quakespasm/Windows/SDL2/COPYING.txt index 5873af74..04f14eed 100644 --- a/quakespasm/Windows/SDL2/COPYING.txt +++ b/quakespasm/Windows/SDL2/COPYING.txt @@ -1,6 +1,6 @@ Simple DirectMedia Layer -Copyright (C) 1997-2015 Sam Lantinga +Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/WhatsNew.txt b/quakespasm/Windows/SDL2/WhatsNew.txt index b37591d8..698ebf7d 100644 --- a/quakespasm/Windows/SDL2/WhatsNew.txt +++ b/quakespasm/Windows/SDL2/WhatsNew.txt @@ -71,13 +71,13 @@ Linux: iOS: * Added support for iOS 8 +* The SDL_WINDOW_ALLOW_HIGHDPI window flag now enables high-dpi support, and SDL_GL_GetDrawableSize() or SDL_GetRendererOutputSize() gets the window resolution in pixels +* SDL_GetWindowSize() and display mode sizes are in the "DPI-independent points" / "screen coordinates" coordinate space rather than pixels (matches OS X behavior) +* Added native resolution support for the iPhone 6 Plus * Added support for MFi game controllers * Added support for the hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK * Added sRGB OpenGL ES context support on iOS 7+ -* Added native resolution support for the iPhone 6 Plus * Added support for SDL_DisableScreenSaver(), SDL_EnableScreenSaver() and the hint SDL_HINT_VIDEO_ALLOW_SCREENSAVER -* The SDL_WINDOW_ALLOW_HIGHDPI window flag now enables high-dpi support, and SDL_GL_GetDrawableSize() or SDL_GetRendererOutputSize() gets the window resolution in pixels -* SDL_GetWindowSize() and display mode sizes are in the "DPI-independent points" coordinate space rather than pixels (matches OS X behavior) * SDL_SysWMinfo now contains the OpenGL ES framebuffer and color renderbuffer objects used by the window's active GLES view * Fixed various rotation and orientation issues * Fixed memory leaks diff --git a/quakespasm/Windows/SDL2/include/SDL.h b/quakespasm/Windows/SDL2/include/SDL.h index 9d1ede33..7647b511 100644 --- a/quakespasm/Windows/SDL2/include/SDL.h +++ b/quakespasm/Windows/SDL2/include/SDL.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_assert.h b/quakespasm/Windows/SDL2/include/SDL_assert.h index 6889514d..402981f9 100644 --- a/quakespasm/Windows/SDL2/include/SDL_assert.h +++ b/quakespasm/Windows/SDL2/include/SDL_assert.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_atomic.h b/quakespasm/Windows/SDL2/include/SDL_atomic.h index bb01eb9e..56aa81df 100644 --- a/quakespasm/Windows/SDL2/include/SDL_atomic.h +++ b/quakespasm/Windows/SDL2/include/SDL_atomic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_audio.h b/quakespasm/Windows/SDL2/include/SDL_audio.h index 359005d0..4f655214 100644 --- a/quakespasm/Windows/SDL2/include/SDL_audio.h +++ b/quakespasm/Windows/SDL2/include/SDL_audio.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_bits.h b/quakespasm/Windows/SDL2/include/SDL_bits.h index c62766d9..528da2ea 100644 --- a/quakespasm/Windows/SDL2/include/SDL_bits.h +++ b/quakespasm/Windows/SDL2/include/SDL_bits.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_blendmode.h b/quakespasm/Windows/SDL2/include/SDL_blendmode.h index c7fa09f7..56d8ad66 100644 --- a/quakespasm/Windows/SDL2/include/SDL_blendmode.h +++ b/quakespasm/Windows/SDL2/include/SDL_blendmode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_clipboard.h b/quakespasm/Windows/SDL2/include/SDL_clipboard.h index 3ad20548..a5556f21 100644 --- a/quakespasm/Windows/SDL2/include/SDL_clipboard.h +++ b/quakespasm/Windows/SDL2/include/SDL_clipboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config.h b/quakespasm/Windows/SDL2/include/SDL_config.h index eda76602..4270c78b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config.h +++ b/quakespasm/Windows/SDL2/include/SDL_config.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_android.h b/quakespasm/Windows/SDL2/include/SDL_config_android.h index 8d5f1e5f..a388ba8d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_android.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_android.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h b/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h index 2d741c38..304c8920 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_iphoneos.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_macosx.h b/quakespasm/Windows/SDL2/include/SDL_config_macosx.h index e4ce82fc..5c8b7e03 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_macosx.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_macosx.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_minimal.h b/quakespasm/Windows/SDL2/include/SDL_config_minimal.h index 7721abc9..3c9d09af 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_minimal.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_minimal.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_pandora.h b/quakespasm/Windows/SDL2/include/SDL_config_pandora.h index 530e78f1..7b51e571 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_pandora.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_pandora.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_psp.h b/quakespasm/Windows/SDL2/include/SDL_config_psp.h index 26bf9d1a..a6e49609 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_psp.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_psp.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_windows.h b/quakespasm/Windows/SDL2/include/SDL_config_windows.h index b3f9bbb1..4c2c7f62 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_windows.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_windows.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_winrt.h b/quakespasm/Windows/SDL2/include/SDL_config_winrt.h index 29bf79fe..e392f773 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_winrt.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_winrt.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_config_wiz.h b/quakespasm/Windows/SDL2/include/SDL_config_wiz.h index a5063ba7..e090a1a9 100644 --- a/quakespasm/Windows/SDL2/include/SDL_config_wiz.h +++ b/quakespasm/Windows/SDL2/include/SDL_config_wiz.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_copying.h b/quakespasm/Windows/SDL2/include/SDL_copying.h index 6fd65219..212da0ee 100644 --- a/quakespasm/Windows/SDL2/include/SDL_copying.h +++ b/quakespasm/Windows/SDL2/include/SDL_copying.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h b/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h index 30d09cce..d0ba47bf 100644 --- a/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h +++ b/quakespasm/Windows/SDL2/include/SDL_cpuinfo.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_egl.h b/quakespasm/Windows/SDL2/include/SDL_egl.h index 358d869b..bea2a6c0 100644 --- a/quakespasm/Windows/SDL2/include/SDL_egl.h +++ b/quakespasm/Windows/SDL2/include/SDL_egl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_endian.h b/quakespasm/Windows/SDL2/include/SDL_endian.h index ec7841c4..9100b103 100644 --- a/quakespasm/Windows/SDL2/include/SDL_endian.h +++ b/quakespasm/Windows/SDL2/include/SDL_endian.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_error.h b/quakespasm/Windows/SDL2/include/SDL_error.h index 1720c43f..2f3b4b50 100644 --- a/quakespasm/Windows/SDL2/include/SDL_error.h +++ b/quakespasm/Windows/SDL2/include/SDL_error.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_events.h b/quakespasm/Windows/SDL2/include/SDL_events.h index 8a364c2a..1437f4c7 100644 --- a/quakespasm/Windows/SDL2/include/SDL_events.h +++ b/quakespasm/Windows/SDL2/include/SDL_events.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_filesystem.h b/quakespasm/Windows/SDL2/include/SDL_filesystem.h index 15bda498..02999ed2 100644 --- a/quakespasm/Windows/SDL2/include/SDL_filesystem.h +++ b/quakespasm/Windows/SDL2/include/SDL_filesystem.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h index 5459387b..42087eea 100644 --- a/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h +++ b/quakespasm/Windows/SDL2/include/SDL_gamecontroller.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_gesture.h b/quakespasm/Windows/SDL2/include/SDL_gesture.h index 44983486..3c29ca7a 100644 --- a/quakespasm/Windows/SDL2/include/SDL_gesture.h +++ b/quakespasm/Windows/SDL2/include/SDL_gesture.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_haptic.h b/quakespasm/Windows/SDL2/include/SDL_haptic.h index 0e6f523b..b36d78b1 100644 --- a/quakespasm/Windows/SDL2/include/SDL_haptic.h +++ b/quakespasm/Windows/SDL2/include/SDL_haptic.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_hints.h b/quakespasm/Windows/SDL2/include/SDL_hints.h index c28cbad8..3bd5435f 100644 --- a/quakespasm/Windows/SDL2/include/SDL_hints.h +++ b/quakespasm/Windows/SDL2/include/SDL_hints.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_joystick.h b/quakespasm/Windows/SDL2/include/SDL_joystick.h index 78176321..266f3b38 100644 --- a/quakespasm/Windows/SDL2/include/SDL_joystick.h +++ b/quakespasm/Windows/SDL2/include/SDL_joystick.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_keyboard.h b/quakespasm/Windows/SDL2/include/SDL_keyboard.h index 1ad58ee3..bbba0f07 100644 --- a/quakespasm/Windows/SDL2/include/SDL_keyboard.h +++ b/quakespasm/Windows/SDL2/include/SDL_keyboard.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_keycode.h b/quakespasm/Windows/SDL2/include/SDL_keycode.h index 66980cef..7be96357 100644 --- a/quakespasm/Windows/SDL2/include/SDL_keycode.h +++ b/quakespasm/Windows/SDL2/include/SDL_keycode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_loadso.h b/quakespasm/Windows/SDL2/include/SDL_loadso.h index db7493ad..3d540bd7 100644 --- a/quakespasm/Windows/SDL2/include/SDL_loadso.h +++ b/quakespasm/Windows/SDL2/include/SDL_loadso.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_log.h b/quakespasm/Windows/SDL2/include/SDL_log.h index 6ffbfc99..09be1104 100644 --- a/quakespasm/Windows/SDL2/include/SDL_log.h +++ b/quakespasm/Windows/SDL2/include/SDL_log.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_main.h b/quakespasm/Windows/SDL2/include/SDL_main.h index c5168ba6..9ce3754e 100644 --- a/quakespasm/Windows/SDL2/include/SDL_main.h +++ b/quakespasm/Windows/SDL2/include/SDL_main.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_messagebox.h b/quakespasm/Windows/SDL2/include/SDL_messagebox.h index 44d458f4..ec370dbb 100644 --- a/quakespasm/Windows/SDL2/include/SDL_messagebox.h +++ b/quakespasm/Windows/SDL2/include/SDL_messagebox.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_mouse.h b/quakespasm/Windows/SDL2/include/SDL_mouse.h index 1ae31269..ea9622f0 100644 --- a/quakespasm/Windows/SDL2/include/SDL_mouse.h +++ b/quakespasm/Windows/SDL2/include/SDL_mouse.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_mutex.h b/quakespasm/Windows/SDL2/include/SDL_mutex.h index 2765210a..b7e39734 100644 --- a/quakespasm/Windows/SDL2/include/SDL_mutex.h +++ b/quakespasm/Windows/SDL2/include/SDL_mutex.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_name.h b/quakespasm/Windows/SDL2/include/SDL_name.h index b6a413a2..06cd4a5e 100644 --- a/quakespasm/Windows/SDL2/include/SDL_name.h +++ b/quakespasm/Windows/SDL2/include/SDL_name.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_opengl.h b/quakespasm/Windows/SDL2/include/SDL_opengl.h index aebe30eb..780919bc 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengl.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengl.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_opengles.h b/quakespasm/Windows/SDL2/include/SDL_opengles.h index 49c709c1..bcc12777 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengles.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengles.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_opengles2.h b/quakespasm/Windows/SDL2/include/SDL_opengles2.h index 13ebd9dc..edcd1a24 100644 --- a/quakespasm/Windows/SDL2/include/SDL_opengles2.h +++ b/quakespasm/Windows/SDL2/include/SDL_opengles2.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_pixels.h b/quakespasm/Windows/SDL2/include/SDL_pixels.h index ba24a47d..8499c328 100644 --- a/quakespasm/Windows/SDL2/include/SDL_pixels.h +++ b/quakespasm/Windows/SDL2/include/SDL_pixels.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_platform.h b/quakespasm/Windows/SDL2/include/SDL_platform.h index 75e4c653..c6c21398 100644 --- a/quakespasm/Windows/SDL2/include/SDL_platform.h +++ b/quakespasm/Windows/SDL2/include/SDL_platform.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_power.h b/quakespasm/Windows/SDL2/include/SDL_power.h index 89eb1718..24c05011 100644 --- a/quakespasm/Windows/SDL2/include/SDL_power.h +++ b/quakespasm/Windows/SDL2/include/SDL_power.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_quit.h b/quakespasm/Windows/SDL2/include/SDL_quit.h index 0108ff04..cc06f28d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_quit.h +++ b/quakespasm/Windows/SDL2/include/SDL_quit.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_rect.h b/quakespasm/Windows/SDL2/include/SDL_rect.h index ebe51674..bbcb9a3b 100644 --- a/quakespasm/Windows/SDL2/include/SDL_rect.h +++ b/quakespasm/Windows/SDL2/include/SDL_rect.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_render.h b/quakespasm/Windows/SDL2/include/SDL_render.h index de2749cc..e4ed2af6 100644 --- a/quakespasm/Windows/SDL2/include/SDL_render.h +++ b/quakespasm/Windows/SDL2/include/SDL_render.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -215,7 +215,7 @@ extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info); /** - * \brief Get the output size of a rendering context. + * \brief Get the output size in pixels of a rendering context. */ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h); diff --git a/quakespasm/Windows/SDL2/include/SDL_revision.h b/quakespasm/Windows/SDL2/include/SDL_revision.h index f8851bd3..6d7163d4 100644 --- a/quakespasm/Windows/SDL2/include/SDL_revision.h +++ b/quakespasm/Windows/SDL2/include/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-9972:734c90ea9990" -#define SDL_REVISION_NUMBER 9972 +#define SDL_REVISION "hg-10001:e12c38730512" +#define SDL_REVISION_NUMBER 10001 diff --git a/quakespasm/Windows/SDL2/include/SDL_rwops.h b/quakespasm/Windows/SDL2/include/SDL_rwops.h index c8b024be..f460ae7d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_rwops.h +++ b/quakespasm/Windows/SDL2/include/SDL_rwops.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_scancode.h b/quakespasm/Windows/SDL2/include/SDL_scancode.h index 4bf86180..0af1dd59 100644 --- a/quakespasm/Windows/SDL2/include/SDL_scancode.h +++ b/quakespasm/Windows/SDL2/include/SDL_scancode.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_shape.h b/quakespasm/Windows/SDL2/include/SDL_shape.h index 157d6127..db10a8f0 100644 --- a/quakespasm/Windows/SDL2/include/SDL_shape.h +++ b/quakespasm/Windows/SDL2/include/SDL_shape.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_stdinc.h b/quakespasm/Windows/SDL2/include/SDL_stdinc.h index c1f2b6dd..887bcd2d 100644 --- a/quakespasm/Windows/SDL2/include/SDL_stdinc.h +++ b/quakespasm/Windows/SDL2/include/SDL_stdinc.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_surface.h b/quakespasm/Windows/SDL2/include/SDL_surface.h index 3634f7d3..e63ca890 100644 --- a/quakespasm/Windows/SDL2/include/SDL_surface.h +++ b/quakespasm/Windows/SDL2/include/SDL_surface.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_system.h b/quakespasm/Windows/SDL2/include/SDL_system.h index bdc4f968..5da9adb4 100644 --- a/quakespasm/Windows/SDL2/include/SDL_system.h +++ b/quakespasm/Windows/SDL2/include/SDL_system.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_syswm.h b/quakespasm/Windows/SDL2/include/SDL_syswm.h index a3441fdc..1056e526 100644 --- a/quakespasm/Windows/SDL2/include/SDL_syswm.h +++ b/quakespasm/Windows/SDL2/include/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_thread.h b/quakespasm/Windows/SDL2/include/SDL_thread.h index 797767f8..377e6c73 100644 --- a/quakespasm/Windows/SDL2/include/SDL_thread.h +++ b/quakespasm/Windows/SDL2/include/SDL_thread.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_timer.h b/quakespasm/Windows/SDL2/include/SDL_timer.h index 1f2a0206..e0d3785e 100644 --- a/quakespasm/Windows/SDL2/include/SDL_timer.h +++ b/quakespasm/Windows/SDL2/include/SDL_timer.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_touch.h b/quakespasm/Windows/SDL2/include/SDL_touch.h index 68ff1714..2643e367 100644 --- a/quakespasm/Windows/SDL2/include/SDL_touch.h +++ b/quakespasm/Windows/SDL2/include/SDL_touch.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_types.h b/quakespasm/Windows/SDL2/include/SDL_types.h index 1a1877fa..5118af21 100644 --- a/quakespasm/Windows/SDL2/include/SDL_types.h +++ b/quakespasm/Windows/SDL2/include/SDL_types.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_version.h b/quakespasm/Windows/SDL2/include/SDL_version.h index 0b364d07..de1f1605 100644 --- a/quakespasm/Windows/SDL2/include/SDL_version.h +++ b/quakespasm/Windows/SDL2/include/SDL_version.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/SDL_video.h b/quakespasm/Windows/SDL2/include/SDL_video.h index f466165b..52dbbc76 100644 --- a/quakespasm/Windows/SDL2/include/SDL_video.h +++ b/quakespasm/Windows/SDL2/include/SDL_video.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -53,8 +53,8 @@ extern "C" { typedef struct { Uint32 format; /**< pixel format */ - int w; /**< width */ - int h; /**< height */ + int w; /**< width, in screen coordinates */ + int h; /**< height, in screen coordinates */ int refresh_rate; /**< refresh rate (or zero for unspecified) */ void *driverdata; /**< driver-specific data, initialize to 0 */ } SDL_DisplayMode; @@ -143,7 +143,9 @@ typedef enum SDL_WINDOWEVENT_MOVED, /**< Window has been moved to data1, data2 */ SDL_WINDOWEVENT_RESIZED, /**< Window has been resized to data1xdata2 */ - SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */ + SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as + a result of an API call or through the + system or user changing the window size. */ SDL_WINDOWEVENT_MINIMIZED, /**< Window has been minimized */ SDL_WINDOWEVENT_MAXIMIZED, /**< Window has been maximized */ SDL_WINDOWEVENT_RESTORED, /**< Window has been restored to normal size @@ -412,8 +414,8 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * ::SDL_WINDOWPOS_UNDEFINED. * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. + * \param w The width of the window, in screen coordinates. + * \param h The height of the window, in screen coordinates. * \param flags The flags for the window, a mask of any of the following: * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, @@ -423,6 +425,12 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); * * \return The id of the window created, or zero if window creation failed. * + * If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size + * in pixels may differ from its size in screen coordinates on platforms with + * high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query + * the client area's size in screen coordinates, and SDL_GL_GetDrawableSize() + * or SDL_GetRendererOutputSize() to query the drawable size in pixels. + * * \sa SDL_DestroyWindow() */ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, @@ -513,10 +521,10 @@ extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, * \brief Set the position of a window. * * \param window The window to reposition. - * \param x The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. + * \param x The x coordinate of the window in screen coordinates, or + * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. + * \param y The y coordinate of the window in screen coordinates, or + * ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED. * * \note The window coordinate origin is the upper left of the display. * @@ -529,8 +537,10 @@ extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, * \brief Get the position of a window. * * \param window The window to query. - * \param x Pointer to variable for storing the x position, may be NULL - * \param y Pointer to variable for storing the y position, may be NULL + * \param x Pointer to variable for storing the x position, in screen + * coordinates. May be NULL. + * \param y Pointer to variable for storing the y position, in screen + * coordinates. May be NULL. * * \sa SDL_SetWindowPosition() */ @@ -541,12 +551,17 @@ extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, * \brief Set the size of a window's client area. * * \param window The window to resize. - * \param w The width of the window, must be >0 - * \param h The height of the window, must be >0 + * \param w The width of the window, in screen coordinates. Must be >0. + * \param h The height of the window, in screen coordinates. Must be >0. * * \note You can't change the size of a fullscreen window, it automatically * matches the size of the display mode. * + * The window size in screen coordinates may differ from the size in pixels, if + * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with + * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. + * * \sa SDL_GetWindowSize() */ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, @@ -556,8 +571,15 @@ extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, * \brief Get the size of a window's client area. * * \param window The window to query. - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL + * \param w Pointer to variable for storing the width, in screen + * coordinates. May be NULL. + * \param h Pointer to variable for storing the height, in screen + * coordinates. May be NULL. + * + * The window size in screen coordinates may differ from the size in pixels, if + * the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with + * high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or + * SDL_GetRendererOutputSize() to get the real client area size in pixels. * * \sa SDL_SetWindowSize() */ @@ -1009,11 +1031,12 @@ extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); /** - * \brief Get the size of a window's underlying drawable (for use with glViewport). + * \brief Get the size of a window's underlying drawable in pixels (for use + * with glViewport). * * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL + * \param w Pointer to variable for storing the width in pixels, may be NULL + * \param h Pointer to variable for storing the height in pixels, may be NULL * * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a diff --git a/quakespasm/Windows/SDL2/include/begin_code.h b/quakespasm/Windows/SDL2/include/begin_code.h index c032400f..04e78c64 100644 --- a/quakespasm/Windows/SDL2/include/begin_code.h +++ b/quakespasm/Windows/SDL2/include/begin_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/include/close_code.h b/quakespasm/Windows/SDL2/include/close_code.h index 73f6c818..d908b00e 100644 --- a/quakespasm/Windows/SDL2/include/close_code.h +++ b/quakespasm/Windows/SDL2/include/close_code.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2015 Sam Lantinga + Copyright (C) 1997-2016 Sam Lantinga This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/quakespasm/Windows/SDL2/lib/SDL2.dll b/quakespasm/Windows/SDL2/lib/SDL2.dll index 8ecf3150..4fffbecf 100644 Binary files a/quakespasm/Windows/SDL2/lib/SDL2.dll and b/quakespasm/Windows/SDL2/lib/SDL2.dll differ diff --git a/quakespasm/Windows/SDL2/lib64/SDL2.dll b/quakespasm/Windows/SDL2/lib64/SDL2.dll index 642d676b..c7361c37 100644 Binary files a/quakespasm/Windows/SDL2/lib64/SDL2.dll and b/quakespasm/Windows/SDL2/lib64/SDL2.dll differ