ruby-sdl2 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e0bde3276687797e754fb38566b3c23258a0cabedd2cb1b3b8c89fd20f03b1
-  data.tar.gz: 18ed3f916732eac3c54978dd251b4a01b86dfb71e33a8a4d105d906edeecf8dc
+  metadata.gz: 9a1d841e87d0b4437b0eb204f4062d451ff279a49bbae6b98fc70af51daf36f7
+  data.tar.gz: 933024c5bc62bbcb3b7fcdaec2dabdc89a54185a16c82d18a5483dde3c8443c6
 SHA512:
-  metadata.gz: c86c17d1f78f2a4d1835221a08490fc3c1cd5d4fb7848e9a926b7c6d89c3afcc758054f667c5242e2773dbe1a554bd92872bf23cc1f214fc58312527f79ffbda
-  data.tar.gz: e5314ba882de2a93c433b336590286482f9485092da806f711fbabda9e78ee0cb6781310e97f8f11270048bb3acfbcc261628c3bbadf1d17c8a38abb15c9b14c
+  metadata.gz: f515b8d0a224220af3feb34e11c47ec8212a9efb24166fccd42469a2d04fc5ec250798ae45d374aed504e68bccf3b18c02fc5a03db0727fcdf8de96ed01e31dc
+  data.tar.gz: 32404bacccbd2c18426a90322ca93a112cc9d2e4b247d8b64eac978ce8e23a4e625f37d54d4c0785511dde85f59565ea0896b97a43c20e458e3125d3eae39d3f

data/Gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 group :development do
   gem "rake"
   gem "yard"
-  gem "sord", path: "../sord/main"  # For locally modified sord, PR is already sent.
-  gem "steep", "~> 1.3.0"  # sord depends on rbs 2.x, but steep 1.4.x depends rbs 3.x
-  gem "parallel", "~> 1.22.0"  #  parallel >= 1.23.0 breaks compatibility
+  gem "sord" # , path: "../sord"
+  gem "steep" # , path: "../steep"
 end

data/README.md

@@ -5,7 +5,7 @@ The simple ruby extension library for SDL 2.x.
 # Install
 Before installing Ruby/SDL2, you need to install:
 
-* [devkit](http://rubyinstaller.org/add-ons/devkit/) (only for windows)
+* [devkit](https://rubyinstaller.org/add-ons/devkit.html) (only for windows)
 * M4 (only for installing from git repository)
 * [SDL 2.x](http://www.libsdl.org/download-2.0.php)
 * [SDL_image](https://www.libsdl.org/projects/SDL_image/)
@@ -31,6 +31,8 @@ Alternatively You can also install the master version of Ruby/SDL2 from github:
 
 LGPL v3 (see {file:COPYING.txt}).
 
+The API documentation is based on [SDL2 Wiki](https://wiki.libsdl.org/SDL2/FrontPage), which is distributed under CC-BY 4.0.
+
 # Author
 
 Ippei Obayashi <ohai@kmc.gr.jp>

data/event.c

@@ -86,11 +86,14 @@ static VALUE event_type_to_class[SDL_LASTEVENT];
  *   timestamp of the event
  *   @return [Integer] 
  */
+DEFINE_DATA_TYPE(SDL_Event, free);
+
 static VALUE Event_new(SDL_Event* ev)
 {
-    SDL_Event* e = ALLOC(SDL_Event);
+    SDL_Event* e;
+    VALUE obj = TypedData_Make_Struct(event_type_to_class[ev->type], SDL_Event, &SDL_Event_data_type, e);
     *e = *ev;
-    return Data_Wrap_Struct(event_type_to_class[ev->type], 0, free, e);
+    return obj;
 }
 
 static VALUE Event_s_allocate(VALUE klass)
@@ -99,11 +102,12 @@ static VALUE Event_s_allocate(VALUE klass)
     VALUE event_type = rb_iv_get(klass, "event_type");
     if (event_type == Qnil)
         rb_raise(rb_eArgError, "Cannot allocate %s", rb_class2name(klass));
-    
-    e = ALLOC(SDL_Event);
-    memset(e, 0, sizeof(SDL_Event));
-    e->common.type = NUM2INT(event_type);
-    return Data_Wrap_Struct(klass, 0, free, e);
+
+    {
+        VALUE obj = TypedData_Make_Struct(klass, SDL_Event, &SDL_Event_data_type, e);
+        e->common.type = NUM2INT(event_type);
+        return obj;
+    }
 }
 
 /*
@@ -176,7 +180,7 @@ static void set_string(char* field, VALUE str, int maxlength)
     static VALUE Ev##classname##_##name(VALUE self)             \
     {                                                           \
         SDL_Event* ev;                                          \
-        Data_Get_Struct(self, SDL_Event, ev);                   \
+        TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev); \
         return c2ruby(ev->field);                               \
     }                                                           \
 
@@ -184,7 +188,7 @@ static void set_string(char* field, VALUE str, int maxlength)
     static VALUE Ev##classname##_set_##name(VALUE self, VALUE val)      \
     {                                                                   \
         SDL_Event* ev;                                                  \
-        Data_Get_Struct(self, SDL_Event, ev);                           \
+        TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev); \
         ev->field = ruby2c(val);                                        \
         return Qnil;                                                    \
     }
@@ -214,7 +218,7 @@ EVENT_ACCESSOR_UINT(Event, timestamp, common.timestamp);
 /* @return [String] inspection string */
 static VALUE Event_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp);
 }
@@ -303,7 +307,7 @@ EVENT_ACCESSOR_INT(Window, data2, window.data2);
 /* @return [String] inspection string */
 static VALUE EvWindow_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u window_id=%u event=%u data1=%d data2=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
                       ev->window.windowID, ev->window.event,
@@ -357,7 +361,7 @@ EVENT_ACCESSOR_UINT(Keyboard, mod, key.keysym.mod);
 /* @return [String] inspection string */
 static VALUE EvKeyboard_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " window_id=%u state=%u repeat=%u"
                       " scancode=%u sym=%u mod=%u>",
@@ -407,7 +411,7 @@ EVENT_READER(TextEditing, text, edit.text, utf8str_new_cstr);
 static VALUE EvTextEditing_set_text(VALUE self, VALUE str)
 {
     SDL_Event* ev;
-    Data_Get_Struct(self, SDL_Event, ev);
+    TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     set_string(ev->edit.text, str, 30);
     return str;
 }
@@ -415,7 +419,7 @@ static VALUE EvTextEditing_set_text(VALUE self, VALUE str)
 /* @return [String] inspection string */
 static VALUE EvTextEditing_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " window_id=%u text=%s start=%d length=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -441,7 +445,7 @@ EVENT_READER(TextInput, text, text.text, utf8str_new_cstr);
 static VALUE EvTextInput_set_text(VALUE self, VALUE str)
 {
     SDL_Event* ev;
-    Data_Get_Struct(self, SDL_Event, ev);
+    TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     set_string(ev->text.text, str, 30);
     return str;
 }
@@ -449,7 +453,7 @@ static VALUE EvTextInput_set_text(VALUE self, VALUE str)
 /* @return [String] inspection string */
 static VALUE EvTextInput_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u window_id=%u text=%s>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
                       ev->text.windowID, ev->text.text);
@@ -507,7 +511,7 @@ EVENT_ACCESSOR_INT(MouseButton, y, button.y);
 /* @return [String] inspection string */
 static VALUE EvMouseButton_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " window_id=%u which=%u button=%hhu pressed=%s"
 #if SDL_VERSION_ATLEAST(2,0,2)
@@ -576,7 +580,7 @@ EVENT_ACCESSOR_INT(MouseMotion, yrel, motion.yrel);
 /* @return [String] inspection string */
 static VALUE EvMouseMotion_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " window_id=%u which=%u state=%u"
                       " x=%d y=%d xrel=%d yrel=%d>",
@@ -615,7 +619,7 @@ EVENT_ACCESSOR_INT(MouseWheel, y, wheel.y);
 /* @return [String] inspection string */
 static VALUE EvMouseWheel_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " window_id=%u which=%u x=%d y=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -651,7 +655,7 @@ EVENT_ACCESSOR_BOOL(JoyButton, pressed, jbutton.state);
 /* @return [String] inspection string */
 static VALUE EvJoyButton_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " which=%d button=%u pressed=%s>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -693,7 +697,7 @@ EVENT_ACCESSOR_INT(JoyAxisMotion, value, jaxis.value);
 /* @return [String] inspection string */
 static VALUE EvJoyAxisMotion_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " which=%d axis=%u value=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -728,7 +732,7 @@ EVENT_ACCESSOR_INT(JoyBallMotion, yrel, jball.yrel);
 /* @return [String] inspection string */
 static VALUE EvJoyBallMotion_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " which=%d ball=%u xrel=%d yrel=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -758,7 +762,7 @@ EVENT_ACCESSOR_UINT8(JoyHatMotion, value, jhat.value);
 /* @return [String] inspection string */
 static VALUE EvJoyHatMotion_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u which=%d hat=%u value=%u>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
                       ev->jhat.which, ev->jhat.hat, ev->jhat.value);
