gosu 1.4.6 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (320) hide show
  1. checksums.yaml +4 -4
  2. data/COPYING +2 -1
  3. data/dependencies/SDL/include/SDL3/SDL.h +91 -0
  4. data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
  5. data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
  6. data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
  7. data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
  8. data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
  9. data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
  10. data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
  11. data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
  12. data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
  13. data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
  14. data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
  15. data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
  16. data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
  17. data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
  18. data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
  19. data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
  20. data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
  21. data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
  22. data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
  23. data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
  24. data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
  25. data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
  26. data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
  27. data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
  28. data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
  29. data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
  30. data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
  31. data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
  32. data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
  33. data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
  34. data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
  35. data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
  36. data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
  37. data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
  38. data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
  39. data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
  40. data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
  41. data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
  42. data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
  43. data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
  44. data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
  45. data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
  46. data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
  47. data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
  48. data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
  49. data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
  50. data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
  51. data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
  52. data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
  53. data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
  54. data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
  55. data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
  56. data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
  57. data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
  58. data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
  59. data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
  60. data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
  61. data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
  62. data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
  63. data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
  64. data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
  65. data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
  66. data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
  67. data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
  68. data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
  69. data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
  70. data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
  71. data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
  72. data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
  73. data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
  74. data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
  75. data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
  76. data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
  77. data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
  78. data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
  79. data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
  80. data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
  81. data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
  82. data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
  83. data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
  84. data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
  85. data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
  86. data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
  87. data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
  88. data/dependencies/SDL_sound/SDL_sound.c +136 -215
  89. data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
  90. data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
  91. data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
  92. data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
  93. data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
  94. data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
  95. data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
  96. data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
  97. data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
  98. data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
  99. data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
  100. data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
  101. data/dependencies/SDL_sound/dr_flac.h +1890 -1301
  102. data/dependencies/SDL_sound/dr_mp3.h +1098 -660
  103. data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
  104. data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
  105. data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
  106. data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
  107. data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
  108. data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
  109. data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
  110. data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
  111. data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
  112. data/dependencies/SDL_sound/stb_vorbis.h +397 -342
  113. data/dependencies/mojoAL/AL/alc.h +2 -2
  114. data/dependencies/mojoAL/mojoal.c +2120 -1885
  115. data/dependencies/stb/stb_image.h +1190 -1379
  116. data/dependencies/stb/stb_image_write.h +329 -129
  117. data/dependencies/stb/stb_truetype.h +304 -60
  118. data/dependencies/utf8proc/utf8proc.c +133 -75
  119. data/dependencies/utf8proc/utf8proc.h +131 -50
  120. data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
  121. data/ext/gosu-ffi/extconf.rb +103 -0
  122. data/ext/gosu-ffi/gosu-ffi.def +467 -0
  123. data/ffi/Gosu.cpp +330 -0
  124. data/ffi/Gosu.h +84 -0
  125. data/ffi/Gosu_Channel.cpp +62 -0
  126. data/ffi/Gosu_Channel.h +17 -0
  127. data/ffi/Gosu_Color.cpp +176 -0
  128. data/ffi/Gosu_Color.h +31 -0
  129. data/ffi/Gosu_Constants.cpp +334 -0
  130. data/ffi/Gosu_FFI.h +34 -0
  131. data/ffi/Gosu_FFI_internal.h +160 -0
  132. data/ffi/Gosu_Font.cpp +97 -0
  133. data/ffi/Gosu_Font.h +32 -0
  134. data/ffi/Gosu_Image.cpp +239 -0
  135. data/ffi/Gosu_Image.h +71 -0
  136. data/ffi/Gosu_Sample.cpp +29 -0
  137. data/ffi/Gosu_Sample.h +14 -0
  138. data/ffi/Gosu_Song.cpp +69 -0
  139. data/ffi/Gosu_Song.h +18 -0
  140. data/ffi/Gosu_TextInput.cpp +94 -0
  141. data/ffi/Gosu_TextInput.h +25 -0
  142. data/ffi/Gosu_Window.cpp +314 -0
  143. data/ffi/Gosu_Window.h +78 -0
  144. data/include/Gosu/Audio.hpp +6 -11
  145. data/include/Gosu/Bitmap.hpp +38 -53
  146. data/include/Gosu/Buffer.hpp +54 -0
  147. data/include/Gosu/Color.hpp +29 -36
  148. data/include/Gosu/Directories.hpp +25 -28
  149. data/include/Gosu/Drawable.hpp +58 -0
  150. data/include/Gosu/Font.hpp +6 -5
  151. data/include/Gosu/Fwd.hpp +4 -6
  152. data/include/Gosu/Gosu.hpp +5 -5
  153. data/include/Gosu/Graphics.hpp +53 -61
  154. data/include/Gosu/GraphicsBase.hpp +1 -11
  155. data/include/Gosu/Image.hpp +12 -15
  156. data/include/Gosu/Math.hpp +50 -72
  157. data/include/Gosu/Transform.hpp +32 -0
  158. data/include/Gosu/Utility.hpp +77 -1
  159. data/include/Gosu/Version.hpp +2 -2
  160. data/include/Gosu/Window.hpp +15 -9
  161. data/lib/SDL3.dll +0 -0
  162. data/lib/gosu/channel.rb +50 -0
  163. data/lib/gosu/color.rb +173 -0
  164. data/lib/gosu/compat.rb +130 -17
  165. data/lib/gosu/constants.rb +386 -0
  166. data/lib/gosu/ffi.rb +269 -0
  167. data/lib/gosu/font.rb +62 -0
  168. data/lib/gosu/gl_tex_info.rb +33 -0
  169. data/lib/gosu/gosu.rb +250 -0
  170. data/lib/gosu/image.rb +179 -0
  171. data/lib/gosu/numeric.rb +17 -0
  172. data/lib/gosu/preview.rb +6 -6
  173. data/lib/gosu/sample.rb +25 -0
  174. data/lib/gosu/song.rb +57 -0
  175. data/lib/gosu/text_input.rb +83 -0
  176. data/lib/gosu/window.rb +249 -0
  177. data/lib/gosu.rb +29 -8
  178. data/lib64/SDL3.dll +0 -0
  179. data/rdoc/gosu.rb +2 -2
  180. data/src/Audio.cpp +30 -24
  181. data/src/AudioFile.hpp +5 -4
  182. data/src/AudioFileAudioToolbox.cpp +8 -8
  183. data/src/AudioFileSDLSound.cpp +12 -15
  184. data/src/BinPacker.cpp +188 -0
  185. data/src/BinPacker.hpp +55 -0
  186. data/src/Bitmap.cpp +172 -143
  187. data/src/BitmapIO.cpp +60 -86
  188. data/src/Buffer.cpp +150 -0
  189. data/src/ClipRectStack.cpp +38 -0
  190. data/src/ClipRectStack.hpp +17 -83
  191. data/src/Color.cpp +75 -80
  192. data/src/Directories.cpp +47 -0
  193. data/src/DirectoriesUIKit.cpp +50 -0
  194. data/src/DrawOp.hpp +20 -18
  195. data/src/DrawOpQueue.hpp +27 -33
  196. data/src/Drawable.cpp +95 -0
  197. data/src/EmptyDrawable.hpp +38 -0
  198. data/src/FPS.cpp +31 -0
  199. data/src/Font.cpp +104 -74
  200. data/src/GosuGLView.cpp +13 -11
  201. data/src/GosuViewController.cpp +2 -10
  202. data/src/Graphics.cpp +86 -145
  203. data/src/GraphicsImpl.hpp +14 -68
  204. data/src/Image.cpp +41 -35
  205. data/src/Input.cpp +73 -78
  206. data/src/Macro.cpp +46 -29
  207. data/src/Macro.hpp +23 -17
  208. data/src/MarkupParser.cpp +5 -5
  209. data/src/Math.cpp +48 -22
  210. data/src/OffScreenTarget.cpp +47 -50
  211. data/src/OffScreenTarget.hpp +13 -11
  212. data/src/OpenGLContext.cpp +116 -0
  213. data/src/OpenGLContext.hpp +41 -0
  214. data/src/RenderState.hpp +49 -71
  215. data/src/Resolution.cpp +65 -53
  216. data/src/TexChunk.cpp +35 -80
  217. data/src/TexChunk.hpp +44 -35
  218. data/src/Text.cpp +1 -1
  219. data/src/TextBuilder.cpp +35 -21
  220. data/src/TextBuilder.hpp +6 -9
  221. data/src/TextInput.cpp +9 -9
  222. data/src/Texture.cpp +62 -80
  223. data/src/Texture.hpp +25 -23
  224. data/src/TiledDrawable.cpp +149 -0
  225. data/src/TiledDrawable.hpp +47 -0
  226. data/src/TimingApple.cpp +1 -1
  227. data/src/Transform.cpp +45 -50
  228. data/src/TransformStack.hpp +16 -16
  229. data/src/TrueTypeFont.cpp +59 -51
  230. data/src/TrueTypeFont.hpp +6 -7
  231. data/src/TrueTypeFontApple.cpp +28 -19
  232. data/src/TrueTypeFontUnix.cpp +39 -32
  233. data/src/TrueTypeFontWin.cpp +30 -30
  234. data/src/Utility.cpp +113 -37
  235. data/src/UtilityWin.cpp +49 -0
  236. data/src/Window.cpp +121 -151
  237. data/src/WindowUIKit.cpp +14 -14
  238. metadata +165 -118
  239. data/dependencies/SDL/include/SDL.h +0 -233
  240. data/dependencies/SDL/include/SDL_assert.h +0 -320
  241. data/dependencies/SDL/include/SDL_atomic.h +0 -415
  242. data/dependencies/SDL/include/SDL_audio.h +0 -1500
  243. data/dependencies/SDL/include/SDL_clipboard.h +0 -141
  244. data/dependencies/SDL/include/SDL_config.h +0 -331
  245. data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
  246. data/dependencies/SDL/include/SDL_endian.h +0 -348
  247. data/dependencies/SDL/include/SDL_error.h +0 -163
  248. data/dependencies/SDL/include/SDL_events.h +0 -1166
  249. data/dependencies/SDL/include/SDL_filesystem.h +0 -149
  250. data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
  251. data/dependencies/SDL/include/SDL_gesture.h +0 -117
  252. data/dependencies/SDL/include/SDL_guid.h +0 -100
  253. data/dependencies/SDL/include/SDL_haptic.h +0 -1341
  254. data/dependencies/SDL/include/SDL_hidapi.h +0 -451
  255. data/dependencies/SDL/include/SDL_hints.h +0 -2569
  256. data/dependencies/SDL/include/SDL_joystick.h +0 -1066
  257. data/dependencies/SDL/include/SDL_keyboard.h +0 -353
  258. data/dependencies/SDL/include/SDL_keycode.h +0 -358
  259. data/dependencies/SDL/include/SDL_loadso.h +0 -115
  260. data/dependencies/SDL/include/SDL_log.h +0 -404
  261. data/dependencies/SDL/include/SDL_main.h +0 -275
  262. data/dependencies/SDL/include/SDL_mouse.h +0 -465
  263. data/dependencies/SDL/include/SDL_mutex.h +0 -471
  264. data/dependencies/SDL/include/SDL_name.h +0 -33
  265. data/dependencies/SDL/include/SDL_pixels.h +0 -644
  266. data/dependencies/SDL/include/SDL_platform.h +0 -261
  267. data/dependencies/SDL/include/SDL_quit.h +0 -58
  268. data/dependencies/SDL/include/SDL_rect.h +0 -376
  269. data/dependencies/SDL/include/SDL_render.h +0 -1919
  270. data/dependencies/SDL/include/SDL_revision.h +0 -7
  271. data/dependencies/SDL/include/SDL_rwops.h +0 -841
  272. data/dependencies/SDL/include/SDL_sensor.h +0 -322
  273. data/dependencies/SDL/include/SDL_shape.h +0 -155
  274. data/dependencies/SDL/include/SDL_stdinc.h +0 -830
  275. data/dependencies/SDL/include/SDL_surface.h +0 -997
  276. data/dependencies/SDL/include/SDL_system.h +0 -623
  277. data/dependencies/SDL/include/SDL_syswm.h +0 -386
  278. data/dependencies/SDL/include/SDL_test_images.h +0 -78
  279. data/dependencies/SDL/include/SDL_test_random.h +0 -115
  280. data/dependencies/SDL/include/SDL_thread.h +0 -464
  281. data/dependencies/SDL/include/SDL_timer.h +0 -222
  282. data/dependencies/SDL/include/SDL_touch.h +0 -150
  283. data/dependencies/SDL/include/SDL_version.h +0 -204
  284. data/dependencies/SDL/include/SDL_video.h +0 -2150
  285. data/dependencies/SDL/include/SDL_vulkan.h +0 -215
  286. data/dependencies/SDL/include/begin_code.h +0 -187
  287. data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
  288. data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
  289. data/dependencies/SDL_sound/SDL_sound.h +0 -725
  290. data/ext/gosu/extconf.rb +0 -119
  291. data/include/Gosu/IO.hpp +0 -254
  292. data/include/Gosu/ImageData.hpp +0 -53
  293. data/include/Gosu/Inspection.hpp +0 -7
  294. data/lib/SDL2.dll +0 -0
  295. data/lib/gosu/patches.rb +0 -66
  296. data/lib/gosu/run.rb +0 -20
  297. data/lib/gosu/swig_patches.rb +0 -110
  298. data/lib64/SDL2.dll +0 -0
  299. data/src/BlockAllocator.cpp +0 -131
  300. data/src/BlockAllocator.hpp +0 -32
  301. data/src/DirectoriesApple.cpp +0 -69
  302. data/src/DirectoriesUnix.cpp +0 -46
  303. data/src/DirectoriesWin.cpp +0 -65
  304. data/src/EmptyImageData.hpp +0 -52
  305. data/src/FileUnix.cpp +0 -99
  306. data/src/FileWin.cpp +0 -88
  307. data/src/IO.cpp +0 -60
  308. data/src/Iconv.hpp +0 -51
  309. data/src/Inspection.cpp +0 -27
  310. data/src/LargeImageData.cpp +0 -215
  311. data/src/LargeImageData.hpp +0 -39
  312. data/src/Log.hpp +0 -19
  313. data/src/RubyGosu.cxx +0 -13100
  314. data/src/RubyGosu.h +0 -49
  315. data/src/WinUtility.cpp +0 -61
  316. data/src/WinUtility.hpp +0 -27
  317. /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
  318. /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
  319. /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
  320. /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
