gosu 1.4.3 → 1.4.5.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e577795a3efb0fe3e5a207c81305191da2682fe06de1c58de7bb78fe2351fa54
-  data.tar.gz: 9ba25d605fab3f9950c9d861fed9eed3f276ce3bb2316276426be2dd6d6a7626
+  metadata.gz: 44607a2ab15d11917e1a6106352fe652cd4aab595b1193d44f946a0184309647
+  data.tar.gz: 6facb9f07929562d2d7d3a58ddcc90fa6afbda6db4d9f1fd42d629a1b4a06a0b
 SHA512:
-  metadata.gz: f24d89b6a88e3d1b5dd8e776bd93e2c5c338ca67b8f2d87b570caded06021ff7369a272e9771c5509dcbc9f0dae1fb303ac6541a6a65a9267393e3138be536d3
-  data.tar.gz: e2d21e6b09442dcf5041e02725da89566bb151b9a3b9b2edb2f4b95a1efa99c7318dfdd7da6c287bf64f0e824e68f7684153be3c3d5b2b0781369c0c0e14cbd1
+  metadata.gz: 83afbc1d09db1f2545ff570d7674e9f770d95353d1614ef45f2d3c1e580f191a4cb6589af161767ca942fa7309786fa06155a4c2ac342cf08864f04383078eb0
+  data.tar.gz: 6255e2435e6e85c63adbdad2cfcf3f48b9204d982b2a3f07bbc3de7757d44850f456a4bf1863de733386edbcdd6b2800b5bae599e08964a9837a7836ee140998

data/ext/gosu/extconf.rb

@@ -74,9 +74,12 @@ elsif macos
   $LDFLAGS << " #{`sdl2-config --static-libs`.chomp} -framework OpenGL -framework Metal"
   # And yet another hack: `sdl2-config --static-libs` uses `-lSDL2` instead of linking to the static library,
   # even if it exists. -> Manually replace it. (Ugh!)
-  %w(/usr/local/lib/libSDL2.a /opt/homebrew/opt/sdl2/lib/libSDL2.a).each do |static_lib|
-    $LDFLAGS.sub! " -lSDL2 ", " #{static_lib} " if File.exist? static_lib
-  end
+  static_lib = if RbConfig::CONFIG["target_cpu"] == "arm64"
+                 "/opt/homebrew/opt/sdl2/lib/libSDL2.a"
+               else
+                 "/usr/local/lib/libSDL2.a"
+               end
+  $LDFLAGS.sub! " -lSDL2 ", " #{static_lib} " if File.exist? static_lib
 
   # Disable building of 32-bit slices in Apple's Ruby.
   # (RbConfig::CONFIG['CXXFLAGS'] on 10.11: -arch x86_64 -arch i386 -g -Os -pipe)

data/include/Gosu/Input.hpp

@@ -24,7 +24,7 @@ namespace Gosu
 
     /// Manages initialization and shutdown of the input system.
     /// Only one Input instance can exist per application.
-    class Input : Noncopyable
+    class Input : private Noncopyable
     {
         struct Impl;
         std::unique_ptr<Impl> pimpl;
@@ -107,5 +107,11 @@ namespace Gosu
         TextInput* text_input() const;
         //! Sets the currently active TextInput, or resets it to the nullptr.
         void set_text_input(TextInput* input);
+
+        /// Returns the contents of the clipboard as plain text, or an empty string if none is available.
+        static std::string clipboard();
+
+        /// Replaces the contents of the clipboard with the given string.
+        static void set_clipboard(const std::string& text);
     };
 }

data/include/Gosu/TextInput.hpp

@@ -2,6 +2,7 @@
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Utility.hpp>
 #include <memory>
 #include <string>
 
@@ -15,11 +16,10 @@ namespace Gosu
     /// build a text that can be accessed via TextInput::text().
     /// A TextInput object has no built-in UI. It is up to you to actually draw a text field.
     /// TextInput only provides a portable base for your own GUI to build upon.