@@ -775,7 +779,7 @@ EVENT_ACCESSOR_INT(JoyDevice, which, jdevice.which);
 /* @return [String] inspection string */
 static VALUE EvJoyDevice_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u which=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
                       ev->jdevice.which);
@@ -816,7 +820,7 @@ EVENT_ACCESSOR_INT(ControllerAxis, value, caxis.value);
 /* @return [String] inspection string */
 static VALUE ControllerAxis_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " which=%d axis=%s value=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -853,7 +857,7 @@ EVENT_ACCESSOR_BOOL(ControllerButton, pressed, cbutton.state);
 /* @return [String] inspection string */
 static VALUE ControllerButton_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " which=%d button=%s state=%s>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
@@ -893,7 +897,7 @@ EVENT_ACCESSOR_INT(ControllerDevice, which, cdevice.which);
 /* @return [String] inspection string */
 static VALUE ControllerDevice_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u which=%d>",
                       rb_obj_classname(self), ev->common.type, ev->common.timestamp,
                       ev->cdevice.which);
@@ -953,7 +957,7 @@ EVENT_ACCESSOR_DBL(TouchFinger, pressure, tfinger.pressure);
 /* @return [String] inspection string */
 static VALUE EvTouchFinger_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " touch_id=%d finger_id=%d"
                       " x=%f y=%f pressure=%f>",
