sfml3-rb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ef7284361fdd31619f9f97c920664262125cfb26936bbc8a6425ff6c585e12c
-  data.tar.gz: 59baa039d3fa9f7d704469f3204070dc90dc8db48f2be3e9737c7e888554ed7e
+  metadata.gz: f98dbb27451c7780e8dbd1ab1f677a9590d5d42b55db97cad407eee15fdd3ef8
+  data.tar.gz: 6ffe42d972c73f477b642ad6e1bfc1e9c4d5585f40bd9a9402bc08dfb03834ef
 SHA512:
-  metadata.gz: d2d1dbf0f61b9c418e1aa01e81770158390cb28b9f297157195357463bd7ac6ca2e8ac0d2974f295968f4e762dd6e4affa330bf72df4cba5588a4bc30f459c74
-  data.tar.gz: 2b959e3a75e33a5633ec3cdaf64e2d5c95bdaa62ff58d37e981b114a3e52b0a69df5594c1adbf32a47446c3c1d4bd3f961a99ae06f56dde83ce80af2b6468934
+  metadata.gz: 7fde721522979c1446f14a18ce2433dcf6c8a1009c40cedb6771926f87a759bee9f44f338a47d8205336e51624ee80d919a18ea7172e9815c434194e814459c9
+  data.tar.gz: c2fde3b6034c72f50cf8d480a77bee01f79d505b510ca7b354c618bcf0f694307776d2409c00ab0b173253c3c797b2498e5f0c50cbd94256d902f7f96c816d91

data/CHANGELOG.md

@@ -6,6 +6,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+## [0.3.1] - 2026-09-19
+
+### Added
+* **`SFML::WindowBase`, `SFML::RenderWindow` and the `SFML::RenderTarget` module**, mirroring
+  SFML 3's own hierarchy. `WindowBase` wraps `sfWindowBase` -- an OS window and event queue with
+  no OpenGL context -- and is constructible, with `Window` and `RenderWindow` derived from it.
+  `Window` keeps its existing `sfRenderWindow` behaviour; `RenderWindow` is the same renderable
+  window under the name that also includes `RenderTarget`. `RenderTexture` includes
+  `RenderTarget` too, so a drawable's `#draw` now accepts a `RenderWindow` or a `RenderTexture`
+  directly (the legacy `Target` still works). The shared window surface is generated once, in
+  `ext/window/window_base.inc`.
+* **RBS signatures are now checked against the code.** `sig/**/*.rbs` declares `SFML::VERSION`, and
+  a `Steepfile` plus the `steep` development gem add `rake steep` to type-check `lib/` against the
+  signatures. `check.yaml` runs both `rake rbs` and `rake steep`, on `main` and on `release/**`
+  PRs, which previously ran no workflow at all.
+
+### Changed
+* `Mouse.position`, `Mouse.set_position` and `Touch.position` dispatch to the
+  `*RenderWindow` or `*WindowBase` CSFML entry point depending on whether the argument is a
+  Window/RenderWindow or a WindowBase, instead of passing an `sfRenderWindow*` where an
+  `sfWindowBase*` is expected.
+* **RBS constructors use `def initialize`.** Every `def self.new` became
+  `def initialize: (…) -> void`, the form RubyMine links to `Foo.new` and Steep checks, and which
+  matches the C extension, where every constructor is an `initialize`.
+
 ## [0.3.0] - 2026-09-19
 
 ### Added

data/README.md