@@ -0,0 +1,49 @@
1
+ #include <Gosu/Platform.hpp>
2
+ #if defined(GOSU_IS_WIN)
3
+
4
+ #include <Gosu/Utility.hpp>
5
+ #include <stdexcept>
6
+ #include <windows.h>
7
+
8
+ std::wstring Gosu::utf8_to_utf16(const std::string& utf8)
9
+ {
10
+ if (utf8.empty()) {
11
+ return std::wstring();
12
+ }
13
+
14
+ // The UTF-16 result can never consist of more codepoints than we have bytes in UTF-8.
15
+ // -> Start with a size that we know is sufficient, then truncate later.
16
+ std::wstring utf16(utf8.size(), '\0');
17
+ int result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, utf8.data(), utf8.size(),
18
+ utf16.data(), utf16.size());
19
+ if (result == 0) {
20
+ throw std::runtime_error("Could not convert UTF-8 to UTF-16, GetLastError() = "
21
+ + std::to_string(GetLastError()));
22
+ }
23
+ utf16.resize(result);
24
+ return utf16;
25
+ }
26
+
27
+ std::string Gosu::utf16_to_utf8(const std::wstring& utf16)
28
+ {
29
+ if (utf16.empty()) {
30
+ return std::string();
31
+ }
32
+
33
+ int result = WideCharToMultiByte(CP_UTF8, 0, utf16.c_str(), utf16.size(), nullptr, 0, nullptr,
34
+ nullptr);
35
+ if (result == 0) {
36
+ throw std::runtime_error("Could not convert UTF-16 to UTF-8, GetLastError() = "
37
+ + std::to_string(GetLastError()));
38
+ }
39
+ std::string utf8(result, '\0');
40
+ result = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, utf16.c_str(), utf16.size(),
41
+ utf8.data(), utf8.size(), nullptr, nullptr);
42
+ if (result == 0) {
43
+ throw std::runtime_error("Could not convert UTF-16 to UTF-8, GetLastError() = "
44
+ + std::to_string(GetLastError()));
45
+ }
46
+ return utf8;
47
+ }
48
+
49
+ #endif
data/src/Window.cpp CHANGED
@@ -3,72 +3,13 @@
3
3
 