@@ -990,7 +994,7 @@ EVENT_ACCESSOR_DBL(FingerMotion, dy, tfinger.dy);
 /* @return [String] inspection string */
 static VALUE EvFingerMotion_inspect(VALUE self)
 {
-    SDL_Event* ev; Data_Get_Struct(self, SDL_Event, ev);
+    SDL_Event* ev; TypedData_Get_Struct(self, SDL_Event, &SDL_Event_data_type, ev);
     return rb_sprintf("<%s: type=%u timestamp=%u"
                       " touch_id=%d finger_id=%d"
                       " x=%f y=%f pressure=%f"

data/gamecontroller.c

@@ -17,6 +17,8 @@ static void GameController_free(GameController* g)
     free(g);
 }
 
+DEFINE_DATA_TYPE(GameController, GameController_free);
+
 /*
  * Document-class: SDL2::GameController
  *
@@ -60,9 +62,10 @@ static void GameController_free(GameController* g)
 
 static VALUE GameController_new(SDL_GameController* controller)
 {
-    GameController* g = ALLOC(GameController);
+    GameController* g;
+    VALUE obj = TypedData_Make_Struct(cGameController, GameController, &GameController_data_type, g);
     g->controller = controller;
-    return Data_Wrap_Struct(cGameController, 0, GameController_free, g);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_GameController, GameController, controller, cGameController,

data/gamecontroller.c.m4

@@ -17,6 +17,8 @@ static void GameController_free(GameController* g)
     free(g);
 }
 
+DEFINE_DATA_TYPE(GameController, GameController_free);
+
 /*
  * Document-class: SDL2::GameController
  *
@@ -60,9 +62,10 @@ static void GameController_free(GameController* g)
 
 static VALUE GameController_new(SDL_GameController* controller)
 {
-    GameController* g = ALLOC(GameController);
+    GameController* g;
+    VALUE obj = TypedData_Make_Struct(cGameController, GameController, &GameController_data_type, g);
     g->controller = controller;
-    return Data_Wrap_Struct(cGameController, 0, GameController_free, g);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_GameController, GameController, controller, cGameController,

data/gl.c

@@ -12,8 +12,6 @@ typedef struct GLContext {
     SDL_GLContext context;
 } GLContext;
 
-DEFINE_WRAPPER(SDL_GLContext, GLContext, context, cGLContext, "SDL2::GL::Context");
-
 static void GLContext_free(GLContext* c)
 {
     if (c->context)
@@ -21,11 +19,16 @@ static void GLContext_free(GLContext* c)
     free(c);
 }
 
+DEFINE_DATA_TYPE(GLContext, GLContext_free);
+
+DEFINE_WRAPPER(SDL_GLContext, GLContext, context, cGLContext, "SDL2::GL::Context");
+
 static VALUE GLContext_new(SDL_GLContext context)
 {
-    GLContext* c = ALLOC(GLContext);
+    GLContext* c;
+    VALUE obj = TypedData_Make_Struct(cGLContext, GLContext, &GLContext_data_type, c);
     c->context = context;
-    return Data_Wrap_Struct(cGLContext, 0, GLContext_free, c);
+    return obj;
 }
 
 /*

data/gl.c.m4

@@ -12,8 +12,6 @@ typedef struct GLContext {
     SDL_GLContext context;
 } GLContext;
 
-DEFINE_WRAPPER(SDL_GLContext, GLContext, context, cGLContext, "SDL2::GL::Context");
-
 static void GLContext_free(GLContext* c)
 {
     if (c->context)
@@ -21,11 +19,16 @@ static void GLContext_free(GLContext* c)
     free(c);
 }
 
+DEFINE_DATA_TYPE(GLContext, GLContext_free);
+
+DEFINE_WRAPPER(SDL_GLContext, GLContext, context, cGLContext, "SDL2::GL::Context");
+
 static VALUE GLContext_new(SDL_GLContext context)
 {
-    GLContext* c = ALLOC(GLContext);
+    GLContext* c;
+    VALUE obj = TypedData_Make_Struct(cGLContext, GLContext, &GLContext_data_type, c);
     c->context = context;
-    return Data_Wrap_Struct(cGLContext, 0, GLContext_free, c);
+    return obj;
 }
 
 /*

data/joystick.c

@@ -18,11 +18,14 @@ static void Joystick_free(Joystick* j)
     free(j);
 }
 
+DEFINE_DATA_TYPE(Joystick, Joystick_free);
+
 static VALUE Joystick_new(SDL_Joystick* joystick)
 {
-    Joystick* j = ALLOC(Joystick);
+    Joystick* j;
+    VALUE obj = TypedData_Make_Struct(cJoystick, Joystick, &Joystick_data_type, j);
     j->joystick = joystick;
-    return Data_Wrap_Struct(cJoystick, 0, Joystick_free, j);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Joystick, Joystick, joystick, cJoystick, "SDL2::Joystick");

data/joystick.c.m4

@@ -18,11 +18,14 @@ static void Joystick_free(Joystick* j)
     free(j);
 }
 
+DEFINE_DATA_TYPE(Joystick, Joystick_free);
+
 static VALUE Joystick_new(SDL_Joystick* joystick)
 {
-    Joystick* j = ALLOC(Joystick);
+    Joystick* j;
+    VALUE obj = TypedData_Make_Struct(cJoystick, Joystick, &Joystick_data_type, j);
     j->joystick = joystick;
-    return Data_Wrap_Struct(cJoystick, 0, Joystick_free, j);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Joystick, Joystick, joystick, cJoystick, "SDL2::Joystick");

data/lib/sdl2/version.rb

@@ -1,6 +1,6 @@
 module SDL2
   # @return [String] Version string of Ruby/SDL2
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
   # @return [Array<Integer>] Version of Ruby/SDL2, [major, minor, patch level] 
   VERSION_NUMBER = VERSION.split(".").map(&:to_i)
 end

data/mixer.c

@@ -27,34 +27,40 @@ typedef struct Music {
 
 static void Chunk_free(Chunk* c)
 {
-    if (rubysdl2_is_active() && c->chunk) 
+    if (rubysdl2_is_active() && c->chunk)
         Mix_FreeChunk(c->chunk);
     free(c);
 }
 
+DEFINE_DATA_TYPE(Chunk, Chunk_free);
+
 static VALUE Chunk_new(Mix_Chunk* chunk)
 {
-    Chunk* c = ALLOC(Chunk);
+    Chunk* c;
+    VALUE obj = TypedData_Make_Struct(cChunk, Chunk, &Chunk_data_type, c);
     c->chunk = chunk;
-    return Data_Wrap_Struct(cChunk, 0, Chunk_free, c);
+    return obj;
 }
 
 DEFINE_WRAPPER(Mix_Chunk, Chunk, chunk, cChunk, "SDL2::Mixer::Chunk");
 
 static void Music_free(Music* m)
 {
-    if (rubysdl2_is_active() && m->music) 
+    if (rubysdl2_is_active() && m->music)
         Mix_FreeMusic(m->music);
     free(m);
 }
 
+DEFINE_DATA_TYPE(Music, Music_free);
+
 static VALUE Music_new(Mix_Music* music)
 {
-    Music* c = ALLOC(Music);
+    Music* c;
+    VALUE obj = TypedData_Make_Struct(cMusic, Music, &Music_data_type, c);
     c->music = music;
-    return Data_Wrap_Struct(cMusic, 0, Music_free, c);
+    return obj;
 }
-                            
+
 DEFINE_WRAPPER(Mix_Music, Music, music, cMusic, "SDL2::Mixer::Music");
 
 /*

data/mixer.c.m4

@@ -27,34 +27,40 @@ typedef struct Music {
 
 static void Chunk_free(Chunk* c)
 {
-    if (rubysdl2_is_active() && c->chunk) 
+    if (rubysdl2_is_active() && c->chunk)
         Mix_FreeChunk(c->chunk);
     free(c);
 }
 
+DEFINE_DATA_TYPE(Chunk, Chunk_free);
+
 static VALUE Chunk_new(Mix_Chunk* chunk)
 {
-    Chunk* c = ALLOC(Chunk);
+    Chunk* c;
+    VALUE obj = TypedData_Make_Struct(cChunk, Chunk, &Chunk_data_type, c);
     c->chunk = chunk;
-    return Data_Wrap_Struct(cChunk, 0, Chunk_free, c);
+    return obj;
 }
 
 DEFINE_WRAPPER(Mix_Chunk, Chunk, chunk, cChunk, "SDL2::Mixer::Chunk");
 
 static void Music_free(Music* m)
 {
-    if (rubysdl2_is_active() && m->music) 
+    if (rubysdl2_is_active() && m->music)
         Mix_FreeMusic(m->music);
     free(m);
 }
 
+DEFINE_DATA_TYPE(Music, Music_free);
+
 static VALUE Music_new(Mix_Music* music)
 {
-    Music* c = ALLOC(Music);
+    Music* c;
+    VALUE obj = TypedData_Make_Struct(cMusic, Music, &Music_data_type, c);
     c->music = music;
-    return Data_Wrap_Struct(cMusic, 0, Music_free, c);
+    return obj;
 }
-                            
+
 DEFINE_WRAPPER(Mix_Music, Music, music, cMusic, "SDL2::Mixer::Music");
 
 /*

data/rubysdl2_internal.h

@@ -71,6 +71,17 @@ void rubysdl2_init_gamecontorller(void);
 #define UCHAR2NUM UINT2NUM
 #define rb_str_export_to_utf8(str) rb_str_export_to_enc((str), rb_utf8_encoding())
 
+/* Helper macro to define a rb_data_type_t for TypedData.
+ * Usage: DEFINE_DATA_TYPE(struct_name, free_func)
+ * Defines: static const rb_data_type_t struct_name##_data_type
+ */
+#define DEFINE_DATA_TYPE(struct_name, free_func)                         \
+    static const rb_data_type_t struct_name##_data_type = {             \
+        "ruby-sdl2/" #struct_name,                                      \
+        { NULL, (void (*)(void*))(free_func), NULL },                   \
+        NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY                         \
+    };
+
 #define DEFINE_GETTER(scope, ctype, var_class, classname)               \
     scope ctype* Get_##ctype(VALUE obj)                                 \
     {                                                                   \
@@ -78,7 +89,7 @@ void rubysdl2_init_gamecontorller(void);
         if (!rb_obj_is_kind_of(obj, var_class))                         \
             rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)", \
                      rb_obj_classname(obj), classname);                 \
-        Data_Get_Struct(obj, ctype, s);                                 \
+        TypedData_Get_Struct(obj, ctype, &ctype##_data_type, s);        \
                                                                         \
         return s;                                                       \
     }