-    class TextInput
+    class TextInput : private Noncopyable
     {
         struct Impl;
-        // Non-movable (const) to avoid dangling references to TextInput instances.
-        const std::unique_ptr<Impl> m_impl;
+        std::unique_ptr<Impl> m_impl;
 
     public:
         TextInput();

data/include/Gosu/Timing.hpp

@@ -2,6 +2,9 @@
 
 namespace Gosu
 {
+    /// Freezes the current thread for the given amount of milliseconds.
+    void sleep(unsigned milliseconds);
+
     /// Returns the milliseconds since first calling this function.
     /// Can wrap after running for a long time.
     unsigned long milliseconds();

data/include/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 1
 #define GOSU_MINOR_VERSION 4
-#define GOSU_POINT_VERSION 3
+#define GOSU_POINT_VERSION 5
 
 namespace Gosu
 {

data/include/Gosu/Window.hpp

@@ -3,6 +3,7 @@
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Input.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Utility.hpp>
 #include <memory>
 #include <string>
 
@@ -19,10 +20,10 @@ namespace Gosu
     /// Convenient all-in-one class that serves as the foundation of a standard Gosu application.
     /// Manages initialization of all of Gosu's core components and provides timing functionality.
     /// Note that you can only use one instance of this class at the same time.
-    class Window
+    class Window : private Noncopyable
     {
         struct Impl;
-        const std::unique_ptr<Impl> m_impl;
+        std::unique_ptr<Impl> m_impl;
 
     public:
         /// Constructs a Window.

data/rdoc/gosu.rb

@@ -272,6 +272,7 @@ module Gosu
     # @option options [bool] :bold (false)
     # @option options [bool] :italic (false)
     # @option options [bool] :underline (false)
+    # @option options [bool] :retro (false) see Gosu::Image
     #
     # @overload initialize(height, options = {})
     # @overload initialize(window, font_name, height)
@@ -1042,6 +1043,19 @@ module Gosu
     #
     def axis(id); end
 
+    ##
+    # Returns the contents of the clipboard as plain text, or an empty string if none is available.
+    #
+    # @return [String]
+    def clipboard(); end
+
+    ##
+    # Replaces the contents of the clipboard with the given string.
+    #
+    # @return [nil]
+    def clipboard=(text); end
+
+
     # @!group Drawing primitives
 
     ##
@@ -1295,7 +1309,7 @@ module Gosu
     # @see char_to_button_id
     # @see Window#text_input
     # @see TextInput
-    def self.button_id_to_char(id); end
+    def button_id_to_char(id); end
 
     ##
     # Returns the button that usually produces a character, if any.
@@ -1306,7 +1320,7 @@ module Gosu
     # @see button_id_to_char
     # @see Window#text_input
     # @see TextInput
-    def self.char_to_button_id(char); end
+    def char_to_button_id(char); end
 
     ##
     # @return [Float] a random number in the range [min; max).

data/src/Audio.cpp

@@ -13,7 +13,7 @@ static Gosu::Song* cur_song = nullptr;
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 static bool cur_song_looping;
 
-struct Gosu::Sample::Impl : Gosu::Noncopyable
+struct Gosu::Sample::Impl : private Gosu::Noncopyable
 {
     ALuint buffer;
 
@@ -76,7 +76,7 @@ Gosu::Channel Gosu::Sample::play_pan(double pan, double volume, double speed, bo
 }
 
 // AudioFile impl
-struct Gosu::Song::Impl : Gosu::Noncopyable
+struct Gosu::Song::Impl : private Gosu::Noncopyable
 {
 private:
     double m_volume = 1.0;

data/src/AudioFileAudioToolbox.cpp

@@ -35,7 +35,7 @@ static void throw_os_error(OSStatus status, unsigned line)
 
 #define CHECK_OS(status) do { if (status) throw_os_error(status, __LINE__); } while (0)
 
-struct Gosu::AudioFile::Impl : Gosu::Noncopyable
+struct Gosu::AudioFile::Impl : private Gosu::Noncopyable
 {
     Buffer buffer;
     AudioFileID file_id;

data/src/AudioFileSDLSound.cpp

@@ -14,7 +14,7 @@
 #include <mutex>
 #include <vector>
 
-struct Gosu::AudioFile::Impl : Gosu::Noncopyable
+struct Gosu::AudioFile::Impl : private Gosu::Noncopyable
 {
     Buffer buffer;
 

data/src/BlockAllocator.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 using namespace std;
 
-struct Gosu::BlockAllocator::Impl : Gosu::Noncopyable
+struct Gosu::BlockAllocator::Impl : private Gosu::Noncopyable
 {
     unsigned width, height;
 

data/src/FileUnix.cpp

@@ -16,7 +16,7 @@
 
 using namespace std;
 
-struct Gosu::File::Impl : Gosu::Noncopyable
+struct Gosu::File::Impl : private Gosu::Noncopyable
 {
     int fd = -1;
     void* mapping = MAP_FAILED;

data/src/FileWin.cpp

@@ -9,7 +9,7 @@ using namespace std;
 
 // TODO: Error checking
 
-struct Gosu::File::Impl : Gosu::Noncopyable
+struct Gosu::File::Impl : private Gosu::Noncopyable
 {
     HANDLE handle = INVALID_HANDLE_VALUE;
 

data/src/Font.cpp

@@ -13,7 +13,7 @@
 
 static const int FONT_RENDER_SCALE = 2;
 
-struct Gosu::Font::Impl : Gosu::Noncopyable
+struct Gosu::Font::Impl : private Gosu::Noncopyable
 {
     std::string name;
     int height;

data/src/Graphics.cpp

@@ -42,7 +42,7 @@ namespace Gosu
     }
 }
 
-struct Gosu::Graphics::Impl : Gosu::Noncopyable
+struct Gosu::Graphics::Impl : private Gosu::Noncopyable
 {
     unsigned virt_width = 0, virt_height = 0;
     unsigned phys_width = 0, phys_height = 0;

data/src/Input.cpp

@@ -36,7 +36,7 @@ static vector<shared_ptr<SDL_GameController>> open_game_controllers;
 // Stores joystick instance id or -1 if empty
 static array<int, Gosu::NUM_GAMEPADS> gamepad_slots = {-1, -1, -1, -1};
 
-struct Gosu::Input::Impl : Gosu::Noncopyable
+struct Gosu::Input::Impl : private Gosu::Noncopyable
 {
     struct InputEvent
     {
@@ -678,4 +678,19 @@ void Gosu::Input::set_text_input(TextInput* text_input)
     pimpl->text_input = text_input;
 }
 
+std::string Gosu::Input::clipboard()
+{
+    require_sdl_video();
+
+    std::shared_ptr<char> clipboard{SDL_GetClipboardText(), SDL_free};
+    return std::string{clipboard.get()};
+}
+
+void Gosu::Input::set_clipboard(const std::string& text)
+{
+    require_sdl_video();
+
+    SDL_SetClipboardText(text.c_str());
+}
+
 #endif

data/src/InputUIKit.cpp

@@ -7,7 +7,7 @@
 #import <UIKit/UIKit.h>
 using namespace std;
 
-struct Gosu::Input::Impl : Gosu::Noncopyable
+struct Gosu::Input::Impl : private Gosu::Noncopyable
 {
     UIView* view = nil;
     TextInput* text_input = nullptr;

data/src/Macro.cpp

@@ -4,7 +4,7 @@
 #include "DrawOpQueue.hpp"
 #include <stdexcept>
 
-struct Gosu::Macro::Impl : Gosu::Noncopyable
+struct Gosu::Macro::Impl : private Gosu::Noncopyable
 {
     VertexArrays vertex_arrays;
     int width, height;

data/src/RubyGosu.cxx

@@ -2345,6 +2345,16 @@ namespace Gosu
     {
         return Gosu::Input::axis(btn);
     }
+
+    std::string clipboard()
+    {
+        return Gosu::Input::clipboard();
+    }
+
+    void set_clipboard(const std::string& text)
+    {
+        return Gosu::Input::set_clipboard(text);
+    }
 }
 
 // Global graphics functions
@@ -10918,6 +10928,64 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_clipboard(int argc, VALUE *argv, VALUE self) {
+  std::string result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = Gosu::clipboard();
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_From_std_string(static_cast< std::string >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_clipboarde___(int argc, VALUE *argv, VALUE self) {
+  std::string *arg1 = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    std::string *ptr = (std::string *)0;
+    res1 = SWIG_AsPtr_std_string(argv[0], &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "std::string const &","Gosu::set_clipboard", 1, argv[0] )); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","Gosu::set_clipboard", 1, argv[0])); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      Gosu::set_clipboard((std::string const &)*arg1);
+    }
+    catch (const std::exception& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return Qnil;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_draw_line(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
@@ -12459,7 +12527,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "LICENSES", SWIG_From_std_string(static_cast< std::string >(Gosu::LICENSES)));
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(1)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(4)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(3)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(5)));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);
@@ -12960,6 +13028,8 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_module_function(mGosu, "button_name", VALUEFUNC(_wrap_button_name), -1);
   rb_define_module_function(mGosu, "gamepad_name", VALUEFUNC(_wrap_gamepad_name), -1);
   rb_define_module_function(mGosu, "axis", VALUEFUNC(_wrap_axis), -1);
+  rb_define_module_function(mGosu, "clipboard", VALUEFUNC(_wrap_clipboard), -1);
+  rb_define_module_function(mGosu, "clipboard=", VALUEFUNC(_wrap_clipboarde___), -1);
   rb_define_module_function(mGosu, "draw_line", VALUEFUNC(_wrap_draw_line), -1);
   rb_define_module_function(mGosu, "draw_triangle", VALUEFUNC(_wrap_draw_triangle), -1);
   rb_define_module_function(mGosu, "draw_quad", VALUEFUNC(_wrap_draw_quad), -1);

data/src/TextInput.cpp

@@ -7,7 +7,7 @@
 #include <SDL.h>
 #endif
 
-struct Gosu::TextInput::Impl : Gosu::Noncopyable
+struct Gosu::TextInput::Impl : private Gosu::Noncopyable
 {
     std::string text;
 

data/src/TimingApple.cpp

@@ -2,6 +2,12 @@
 #if defined(GOSU_IS_MAC)
 
 #include <Gosu/Timing.hpp>
+#include <unistd.h>
+
+void Gosu::sleep(unsigned milliseconds)
+{
+    usleep(milliseconds * 1000);
+}
 
 // Thanks to this blog for the unconvoluted code example:
 // http://shiftedbits.org/2008/10/01/mach_absolute_time-on-the-iphone/
@@ -11,7 +17,7 @@
 unsigned long Gosu::milliseconds()
 {
     static mach_timebase_info_data_t info;
-    static uint64_t first_tick = [] {
+    static const uint64_t first_tick = [] {
         mach_timebase_info(&info);
         return mach_absolute_time();
     }();

data/src/TimingUnix.cpp

@@ -3,19 +3,21 @@
 
 #include <Gosu/Timing.hpp>
 #include <sys/time.h>
+#include <unistd.h>
 
-unsigned long Gosu::milliseconds()
+void Gosu::sleep(unsigned milliseconds)
 {
-    static unsigned long start = 0;
+    usleep(milliseconds * 1000);
+}
 
+unsigned long Gosu::milliseconds()
+{
     timeval tp;
     gettimeofday(&tp, nullptr);
+    unsigned long ms = tp.tv_usec / 1000UL + tp.tv_sec * 1000UL;
 
-    if (start == 0) {
-        start = tp.tv_usec / 1000UL + tp.tv_sec * 1000UL;
-    }
-
-    return tp.tv_usec / 1000UL + tp.tv_sec * 1000UL - start;
+    static unsigned long start = ms;
+    return ms - start;
 }
 
 #endif

data/src/TimingWin.cpp

@@ -4,9 +4,14 @@
 #include <Gosu/Timing.hpp>
 #include <windows.h>
 
+void Gosu::sleep(unsigned milliseconds)
+{
+    Sleep(milliseconds);
+}
+
 unsigned long Gosu::milliseconds()
 {
-    static unsigned long start = [] {
+    static const unsigned long start = [] {
         timeBeginPeriod(1);
         return timeGetTime();
     }();

data/src/TrueTypeFont.cpp

@@ -9,7 +9,7 @@
 #define STB_TRUETYPE_IMPLEMENTATION
 #include <stb_truetype.h>
 
-struct Gosu::TrueTypeFont::Impl : Gosu::Noncopyable
+struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
 {
     stbtt_fontinfo info{};
     std::shared_ptr<TrueTypeFont> fallback;

data/src/Window.cpp

@@ -11,7 +11,6 @@
 #include <SDL.h>
 #include <algorithm>
 #include <stdexcept>
-#include <thread>
 
 namespace Gosu
 {
@@ -71,7 +70,7 @@ namespace Gosu
     }
 }
 
-struct Gosu::Window::Impl : Gosu::Noncopyable
+struct Gosu::Window::Impl : private Gosu::Noncopyable
 {
     bool fullscreen = false;
     double update_interval = 0;
@@ -273,10 +272,10 @@ void Gosu::Window::show()
     try {
         while (tick()) {
             // Sleep to keep this loop from eating 100% CPU.
-            long tick_time = milliseconds() - time_before_tick;
-            long sleep_time = static_cast<long>(update_interval() - tick_time);
+            unsigned long tick_time = milliseconds() - time_before_tick;
+            long sleep_time = static_cast<long>(update_interval() - static_cast<double>(tick_time));
             if (sleep_time >= 1) {
-                std::this_thread::sleep_for(std::chrono::milliseconds{sleep_time});
+                Gosu::sleep(sleep_time);
             }
 
             time_before_tick = milliseconds();

data/src/WindowUIKit.cpp

@@ -4,7 +4,7 @@
 #include "GosuViewController.hpp"
 #include <Gosu/Gosu.hpp>
 
-struct Gosu::Window::Impl : Gosu::Noncopyable
+struct Gosu::Window::Impl : private Gosu::Noncopyable
 {
     UIWindow* window;
     GosuViewController* controller;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5.pre1
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -300,11 +300,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: 2D game development library.