4
4
  #if defined(GOSU_IS_WIN)
5
5
  #define NOMINMAX
6
- #include <windows.h>
6
+ #include <windows.h> // for SetThreadAffinityMask()
7
7
  #endif
8
8
 
9
9
  #include <Gosu/Gosu.hpp>
10
10
  #include "GraphicsImpl.hpp"
11
- #include <SDL.h>
11
+ #include "OpenGLContext.hpp"
12
12
  #include <algorithm>
13
- #include <stdexcept>
14
-
15
- namespace Gosu
16
- {
17
- namespace FPS
18
- {
19
- void register_frame();
20
- }
21
-
22
- [[noreturn]] static void throw_sdl_error(const std::string& operation)
23
- {
24
- const char* error = SDL_GetError();
25
- throw std::runtime_error{operation + ": " + (error ? error : "(unknown error)")};
26
- }
27
-
28
- SDL_Window* shared_window()
29
- {
30
- // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
31
- static SDL_Window* window = nullptr;
32
- if (window == nullptr) {
33
- if (SDL_Init(SDL_INIT_VIDEO) < 0) {
34
- throw_sdl_error("Could not initialize SDL Video");
35
- }
36
-
37
- Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN | SDL_WINDOW_ALLOW_HIGHDPI;
38
-
39
- window = SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 64, 64,
40
- flags);
41
- if (window == nullptr) {
42
- throw_sdl_error("Could not create window");
43
- }
44
- SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
45
- }
46
- return window;
47
- }
48
-
49
- static SDL_GLContext shared_gl_context()
50
- {
51
- static SDL_GLContext context = nullptr;
52
- if (context == nullptr) {
53
- #ifdef GOSU_IS_OPENGLES
54
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
55
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
56
- #endif
57
-
58
- context = SDL_GL_CreateContext(shared_window());
59
-
60
- if (context == nullptr) {
61
- throw_sdl_error("Could not create OpenGL context");
62
- }
63
- }
64
- return context;
65
- }
66
-
67
- void ensure_current_context() //
68
- {
69
- SDL_GL_MakeCurrent(shared_window(), shared_gl_context());
70
- }
71
- }
72
13
 