data/sample/test_read_pixels.rb

@@ -0,0 +1,41 @@
+require "sdl2"
+
+SDL2.init(SDL2::INIT_VIDEO|SDL2::INIT_EVENTS)
+
+window = SDL2::Window.create("read_pixels",
+                             SDL2::Window::POS_CENTERED, SDL2::Window::POS_CENTERED,
+                             320, 240, 0)
+renderer = window.create_renderer(-1, 0)
+
+# Draw something
+renderer.draw_color = [0, 128, 255]
+renderer.fill_rect(SDL2::Rect.new(60, 40, 200, 160))
+renderer.draw_color = [255, 255, 0]
+renderer.fill_rect(SDL2::Rect.new(110, 80, 100, 80))
+
+# Capture pixels in ARGB8888 format
+pixels = renderer.read_pixels(nil, SDL2::PixelFormat::ARGB8888)
+
+renderer.present
+
+# Save as BMP
+width, height = 320, 240
+row_size = width * 4
+file_size = 54 + row_size * height
+bmp = String.new(encoding: Encoding::BINARY)
+bmp << ["BM", file_size, 0, 0, 54].pack("A2Vv2V")
+bmp << [40, width, height, 1, 32, 0, 0, 0, 0, 0, 0].pack("VV2v2V6")
+(height - 1).downto(0) {|y| bmp << pixels.byteslice(y * row_size, row_size) }
+File.binwrite("screenshot.bmp", bmp)
+puts "Saved screenshot.bmp (#{File.size("screenshot.bmp")} bytes)"
+
+loop do
+  while ev = SDL2::Event.poll
+    if SDL2::Event::KeyDown === ev && ev.scancode == SDL2::Key::Scan::ESCAPE
+      exit
+    end
+  end
+
+  renderer.present
+  sleep 0.1
+end

data/ttf.c

@@ -43,11 +43,14 @@ static void TTF_free(TTF* f)
     free(f);
 }
 
