gosu 0.15.2 → 1.1.0.pre2

data/src/RubyGosu.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.1.0
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -28,7 +28,7 @@ public:
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:
-    SwigDirector_Window(VALUE self, unsigned int width, unsigned int height, bool fullscreen = false, double update_interval = 16.666666, bool resizable = false);
+    SwigDirector_Window(VALUE self,int width,int height,unsigned int window_flags=Gosu::WF_WINDOWED,double update_interval=16.666666);
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();
@@ -41,6 +41,8 @@ public:
     virtual void release_memory();
     virtual void button_down(Gosu::Button arg0);
     virtual void button_up(Gosu::Button arg0);
+    virtual void gamepad_connected(int index);
+    virtual void gamepad_disconnected(int index);
     virtual void drop(std::string const &filename);
 };
 

data/src/TexChunk.cpp

@@ -120,7 +120,7 @@ void Gosu::TexChunk::insert(const Bitmap& original_bitmap, int x, int y)
         if (clipped_width <= 0 || clipped_height <= 0) return;
         
         clipped_bitmap.resize(clipped_width, clipped_height);
-        clipped_bitmap.insert(original_bitmap, -clip_left, -clip_top);
+        clipped_bitmap.insert(-clip_left, -clip_top, original_bitmap);
         bitmap = &clipped_bitmap;
     }
     

data/src/TextBuilder.cpp

@@ -1,8 +1,10 @@
 #include "TextBuilder.hpp"
 #include <Gosu/Text.hpp>
+
+#include <utf8proc.h>
+
 #include <cassert>
 #include <cmath>
-#include "utf8proc.h"
 using namespace std;
 
 Gosu::WordInfo::WordInfo(const string& font_name, double font_height, vector<FormattedString> parts)

data/src/Texture.cpp

@@ -124,7 +124,7 @@ Gosu::Bitmap Gosu::Texture::to_bitmap(unsigned x, unsigned y, unsigned width, un
     // TODO: There are ways to retrieve only part of a texture, which we should use sooner or later.
     glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, full_texture.data());
     Bitmap bitmap(width, height);
-    bitmap.insert(full_texture, -int(x), -int(y));
+    bitmap.insert(-int(x), -int(y), full_texture);
     
     return bitmap;
 #endif

data/src/TrueTypeFont.cpp

@@ -10,7 +10,7 @@
 #endif
 
 #define STB_TRUETYPE_IMPLEMENTATION
-#include "stb_truetype.h"
+#include <stb_truetype.h>
 
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

data/src/TrueTypeFontWin.cpp

