Skip to content
Permalink
Browse files

resync'd overscan patch with SDL mainline.

  • Loading branch information
Eric Wing
Eric Wing committed Apr 18, 2015
2 parents 3138811 + 5a578a0 commit 7d5147bad3d6e7e88117239e1ff4e6149b917201
Showing with 9,094 additions and 3,999 deletions.
  1. +10 −0 .hgignore
  2. +114 −33 CMakeLists.txt
  3. +7 −4 SDL2.spec.in
  4. +3 −0 Xcode-iOS/Demos/src/fireworks.c
  5. +12 −0 Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
  6. +9 −8 android-project/AndroidManifest.xml
  7. +98 −42 android-project/src/org/libsdl/app/SDLActivity.java
  8. +1 −0 build-scripts/config.guess
  9. +2 −0 build-scripts/config.sub
  10. +72 −0 build-scripts/emscripten-buildbot.sh
  11. +31 −0 build-scripts/windows-buildbot-zipper.bat
  12. +1 −1 cmake/macros.cmake
  13. +186 −139 cmake/sdlchecks.cmake
  14. +157 −6 configure
  15. +102 −5 configure.in
  16. +33 −0 docs/README-emscripten.md
  17. +1 −1 docs/README-gesture.md
  18. +5 −31 docs/README-platforms.md
  19. +1 −1 docs/README-porting.md
  20. +11 −4 docs/README-winrt.md
  21. +1 −0 docs/README.md
  22. +21 −13 include/SDL_assert.h
  23. +1 −1 include/SDL_atomic.h
  24. +10 −8 include/SDL_config.h.cmake
  25. +6 −0 include/SDL_config.h.in
  26. +3 −0 include/SDL_config_iphoneos.h
  27. +1 −1 include/SDL_config_winrt.h
  28. +21 −1 include/SDL_events.h
  29. +2 −1 include/SDL_gamecontroller.h
  30. +42 −3 include/SDL_hints.h
  31. +2 −5 include/SDL_main.h
  32. +9 −0 include/SDL_mouse.h
  33. +5 −0 include/SDL_opengl_glext.h
  34. +3 −3 include/SDL_render.h
  35. +61 −7 include/SDL_stdinc.h
  36. +32 −12 include/SDL_system.h
  37. +4 −0 include/SDL_syswm.h
  38. +20 −1 include/SDL_video.h
  39. +3 −0 premake/Xcode-iOS/SDL_config_premake.h
  40. +2 −0 src/SDL.c
  41. +27 −9 src/SDL_error.c
  42. +311 −378 src/audio/SDL_audio.c
  43. +22 −12 src/audio/SDL_audiodev.c
  44. +1 −2 src/audio/SDL_audiodev_c.h
  45. +43 −9 src/audio/SDL_sysaudio.h
  46. +2 −2 src/audio/alsa/SDL_alsa_audio.c
  47. +1 −1 src/audio/android/SDL_androidaudio.c
  48. +3 −3 src/audio/arts/SDL_artsaudio.c
  49. +7 −5 src/audio/bsd/SDL_bsdaudio.c
  50. +234 −93 src/audio/coreaudio/SDL_coreaudio.c
  51. +16 −49 src/audio/directsound/SDL_directsound.c
  52. +4 −2 src/audio/disk/SDL_diskaudio.c
  53. +6 −4 src/audio/dsp/SDL_dspaudio.c
  54. +1 −1 src/audio/dummy/SDL_dummyaudio.c
  55. +275 −0 src/audio/emscripten/SDL_emscriptenaudio.c
  56. +42 −0 src/audio/emscripten/SDL_emscriptenaudio.h
  57. +3 −3 src/audio/esd/SDL_esdaudio.c
  58. +2 −2 src/audio/fusionsound/SDL_fsaudio.c
  59. +1 −1 src/audio/haiku/SDL_haikuaudio.cc
  60. +9 −4 src/audio/nacl/SDL_naclaudio.c
  61. +1 −1 src/audio/nas/SDL_nasaudio.c
  62. +3 −3 src/audio/paudio/SDL_paudio.c
  63. +6 −2 src/audio/psp/SDL_pspaudio.c
  64. +1 −1 src/audio/psp/SDL_pspaudio.h
  65. +250 −105 src/audio/pulseaudio/SDL_pulseaudio.c
  66. +2 −1 src/audio/pulseaudio/SDL_pulseaudio.h
  67. +32 −80 src/audio/qsa/SDL_qsa_audio.c
  68. +2 −2 src/audio/sndio/SDL_sndioaudio.c
  69. +7 −5 src/audio/sun/SDL_sunaudio.c
  70. +14 −49 src/audio/winmm/SDL_winmm.c
  71. +29 −45 src/audio/xaudio2/SDL_xaudio2.c
  72. +42 −29 src/core/android/SDL_android.c
  73. +1 −0 src/core/android/SDL_android.h
  74. +2 −2 src/core/linux/SDL_evdev.c
  75. +7 −2 src/core/linux/SDL_ibus.c
  76. +16 −14 src/core/linux/SDL_udev.c
  77. +10 −0 src/core/winrt/SDL_winrtapp_direct3d.cpp
  78. +1 −1 src/core/winrt/SDL_winrtapp_xaml.h
  79. +12 −6 src/cpuinfo/SDL_cpuinfo.c
  80. +21 −4 src/dynapi/SDL_dynapi.c
  81. +5 −2 src/dynapi/SDL_dynapi.h
  82. +1 −0 src/dynapi/SDL_dynapi_overrides.h
  83. +1 −0 src/dynapi/SDL_dynapi_procs.h
  84. +14 −1 src/events/SDL_events.c
  85. +45 −8 src/events/SDL_gesture.c
  86. +13 −6 src/events/SDL_mouse.c
  87. +1 −1 src/events/SDL_mouse_c.h
  88. +27 −5 src/events/SDL_quit.c
  89. +2 −3 src/file/cocoa/SDL_rwopsbundlesupport.m
  90. +4 −1 src/filesystem/cocoa/SDL_sysfilesystem.m
  91. +69 −0 src/filesystem/emscripten/SDL_sysfilesystem.c
  92. +2 −1 src/filesystem/nacl/SDL_sysfilesystem.c
  93. +0 −6 src/haptic/SDL_syshaptic.h
  94. +3 −3 src/haptic/darwin/SDL_syshaptic.c
  95. +3 −4 src/haptic/linux/SDL_syshaptic.c
  96. +15 −1 src/joystick/SDL_gamecontroller.c
  97. +7 −1 src/joystick/SDL_gamecontrollerdb.h
  98. +3 −6 src/joystick/SDL_joystick.c
  99. +3 −4 src/joystick/SDL_sysjoystick.h
  100. +3 −8 src/joystick/android/SDL_sysjoystick.c
  101. +1 −1 src/joystick/android/SDL_sysjoystick_c.h
  102. +1 −3 src/joystick/bsd/SDL_sysjoystick.c
  103. +17 −24 src/joystick/darwin/SDL_sysjoystick.c
  104. +1 −2 src/joystick/darwin/SDL_sysjoystick_c.h
  105. +3 −6 src/joystick/dummy/SDL_sysjoystick.c
  106. +427 −0 src/joystick/emscripten/SDL_sysjoystick.c
  107. +52 −0 src/joystick/emscripten/SDL_sysjoystick_c.h
  108. +3 −5 src/joystick/haiku/SDL_haikujoystick.cc
  109. +34 −21 src/joystick/iphoneos/SDL_sysjoystick.m
  110. +10 −11 src/joystick/linux/SDL_sysjoystick.c
  111. +9 −8 src/joystick/psp/SDL_sysjoystick.c
  112. +5 −0 src/joystick/windows/SDL_dinputjoystick.c
  113. +3 −6 src/joystick/windows/SDL_mmjoystick.c
  114. +5 −11 src/joystick/windows/SDL_windowsjoystick.c
  115. +1 −1 src/main/haiku/SDL_BApp.h
  116. +7 −0 src/main/psp/SDL_psp_main.c
  117. +41 −6 src/main/windows/SDL_windows_main.c
  118. +4 −0 src/power/SDL_power.c
  119. +62 −0 src/power/emscripten/SDL_syspower.c
  120. +19 −18 src/power/uikit/SDL_syspower.m
  121. +16 −1 src/render/direct3d11/SDL_render_d3d11.c
  122. +5 −3 src/render/opengl/SDL_render_gl.c
  123. +9 −0 src/render/opengles/SDL_render_gles.c
  124. +4 −0 src/render/opengles2/SDL_gles2funcs.h
  125. +72 −9 src/render/opengles2/SDL_render_gles2.c
  126. +1 −1 src/render/psp/SDL_render_psp.c
  127. +5 −0 src/stdlib/SDL_getenv.c
  128. +5 −0 src/stdlib/SDL_iconv.c
  129. +5 −0 src/stdlib/SDL_malloc.c
  130. +5 −0 src/stdlib/SDL_qsort.c
  131. +5 −0 src/stdlib/SDL_stdlib.c
  132. +5 −0 src/stdlib/SDL_string.c
  133. +12 −3 src/test/SDL_test_common.c
  134. +4 −0 src/thread/psp/SDL_syscond.c
  135. +4 −0 src/thread/psp/SDL_sysmutex.c
  136. +5 −0 src/thread/psp/SDL_syssem.c
  137. +4 −0 src/thread/psp/SDL_systhread.c
  138. +5 −0 src/timer/psp/SDL_systimer.c
  139. +11 −4 src/video/SDL_bmp.c
  140. +14 −0 src/video/SDL_clipboard.c
  141. +4 −0 src/video/SDL_fillrect.c
  142. +9 −9 src/video/SDL_surface.c
  143. +5 −0 src/video/SDL_sysvideo.h
  144. +67 −20 src/video/SDL_video.c
  145. +6 −0 src/video/android/SDL_androidevents.c
  146. +1 −1 src/video/android/SDL_androidmessagebox.c
  147. +84 −0 src/video/android/SDL_androidmouse.c
  148. +31 −0 src/video/android/SDL_androidmouse.h
  149. +48 −19 src/video/android/SDL_androidtouch.c
  150. +1 −0 src/video/android/SDL_androidtouch.h
  151. +7 −2 src/video/android/SDL_androidvideo.c
  152. +1 −1 src/video/android/SDL_androidvideo.h
  153. +1 −0 src/video/cocoa/SDL_cocoaevents.h
  154. +112 −14 src/video/cocoa/SDL_cocoaevents.m
  155. +1 −0 src/video/cocoa/SDL_cocoamodes.m
  156. +8 −1 src/video/cocoa/SDL_cocoamouse.m
  157. +4 −0 src/video/cocoa/SDL_cocoavideo.h
  158. +4 −0 src/video/cocoa/SDL_cocoavideo.m
  159. +1 −28 src/video/cocoa/SDL_cocoawindow.m
  160. +1 −1 src/video/directfb/SDL_DirectFB_WM.c
  161. +1 −1 src/video/directfb/SDL_DirectFB_video.c
  162. +0 −1 src/video/dummy/SDL_nullvideo.c
  163. +644 −0 src/video/emscripten/SDL_emscriptenevents.c
  164. +36 −0 src/video/emscripten/SDL_emscriptenevents.h
  165. +136 −0 src/video/emscripten/SDL_emscriptenframebuffer.c
  166. +32 −0 src/video/emscripten/SDL_emscriptenframebuffer.h
  167. +232 −0 src/video/emscripten/SDL_emscriptenmouse.c
  168. +39 −0 src/video/emscripten/SDL_emscriptenmouse.h
  169. +117 −0 src/video/emscripten/SDL_emscriptenopengles.c
  170. +49 −0 src/video/emscripten/SDL_emscriptenopengles.h
  171. +319 −0 src/video/emscripten/SDL_emscriptenvideo.c
  172. +52 −0 src/video/emscripten/SDL_emscriptenvideo.h
  173. +1 −1 src/video/mir/SDL_mirevents.c
  174. +7 −1 src/video/nacl/SDL_naclevents.c
  175. +6 −0 src/video/psp/SDL_pspevents.c
  176. +6 −0 src/video/psp/SDL_pspgl.c
  177. +6 −0 src/video/psp/SDL_pspmouse.c
  178. +2 −2 src/video/psp/SDL_pspvideo.c
  179. +3 −3 src/video/psp/SDL_pspvideo.h
  180. +12 −3 src/video/uikit/SDL_uikitappdelegate.h
  181. +264 −168 src/video/uikit/SDL_uikitappdelegate.m
  182. +2 −1 src/video/uikit/SDL_uikitevents.m
  183. +30 −48 src/video/uikit/SDL_uikitmessagebox.m
  184. +11 −11 src/video/uikit/SDL_uikitmodes.h
  185. +96 −89 src/video/uikit/SDL_uikitmodes.m
  186. +2 −0 src/video/uikit/SDL_uikitopengles.h
  187. +106 −107 src/video/uikit/SDL_uikitopengles.m
  188. +28 −46 src/video/uikit/SDL_uikitopenglview.h
  189. +147 −111 src/video/uikit/SDL_uikitopenglview.m
  190. +2 −14 src/video/uikit/SDL_uikitvideo.h
  191. +25 −5 src/video/uikit/SDL_uikitvideo.m
  192. +5 −42 src/video/uikit/SDL_uikitview.h
  193. +88 −362 src/video/uikit/SDL_uikitview.m
  194. +44 −6 src/video/uikit/SDL_uikitviewcontroller.h
  195. +338 −57 src/video/uikit/SDL_uikitviewcontroller.m
  196. +14 −9 src/video/uikit/SDL_uikitwindow.h
  197. +265 −187 src/video/uikit/SDL_uikitwindow.m
  198. +52 −4 src/video/wayland/SDL_waylandevents.c
  199. +1 −2 src/video/wayland/SDL_waylandmouse.c
  200. +77 −129 src/video/wayland/SDL_waylandvideo.c
  201. +3 −12 src/video/wayland/SDL_waylandvideo.h
  202. +11 −16 src/video/wayland/SDL_waylandwindow.c
  203. +1 −0 src/video/wayland/SDL_waylandwindow.h
  204. +9 −8 src/video/windows/SDL_windowsevents.c
  205. +22 −2 src/video/windows/SDL_windowsopengl.c
  206. +1 −0 src/video/windows/SDL_windowsopengl.h
  207. +5 −10 src/video/windows/SDL_windowswindow.c
  208. +74 −11 src/video/winrt/SDL_winrtopengles.cpp
  209. +1 −1 src/video/winrt/SDL_winrtpointerinput.cpp
  210. +1 −1 src/video/winrt/SDL_winrtvideo.cpp
  211. +71 −62 src/video/x11/SDL_x11events.c
  212. +10 −5 src/video/x11/SDL_x11messagebox.c
  213. +5 −1 src/video/x11/SDL_x11modes.c
  214. +75 −102 src/video/x11/SDL_x11opengl.c
  215. +3 −0 src/video/x11/SDL_x11opengl.h
  216. +1 −0 src/video/x11/SDL_x11video.h
  217. +22 −50 src/video/x11/SDL_x11window.c
  218. +1 −2 src/video/x11/SDL_x11window.h
  219. +13 −0 test/Makefile.in
  220. +39 −20 test/checkkeys.c
  221. +5 −0 test/configure
  222. +6 −0 test/configure.in
  223. +0 −1 test/controllermap.c
  224. +25 −0 test/emscripten/joystick-pre.js
  225. +18 −1 test/loopwave.c
  226. +34 −11 test/loopwavequeue.c
  227. +3 −1 test/relative_mode.markdown
  228. +0 −3 test/testatomic.c
  229. +183 −0 test/testaudiohotplug.c
  230. +1 −1 test/testautomation.c
  231. +1 −5 test/testautomation_platform.c
  232. +10 −10 test/testautomation_rwops.c
  233. +94 −94 test/testautomation_sdltest.c
  234. +3 −0 test/testautomation_surface.c
  235. +2 −2 test/testautomation_timer.c
  236. +0 −2 test/testautomation_video.c
  237. +39 −19 test/testdraw2.c
  238. +41 −19 test/testdrawchessboard.c
  239. +0 −1 test/testerror.c
  240. +0 −1 test/testfile.c
  241. +19 −0 test/testfilesystem.c
  242. +107 −83 test/testgamecontroller.c
  243. +53 −51 test/testgesture.c
  244. +72 −45 test/testgles2.c
  245. +0 −2 test/testhaptic.c
  246. +0 −1 test/testhotplug.c
  247. +75 −56 test/testintersections.c
  248. +65 −39 test/testjoystick.c
  249. +0 −2 test/testlock.c
  250. +0 −1 test/testmessage.c
  251. +36 −6 test/testmultiaudio.c
  252. +74 −51 test/testoverlay2.c
  253. +2 −11 test/testplatform.c
  254. +46 −27 test/testrelative.c
  255. +31 −13 test/testrendercopyex.c
  256. +36 −17 test/testrendertarget.c
  257. +0 −2 test/testrumble.c
  258. +31 −12 test/testscale.c
  259. +0 −1 test/testsem.c
  260. +30 −11 test/testsprite2.c
  261. +28 −11 test/testspriteminimal.c
  262. +41 −23 test/teststreaming.c
  263. +0 −1 test/testthread.c
  264. +1 −1 test/testtimer.c
  265. +62 −35 test/testviewport.c
  266. +63 −48 test/testwm2.c
  267. +0 −1 test/torturethread.c
@@ -8,6 +8,9 @@ Makefile
sdl-config
SDL2.spec
build
Build
*xcuserdata*
*xcworkspacedata*

# for Xcode
*.orig
@@ -72,20 +75,26 @@ test/config.status
test/Makefile
test/SDL2.dll
test/checkkeys
test/controllermap
test/loopwave
test/loopwavequeue
test/testatomic
test/testaudiohotplug
test/testaudioinfo
test/testautomation
test/testdraw2
test/testdrawchessboard
test/testdropfile
test/testerror
test/testfile
test/testgamecontroller
test/testgesture
test/testgl2
test/testgles
test/testgles2
test/testhaptic
test/testhittesting
test/testhotplug
test/testiconv
test/testime
test/testintersections
@@ -115,6 +124,7 @@ test/teststreaming
test/testthread
test/testtimer
test/testver
test/testviewport
test/testwm2
test/torturethread
test/*.exe

0 comments on commit 7d5147b

Please sign in to comment.