+DEFINE_DATA_TYPE(TTF, TTF_free);
+
 static VALUE TTF_new(TTF_Font* font)
 {
-    TTF* f = ALLOC(TTF);
+    TTF* f;
+    VALUE obj = TypedData_Make_Struct(cTTF, TTF, &TTF_data_type, f);
     f->font = font;
-    return Data_Wrap_Struct(cTTF, 0, TTF_free, f);
+    return obj;
 }
 
 DEFINE_WRAPPER(TTF_Font, TTF, font, cTTF, "SDL2::TTF");

data/ttf.c.m4

@@ -43,11 +43,14 @@ static void TTF_free(TTF* f)
     free(f);
 }
 
+DEFINE_DATA_TYPE(TTF, TTF_free);
+
 static VALUE TTF_new(TTF_Font* font)
 {
-    TTF* f = ALLOC(TTF);
+    TTF* f;
+    VALUE obj = TypedData_Make_Struct(cTTF, TTF, &TTF_data_type, f);
     f->font = font;
-    return Data_Wrap_Struct(cTTF, 0, TTF_free, f);
+    return obj;
 }
 
 DEFINE_WRAPPER(TTF_Font, TTF, font, cTTF, "SDL2::TTF");

data/video.c

@@ -65,7 +65,20 @@ typedef struct Surface {
     int need_to_free_pixels;
 } Surface;
 
+static void Window_free(Window*);
 static void Renderer_free(Renderer*);