@@ -32,9 +32,9 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     LOGFONT logfont = {
         0, 0, 0, 0,
         (font_flags & Gosu::FF_BOLD) ? FW_BOLD : FW_NORMAL,
-        (font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE,
-        (font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE,
-        FALSE /* no strikethrough */,
+        static_cast<BYTE>((font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE),
+        static_cast<BYTE>((font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE),
+        0 /* no strikethrough */,
         ANSI_CHARSET, OUT_OUTLINE_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
         DEFAULT_PITCH
     };

data/src/Utility.cpp

@@ -1,7 +1,7 @@
 #include <Gosu/Utility.hpp>
 #include <Gosu/Platform.hpp>
 
-#include "utf8proc.h"
+#include <utf8proc.h>
 
 #include <cstring>
 #include <stdexcept>
@@ -45,17 +45,20 @@ u32string Gosu::utf8_to_composed_utc4(const string& utf8)
     return utc4;
 }
 
-bool Gosu::has_extension(const string& filename, const char* extension)
+bool Gosu::has_extension(string_view filename, string_view extension)
 {
-    size_t ext_len = strlen(extension);
+    size_t ext_len = extension.length();
     if (ext_len > filename.length()) {
         return false;
     }
 
-    const char* str = filename.c_str() + filename.length();
-    const char* ext = extension + ext_len;
+    string_view::iterator filename_iter = filename.end();
+    string_view::iterator ext_iter = extension.end();
     while (ext_len--) {
-        if (tolower((int) *--str) != *--ext) {
+        --filename_iter;
+        --ext_iter;
+
+        if (tolower((int) *filename_iter) != tolower((int) *ext_iter)) {
             return false;
         }
     }
@@ -66,6 +69,7 @@ bool Gosu::has_extension(const string& filename, const char* extension)
 #if defined(GOSU_IS_UNIX) && !defined(GOSU_IS_MAC)
 string Gosu::language()
 {
-    return getenv("LANG");
+    const char* env = getenv("LANG");
+    return env ? env : "en_US";
 }
 #endif

data/src/Window.cpp

@@ -1,6 +1,10 @@
 #include <Gosu/Platform.hpp>
 #if !defined(GOSU_IS_IPHONE)
 
+#if defined(GOSU_IS_WIN)
+#include <windows.h>
+#endif
+
 #include <Gosu/Gosu.hpp>
 #include "GraphicsImpl.hpp"
 #include <SDL.h>
@@ -22,8 +26,6 @@ namespace Gosu
         throw runtime_error(operation + ": " + (error ? error : "(unknown error)"));
     }
 
-    static void cleanup();
-
     SDL_Window* shared_window()
     {
         static SDL_Window* window = nullptr;
@@ -32,14 +34,12 @@ namespace Gosu
                 throw_sdl_error("Could not initialize SDL Video");
             }
 
-            atexit(cleanup);
-
             Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN;
-            
+
         #if SDL_VERSION_ATLEAST(2, 0, 1)
             flags |= SDL_WINDOW_ALLOW_HIGHDPI;
         #endif
-            
+
             window =
                 SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 64, 64, flags);
             if (window == nullptr) {
@@ -58,27 +58,20 @@ namespace Gosu
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
         #endif
-            
+
             context = SDL_GL_CreateContext(shared_window());
-            
+
             if (context == nullptr) {
                 throw_sdl_error("Could not create OpenGL context");
             }
         }
         return context;
     }
-    
+
     void ensure_current_context()
     {
         SDL_GL_MakeCurrent(shared_window(), shared_gl_context());
     }
-
-    static void cleanup()
-    {
-        SDL_GL_DeleteContext(shared_gl_context());
-        SDL_DestroyWindow(shared_window());
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    }
 }
 
 struct Gosu::Window::Impl
@@ -98,13 +91,11 @@ struct Gosu::Window::Impl
     unique_ptr<Input> input;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
-                     bool resizable)
+Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
 : pimpl(new Impl)
 {
-#if SDL_VERSION_ATLEAST(2, 0, 5)
-    SDL_SetWindowResizable(shared_window(), (SDL_bool)resizable);
-#endif
+    set_borderless(window_flags & WF_BORDERLESS);
+    set_resizable(window_flags & WF_RESIZABLE);
 
     // Even in fullscreen mode, temporarily show the window in windowed mode to centre it.
     // This ensures that the window will be centered correctly when exiting fullscreen mode.
@@ -114,15 +105,16 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     SDL_SetWindowPosition(shared_window(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
 
     // Really enable fullscreen if desired.
-    resize(width, height, fullscreen);
+    resize(width, height, (window_flags & WF_FULLSCREEN));
 
     SDL_GL_SetSwapInterval(1);
 
     pimpl->update_interval = update_interval;
-    pimpl->resizable = resizable;
 
     input().on_button_down = [this](Button button) { button_down(button); };
     input().on_button_up   = [this](Button button) { button_up(button); };
+    input().on_gamepad_connected    = [this](int index) { gamepad_connected(index); };
+    input().on_gamepad_disconnected = [this](int index) { gamepad_disconnected(index); };
 }
 
 Gosu::Window::~Window()
@@ -130,12 +122,12 @@ Gosu::Window::~Window()
     SDL_HideWindow(shared_window());
 }
 
-unsigned Gosu::Window::width() const
+int Gosu::Window::width() const
 {
     return graphics().width();
 }
 
-unsigned Gosu::Window::height() const
+int Gosu::Window::height() const
 {
     return graphics().height();
 }
@@ -145,25 +137,20 @@ bool Gosu::Window::fullscreen() const
     return pimpl->fullscreen;
 }
 
-bool Gosu::Window::resizable() const
-{
-    return pimpl->resizable;
-}
-
-void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
+void Gosu::Window::resize(int width, int height, bool fullscreen)
 {
     pimpl->fullscreen = fullscreen;
-    
+
     int actual_width = width;
     int actual_height = height;
     double scale_factor = 1.0;
     double black_bar_width = 0;
     double black_bar_height = 0;
-    
+
     if (fullscreen) {
         actual_width  = Gosu::screen_width(this);
         actual_height = Gosu::screen_height(this);
-        
+
         if (resizable()) {
             // Resizable fullscreen windows stubbornly follow the desktop resolution.
             width  = actual_width;
@@ -184,9 +171,9 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         }
     }
     else {
-        unsigned max_width  = Gosu::available_width(this);
-        unsigned max_height = Gosu::available_height(this);
-        
+        int max_width  = Gosu::available_width(this);
+        int max_height = Gosu::available_height(this);
+
         if (resizable()) {
             // If the window is resizable, limit its size, without preserving the aspect ratio.
             width  = actual_width  = min(width,  max_width);
@@ -199,18 +186,18 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
             actual_height = height * scale_factor;
         }
     }
-    
+
     SDL_SetWindowFullscreen(shared_window(), fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
     if (!pimpl->resizing) {
         SDL_SetWindowSize(shared_window(), actual_width, actual_height);
     }
-    
+
 #if SDL_VERSION_ATLEAST(2, 0, 1)
     SDL_GL_GetDrawableSize(shared_window(), &actual_width, &actual_height);
 #endif
-    
+
     ensure_current_context();
-    
+
     if (!pimpl->graphics) {
         pimpl->graphics.reset(new Graphics(actual_width, actual_height));
     }
@@ -218,7 +205,7 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         pimpl->graphics->set_physical_resolution(actual_width, actual_height);
     }
     pimpl->graphics->set_resolution(width, height, black_bar_width, black_bar_height);
-    
+
     if (!pimpl->input) {
         pimpl->input.reset(new Input(shared_window()));
     }
@@ -226,6 +213,29 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
                                     black_bar_width, black_bar_height);
 }
 