73
14
  struct Gosu::Window::Impl : private Gosu::Noncopyable
74
15
  {
@@ -77,6 +18,11 @@ struct Gosu::Window::Impl : private Gosu::Noncopyable
77
18
  bool resizable = false;
78
19
  bool resizing = false;
79
20
 
21
+ // We remember the last size in windowed mode so that we can restore it when leaving fullscreen.
22
+ // (In fullscreen, the logical resolution follows the desktop and would otherwise be lost.)
23
+ int windowed_width = 0;
24
+ int windowed_height = 0;
25
+
80
26
  // A single `bool open` is not good enough to support the tick() method: When close() is called
81
27
  // from outside the window's call graph, the next call to tick() must return false (transition
82
28
  // from CLOSING to CLOSED), but the call after that must show the window again (transition from
@@ -86,14 +32,15 @@ struct Gosu::Window::Impl : private Gosu::Noncopyable
86
32
  CLOSED,
87
33
  OPEN,
88
34
  CLOSING
89
- } state = CLOSED;
35
+ } state
36
+ = CLOSED;
90
37
 
91
- std::unique_ptr<Graphics> graphics;
38
+ std::unique_ptr<Viewport> viewport;
92
39
  std::unique_ptr<Input> input;
93
40
  };
94
41
 
95
42
  Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
