rubysdl 2.0.1 → 2.1.0

data/doc/general.rsd

@@ -50,6 +50,18 @@ Ruby/SDL
 * ����¾�ˤ⡢((<Window�δ���|Window Management>))��
   ((<����Ƚ��>))�ʤ�
 
+= Ruby 1.9��m17n�ˤĤ���
+Ruby 1.9�Ǥϡ�String�˥��󥳡��ǥ��󥰾����դ���
+���ޤ�����Ruby/SDL�Ǥϴ���Ū�ˤ��ξ����̵�뤷�ޤ���
+SDL�Ǥ��Τ褦�ʾ����ɤ����٤����������Ƥ��ʤ�����Ǥ���
+
+�����������Ĥ��Υ᥽�åɤǤ�Ruby 1.9�ˤ����Ƥ�
+���󥳡��ǥ�������Ѥ�����ղä�Ԥ��ޤ���
+�ܤ����ϳƥ᥽�åɤι�򸫤Ƥ���������
+
+extconf.rb��¹Ԥ���Ȥ���--enable-m17n/--disable-m17n
+���ץ�����Ȥ����Ȥǡ�������Ruby/SDL��
+m17n��Ϣ�ε�ǽ��ͭ��/̵���ˤǤ��ޤ���
 
 == SDL::Error
 SDL��ͭ�Υ��顼��ɽ�魯�㳰���饹�Ǥ���StandardError��Ѿ����Ƥ��ޤ���

data/doc/mixer.rsd

@@ -226,6 +226,39 @@ OGG
 
 EXCEPTION *
 