+static void Texture_free(Texture*);
+static void Surface_free(Surface*);
+
+/* Forward-declare TypedData types (need free function declarations above) */
+DEFINE_DATA_TYPE(Window, Window_free);
+DEFINE_DATA_TYPE(SDL_DisplayMode, free);
+DEFINE_DATA_TYPE(Renderer, Renderer_free);
+DEFINE_DATA_TYPE(Texture, Texture_free);
+DEFINE_DATA_TYPE(Surface, Surface_free);
+DEFINE_DATA_TYPE(SDL_Rect, free);
+DEFINE_DATA_TYPE(SDL_Point, free);
+
 static void Window_destroy_internal(Window* w)
 {
     int i;
@@ -89,12 +102,13 @@ static void Window_free(Window* w)
 
 static VALUE Window_new(SDL_Window* window)
 {
-    Window* w = ALLOC(Window);
+    Window* w;
+    VALUE obj = TypedData_Make_Struct(cWindow, Window, &Window_data_type, w);
     w->window = window;
     w->num_renderers = 0;
     w->max_renderers = 4;
     w->renderers = ALLOC_N(struct Renderer*, 4);
-    return Data_Wrap_Struct(cWindow, 0, Window_free, w);
+    return obj;
 }
 
 DEFINE_GETTER(static, Window, cWindow, "SDL2::Window");
@@ -111,24 +125,24 @@ static VALUE Display_new(int index)
 
 static VALUE DisplayMode_s_allocate(VALUE klass)
 {
-    SDL_DisplayMode* mode = ALLOC(SDL_DisplayMode);
+    SDL_DisplayMode* mode;
+    VALUE obj = TypedData_Make_Struct(klass, SDL_DisplayMode, &SDL_DisplayMode_data_type, mode);
     mode->format = mode->w = mode->h = mode->refresh_rate = 0;
     mode->driverdata = NULL;
-    return Data_Wrap_Struct(klass, 0, free, mode);
+    return obj;
 }
 
 static VALUE DisplayMode_new(SDL_DisplayMode* mode)
 {
     VALUE display_mode = DisplayMode_s_allocate(cDisplayMode);
     SDL_DisplayMode* m;
-    Data_Get_Struct(display_mode, SDL_DisplayMode, m);
+    TypedData_Get_Struct(display_mode, SDL_DisplayMode, &SDL_DisplayMode_data_type, m);
     *m = *mode;
     return display_mode;
 }
 
 DEFINE_GETTER(static, SDL_DisplayMode, cDisplayMode, "SDL2::Display::Mode");
 
-static void Texture_free(Texture*);
 static void Renderer_destroy_internal(Renderer* r)
 {
     int i;
@@ -167,14 +181,15 @@ static void Window_attach_renderer(Window* w, Renderer* r)
 
 static VALUE Renderer_new(SDL_Renderer* renderer, Window* w)
 {
-    Renderer* r = ALLOC(Renderer);
+    Renderer* r;
+    VALUE obj = TypedData_Make_Struct(cRenderer, Renderer, &Renderer_data_type, r);
     r->renderer = renderer;
     r->num_textures = 0;
     r->max_textures = 16;
     r->textures = ALLOC_N(Texture*, 16);
     r->refcount = 1;
     Window_attach_renderer(w, r);
-    return Data_Wrap_Struct(cRenderer, 0, Renderer_free, r);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Renderer, Renderer, renderer, cRenderer, "SDL2::Renderer");
@@ -209,11 +224,12 @@ static void Renderer_attach_texture(Renderer* r, Texture* t)
 
 static VALUE Texture_new(SDL_Texture* texture, Renderer* r)
 {
-    Texture* t = ALLOC(Texture);
+    Texture* t;
+    VALUE obj = TypedData_Make_Struct(cTexture, Texture, &Texture_data_type, t);
     t->texture = texture;
     t->refcount = 1;
     Renderer_attach_texture(r, t);
-    return Data_Wrap_Struct(cTexture, 0, Texture_free, t);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Texture, Texture, texture, cTexture, "SDL2::Texture");
@@ -231,10 +247,11 @@ static void Surface_free(Surface* s)
 
 VALUE Surface_new(SDL_Surface* surface)
 {
-    Surface* s = ALLOC(Surface);
+    Surface* s;
+    VALUE obj = TypedData_Make_Struct(cSurface, Surface, &Surface_data_type, s);
     s->surface = surface;
     s->need_to_free_pixels = 0;
-    return Data_Wrap_Struct(cSurface, 0, Surface_free, s);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Surface, Surface, surface, cSurface, "SDL2::Surface");
@@ -1338,6 +1355,54 @@ static VALUE Renderer_present(VALUE self)
     return Qnil;
 }
 
+/*
+ * @overload read_pixels(rect, format)
+ *   Read pixels from the current rendering target.
+ *
+ *   ## Remarks
+ *
+ *   **WARNING**: This is a very slow operation, and should not be used frequently.
+ *   If you're using this on the main rendering target, it should be called after
+ *   rendering and before {#present}.
+ *
+ *   @param [SDL2::Rect,nil] rect the area to read, or nil for the entire target
+ *   @param [SDL2::PixelFormat,Integer] format the desired pixel format
+ *     (0 to use the format of the rendering target)
+ *   @return [String] raw pixel data as a binary string
+ */
+static VALUE Renderer_read_pixels(VALUE self, VALUE rect, VALUE format)
+{
+    SDL_Renderer* renderer = Get_SDL_Renderer(self);
+    SDL_Rect sdl_rect;
+    SDL_Rect* rect_ptr = NULL;
+    Uint32 fmt = uint32_for_format(format);
+    int w, h, pitch;
+    void* pixels;
+
+    if (rect != Qnil) {
+        sdl_rect = *Get_SDL_Rect(rect);
+        rect_ptr = &sdl_rect;
+        w = sdl_rect.w;
+        h = sdl_rect.h;
+    } else {
+        HANDLE_ERROR(SDL_GetRendererOutputSize(renderer, &w, &h));
+    }
+
+    if (fmt == 0) {
+        SDL_RendererInfo info;
+        HANDLE_ERROR(SDL_GetRendererInfo(renderer, &info));
+        pitch = w * SDL_BYTESPERPIXEL(info.texture_formats[0]);
+    } else {
+        pitch = w * SDL_BYTESPERPIXEL(fmt);
+    }
+
+    pixels = ALLOCA_N(char, pitch * h);
+
+    HANDLE_ERROR(SDL_RenderReadPixels(renderer, rect_ptr, fmt, pixels, pitch));
+    
+    return rb_str_new(pixels, pitch * h);
+}
+
 /*
  * Crear the rendering target with the drawing color.
  * @return [nil]
@@ -2063,6 +2128,7 @@ static VALUE Surface_s_from_string(int argc, VALUE* argv, VALUE self)
     SDL_Surface* surface;
     void* pixels;
     Surface* s;
+    VALUE obj;
 
     rb_scan_args(argc, argv, "45", &string, &width, &height, &depth,
                  &pitch, &Rmask, &Gmask, &Bmask, &Amask);
@@ -2089,10 +2155,10 @@ static VALUE Surface_s_from_string(int argc, VALUE* argv, VALUE self)
 
     RB_GC_GUARD(string);
 
-    s = ALLOC(Surface);
+    obj = TypedData_Make_Struct(cSurface, Surface, &Surface_data_type, s);
     s->surface = surface;
     s->need_to_free_pixels = 1;
-    return Data_Wrap_Struct(cSurface, 0, Surface_free, s);
+    return obj;
 }
 
 /*
@@ -2446,12 +2512,14 @@ static VALUE Surface_s_new(int argc, VALUE* argv, VALUE self)
 #define FIELD_ACCESSOR(classname, typename, field)              \
     static VALUE classname##_##field(VALUE self)                \
     {                                                           \
-        typename* r; Data_Get_Struct(self, typename, r);        \
+        typename* r;                                            \
+        TypedData_Get_Struct(self, typename, &typename##_data_type, r); \
         return INT2NUM(r->field);                               \
     }                                                           \
     static VALUE classname##_set_##field(VALUE self, VALUE val) \
     {                                                           \
-        typename* r; Data_Get_Struct(self, typename, r);        \
+        typename* r;                                            \
+        TypedData_Get_Struct(self, typename, &typename##_data_type, r); \
         r->field = NUM2INT(val); return val;                    \
     }
 
@@ -2490,10 +2558,10 @@ static VALUE Surface_s_new(int argc, VALUE* argv, VALUE self)
  */
 static VALUE Rect_s_allocate(VALUE klass)
 {
-    SDL_Rect* rect = ALLOC(SDL_Rect);
+    SDL_Rect* rect;
+    VALUE obj = TypedData_Make_Struct(klass, SDL_Rect, &SDL_Rect_data_type, rect);
     rect->x = rect->y = rect->w = rect->h = 0;
-
-    return Data_Wrap_Struct(cRect, 0, free, rect);
+    return obj;
 }
 
 /*
@@ -2521,7 +2589,7 @@ static VALUE Rect_initialize(int argc, VALUE* argv, VALUE self)
         /* do nothing*/
     } else if (argc == 4) {
         SDL_Rect* rect;
-        Data_Get_Struct(self, SDL_Rect, rect);
+        TypedData_Get_Struct(self, SDL_Rect, &SDL_Rect_data_type, rect);
         rect->x = NUM2INT(x); rect->y = NUM2INT(y);
         rect->w = NUM2INT(w); rect->h = NUM2INT(h);
     } else {
@@ -2596,7 +2664,7 @@ static VALUE Rect_union(VALUE self, VALUE other)
 static VALUE Point_s_allocate(VALUE klass)
 {
     SDL_Point* point;
-    return Data_Make_Struct(klass, SDL_Point, 0, free, point);
+    return TypedData_Make_Struct(klass, SDL_Point, &SDL_Point_data_type, point);
 }
 
 /*
@@ -2960,6 +3028,7 @@ void rubysdl2_init_video(void)
     rb_define_method(cRenderer, "copy", Renderer_copy, 3);
     rb_define_method(cRenderer, "copy_ex", Renderer_copy_ex, 6);
     rb_define_method(cRenderer, "present", Renderer_present, 0);
+    rb_define_method(cRenderer, "read_pixels", Renderer_read_pixels, 2);
     rb_define_method(cRenderer, "draw_color",Renderer_draw_color, 0);
     rb_define_method(cRenderer, "draw_color=",Renderer_set_draw_color, 1);
     rb_define_method(cRenderer, "clear", Renderer_clear, 0);

data/video.c.m4

@@ -65,7 +65,20 @@ typedef struct Surface {
     int need_to_free_pixels;
 } Surface;
 
+static void Window_free(Window*);
 static void Renderer_free(Renderer*);
+static void Texture_free(Texture*);
+static void Surface_free(Surface*);
+
+/* Forward-declare TypedData types (need free function declarations above) */
+DEFINE_DATA_TYPE(Window, Window_free);
+DEFINE_DATA_TYPE(SDL_DisplayMode, free);
+DEFINE_DATA_TYPE(Renderer, Renderer_free);
+DEFINE_DATA_TYPE(Texture, Texture_free);
+DEFINE_DATA_TYPE(Surface, Surface_free);
+DEFINE_DATA_TYPE(SDL_Rect, free);
+DEFINE_DATA_TYPE(SDL_Point, free);
+
 static void Window_destroy_internal(Window* w)
 {
     int i;
@@ -89,12 +102,13 @@ static void Window_free(Window* w)
 
 static VALUE Window_new(SDL_Window* window)
 {
-    Window* w = ALLOC(Window);
+    Window* w;
+    VALUE obj = TypedData_Make_Struct(cWindow, Window, &Window_data_type, w);
     w->window = window;
     w->num_renderers = 0;
     w->max_renderers = 4;
     w->renderers = ALLOC_N(struct Renderer*, 4);
-    return Data_Wrap_Struct(cWindow, 0, Window_free, w);
+    return obj;
 }
 
 DEFINE_GETTER(static, Window, cWindow, "SDL2::Window");
@@ -111,24 +125,24 @@ static VALUE Display_new(int index)
 
 static VALUE DisplayMode_s_allocate(VALUE klass)
 {
-    SDL_DisplayMode* mode = ALLOC(SDL_DisplayMode);
+    SDL_DisplayMode* mode;
+    VALUE obj = TypedData_Make_Struct(klass, SDL_DisplayMode, &SDL_DisplayMode_data_type, mode);
     mode->format = mode->w = mode->h = mode->refresh_rate = 0;
     mode->driverdata = NULL;
-    return Data_Wrap_Struct(klass, 0, free, mode);
+    return obj;
 }
 
 static VALUE DisplayMode_new(SDL_DisplayMode* mode)
 {
     VALUE display_mode = DisplayMode_s_allocate(cDisplayMode);
     SDL_DisplayMode* m;
-    Data_Get_Struct(display_mode, SDL_DisplayMode, m);
+    TypedData_Get_Struct(display_mode, SDL_DisplayMode, &SDL_DisplayMode_data_type, m);
     *m = *mode;
     return display_mode;
 }
 
 DEFINE_GETTER(static, SDL_DisplayMode, cDisplayMode, "SDL2::Display::Mode");
 
-static void Texture_free(Texture*);
 static void Renderer_destroy_internal(Renderer* r)
 {
     int i;
@@ -167,14 +181,15 @@ static void Window_attach_renderer(Window* w, Renderer* r)
 
 static VALUE Renderer_new(SDL_Renderer* renderer, Window* w)
 {
-    Renderer* r = ALLOC(Renderer);
+    Renderer* r;
+    VALUE obj = TypedData_Make_Struct(cRenderer, Renderer, &Renderer_data_type, r);
     r->renderer = renderer;
     r->num_textures = 0;
     r->max_textures = 16;
     r->textures = ALLOC_N(Texture*, 16);
     r->refcount = 1;
     Window_attach_renderer(w, r);
-    return Data_Wrap_Struct(cRenderer, 0, Renderer_free, r);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Renderer, Renderer, renderer, cRenderer, "SDL2::Renderer");
@@ -209,11 +224,12 @@ static void Renderer_attach_texture(Renderer* r, Texture* t)
 
 static VALUE Texture_new(SDL_Texture* texture, Renderer* r)
 {
-    Texture* t = ALLOC(Texture);
+    Texture* t;
+    VALUE obj = TypedData_Make_Struct(cTexture, Texture, &Texture_data_type, t);
     t->texture = texture;
     t->refcount = 1;
     Renderer_attach_texture(r, t);
-    return Data_Wrap_Struct(cTexture, 0, Texture_free, t);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Texture, Texture, texture, cTexture, "SDL2::Texture");
@@ -231,10 +247,11 @@ static void Surface_free(Surface* s)
 
 VALUE Surface_new(SDL_Surface* surface)
 {
-    Surface* s = ALLOC(Surface);
+    Surface* s;
+    VALUE obj = TypedData_Make_Struct(cSurface, Surface, &Surface_data_type, s);
     s->surface = surface;
     s->need_to_free_pixels = 0;
-    return Data_Wrap_Struct(cSurface, 0, Surface_free, s);
+    return obj;
 }
 
 DEFINE_WRAPPER(SDL_Surface, Surface, surface, cSurface, "SDL2::Surface");
@@ -1323,6 +1340,54 @@ static VALUE Renderer_present(VALUE self)
     return Qnil;
 }
 
+/*
+ * @overload read_pixels(rect, format)
+ *   Read pixels from the current rendering target.
+ *
+ *   ## Remarks
+ *
+ *   **WARNING**: This is a very slow operation, and should not be used frequently.
+ *   If you're using this on the main rendering target, it should be called after
+ *   rendering and before {#present}.
+ *
+ *   @param [SDL2::Rect,nil] rect the area to read, or nil for the entire target
+ *   @param [SDL2::PixelFormat,Integer] format the desired pixel format
+ *     (0 to use the format of the rendering target)
+ *   @return [String] raw pixel data as a binary string
+ */
+static VALUE Renderer_read_pixels(VALUE self, VALUE rect, VALUE format)
+{
+    SDL_Renderer* renderer = Get_SDL_Renderer(self);
+    SDL_Rect sdl_rect;
+    SDL_Rect* rect_ptr = NULL;
+    Uint32 fmt = uint32_for_format(format);
+    int w, h, pitch;
+    void* pixels;
+
+    if (rect != Qnil) {
+        sdl_rect = *Get_SDL_Rect(rect);
+        rect_ptr = &sdl_rect;
+        w = sdl_rect.w;
+        h = sdl_rect.h;
+    } else {
+        HANDLE_ERROR(SDL_GetRendererOutputSize(renderer, &w, &h));
+    }
+
+    if (fmt == 0) {
+        SDL_RendererInfo info;
+        HANDLE_ERROR(SDL_GetRendererInfo(renderer, &info));
+        pitch = w * SDL_BYTESPERPIXEL(info.texture_formats[0]);
+    } else {
+        pitch = w * SDL_BYTESPERPIXEL(fmt);
+    }
+
+    pixels = ALLOCA_N(char, pitch * h);
+
+    HANDLE_ERROR(SDL_RenderReadPixels(renderer, rect_ptr, fmt, pixels, pitch));
+    
+    return rb_str_new(pixels, pitch * h);
+}
+
 /*
  * Crear the rendering target with the drawing color.
  * @return [nil]
@@ -2048,6 +2113,7 @@ static VALUE Surface_s_from_string(int argc, VALUE* argv, VALUE self)
     SDL_Surface* surface;
     void* pixels;
     Surface* s;
+    VALUE obj;
 
     rb_scan_args(argc, argv, "45", &string, &width, &height, &depth,
                  &pitch, &Rmask, &Gmask, &Bmask, &Amask);
@@ -2074,10 +2140,10 @@ static VALUE Surface_s_from_string(int argc, VALUE* argv, VALUE self)
 
     RB_GC_GUARD(string);
 
-    s = ALLOC(Surface);
+    obj = TypedData_Make_Struct(cSurface, Surface, &Surface_data_type, s);
     s->surface = surface;
     s->need_to_free_pixels = 1;
-    return Data_Wrap_Struct(cSurface, 0, Surface_free, s);
+    return obj;
 }
 
 /*
@@ -2431,12 +2497,14 @@ static VALUE Surface_s_new(int argc, VALUE* argv, VALUE self)
 #define FIELD_ACCESSOR(classname, typename, field)              \
     static VALUE classname##_##field(VALUE self)                \
     {                                                           \
-        typename* r; Data_Get_Struct(self, typename, r);        \
+        typename* r;                                            \
+        TypedData_Get_Struct(self, typename, &typename##_data_type, r); \
         return INT2NUM(r->field);                               \
     }                                                           \
     static VALUE classname##_set_##field(VALUE self, VALUE val) \
     {                                                           \
-        typename* r; Data_Get_Struct(self, typename, r);        \
+        typename* r;                                            \
+        TypedData_Get_Struct(self, typename, &typename##_data_type, r); \
         r->field = NUM2INT(val); return val;                    \
     }
 
@@ -2475,10 +2543,10 @@ static VALUE Surface_s_new(int argc, VALUE* argv, VALUE self)
  */
 static VALUE Rect_s_allocate(VALUE klass)
 {
-    SDL_Rect* rect = ALLOC(SDL_Rect);
+    SDL_Rect* rect;
+    VALUE obj = TypedData_Make_Struct(klass, SDL_Rect, &SDL_Rect_data_type, rect);
     rect->x = rect->y = rect->w = rect->h = 0;
-
-    return Data_Wrap_Struct(cRect, 0, free, rect);
+    return obj;
 }
 
 /*
@@ -2506,7 +2574,7 @@ static VALUE Rect_initialize(int argc, VALUE* argv, VALUE self)
         /* do nothing*/
     } else if (argc == 4) {
         SDL_Rect* rect;
-        Data_Get_Struct(self, SDL_Rect, rect);
+        TypedData_Get_Struct(self, SDL_Rect, &SDL_Rect_data_type, rect);
         rect->x = NUM2INT(x); rect->y = NUM2INT(y);
         rect->w = NUM2INT(w); rect->h = NUM2INT(h);
     } else {
@@ -2581,7 +2649,7 @@ static VALUE Rect_union(VALUE self, VALUE other)
 static VALUE Point_s_allocate(VALUE klass)
 {
     SDL_Point* point;
-    return Data_Make_Struct(klass, SDL_Point, 0, free, point);
+    return TypedData_Make_Struct(klass, SDL_Point, &SDL_Point_data_type, point);
 }
 
 /*
@@ -2919,6 +2987,7 @@ void rubysdl2_init_video(void)
     rb_define_method(cRenderer, "copy", Renderer_copy, 3);
     rb_define_method(cRenderer, "copy_ex", Renderer_copy_ex, 6);
     rb_define_method(cRenderer, "present", Renderer_present, 0);
+    rb_define_method(cRenderer, "read_pixels", Renderer_read_pixels, 2);
     rb_define_method(cRenderer, "draw_color",Renderer_draw_color, 0);
     rb_define_method(cRenderer, "draw_color=",Renderer_set_draw_color, 1);
     rb_define_method(cRenderer, "clear", Renderer_clear, 0);

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-sdl2
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ippei Obayashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
         Ruby/SDL2 is an extension library to use SDL 2.x
@@ -69,6 +68,7 @@ files:
 - sample/test_joystick.rb
 - sample/test_keyboard.rb
 - sample/test_mouse.rb
+- sample/test_read_pixels.rb
 - sample/test_surface.rb
 - sample/test_ttf.rb
 - sample/test_video.rb
@@ -87,7 +87,6 @@ homepage: https://github.com/ohai/ruby-sdl2
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: The simple ruby extension library for SDL 2.x
 test_files: []