@@ -3,13 +3,14 @@
 Ruby bindings for [SFML 3](https://www.sfml-dev.org/), via its C API, [CSFML](https://github.com/SFML/CSFML).
 
 [![Ruby](https://img.shields.io/badge/ruby-3.1%2B-red?style=flat-square)](https://www.ruby-lang.org/)
-[![Test](https://github.com/algaves/sfml3.rb/actions/workflows/test.yaml/badge.svg)](https://github.com/algaves/sfml3.rb/actions/workflows/test.yaml)
-[![Check](https://github.com/algaves/sfml3.rb/actions/workflows/check.yaml/badge.svg)](https://github.com/algaves/sfml3.rb/actions/workflows/check.yaml)
+[![Test](https://img.shields.io/github/actions/workflow/status/algaves/sfml3.rb/test.yaml?style=flat-square)](https://img.shields.io/github/actions/workflow/status/algaves/sfml3.rb/test.yaml?style=flat-square)
+[![Check](https://img.shields.io/github/actions/workflow/status/algaves/sfml3.rb/check.yaml?style=flat-square)](https://img.shields.io/github/actions/workflow/status/algaves/sfml3.rb/check.yaml?style=flat-square)
+[![Docs](https://img.shields.io/badge/docs-GitHub%20Pages-4c9a2a?style=flat-square)](https://algaves.github.io/sfml3.rb/)
 [![Gem Version](https://img.shields.io/gem/v/sfml3-rb?style=flat-square)](https://rubygems.org/gems/sfml3-rb)
 [![Gem Downloads](https://img.shields.io/gem/dt/sfml3-rb?style=flat-square)](https://rubygems.org/gems/sfml3-rb)
 [![License](https://img.shields.io/badge/license-0BSD-green?style=flat-square)](LICENSE.md)
 
-Latest release: **0.3.0**, bound against **CSFML 3**.
+Latest release: **0.3.1**, bound against **CSFML 3**.
 
 ## Features
 
@@ -20,10 +21,11 @@ Latest release: **0.3.0**, bound against **CSFML 3**.
 * **A source fallback everywhere else**, which downloads and builds the pinned, checksum-verified
   dependencies at install time, so the gem works on macOS, ARM and the BSDs out of the box.
 * **Complete API documentation and types**: every class, module, method and constant is documented
-  on [rubydoc.info](https://rubydoc.info/gems/sfml3-rb) and covered by RBS signatures shipped in
+  on the [docs site](https://algaves.github.io/sfml3.rb/) and covered by RBS signatures shipped in
   the gem.
-* **A close fit to SFML's own model**: classes mirror the C++ types (Window, Texture, Sprite,
-  Sound, ...) minus the parts that only exist in C++, like `std::string` and exceptions.
+* **A close fit to SFML's own model**: classes mirror the C++ types (WindowBase, Window,
+  RenderWindow, Texture, Sprite, Sound, ...) minus the parts that only exist in C++, like
+  `std::string` and exceptions.
 
 ## Table of Contents
 
@@ -124,13 +126,30 @@ part of the test suite.
 
 ## Documentation
 
-* [API reference](https://rubydoc.info/gems/sfml3-rb) — every class, module, method and constant,
-  built from the YARD comments in `ext/**/*.c`.
-* RBS type signatures (`sig/**/*.rbs`) ship in the gem for IDE completion (Solargraph, RubyMine)
-  and static type-checking (Sorbet, Steep). Validate them with `rake rbs`.
+* [API reference](https://algaves.github.io/sfml3.rb/) — every class, module, method and constant,
+  built from the YARD comments in `ext/**/*.c` and deployed to GitHub Pages by CI. The same docs
+  are also generated on [RubyDoc.info](https://rubydoc.info/gems/sfml3-rb).
+* RBS type signatures (`sig/**/*.rbs`) describe the whole API, including the native classes, for
+  RBS-aware editors. `rake rbs` validates the signatures and `rake steep` type-checks `lib/`
+  against them.
 * [CHANGELOG.md](CHANGELOG.md) — what changed in each release.
 * [TODO.md](TODO.md) — module-by-module porting coverage and what is deliberately unbound.
 
+### IDE setup (RubyMine)
+
+`sig/**/*.rbs` is the only machine-readable description of the API: the native extension cannot be
+introspected, so an editor either reads the signatures or sees nothing. RBS support lives in
+**RubyMine** (and IntelliJ IDEA Ultimate with the Ruby plugin); CLion and other C/C++ IDEs show
+`.rbs` files as plain text.
+
+1. Open the project in RubyMine and point **Settings → Languages & Frameworks → Ruby SDK** at the
+   interpreter you build against (Ruby 3.1+). Keep the C sources in CLion/clangd.
+2. Run `bundle install` so the `rbs` gem (3.2+) is available to that interpreter.
+3. RubyMine indexes `sig/` automatically; completion, type info (`Ctrl+Shift+P`), parameter info
+   and *Navigate → Type Signature* then work for `Window.new` and the rest of the API.
+4. For a full type check, run `steep check` from *Run anything* (`Ctrl` twice); `Steepfile` points
+   it at `lib/` and `sig/`.
+
 ## Development
 
 ```sh
@@ -140,6 +159,7 @@ rake test     # compile, then run the test suite
 rake gem      # build the source gem into pkg/
 rake yard     # build API docs into doc/
 rake rbs      # validate sig/**/*.rbs
+rake steep    # type-check lib/ against sig/**/*.rbs
 ```
 
 `rake githooks:install` points your checkout at the committed `.githooks/` pre-commit hook, which
@@ -155,9 +175,12 @@ side by side: `core/` (CSFML umbrella header, macros, exceptions, UTF-32 convers
 devices), `graphics/` (shapes, Color, Transform, View, Texture, Text, Shader, the render targets),
 `audio/` and `network/`. Includes are subsystem-relative, e.g. `#include "graphics/circle.h"`.
 
-Two `.inc` files hold method bodies shared by several classes and are included once per class with
-a different macro prefix: `audio/sound_source.inc` (Sound, Music, SoundStream) and
-`graphics/render_target.inc` (Window, RenderTexture).
+Three `.inc` files hold method bodies shared by several classes and are included once per class
+with a different macro prefix: `audio/sound_source.inc` (Sound, Music, SoundStream),
+`window/window_base.inc` (WindowBase, Window) and `graphics/render_target.inc` (Window,
+RenderTexture). `SFML::RenderWindow < SFML::Window < SFML::WindowBase` and includes the
+`SFML::RenderTarget` module, so a drawable's `#draw` accepts a `RenderWindow` or a
+`RenderTexture` directly; `SFML::Target` remains as the legacy generic wrapper.
 
 Note that mkmf flattens object files to their basenames, so every `.c` filename has to stay
 unique across the whole tree — and that `$srcs` is baked into the generated Makefile, so after

data/TODO.md

@@ -51,9 +51,14 @@ Base module: time, vectors, clocks, streams.
 
 OpenGL-based windows, events, input handling.
 
-- [x] **Window** — `SFML::Window` (`ext/window/window.c`); wraps `sfRenderWindow`, so this single
-      class covers what SFML splits into `WindowBase` + `Window` + `RenderWindow`. Accepts style,
-      state and `ContextSettings`; exposes min/max size, icon, cursor, native handle, settings.
+- [x] **WindowBase** — `SFML::WindowBase` (`ext/window/window_base.c`); wraps `sfWindowBase`, an OS
+      window and event queue with no OpenGL context. The methods shared with `Window` are generated
+      from `ext/window/window_base.inc`.
+- [x] **Window** — `SFML::Window` (`ext/window/window.c`); wraps `sfRenderWindow` and derives from
+      `WindowBase`, overriding every base method with the matching `sfRenderWindow_*` entry point.
+      Accepts style, state and `ContextSettings`; exposes min/max size, icon, cursor, native handle,
+      settings, display, and the render-target surface. Deliberately still renderable, so existing
+      `Window.new(...).clear` code keeps working.
 - [x] **VideoMode** — `SFML::VideoMode` (`ext/window/video_mode.c`); includes `desktop_mode` and
       `fullscreen_modes`
 - [x] **Event** — `SFML::Event` (`ext/window/event.c`, `ext/window/event_name.c`); every payload is
@@ -87,13 +92,16 @@ OpenGL-based windows, events, input handling.
 - [x] **Drawable** — `SFML::Drawable` mixin (`ext/graphics/drawable.c`)
 - [x] **RenderStates** — `SFML::RenderState` (`ext/graphics/render_state.c`); blend mode, stencil
       mode, coordinate type, texture, shader and transform are all settable
-- [x] **RenderTarget** — `SFML::Target` (`ext/graphics/target.c`) dispatches to `sfRenderWindow_*`
-      or `sfRenderTexture_*` at runtime for `Drawable#draw`. The methods each concrete target owns
-      directly — `map_pixel_to_coords`, `map_coords_to_pixel`, `push_gl_states`, `pop_gl_states`,
+- [x] **RenderTarget** — `SFML::RenderTarget` module (`ext/graphics/target.c`), included by
+      `RenderWindow` and `RenderTexture`, so a drawable's `#draw` accepts either directly. The
+      methods — `map_pixel_to_coords`, `map_coords_to_pixel`, `push_gl_states`, `pop_gl_states`,
       `reset_gl_states`, `draw_primitives`, `draw_vertex_buffer_range`, `clear_stencil`,
       `clear_color_and_stencil`, `viewport`, `scissor`, `srgb?` — are generated once for both
-      `Window` and `RenderTexture` from `ext/graphics/render_target.inc`
-- [x] **RenderWindow** — folded into `SFML::Window` (see Window module above)
+      `Window` and `RenderTexture` from `ext/graphics/render_target.inc`. `SFML::Target` remains
+      as the legacy runtime-dispatch wrapper for `Drawable#draw`.
+- [x] **RenderWindow** — `SFML::RenderWindow` (`ext/graphics/render_window.c`); derives from
+      `Window` and includes `RenderTarget`. Creation, events and the window surface come from
+      `Window` / `WindowBase`.
 - [x] **RenderTexture** — `SFML::RenderTexture` (`ext/graphics/render_texture.c`)
 - [x] **View** — `SFML::View` (`ext/graphics/view.c`); including `View.from_rect` and
       `scissor`/`scissor=`
@@ -179,9 +187,8 @@ without re-deriving the reasoning each time.
 
 | Symbols | Why |
 | --- | --- |
-| `sfWindow_*`, `sfWindowBase_*` (~55 functions) | `SFML::Window` wraps `sfRenderWindow`, which subsumes both a plain window and a base window. |
-| `sfMouse_*WindowBase`, `sfTouch_getPositionWindowBase` | Superseded by the `*RenderWindow` forms, which need no downcast. |
-| `sfRenderWindow_create`, `sfText_getString`/`setString`, `sfRenderWindow_setTitle`, `sfFtpDirectoryResponse_getDirectory` | Superseded by their `*Unicode` counterparts; the narrow forms decode through the C locale and mangle non-ASCII. |
+| `sfWindow_*` (~26 functions) | A plain `sfWindow` (an OpenGL context with no render-target surface); `SFML::Window` wraps `sfRenderWindow` and `SFML::WindowBase` wraps `sfWindowBase`. |
+| `sfRenderWindow_create`, `sfWindowBase_create`, `sfText_getString`/`setString`, `sfRenderWindow_setTitle`, `sfWindowBase_setTitle`, `sfFtpDirectoryResponse_getDirectory` | Superseded by their `*Unicode` counterparts; the narrow forms decode through the C locale and mangle non-ASCII. |
 | `sfColor_add`/`subtract`/`modulate`/`fromRGB`/`fromRGBA`/`fromInteger`/`toInteger`, `sfIntRect_contains`/`intersects` | Reimplemented directly in C in `color.c` / `rect.c`; the Ruby methods exist. |
 | `sfSprite_getTexture`, `sfText_getFont`, `sf*Shape_getTexture` | The Ruby getters return the cached wrapper object. CSFML returns a non-owning pointer, so re-wrapping it would hand Ruby an object it must not free. |
 | `sfShape_getPoint`, `sfShape_getPointCount` | `SFML::Shape` reads these from the Ruby subclass, which is where they are defined. |

data/ext/audio/music.c

@@ -216,6 +216,11 @@ static VALUE Music_set_loop_points(VALUE self, VALUE rb_span) {
 #undef SS_FN
 #undef SS_METHOD
 
+static VALUE Music_alloc(VALUE klass) {
+    (void)klass;
+    rb_raise(rb_eNotImpError, "use Music.from_file, Music.from_memory or Music.from_stream");
+}
+
 /* Document-class: SFML::Music
  * Music streamed from a file, memory buffer or InputStream rather than held
  * fully decoded in memory, so it's suited to long tracks that would be
@@ -349,6 +354,7 @@ static VALUE Music_set_loop_points(VALUE self, VALUE rb_span) {
  */
 void Init_Music(VALUE rb_mSFML) {
     rb_cMusic = rb_define_class_under(rb_mSFML, "Music", rb_cObject);
+    rb_define_alloc_func(rb_cMusic, Music_alloc);
 
     rb_define_singleton_method(rb_cMusic, "from_file", Music_from_file, 1);
     rb_define_singleton_method(rb_cMusic, "from_memory", Music_from_memory, 1);

data/ext/audio/sound.c

@@ -39,7 +39,11 @@ static void Sound_free(void* ptr) {
        thread's effect_processor_acquire could reuse the slot number for an
        unrelated new source while this source's callback might still be
        executing against it. */
-    rb_thread_call_without_gvl(Sound_destroy_without_gvl, sound->source.handle, RUBY_UBF_IO, NULL);
+    if (sound->source.handle != NULL) {
+        rb_thread_call_without_gvl(Sound_destroy_without_gvl, sound->source.handle, RUBY_UBF_IO,
+                                   NULL);
+    }
+
     effect_processor_release(sound->source.effect_slot);
     free(sound);
 }
@@ -68,6 +72,25 @@ static VALUE Sound_wrap(VALUE klass, sfSound* handle, VALUE rb_buffer) {
     return TypedData_Wrap_Struct(klass, &Sound_data_type, ptr);
 }
 
+static VALUE Sound_initialize_copy(VALUE self, VALUE other) {
+    (void)other;
+    rb_raise(rb_eTypeError, "can't copy a %s", rb_obj_classname(self));
+}
+
+static VALUE Sound_alloc(VALUE klass) {
+    Sound* ptr = malloc(sizeof(Sound));
+
+    if (ptr == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate sound");
+    }
+
+    ptr->source.handle = NULL;
+    ptr->source.effect_slot = -1;
+    ptr->rb_buffer = Qnil;
+
+    return TypedData_Wrap_Struct(klass, &Sound_data_type, ptr);
+}
+
 /* call-seq:
  *   Sound.new(buffer) -> Sound
  *
@@ -76,12 +99,26 @@ static VALUE Sound_wrap(VALUE klass, sfSound* handle, VALUE rb_buffer) {
  * @return [Sound]
  * @raise [ArgumentError] if +buffer+ is not a SoundBuffer
  */
-static VALUE Sound_new(VALUE klass, VALUE rb_buffer) {
+static VALUE Sound_initialize(VALUE self, VALUE rb_buffer) {
+    Sound* sound;
+    sfSound* handle;
+
     if (!rb_obj_is_kind_of(rb_buffer, Get_Klass_SoundBuffer())) {
         raise_invalid_argument_class(Get_Klass_SoundBuffer());
     }
 
-    return Sound_wrap(klass, sfSound_create(Get_SoundBuffer_Struct(rb_buffer)), rb_buffer);
+    sound = (Sound*)Get_Sound_Struct(self);
+
+    handle = sfSound_create(Get_SoundBuffer_Struct(rb_buffer));
+
+    if (handle == NULL) {
+        rb_raise(rb_eRuntimeError, "failed to create sound");
+    }
+
+    sound->source.handle = handle;
+    sound->rb_buffer = rb_buffer;
+
+    return self;
 }
 
 /* call-seq: copy -> Sound
@@ -289,7 +326,9 @@ static VALUE Sound_set_buffer(VALUE self, VALUE rb_buffer) {
 void Init_Sound(VALUE rb_mSFML) {
     rb_cSound = rb_define_class_under(rb_mSFML, "Sound", rb_cObject);
 
-    rb_define_singleton_method(rb_cSound, "new", Sound_new, 1);
+    rb_define_alloc_func(rb_cSound, Sound_alloc);
+    rb_define_method(rb_cSound, "initialize", Sound_initialize, 1);
+    rb_define_private_method(rb_cSound, "initialize_copy", Sound_initialize_copy, 1);
 
     rb_define_method(rb_cSound, "copy", Sound_copy, 0);
     rb_define_method(rb_cSound, "buffer", Sound_get_buffer, 0);

data/ext/audio/sound_buffer.c

@@ -381,6 +381,13 @@ static VALUE SoundBuffer_duration(VALUE self) {
     return time_to_rb(sfSoundBuffer_getDuration(Get_SoundBuffer_Struct(self)));
 }
 
+static VALUE SoundBuffer_alloc(VALUE klass) {
+    (void)klass;
+    rb_raise(rb_eNotImpError,
+             "use SoundBuffer.from_file, SoundBuffer.from_memory, SoundBuffer.from_stream or "
+             "SoundBuffer.from_samples");
+}
+
 /* Document-class: SFML::SoundBuffer
  * Audio samples held fully decoded in memory, ready to be played through one
  * or more Sound instances (a single buffer may back several simultaneous
@@ -389,6 +396,7 @@ static VALUE SoundBuffer_duration(VALUE self) {
  */
 void Init_SoundBuffer(VALUE rb_mSFML) {
     rb_cSoundBuffer = rb_define_class_under(rb_mSFML, "SoundBuffer", rb_cObject);
+    rb_define_alloc_func(rb_cSoundBuffer, SoundBuffer_alloc);
 
     rb_define_singleton_method(rb_cSoundBuffer, "from_file", SoundBuffer_from_file, 1);
     rb_define_singleton_method(rb_cSoundBuffer, "from_memory", SoundBuffer_from_memory, 1);

data/ext/audio/sound_buffer_recorder.c

@@ -41,6 +41,10 @@ static VALUE SoundBufferRecorder_wrap(VALUE klass, sfSoundBufferRecorder* handle
     return TypedData_Wrap_Struct(klass, &SoundBufferRecorder_data_type, ptr);
 }
 
+static VALUE SoundBufferRecorder_alloc(VALUE klass) {
+    return SoundBufferRecorder_wrap(klass, sfSoundBufferRecorder_create());
+}
+
 /* call-seq:
  *   SoundBufferRecorder.new -> SoundBufferRecorder
  *
@@ -49,8 +53,8 @@ static VALUE SoundBufferRecorder_wrap(VALUE klass, sfSoundBufferRecorder* handle
  * @return [SoundBufferRecorder]
  * @raise [RuntimeError] if no capture device is available
  */
-static VALUE SoundBufferRecorder_new(VALUE klass) {
-    return SoundBufferRecorder_wrap(klass, sfSoundBufferRecorder_create());
+static VALUE SoundBufferRecorder_initialize(VALUE self) {
+    return self;
 }
 
 /* call-seq:
@@ -151,7 +155,8 @@ static VALUE SoundBufferRecorder_set_channel_count(VALUE self, VALUE rb_count) {
 void Init_SoundBufferRecorder(VALUE rb_mSFML) {
     rb_cSoundBufferRecorder = rb_define_class_under(rb_mSFML, "SoundBufferRecorder", rb_cObject);
 
-    rb_define_singleton_method(rb_cSoundBufferRecorder, "new", SoundBufferRecorder_new, 0);
+    rb_define_alloc_func(rb_cSoundBufferRecorder, SoundBufferRecorder_alloc);
+    rb_define_method(rb_cSoundBufferRecorder, "initialize", SoundBufferRecorder_initialize, 0);
 
     rb_define_method(rb_cSoundBufferRecorder, "start", SoundBufferRecorder_start, 1);
     rb_define_method(rb_cSoundBufferRecorder, "stop", SoundBufferRecorder_stop, 0);

data/ext/audio/sound_recorder.c

@@ -154,6 +154,23 @@ static void SoundRecorder_on_stop(void* userData) {
     }
 }
 
+static VALUE SoundRecorder_alloc(VALUE klass) {
+    SoundRecorder* ptr = malloc(sizeof(SoundRecorder));
+    VALUE self;
+
+    if (ptr == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate sound recorder");
+    }
+
+    ptr->rb_self = Qnil;
+    ptr->handle = NULL;
+
+    self = TypedData_Wrap_Struct(klass, &SoundRecorder_data_type, ptr);
+    ptr->rb_self = self;
+
+    return self;
+}
+
 /* call-seq:
  *   SoundRecorder.new -> SoundRecorder
  *
@@ -167,21 +184,13 @@ static void SoundRecorder_on_stop(void* userData) {
  * @raise [NotImplementedError] if the subclass does not define #on_process
  * @raise [RuntimeError] if no capture device is available
  */
-static VALUE SoundRecorder_new(VALUE klass) {
+static VALUE SoundRecorder_initialize(VALUE self) {
     SoundRecorder* ptr;
     sfSoundRecorder* handle;
-    VALUE self;
-
-    ptr = malloc(sizeof(SoundRecorder));
-    ptr->rb_self = Qnil;
-    ptr->handle = NULL;
 
-    self = TypedData_Wrap_Struct(klass, &SoundRecorder_data_type, ptr);
-    ptr->rb_self = self;
+    TypedData_Get_Struct(self, SoundRecorder, &SoundRecorder_data_type, ptr);
 
     if (!rb_respond_to(self, rb_intern("on_process"))) {
-        /* Ruby already owns the wrapper; SoundRecorder_free handles the NULL
-           handle, so let GC clean up after the raise. */
         rb_raise(rb_eNotImpError, "subclass must define #on_process");
     }
 
@@ -360,7 +369,8 @@ static VALUE SoundRecorder_channel_map(VALUE self) {
 void Init_SoundRecorder(VALUE rb_mSFML) {
     rb_cSoundRecorder = rb_define_class_under(rb_mSFML, "SoundRecorder", rb_cObject);
 
-    rb_define_singleton_method(rb_cSoundRecorder, "new", SoundRecorder_new, 0);
+    rb_define_alloc_func(rb_cSoundRecorder, SoundRecorder_alloc);
+    rb_define_method(rb_cSoundRecorder, "initialize", SoundRecorder_initialize, 0);
     rb_define_singleton_method(rb_cSoundRecorder, "available?", SoundRecorder_available, 0);
     rb_define_singleton_method(rb_cSoundRecorder, "available_devices",
                                SoundRecorder_available_devices, 0);

data/ext/audio/sound_source_cone.c

@@ -29,6 +29,18 @@ static VALUE SoundSourceCone_wrap(sfSoundSourceCone cone) {
     return TypedData_Wrap_Struct(rb_cSoundSourceCone, &SoundSourceCone_data_type, ptr);
 }
 
+static VALUE SoundSourceCone_alloc(VALUE klass) {
+    SoundSourceCone* ptr = malloc(sizeof(SoundSourceCone));
+
+    if (ptr == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate sound source cone");
+    }
+
+    ptr->cone = (sfSoundSourceCone){0.0f, 0.0f, 0.0f};
+
+    return TypedData_Wrap_Struct(klass, &SoundSourceCone_data_type, ptr);
+}
+
 /* call-seq:
  *   SoundSourceCone.new(inner_angle, outer_angle, outer_gain) -> SoundSourceCone
  *
@@ -36,12 +48,14 @@ static VALUE SoundSourceCone_wrap(sfSoundSourceCone cone) {
  *
  * @return [SoundSourceCone]
  */
-static VALUE SoundSourceCone_new(VALUE klass, VALUE rb_inner, VALUE rb_outer, VALUE rb_gain) {
+static VALUE SoundSourceCone_initialize(VALUE self, VALUE rb_inner, VALUE rb_outer, VALUE rb_gain) {
     sfSoundSourceCone cone = {.innerAngle = (float)NUM2DBL(rb_inner),
                               .outerAngle = (float)NUM2DBL(rb_outer),
                               .outerGain = (float)NUM2DBL(rb_gain)};
 
-    return SoundSourceCone_wrap(cone);
+    ((SoundSourceCone*)Get_SoundSourceCone_Struct(self))->cone = cone;
+
+    return self;
 }
 
 /* call-seq: inner_angle -> Float
@@ -172,7 +186,8 @@ static VALUE SoundSourceCone_eql(VALUE self, VALUE rb_other) {
 void Init_SoundSourceCone(VALUE rb_mSFML) {
     rb_cSoundSourceCone = rb_define_class_under(rb_mSFML, "SoundSourceCone", rb_cObject);
 
-    rb_define_singleton_method(rb_cSoundSourceCone, "new", SoundSourceCone_new, 3);
+    rb_define_alloc_func(rb_cSoundSourceCone, SoundSourceCone_alloc);
+    rb_define_method(rb_cSoundSourceCone, "initialize", SoundSourceCone_initialize, 3);
 
     rb_define_method(rb_cSoundSourceCone, "inner_angle", SoundSourceCone_get_inner_angle, 0);
     rb_define_method(rb_cSoundSourceCone, "outer_angle", SoundSourceCone_get_outer_angle, 0);

data/ext/audio/sound_stream.c

@@ -193,6 +193,26 @@ static void SoundStream_on_seek(sfTime time, void* userData) {
     run_on_ruby_thread(SoundStream_seek_run, &ctx, SOUND_STREAM_CALLBACK_TIMEOUT_MS);
 }
 
+static VALUE SoundStream_alloc(VALUE klass) {
+    SoundStream* ptr = malloc(sizeof(SoundStream));
+    VALUE self;
+
+    if (ptr == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate sound stream");
+    }
+
+    ptr->source.handle = NULL;
+    ptr->source.effect_slot = -1;
+    ptr->rb_self = Qnil;
+    ptr->samples = NULL;
+    ptr->samples_capacity = 0;
+
+    self = TypedData_Wrap_Struct(klass, &SoundStream_data_type, ptr);
+    ptr->rb_self = self;
+
+    return self;
+}
+
 /* call-seq:
  *   SoundStream.new(channel_count, sample_rate)             -> SoundStream
  *   SoundStream.new(channel_count, sample_rate, channel_map) -> SoundStream
@@ -206,14 +226,15 @@ static void SoundStream_on_seek(sfTime time, void* userData) {
  * @raise [NotImplementedError] if the subclass does not define #on_get_data
  * @raise [RuntimeError] if the underlying stream could not be created
  */
-static VALUE SoundStream_new(int argc, VALUE* argv, VALUE klass) {
+static VALUE SoundStream_initialize(int argc, VALUE* argv, VALUE self) {
     VALUE rb_channel_count, rb_sample_rate, rb_channel_map;
     sfSoundChannel* channel_map = NULL;
     size_t channel_map_size = 0;
     SoundStream* ptr;
-    VALUE self;
     long i;
 
+    TypedData_Get_Struct(self, SoundStream, &SoundStream_data_type, ptr);
+
     rb_scan_args(argc, argv, "21", &rb_channel_count, &rb_sample_rate, &rb_channel_map);
 
     if (!NIL_P(rb_channel_map)) {
@@ -229,19 +250,7 @@ static VALUE SoundStream_new(int argc, VALUE* argv, VALUE klass) {
         }
     }
 
-    ptr = malloc(sizeof(SoundStream));
-    ptr->source.handle = NULL;
-    ptr->source.effect_slot = -1;
-    ptr->rb_self = Qnil;
-    ptr->samples = NULL;
-    ptr->samples_capacity = 0;
-
-    self = TypedData_Wrap_Struct(klass, &SoundStream_data_type, ptr);
-    ptr->rb_self = self;
-
     if (!rb_respond_to(self, rb_intern("on_get_data"))) {
-        /* The wrapper is already owned by Ruby; its dfree tolerates a NULL
-           handle, so raising here just leaves it to be collected. */
         free(channel_map);
         rb_raise(rb_eNotImpError, "subclass must define #on_get_data");
     }
@@ -447,7 +456,8 @@ static VALUE SoundStream_channel_map(VALUE self) {
 void Init_SoundStream(VALUE rb_mSFML) {
     rb_cSoundStream = rb_define_class_under(rb_mSFML, "SoundStream", rb_cObject);
 
-    rb_define_singleton_method(rb_cSoundStream, "new", SoundStream_new, -1);
+    rb_define_alloc_func(rb_cSoundStream, SoundStream_alloc);
+    rb_define_method(rb_cSoundStream, "initialize", SoundStream_initialize, -1);
 
     rb_define_method(rb_cSoundStream, "channel_count", SoundStream_channel_count, 0);
     rb_define_method(rb_cSoundStream, "sample_rate", SoundStream_sample_rate, 0);

data/ext/ext.c

@@ -22,6 +22,7 @@
 #include "graphics/target.h"
 #include "graphics/render_state.h"
 #include "window/event.h"
+#include "window/window_base.h"
 #include "window/window.h"
 #include "window/keyboard.h"
 #include "window/mouse.h"
@@ -47,6 +48,7 @@
 #include "graphics/font.h"
 #include "graphics/text.h"
 #include "graphics/render_texture.h"
+#include "graphics/render_window.h"
 #include "graphics/shader.h"
 #include "audio/effect_processor.h"
 #include "audio/audio_enums.h"
@@ -127,7 +129,9 @@ void Init_sfml_ext(void) {
     Init_Event(rb_mExt);
     Init_VideoMode(rb_mExt);
     Init_View(rb_mExt);
+    Init_WindowBase(rb_mExt);
     Init_Window(rb_mExt);
+    Init_RenderWindow(rb_mExt);
     Init_Keyboard(rb_mExt);
     Init_Mouse(rb_mExt);
     Init_Joystick(rb_mExt);

data/ext/graphics/blend_mode.c

@@ -80,6 +80,18 @@ static sfBlendEquation equation_from_rb(VALUE rb_equation) {
     return sfBlendEquationAdd;
 }
 
+static VALUE BlendMode_alloc(VALUE klass) {
+    BlendMode* ptr = malloc(sizeof(BlendMode));
+
+    if (ptr == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate blend mode");
+    }
+
+    ptr->mode = sfBlendAlpha;
+
+    return TypedData_Wrap_Struct(klass, &BlendMode_data_type, ptr);
+}
+
 /* call-seq:
  *   BlendMode.new -> BlendMode(ALPHA)
  *   BlendMode.new(color_src_factor, color_dst_factor, color_equation, alpha_src_factor,
@@ -95,9 +107,7 @@ static sfBlendEquation equation_from_rb(VALUE rb_equation) {
  * @return [BlendMode]
  * @raise [ArgumentError] if given an argument count other than 0 or 6
  */
-static VALUE BlendMode_new(int argc, VALUE* argv, VALUE klass) {
-    VALUE self;
-    BlendMode* ptr;
+static VALUE BlendMode_initialize(int argc, VALUE* argv, VALUE self) {
     sfBlendMode mode = sfBlendAlpha;
 
     if (argc == 6) {
@@ -108,10 +118,7 @@ static VALUE BlendMode_new(int argc, VALUE* argv, VALUE klass) {
         raise_invalid_arguments_excepted(6, argc);
     }
 
-    ptr = malloc(sizeof(BlendMode));
-    ptr->mode = mode;
-
-    self = TypedData_Wrap_Struct(klass, &BlendMode_data_type, ptr);
+    ((BlendMode*)Get_BlendMode_Struct(self))->mode = mode;
 
     return self;
 }
@@ -310,7 +317,8 @@ static VALUE BlendMode_eql(VALUE self, VALUE rb_other) {
 void Init_BlendMode(VALUE rb_mSFML) {
     rb_cBlendMode = rb_define_class_under(rb_mSFML, "BlendMode", rb_cObject);
 
-    rb_define_singleton_method(rb_cBlendMode, "new", BlendMode_new, -1);
+    rb_define_alloc_func(rb_cBlendMode, BlendMode_alloc);
+    rb_define_method(rb_cBlendMode, "initialize", BlendMode_initialize, -1);
 
     rb_define_method(rb_cBlendMode, "color_src_factor", BlendMode_get_color_src_factor, 0);
     rb_define_method(rb_cBlendMode, "color_dst_factor", BlendMode_get_color_dst_factor, 0);