96
- : m_impl(new Impl)
43
+ : m_impl(new Impl)
97
44
  {
98
45
  set_borderless(window_flags & WF_BORDERLESS);
99
46
  set_resizable(window_flags & WF_RESIZABLE);
@@ -103,13 +50,11 @@ Gosu::Window::Window(int width, int height, unsigned window_flags, double update
103
50
  // Fixes https://github.com/gosu/gosu/issues/369
104
51
  // (This will implicitly create graphics() and input(), and make the OpenGL context current.)
105
52
  resize(width, height, false);
106
- SDL_SetWindowPosition(shared_window(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
53
+ SDL_SetWindowPosition(sdl_window(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
107
54
 
108
55
  // Really enable fullscreen if desired.
109
56
  resize(width, height, (window_flags & WF_FULLSCREEN));
110
57
 
111
- SDL_GL_SetSwapInterval(1);
112
-
113
58
  m_impl->update_interval = update_interval;
114
59
 
115
60
  input().on_button_down = [this](Button button) { button_down(button); };
@@ -120,17 +65,17 @@ Gosu::Window::Window(int width, int height, unsigned window_flags, double update
120
65
 
121
66
  Gosu::Window::~Window()
122
67
  {
123
- SDL_HideWindow(shared_window());
68
+ SDL_HideWindow(sdl_window());
124
69
  }
125
70
 
126
71
  int Gosu::Window::width() const
127
72
  {
128
- return graphics().width();
73
+ return viewport().width();
129
74
  }
130
75
 
131
76
  int Gosu::Window::height() const
132
77
  {
133
- return graphics().height();
78
+ return viewport().height();
134
79
  }
135
80
 
136
81
  bool Gosu::Window::fullscreen() const
@@ -142,6 +87,12 @@ void Gosu::Window::resize(int width, int height, bool fullscreen)
142
87
  {
143
88
  m_impl->fullscreen = fullscreen;
144
89
 
90
+ // Remember the windowed size so we can restore it when leaving fullscreen mode later.
91
+ if (!fullscreen) {
92
+ m_impl->windowed_width = width;
93
+ m_impl->windowed_height = height;
94
+ }
95
+
145
96
  int actual_width = width;
146
97
  int actual_height = height;
147
98
  double scale_factor = 1.0;
@@ -188,25 +139,23 @@ void Gosu::Window::resize(int width, int height, bool fullscreen)
188
139
  }
189
140
  }
190
141
 
191
- SDL_SetWindowFullscreen(shared_window(), fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
142
+ SDL_SetWindowFullscreen(sdl_window(), fullscreen);
192
143
  if (!m_impl->resizing) {
193
- SDL_SetWindowSize(shared_window(), actual_width, actual_height);
144
+ SDL_SetWindowSize(sdl_window(), actual_width, actual_height);
194
145
  }
195
146
 
196
- SDL_GL_GetDrawableSize(shared_window(), &actual_width, &actual_height);
147
+ SDL_GetWindowSizeInPixels(sdl_window(), &actual_width, &actual_height);
197
148
 
198
- ensure_current_context();
199
-
200
- if (!m_impl->graphics) {
201
- m_impl->graphics.reset(new Graphics(actual_width, actual_height));
149
+ if (!m_impl->viewport) {
150
+ m_impl->viewport = std::make_unique<Viewport>(actual_width, actual_height);
202
151
  }
203
152
  else {
204
- m_impl->graphics->set_physical_resolution(actual_width, actual_height);
153
+ m_impl->viewport->set_physical_resolution(actual_width, actual_height);
205
154
  }
206
- m_impl->graphics->set_resolution(width, height, black_bar_width, black_bar_height);
155
+ m_impl->viewport->set_resolution(width, height, black_bar_width, black_bar_height);
207
156
 
208
157
  if (!m_impl->input) {
209
- m_impl->input.reset(new Input(shared_window()));
158
+ m_impl->input = std::make_unique<Input>(sdl_window());
210
159
  }
211
160
  m_impl->input->set_mouse_factors(1 / scale_factor, 1 / scale_factor, black_bar_width,
212
161
  black_bar_height);
@@ -220,19 +169,19 @@ bool Gosu::Window::resizable() const
220
169
  void Gosu::Window::set_resizable(bool resizable)
221
170
  {
222
171
  m_impl->resizable = resizable;
223
- SDL_SetWindowResizable(shared_window(), resizable ? SDL_TRUE : SDL_FALSE);
172
+ SDL_SetWindowResizable(sdl_window(), resizable);
224
173
  }
225
174
 
226
175
  // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
227
176
  bool Gosu::Window::borderless() const
228
177
  {
229
- return SDL_GetWindowFlags(shared_window()) & SDL_WINDOW_BORDERLESS;
178
+ return SDL_GetWindowFlags(sdl_window()) & SDL_WINDOW_BORDERLESS;
230
179
  }
231
180
 
232
181
  // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
233
182
  void Gosu::Window::set_borderless(bool borderless)
234
183
  {
235
- SDL_SetWindowBordered(shared_window(), borderless ? SDL_FALSE : SDL_TRUE);
184
+ SDL_SetWindowBordered(sdl_window(), !borderless);
236
185
  }
237
186
 
238
187
  double Gosu::Window::update_interval() const
@@ -248,14 +197,14 @@ void Gosu::Window::set_update_interval(double update_interval)
248
197
  // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
249
198
  std::string Gosu::Window::caption() const
250
199
  {
251
- const char* title = SDL_GetWindowTitle(shared_window());
200
+ const char* title = SDL_GetWindowTitle(sdl_window());
252
201
  return title ? title : "";
253
202
  }
254
203
 
255
204
  // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
256
205
  void Gosu::Window::set_caption(const std::string& caption)
257
206
  {
258
- SDL_SetWindowTitle(shared_window(), caption.c_str());
207
+ SDL_SetWindowTitle(sdl_window(), caption.c_str());
259
208
  }
260
209
 
261
210
  void Gosu::Window::show()
@@ -285,13 +234,17 @@ void Gosu::Window::show()
285
234
  }
286
235
  } catch (...) {
287
236
  #ifdef GOSU_IS_WIN
288
- if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
237
+ if (previous_affinity) {
238
+ SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
239
+ }
289
240
  #endif
290
241
  throw;
291
242
  }
292
243
 
293
244
  #ifdef GOSU_IS_WIN
294
- if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
245
+ if (previous_affinity) {
246
+ SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
247
+ }
295
248
  #endif
296
249
 
297
250
  m_impl->state = Impl::CLOSED;
@@ -305,59 +258,65 @@ bool Gosu::Window::tick()
305
258
  }
306
259
 
307
260
  if (m_impl->state == Impl::CLOSED) {
308
- SDL_ShowWindow(shared_window());
261
+ SDL_ShowWindow(sdl_window());
309
262
  m_impl->state = Impl::OPEN;
310
263
 
264
+ SDL_SetEventEnabled(SDL_EVENT_DROP_FILE, true);
265
+
266
+ // Enable vsync.
267
+ const OpenGLContext current_context(true);
268
+ SDL_GL_SetSwapInterval(1);
269
+
311
270
  // SDL_GL_GetDrawableSize returns different values before and after showing the window.
312
271
  // -> When first showing the window, update the physical size of Graphics (=glViewport).
313
272
  // Fixes https://github.com/gosu/gosu/issues/318
314
273
  int width, height;
315
- SDL_GL_GetDrawableSize(shared_window(), &width, &height);
316
- graphics().set_physical_resolution(width, height);
274
+ SDL_GetWindowSizeInPixels(sdl_window(), &width, &height);
275
+ viewport().set_physical_resolution(width, height);
317
276
  }
318
277
 
319
278
  SDL_Event e;
320
279
  while (SDL_PollEvent(&e)) {
321
280
  switch (e.type) {
322
- case SDL_WINDOWEVENT: {
323
- switch (e.window.event) {
324
- case SDL_WINDOWEVENT_SIZE_CHANGED: {
325
- if (m_impl->resizable &&
326
- (width() != e.window.data1 || height() != e.window.data2)) {
327
- m_impl->resizing = true;
328
- resize(e.window.data1, e.window.data2, fullscreen());
329
- m_impl->resizing = false;
330
- }
331
- break;
332
- }
333
- case SDL_WINDOWEVENT_FOCUS_GAINED: {
334
- gain_focus();
335
- break;
336
- }
337
- case SDL_WINDOWEVENT_FOCUS_LOST: {
338
- lose_focus();
339
- break;
340
- }
341
- default: {
342
- break;
343
- }
344
- }
345
- break;
281
+ case SDL_EVENT_WINDOW_RESIZED: {
282
+ if (m_impl->resizable && (width() != e.window.data1 || height() != e.window.data2)) {
283
+ m_impl->resizing = true;
284
+ resize(e.window.data1, e.window.data2, fullscreen());
285
+ m_impl->resizing = false;
346
286
  }
347
- case SDL_QUIT: {
348
- close();
349
- break;
350
- }
351
- case SDL_DROPFILE: {
352
- std::shared_ptr<char> dropped_file{e.drop.file, SDL_free};
353
- if (dropped_file == nullptr) break;
354
- drop(dropped_file.get());
355
- break;
356
- }
357
- default: {
358
- input().feed_sdl_event(&e);
287
+ break;
288
+ }
289
+ case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED: {
290
+ // The logical window size stays the same, but the pixel density changed.
291
+ // Example: the window is moved to a display with a different scaling factor.
292
+ // => Update the viewport (and thus glViewport) without going through a full resize().
293
+ viewport().set_physical_resolution(e.window.data1, e.window.data2);
294
+ break;
295
+ }
296
+ case SDL_EVENT_WINDOW_FOCUS_GAINED: {
297
+ gain_focus();
298
+ break;
299
+ }
300
+ case SDL_EVENT_WINDOW_FOCUS_LOST: {
301
+ lose_focus();
302
+ break;
303
+ }
304
+ case SDL_EVENT_QUIT: {
305
+ close();
306
+ break;
307
+ }
308
+ case SDL_EVENT_DROP_FILE: {
309
+ const char* dropped_file = e.drop.data;
310
+ if (dropped_file == nullptr) {
359
311
  break;
360
312
  }
313
+ drop(dropped_file);
314
+ break;
315
+ }
316
+ default: {
317
+ input().feed_sdl_event(&e);
318
+ break;
319
+ }
361
320
  }
362
321
  }
363
322
 
@@ -367,16 +326,21 @@ bool Gosu::Window::tick()
367
326
 
368
327
  update();
369
328
 
370
- SDL_ShowCursor(needs_cursor());
329
+ if (needs_cursor()) {
330
+ SDL_ShowCursor();
331
+ }
332
+ else {
333
+ SDL_HideCursor();
334
+ }
371
335
 
372
336
  if (needs_redraw()) {
373
- ensure_current_context();
374
- graphics().frame([&] {
337
+ const OpenGLContext current_context(true);
338
+ viewport().frame([&] {
375
339
  draw();
376
- FPS::register_frame();
340
+ register_frame();
377
341
  });
378
342
 
379
- SDL_GL_SwapWindow(shared_window());
343
+ SDL_GL_SwapWindow(sdl_window());
380
344
  }
381
345
 
382
346
  if (m_impl->state == Impl::CLOSING) {
@@ -389,7 +353,7 @@ bool Gosu::Window::tick()
389
353
  void Gosu::Window::close()
390
354
  {
391
355
  m_impl->state = Impl::CLOSING;
392
- SDL_HideWindow(shared_window());
356
+ SDL_HideWindow(sdl_window());
393
357
  }
394
358
 
395
359
  void Gosu::Window::button_down(Button button)
@@ -398,42 +362,43 @@ void Gosu::Window::button_down(Button button)
398
362
 
399
363
  // Default shortcuts for toggling fullscreen mode, see: https://github.com/gosu/gosu/issues/361
400
364
 
365
+ const bool control_down = Input::down(KB_LEFT_CONTROL) || Input::down(KB_RIGHT_CONTROL);
366
+ const bool alt_down = Input::down(KB_LEFT_ALT) || Input::down(KB_RIGHT_ALT);
367
+ const bool shift_down = Input::down(KB_LEFT_SHIFT) || Input::down(KB_RIGHT_SHIFT);
368
+ const bool meta_down = Input::down(KB_LEFT_META) || Input::down(KB_RIGHT_META);
369
+
401
370
  #ifdef GOSU_IS_MAC
402
371
  // cmd+F and cmd+ctrl+F are both common shortcuts for toggling fullscreen mode on macOS.
403
- toggle_fullscreen = button == KB_F &&
404
- (Input::down(KB_LEFT_META) || Input::down(KB_RIGHT_META)) &&
405
- !Input::down(KB_LEFT_SHIFT) && !Input::down(KB_RIGHT_SHIFT) &&
406
- !Input::down(KB_LEFT_ALT) && !Input::down(KB_RIGHT_ALT);
372
+ toggle_fullscreen = button == KB_F && meta_down && !control_down && !alt_down && !shift_down;
407
373
  #else
408
374
  // Alt+Enter and Alt+Return toggle fullscreen mode on all other platforms.
409
- toggle_fullscreen = (button == KB_RETURN || button == KB_ENTER) &&
410
- (Input::down(KB_LEFT_ALT) || Input::down(KB_RIGHT_ALT)) &&
411
- !Input::down(KB_LEFT_CONTROL) && !Input::down(KB_RIGHT_CONTROL) &&
412
- !Input::down(KB_LEFT_META) && !Input::down(KB_RIGHT_META) &&
413
- !Input::down(KB_LEFT_SHIFT) && !Input::down(KB_RIGHT_SHIFT);
375
+ const bool enter_or_return = (button == KB_RETURN || button == KB_ENTER);
376
+ toggle_fullscreen = enter_or_return && alt_down && !control_down && !shift_down && !meta_down;
414
377
  #endif
415
378
  // F11 is supported as a shortcut for fullscreen mode on all platforms.
416
- if (!toggle_fullscreen && button == KB_F11 && !Input::down(KB_LEFT_ALT) &&
417
- !Input::down(KB_RIGHT_ALT) && !Input::down(KB_LEFT_CONTROL) &&
418
- !Input::down(KB_RIGHT_CONTROL) && !Input::down(KB_LEFT_META) &&
419
- !Input::down(KB_RIGHT_META) && !Input::down(KB_LEFT_SHIFT) &&
420
- !Input::down(KB_RIGHT_SHIFT)) {
379
+ if (button == KB_F11 && !meta_down && !control_down && !alt_down && !shift_down) {
421
380
  toggle_fullscreen = true;
422
381
  }
423
382
 
424
383
  if (toggle_fullscreen) {
425
- resize(width(), height(), !fullscreen());
384
+ if (fullscreen()) {
385
+ // Restore the previous windowed size instead of the current (desktop) resolution.
386
+ resize(m_impl->windowed_width, m_impl->windowed_height, false);
387
+ }
388
+ else {
389
+ resize(width(), height(), true);
390
+ }
426
391
  }
427
392
  }
428
393
 
429
- const Gosu::Graphics& Gosu::Window::graphics() const
394
+ const Gosu::Viewport& Gosu::Window::viewport() const
430
395
  {
431
- return *m_impl->graphics;
396
+ return *m_impl->viewport;
432
397
  }
433
398
 
434
- Gosu::Graphics& Gosu::Window::graphics()
399
+ Gosu::Viewport& Gosu::Window::viewport()
435
400
  {
436
- return *m_impl->graphics;
401
+ return *m_impl->viewport;
437
402
  }
438
403
 
439
404
  const Gosu::Input& Gosu::Window::input() const
@@ -446,4 +411,9 @@ Gosu::Input& Gosu::Window::input()
446
411
  return *m_impl->input;
447
412
  }
448
413
 
414
+ SDL_Window* Gosu::Window::sdl_window() const // NOLINT(*-convert-member-functions-to-static)
415
+ {
416
+ return OpenGLContext::shared_sdl_window();
417
+ }
418
+
449
419
  #endif
data/src/WindowUIKit.cpp CHANGED
@@ -8,7 +8,7 @@ struct Gosu::Window::Impl : private Gosu::Noncopyable
8
8
  {
9
9
  UIWindow* window;
10
10
  GosuViewController* controller;
11
- std::unique_ptr<Graphics> graphics;
11
+ std::unique_ptr<Viewport> viewport;
12
12
  std::unique_ptr<Input> input;
13
13
 
14
14
  double update_interval;
@@ -23,11 +23,11 @@ Gosu::Window::Window(int width, int height, unsigned window_flags, double update
23
23
  m_impl->controller.gosuWindow = this;
24
24
  m_impl->window.rootViewController = m_impl->controller;
25
25
 
26
- // It is important to (implicitly) load the view before creating the Graphics instance.
26
+ // It is important to (implicitly) load the view before creating the Viewport instance.
27
27
  [m_impl->controller view];
28
28
 
29
- m_impl->graphics.reset(new Graphics(screen_width(), screen_height()));
30
- m_impl->graphics->set_resolution(width, height);
29
+ m_impl->viewport = std::make_unique<Viewport>(screen_width(), screen_height());
30
+ m_impl->viewport->set_resolution(width, height);
31
31
 
32
32
  m_impl->input.reset(new Input((__bridge void*) m_impl->controller.view, update_interval));
33
33
  m_impl->input->set_mouse_factors(1.0 * width / available_width(),
@@ -48,12 +48,12 @@ Gosu::Window::~Window() = default;
48
48
 
49
49
  int Gosu::Window::width() const
50
50
  {
51
- return graphics().width();
51
+ return viewport().width();
52
52
  }
53
53
 
54
54
  int Gosu::Window::height() const
55
55
  {
56
- return graphics().height();
56
+ return viewport().height();
57
57
  }
58
58
 
59
59
  bool Gosu::Window::fullscreen() const
@@ -104,14 +104,14 @@ void Gosu::Window::set_caption(const std::string& caption)
104
104
  m_impl->caption = caption;
105
105
  }
106
106
 
107
- const Gosu::Graphics& Gosu::Window::graphics() const
107
+ const Gosu::Viewport& Gosu::Window::viewport() const
108
108
  {
109
- return *m_impl->graphics;
109
+ return *m_impl->viewport;
110
110
  }
111
111
 
112
- Gosu::Graphics& Gosu::Window::graphics()
112
+ Gosu::Viewport& Gosu::Window::viewport()
113
113
  {
114
- return *m_impl->graphics;
114
+ return *m_impl->viewport;
115
115
  }
116
116
 
117
117
  const Gosu::Input& Gosu::Window::input() const
@@ -147,24 +147,24 @@ void* Gosu::Window::uikit_window() const
147
147
  return (__bridge void*) m_impl->window;
148
148
  }
149
149
 
150
- int Gosu::screen_width(Window*)
150
+ int Gosu::screen_width(const Window*)
151
151
  {
152
152
  return available_width() * [UIScreen mainScreen].scale;
153
153
  }
154
154
 
155
- int Gosu::screen_height(Window*)
155
+ int Gosu::screen_height(const Window*)
156
156
  {
157
157
  return available_height() * [UIScreen mainScreen].scale;
158
158
  }
159
159
 
160
- int Gosu::available_width(Window*)
160
+ int Gosu::available_width(const Window*)
161
161
  {
162
162
  static CGSize screen_size = [UIScreen mainScreen].bounds.size;
163
163
  static CGFloat width = MAX(screen_size.width, screen_size.height);
164
164
  return width;
165
165
  }
166
166
 
167
- int Gosu::available_height(Window*)
167
+ int Gosu::available_height(const Window*)
168
168
  {
169
169
  static CGSize screen_size = [UIScreen mainScreen].bounds.size;
170
170
  static CGFloat height = MIN(screen_size.width, screen_size.height);