+%%
+NAME destroy
+MOD Mixer::Wave
+TYPE #
+PURPOSE �����ǥ����ǡ�����������ޤ�
+
+PROTO
+destroy
+
+DESC
+�����ǥ����ǡ��������Ƥ����꥽������������ޤ���
+������ϰ��ڤ����Ǥ��ʤ��ʤ�ޤ���
+
+SEEALSO
+Mixer::Wave#destroyed?
+
+%%
+NAME destroyed?
+MOD Mixer::Wave
+TYPE #
+PURPOSE �����ǥ����ǡ���������������ɤ������֤��ޤ���
+RVAL true/false
+
+PROTO
+destroyed?
+
+DESC
+@[Mixer::Wave#destroy]�ˤ�ä�
+�����ǥ����ǡ���������������ɤ����򿿵��ͤ��֤��ޤ���
+
+SEEALSO
+Mixer::Wave#destroy
+
 %%
 NAME load
 MOD Mixer::Music
@@ -269,6 +302,41 @@ Windows
 
 EXCEPTION *
 
+%%
+NAME destroy
+MOD Mixer::Music
+TYPE #
+PURPOSE ���ڥǡ�����������ޤ�
+
+PROTO
+destroy
+
+DESC
+���ڥǡ��������Ƥ����꥽������������ޤ���
+������ϰ��ڤ����Ǥ��ʤ��ʤ�ޤ���
+
+SEEALSO
+Mixer::Music#destroyed?
+Mixer::Wave#destroy
+
+%%
+NAME destroyed?
+MOD Mixer::Music
+TYPE #
+PURPOSE ���ڥǡ���������������ɤ������֤��ޤ���
+RVAL true/false
+
+PROTO
+destroyed?
+
+DESC
+@[Mixer::Music#destroy]�ˤ�ä�
+���ڥǡ���������������ɤ����򿿵��ͤ��֤��ޤ���
+
+SEEALSO
+Mixer::Music#destroy
+Mixer::Wave#destroyed?
+
 %%
 NAME set_volume
 MOD Mixer::Wave

data/doc/mpeg.rsd

@@ -591,5 +591,29 @@ total_time
 DESC
 not documented yet
 
+%%
+NAME delete
+MDO MPEG
+TYPE #
+DEP SMPEG
+PURPOSE
+
+PROTO
+delete
+
+DESC
+not documented yet
 
+%%
+NAME deleted?
+MDO MPEG
+TYPE #
+DEP SMPEG
+PURPOSE
+
+PROTO
+deleted?
+
+DESC
+not documented yet
 

data/doc/sdlskk.rsd

@@ -387,6 +387,10 @@ str
 DESC
 ���������ʸ������֤��ޤ���
 
+NOTE
+Ruby 1.9�Ǥ�Ruby/SDL��m17n��ǽ��ͭ���ˤ��Ƥ���¤ꡢ
+�֤��ͤ�ʸ�����Ŭ�ڤʥ��󥳡��ǥ��󥰤��ղä��ޤ���
+
 SEEALSO
 SKK::Context#render_str
 SKK::Context#clear
@@ -461,7 +465,7 @@ JISX0208
 
 ʣ���Ԥ����Ϥ�¸���������硢@[SKK::Context] ��Ƥ֤�
 �⡼�ɤ��������ϥ⡼�ɤ���äƤ��ޤ��Τ��Լ����Ǥ����硢
-���δؿ���Ƥ֤Ȥ褤��
+���δؿ���Ƥ֤Ȥ褤�Ǥ��礦��
 
 �ޤ������åȥХåե������Ƥ���¸����ޤ���
 

data/doc/video.rsd

@@ -1277,6 +1277,41 @@ EXCEPTION *
 SEEALSO
 Surface.load_bmp
 
+%%
+NAME destroy
+MOD Surface
+TYPE #
+PURPOSE �����ե�����������ޤ���
+
+PROTO
+destroy
+
+DESC
+����Surface�����Ƥ���꥽������������ޤ�������������ˤ�
+���Υ��֥������Ȥ��Ф������ϰ����Բ�ǽ�ˤʤ�ޤ���
+
+SEEALSO
+Surface.new
+Surface.new_from
+Surface#destroyed?
+
+%%
+NAME destroyed?
+MOD Surface
+TYPE #
+PURPOSE �����ե�������������Ƥ��뤫�ɤ������֤��ޤ���
+RVAL true/false
+
+PROTO
+destroyed?
+
+DESC
+���Υ����ե����� @[Surface#destroy] �ˤ�äƲ�������Ƥ��뤫
+�ɤ����򿿵��ͤ��֤��ޤ���
+
+SEEALSO
+Surface#destroy
+
 %%
 NAME set_color_key
 MOD Surface

data/doc/wm.rsd

@@ -24,6 +24,9 @@ caption
 DESC
 ������ɥ��Υ����ȥ�ȥ�������̾��ʸ����2�Ĥ�������֤��ޤ���
 
+NOTES
+�֤��ͤΥ��󥳡��ǥ��󥰤�UTF8�Ǥ���
+
 SEEALSO
 WM.set_caption
 
@@ -40,6 +43,13 @@ setCaption(title, icon)
 DESC
 ɽ��������ɥ��Υ����ȥ�С��ȥ�������̾�򥻥åȤ��ޤ���
 
+NOTES
+Ruby 1.8�Ǥ�ʸ����Ȥ���UTF8��Ϳ���뤳�Ȥǥޥ���Х���ʸ����
+���ѤǤ���Ķ��⤢��ޤ���
+
+Ruby 1.9�Ǥ�Ruby/SDL��m17n��ǽ��ͭ���ˤ��Ƥ���¤�
+Ruby��m17n�ε�ǽ���Ѥ�UTF8�ؤ��Ѵ���ưŪ�˹Ԥ��ޤ���
+
 SEEALSO
 WM.caption
 WM.icon=

data/extconf.rb

@@ -65,6 +65,15 @@ have_func("TTF_FontFaceIsFixedWidth")
 have_func("TTF_FontFaceFamilyName")
 have_func("TTF_FontFaceStyleName")
 have_func("Mix_LoadMUS_RW")
+have_func("rb_thread_blocking_region")
+if enable_config("m17n", true)
+  if have_func("rb_enc_str_new") && have_func("rb_str_export_to_enc")
+    $CFLAGS += " -D ENABLE_M17N "
+    if enable_config("m17n-filesystem", false)
+      $CFLAGS += " -D ENABLE_M17N_FILESYSTEM "
+    end
+  end
+end
 
 if have_library("SDLSKK","SDLSKK_Context_new") then
   $CFLAGS+= " -D HAVE_SDLSKK "

data/lib/rubysdl_aliases.rb

@@ -106,6 +106,7 @@ module SDL
   if defined?(Kanji) then
     class Kanji
       alias set_coding_system setCodingSystem
+      alias get_coding_system getCodingSystem
       alias put_tate putTate
     end
   end
@@ -243,6 +244,14 @@ module SDL
       alias render_solid_utf8 renderSolidUTF8
       alias render_blended_utf8 renderBlendedUTF8
       alias render_shaded_utf8 renderShadedUTF8
+      if method_defined?(:drawSolid)
+        alias draw_solid drawSolid
+        alias draw_blended drawBlended
+        alias draw_shaded drawShaded
+        alias render_solid renderSolid
+        alias render_blended renderBlended
+        alias render_shaded renderShaded
+      end
     end
   end
 end

data/lib/sdl.rb

@@ -18,7 +18,7 @@ require 'sdl.so'
 require 'forwardable'
 
 module SDL
-  VERSION = "2.0 alpha1"
+  VERSION = "2.1.0"
 
   class Surface
     def put(surface,x,y)
@@ -175,40 +175,27 @@ module SDL
   end
 
   if defined?(MPEG)
-    class MPEG
-      alias info_imp info
-      private :info_imp
-      def info(*arg)
-	case arg.size
-	when 0
-	  result = SDL::MPEG::Info.new
-	  info_imp(result)
-	  result
-	when 1
-	  info_imp(arg[0])
-	  arg[0]
-	end
-      end
-    end
   end
   if defined?(TTF)
     class TTF
-      def drawSolidUTF8(dst, text, x, y, r, g, b)
-        image = renderSolidUTF8(text, r, g, b)
-        dst.put(image, x, y)
-        image.destroy
-      end
-      
-      def drawBlendedUTF8(dst, text, x, y, r, g, b)
-        image = renderBlendedUTF8(text, r, g, b)
-        dst.put(image, x, y)
-        image.destroy
-      end
-      
-      def drawShadedUTF8(dst, text, fg_r, fg_g, fg_b, bg_r, bg_g, bg_b)
-        image = renderSolidUTF8(text, fg_r, fg_g, fg_b, bg_r, bg_g, bg_b)
-        dst.put(image, x, y)
-        image.destroy
+      define_draw = proc{|t, n|
+        args = (1..n).map{|k| "arg#{k}"}.join(",")
+        module_eval(<<-EOS)
+          def draw#{t}(dst, text, x, y, #{args})
+            image = render#{t}(text, #{args})
+            dst.put(image, x, y)
+            image.destroy
+          end
+        EOS
+      }
+
+      define_draw["SolidUTF8", 3]
+      define_draw["BlendedUTF8", 3]
+      define_draw["ShadedUTF8",6]
+      if method_defined?(:drawSolid)
+        define_draw["Solid",3]
+        define_draw["Blended", 3]
+        define_draw["Shaded", 6]
       end
     end
   end

data/rubysdl.h

@@ -46,14 +46,47 @@ do{ \
   Rect.h=NUM2INT(H); \
 }while(0) \
 
+#ifdef ENABLE_M17N
+#define ExportStringValueToEnc(v,enc)              \
+  do {                                             \
+    SafeStringValue(v);                            \
+    (v) = rb_str_export_to_enc((v),(enc));         \
+  } while (0)
+#else
+#define ExportStringValueToEnc(v,enc)           \
+  SafeStringValue(v)
+#endif
+
+#ifdef ENABLE_M17N_FILESYSTEM
+#define ExportFilenameStringValue(v)                    \
+  ExportStringValueToEnc(v,rb_filesystem_encoding())
+#else
+#define ExportFilenameStringValue(v)            \
+  SafeStringValue(v)
+#endif
+
 #define INT2BOOL(x) ((x)?Qtrue:Qfalse)
 
-/* Global variables */
-#define eSDLError rubysdl_eSDLError
 #ifdef DEF_GLOBAL
-VALUE eSDLError;
+#define GLOBAL(typ, var, val) typ var = val
 #else
-extern VALUE eSDLError;
+#define GLOBAL(typ, var, val) extern typ var
+#endif
+/* Global variables */
+#define eSDLError rubysdl_eSDLError
+GLOBAL(VALUE, eSDLError, Qnil);
+
+#ifdef ENABLE_M17N
+#define ENC_STR_NEW2(str, enc) rb_enc_str_new((str), strlen((str)), (enc))
+#include "ruby/encoding.h"
+#define utf8_enc rubysdl_utf8_enc
+#define eucjp_enc rubysdl_eucjp_enc
+#define iso2022jp_enc rubysdl_iso2022jp_enc
+#define sjis_enc rubysdl_sjis_enc
+GLOBAL(rb_encoding*, utf8_enc, NULL);
+GLOBAL(rb_encoding*, eucjp_enc, NULL);
+GLOBAL(rb_encoding*, iso2022jp_enc, NULL);
+GLOBAL(rb_encoding*, sjis_enc, NULL);
 #endif
 
 /* Global functions */

data/rubysdl_cdrom.c

@@ -159,6 +159,18 @@ static VALUE CD_s_MSFToFrames(VALUE klass, VALUE m, VALUE s, VALUE f)
 {
   return INT2FIX(MSF_TO_FRAMES(NUM2INT(m),NUM2INT(s),NUM2INT(f)));
 }
+static VALUE CD_close(VALUE self)
+{
+  CD* cd = GetCD(self);
+  if( !rubysdl_is_quit() && cd->cd )
+    SDL_CDClose(cd->cd);
+  cd->cd = NULL;
+  return Qnil;
+}
+static VALUE CD_closed(VALUE self)
+{
+  return INT2BOOL(GetCD(self)->cd == NULL);
+}
 
 void rubysdl_init_CD(VALUE mSDL)
 {
@@ -185,7 +197,8 @@ void rubysdl_init_CD(VALUE mSDL)
   rb_define_method(cCD, "currentFrame", CD_currentFrame, 0);
   rb_define_method(cCD, "trackType", CD_trackType, 1);
   rb_define_method(cCD, "trackLength", CD_trackLength, 1);
-
+  rb_define_method(cCD, "close", CD_close, 0);
+  rb_define_method(cCD, "closed?", CD_closed, 0);
   
   rb_define_const(cCD, "TRAYEMPTY", INT2NUM(CD_TRAYEMPTY));
   rb_define_const(cCD, "STOPPED", INT2NUM(CD_STOPPED));

data/rubysdl_event.c

@@ -182,11 +182,25 @@ static VALUE Event_s_poll(VALUE class)
   else
     return Qnil;
 }
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+static VALUE wait(void* ev)
+{
+  return SDL_WaitEvent((SDL_Event*)ev);
+}
+#endif
 static VALUE Event_s_wait(VALUE class)
 {
   SDL_Event event;
   rb_secure(4);
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+  /* Ruby 1.9 and above: Release the global VM lock while calling
+   * SDL_WaitEvent, allowing other Ruby threads to execute. */
+  if( rb_thread_blocking_region(wait, &event, RUBY_UBF_IO, NULL) == 1)
+#else
+  /* Ruby 1.8 and below: Call SDL_WaitEvent directly.
+   * No other threads can execute during this call. */
   if( SDL_WaitEvent(&event) == 1)
+#endif
     return event_creators[event.type](&event);
   else
     rb_raise(eSDLError, "Event handling error");

data/rubysdl_image.c

@@ -26,7 +26,7 @@ static VALUE Surface_s_load(VALUE klass, VALUE filename)
   SDL_Surface *surface;
   
   rb_secure(4);
-  SafeStringValue(filename);
+  ExportFilenameStringValue(filename);
 
   surface = IMG_Load(RSTRING_PTR(filename));
   if(surface == NULL)