+bool Gosu::Window::resizable() const
+{
+    return pimpl->resizable;
+}
+
+void Gosu::Window::set_resizable(bool resizable)
+{
+    pimpl->resizable = resizable;
+#if SDL_VERSION_ATLEAST(2, 0, 5)
+    SDL_SetWindowResizable(shared_window(), resizable ? SDL_TRUE : SDL_FALSE);
+#endif
+}
+
+bool Gosu::Window::borderless() const
+{
+    return SDL_GetWindowFlags(shared_window()) & SDL_WINDOW_BORDERLESS;
+}
+
+void Gosu::Window::set_borderless(bool borderless)
+{
+    SDL_SetWindowBordered(shared_window(), borderless ? SDL_FALSE : SDL_TRUE);
+}
+
 double Gosu::Window::update_interval() const
 {
     return pimpl->update_interval;
@@ -250,17 +260,35 @@ void Gosu::Window::set_caption(const string& caption)
 void Gosu::Window::show()
 {
     unsigned long time_before_tick = milliseconds();
-    
-    while (tick()) {
-        // Sleep to keep this loop from eating 100% CPU.
-        unsigned long tick_time = milliseconds() - time_before_tick;
-        if (tick_time < update_interval()) {
-            sleep(update_interval() - tick_time);
+
+#ifdef GOSU_IS_WIN
+    // Try to convince Windows to only run this thread on the first core, to avoid timing glitches.
+    // (If we ever run into a situation where the first core is not available, we should start to
+    // use GetProcessAffinityMask to retrieve the allowed cores as a bitmask.)
+    DWORD_PTR previous_affinity = SetThreadAffinityMask(GetCurrentThread(), 1);
+#endif
+
+    try {
+        while (tick()) {
+            // Sleep to keep this loop from eating 100% CPU.
+            unsigned long tick_time = milliseconds() - time_before_tick;
+            if (tick_time < update_interval()) {
+                sleep(update_interval() - tick_time);
+            }
+
+            time_before_tick = milliseconds();
         }
-        
-        time_before_tick = milliseconds();
+    } catch (...) {
+    #ifdef GOSU_IS_WIN
+        if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
+    #endif
+        throw;
     }
-    
+
+#ifdef GOSU_IS_WIN
+    if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
+#endif
+
     pimpl->state = Impl::CLOSED;
 }
 
@@ -270,7 +298,7 @@ bool Gosu::Window::tick()
         pimpl->state = Impl::CLOSED;
         return false;
     }
-    
+
     if (pimpl->state == Impl::CLOSED) {
         SDL_ShowWindow(shared_window());
         pimpl->state = Impl::OPEN;
@@ -282,7 +310,7 @@ bool Gosu::Window::tick()
         SDL_GL_GetDrawableSize(shared_window(), &width, &height);
         graphics().set_physical_resolution(width, height);
     }
-    
+
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
 
@@ -320,29 +348,29 @@ bool Gosu::Window::tick()
             }
         }
     }
-    
+
     Song::update();
-    
+
     input().update();
-    
+
     update();
-    
+
     SDL_ShowCursor(needs_cursor());
-    
+
     if (needs_redraw()) {
         ensure_current_context();
         graphics().frame([&] {
             draw();
             FPS::register_frame();
         });
-        
+
         SDL_GL_SwapWindow(shared_window());
     }
-    
+
     if (pimpl->state == Impl::CLOSING) {
         pimpl->state = Impl::CLOSED;
     }
-    
+
     return pimpl->state == Impl::OPEN;
 }
 
@@ -357,7 +385,7 @@ void Gosu::Window::button_down(Button button)
     bool toggle_fullscreen;
 
     // Default shortcuts for toggling fullscreen mode, see: https://github.com/gosu/gosu/issues/361
-    
+
 #ifdef GOSU_IS_MAC
     // cmd+F and cmd+ctrl+F are both common shortcuts for toggling fullscreen mode on macOS.
     toggle_fullscreen = button == KB_F &&