rubysdl 2.1.2 → 2.1.3

data/doc/rsd.rb

@@ -1,4 +1,5 @@
-#!/usr/local/bin/ruby -Ke
+#!ruby
+# -*- coding: euc-jp -*-
 
 class Hash
   def hash_map
@@ -37,7 +38,7 @@ def rsd2rd(input)
   part = Hash.new{""}
   mode = nil
   
-  input.each do |line|
+  input.each_line do |line|
     case line
     when /^(MOD|DEP|NAME|PURPOSE|TYPE|RVAL|OBSOLETE)\s+/
       part[$1] = $'.chomp
@@ -69,7 +70,7 @@ def rsd2rd(input)
   output = ""
   ns = if part.key?("MOD") then "SDL::#{part["MOD"]}" else "SDL" end
 
-  part["PROTO"].each{|proto| output << "--- #{ns}#{part["TYPE"]}#{proto}"}
+  part["PROTO"].each_line{|proto| output << "--- #{ns}#{part["TYPE"]}#{proto}"}
   output << "\n"
   if part.key?("OBSOLETE")
     if $english

data/doc/time.rsd

@@ -41,5 +41,5 @@ NOTES
 �����ͤ��Ǥ����Ū�Ǥ���
 
 ���δؿ���Ȥä���ߤ��Ƥ���֤� Ruby �Υ���åɤ��ڤ��ؤ��ޤ���
-Kernel#sleep ��Ȥä��ۤ����ɤ��Ǥ��礦��
+Ʊ���Τ��Ȥ� Kernel#sleep �Ǽ¸���ǽ�Ǥ���Τǡ��������ȤäƤ���������
 

data/doc/video.rsd

@@ -2445,8 +2445,8 @@ LOCK
 PURPOSE ľ�������褷�ޤ���
 
 PROTO
-draw_line(x1,x2,y1,y2,color, aa=false, alpha=nil)
-drawLine(x1,x2,y1,y2,color, aa=false, alpha=nil)
+draw_line(x1,y1,x2,y2,color, aa=false, alpha=nil)
+drawLine(x1,y1,x2,y2,color, aa=false, alpha=nil)
 
 DESC
 ($[x1], $[y1])����($[x2], $[y2])�ޤǤ�ľ���� $[color]
@@ -2467,8 +2467,8 @@ LOCK
 PURPOSE ����������ꥢ���󥰤��줿ľ�������褷�ޤ���
 
 PROTO
-draw_aa_line(x1,x2,y1,y2,color)
-drawAALine(x1,x2,y1,y2,color)
+draw_aa_line(x1,y1,x2,y2,color)
+drawAALine(x1,y1,x2,y2,color)
 
 OBSOLETE Surface#draw_line
 DESC
@@ -2488,8 +2488,8 @@ PURPOSE
 OBSOLETE Surface#draw_line
 
 PROTO
-draw_line_alpha(x1,x2,y1,y2,color,alpha)
-drawLineAlpha(x1,x2,y1,y2,color,alpha)
+draw_line_alpha(x1,y1,x2,y2,color,alpha)
+drawLineAlpha(x1,y1,x2,y2,color,alpha)
 
 DESC
 ($[x1], $[y1])����($[x2], $[y2])�ޤǤ�ľ���� $[color] �ǻ��ꤷ������
@@ -2508,8 +2508,8 @@ PURPOSE
 OBSOLETE Surface#draw_line
 
 PROTO
-draw_aa_line_alpha(x1,x2,y1,y2,color,alpha)
-drawAALineAlpha(x1,x2,y1,y2,color,alpha)
+draw_aa_line_alpha(x1,y1,x2,y2,color,alpha)
+drawAALineAlpha(x1,y1,x2,y2,color,alpha)
 
 DESC
 ($[x1], $[y1])����($[x2], $[y2])�ޤǤ�ľ���� $[color] �ǻ��ꤷ������

data/extconf.rb

@@ -1,14 +1,14 @@
 require 'mkmf'
 
+$srcs = Dir.glob(File.join($srcdir, "*.c"))
 if /mswin32/ =~ CONFIG["arch"]
   have_library("SDL")
 else
   sdl_config = with_config('sdl-config', 'sdl-config')
-  
-  $CFLAGS += ' ' + `#{sdl_config} --cflags`.chomp
+  $CPPFLAGS += " " + `#{sdl_config} --cflags`.chomp
   $LOCAL_LIBS += ' ' + `#{sdl_config} --libs`.chomp
   
-  if /-Dmain=SDL_main/ =~ $CFLAGS then
+  if /-Dmain=SDL_main/ =~ $CPPFLAGS then
     def try_func(func, libs, headers = nil, &b)
       headers = cpp_include(headers)
       try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
@@ -44,24 +44,29 @@ if enable_config("static-libs",false) then
 end
 
 if have_library("smpeg","SMPEG_new") then
-  $CFLAGS+= " -D HAVE_SMPEG "
+  $CPPFLAGS+= " -D HAVE_SMPEG "
   smpeg_config = with_config('smpeg-config', 'smpeg-config')
   if system(smpeg_config, "--version")
-    $CFLAGS += ' ' + `#{smpeg_config} --cflags`.chomp
+    $CPPFLAGS += ' ' + `#{smpeg_config} --cflags`.chomp
     $LOCAL_LIBS += ' ' + `#{smpeg_config} --libs`.chomp
   end
 end
 if have_library("SDL_mixer","Mix_OpenAudio") then
-  $CFLAGS+= " -D HAVE_SDL_MIXER "
-end
-if have_library("SGE","sge_Line") then
-  $CFLAGS+= " -D HAVE_SGE "
+  $CPPFLAGS+= " -D HAVE_SDL_MIXER "
 end
 if have_library("SDL_image","IMG_Load") then
-  $CFLAGS+= " -D HAVE_SDL_IMAGE "
+  $CPPFLAGS+= " -D HAVE_SDL_IMAGE "
 end
 if have_library("SDL_ttf","TTF_Init") then
-  $CFLAGS+= " -D HAVE_SDL_TTF "
+  $CPPFLAGS+= " -D HAVE_SDL_TTF "
+end
+use_imported_sge = enable_config("imported-sge", false)
+if use_imported_sge
+  $CPPFLAGS+= " -Isge -D HAVE_SGE "
+else
+  if have_library("SGE","sge_Line") then
+    $CPPFLAGS+= " -D HAVE_SGE "
+  end
 end
 
 have_func("TTF_OpenFontIndex")
@@ -71,22 +76,26 @@ have_func("TTF_FontFaceFamilyName")
 have_func("TTF_FontFaceStyleName")
 have_func("Mix_LoadMUS_RW")
 have_func("rb_thread_blocking_region")
+if have_header("ruby/thread.h")
+  have_func("rb_thread_call_without_gvl")
+end
+
 if enable_config("m17n", true)
   if have_func("rb_enc_str_new") && have_func("rb_str_export_to_enc")
-    $CFLAGS += " -D ENABLE_M17N "
+    $CPPFLAGS += " -D ENABLE_M17N "
     if enable_config("m17n-filesystem", false)
-      $CFLAGS += " -D ENABLE_M17N_FILESYSTEM "
+      $CPPFLAGS += " -D ENABLE_M17N_FILESYSTEM "
     end
   end
 end
 
 if have_library("SDLSKK","SDLSKK_Context_new") then
-  $CFLAGS+= " -D HAVE_SDLSKK "
+  $CPPFLAGS+= " -D HAVE_SDLSKK "
 end
 if enable_config("opengl",true) then
   dir_config('x11','/usr/X11R6')
   
-  $CFLAGS+= " -D ENABLE_OPENGL "
+  $CPPFLAGS+= " -D ENABLE_OPENGL "
 
   if /linux/ =~ CONFIG["arch"] then
     have_library("GL","glVertex3d")
@@ -95,5 +104,11 @@ if enable_config("opengl",true) then
     have_library("glu32","gluGetString")
   end
 end
+
+if use_imported_sge
+  $srcs += Dir.glob(File.join($srcdir, "sge/*.cpp"))
+  $objs = $srcs.map{|fname| fname.sub(/\.(c|cpp)\Z/, ".o") }
+end
+
 create_makefile("sdl_ext")
 

data/lib/sdl.rb

@@ -18,7 +18,7 @@ require 'sdl_ext'
 require 'forwardable'
 
 module SDL
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 
   class Surface
     def put(surface,x,y)
@@ -183,6 +183,7 @@ module SDL
         module_eval(<<-EOS)
           def draw#{t}(dst, text, x, y, #{args})
             image = render#{t}(text, #{args})
+            return if image.nil?
             dst.put(image, x, y)
             image.destroy
           end

data/lib/sdl1_compatible.rb

@@ -0,0 +1,20 @@
+
+module SDL
+  module_function
+  
+  def setVideoMode(*args)
+    SDL::Screen.open(*args)
+  end
+  def blitSurface(*args)
+    SDL::Screen.blit(*args)
+  end
+
+  class Surface
+    extend Forwardable
+    def_delegators :format, :mapRGB, :mapRGBA, :getRGB, :getRGBA
+    def_delegators :format, :bpp, :colorkey, :alpha
+    def_delegators :format, :Rmask, :Gmask, :Bmask, :Amask
+  end
+
+  Event2 = Event
+end

data/mkpkg.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+if [ "$1" = "" ];then
+    echo "Usage: $0 VERSION [TAG]"
+    exit 1
+fi
+VERSION=$1
+
+if [ "$2" = "" ];then
+    TAG=$VERSION
+else
+    TAG=$2
+fi
+
+PACKAGE=rubysdl-$VERSION.tar.gz
+DIRNAME=rubysdl-$VERSION
+
+git archive --format=tar --prefix=$DIRNAME/ $TAG | tar xf -
+
+export RBENV_VERSION=system 
+LANG=ja_JP.eucJP make -C $DIRNAME/doc
+make install -C $DIRNAME/doc 
+make -C $DIRNAME/doc-en
+make install -C $DIRNAME/doc-en
+
+
+tar czf $PACKAGE $DIRNAME/*
+rm -r $DIRNAME

data/rubysdl.gemspec

@@ -0,0 +1,21 @@
+# -*- Ruby -*-
+
+Gem::Specification.new do |spec|
+  spec.name = "rubysdl"
+  spec.version = "2.1.3"
+  spec.summary = "The simple ruby extension library to use SDL"
+  spec.description = <<-EOS
+    Ruby/SDL is an extension library to use SDL(Simple DirectMedia
+    Layer). This library enables you to control audio, keyboard,
+    mouse, joystick, 3D hardware via OpenGL, and 2D video 
+    framebuffer. Ruby/SDL is used by games and visual demos.
+  EOS
+  spec.rubyforge_project = "rubysdl"
+  spec.author = "Ohbayashi Ippei"
+  spec.email = "ohai@kmc.gr.jp"
+  spec.homepage = "http://www.kmc.gr.jp/~ohai/"
+  spec.files = `git ls-files`.split(/\n/)
+  spec.test_files = []
+  spec.extensions = ["extconf.rb"]
+  spec.has_rdoc = false
+end

data/rubysdl.h

@@ -19,6 +19,7 @@
   */
 
 #include <SDL.h>
+#define RUBY_DONT_SUBST
 #include <ruby.h>
 #include <stdio.h>
 

data/rubysdl_cdrom.c

@@ -52,7 +52,6 @@ static VALUE CD_s_alloc(VALUE klass)
 static VALUE CD_initialize(VALUE self, VALUE drive)
 {
   CD* cd = GetCD(self);
-  rb_secure(4);
   
   cd->cd = SDL_CDOpen(NUM2INT(drive));
   if(cd->cd == NULL)
@@ -63,12 +62,10 @@ static VALUE CD_initialize(VALUE self, VALUE drive)
 
 static VALUE CD_s_numDrive(VALUE klass)
 {
-  rb_secure(4);
   return INT2FIX(SDL_CDNumDrives());
 }
 static VALUE CD_s_name(VALUE klass, VALUE drive)
 {
-  rb_secure(4);
   return rb_str_new2(SDL_CDName(NUM2INT(drive)));
 }
 static VALUE CD_s_open(VALUE klass, VALUE drive)
@@ -79,12 +76,10 @@ static VALUE CD_s_open(VALUE klass, VALUE drive)
 }
 static VALUE CD_status(VALUE self)
 {
-  rb_secure(4);
   return INT2FIX(SDL_CDStatus(Get_SDL_CD(self)));
 }
 static VALUE CD_play(VALUE self, VALUE start, VALUE length)
 {
-  rb_secure(4);
   if( SDL_CDPlay(Get_SDL_CD(self), NUM2INT(start), NUM2INT(length))==-1 )
     rb_raise(eSDLError, "Couldn't play cd :%s", SDL_GetError() );
   return Qnil;
@@ -92,7 +87,6 @@ static VALUE CD_play(VALUE self, VALUE start, VALUE length)
 static VALUE CD_playTracks(VALUE self, VALUE start_track, VALUE start_frame, 
 			       VALUE ntracks, VALUE nframes)
 {
-  rb_secure(4);
   if( SDL_CDPlayTracks(Get_SDL_CD(self), NUM2INT(start_track),
                        NUM2INT(start_frame), NUM2INT(ntracks),
 		       NUM2INT(nframes))==-1 )
@@ -101,28 +95,24 @@ static VALUE CD_playTracks(VALUE self, VALUE start_track, VALUE start_frame,
 }
 static VALUE CD_pause(VALUE self)
 {
-  rb_secure(4);
   if( SDL_CDPause(Get_SDL_CD(self))==-1 )
     rb_raise(eSDLError, "cd pause failed :%s", SDL_GetError());
   return Qnil;
 }
 static VALUE CD_resume(VALUE self)
 {
-  rb_secure(4);
   if( SDL_CDResume(Get_SDL_CD(self))==-1 )
     rb_raise(eSDLError, "cd resume failed :%s", SDL_GetError());
   return Qnil;
 }
 static VALUE CD_stop(VALUE self)
 {
-  rb_secure(4);
   if( SDL_CDStop(Get_SDL_CD(self))==-1 )
     rb_raise(eSDLError, "cd pause failed :%s", SDL_GetError());
   return Qnil;
 }
 static VALUE CD_eject(VALUE self)
 {
-  rb_secure(4);
   if( SDL_CDEject(Get_SDL_CD(self))==-1 )
     rb_raise(eSDLError, "cd eject failed :%s", SDL_GetError());
   return Qnil;

data/rubysdl_event.c

@@ -19,6 +19,9 @@
   */
 
 #include "rubysdl.h"
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#endif
 
 static VALUE cEvent;
 static VALUE cActiveEvent;
@@ -176,29 +179,48 @@ static VALUE createVideoResizeEvent(SDL_Event *event)
 static VALUE Event_s_poll(VALUE class)
 {
   SDL_Event event;
-  rb_secure(4);
   if( SDL_PollEvent(&event) == 1)
     return event_creators[event.type](&event);
   else
     return Qnil;
 }
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+static void* wait_event(void* ev)
+{
+  return (void*)(intptr_t)SDL_WaitEvent((SDL_Event*)ev);
+}
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
 static VALUE wait_event(void* ev)
 {
   return SDL_WaitEvent((SDL_Event*)ev);
 }
 #endif
+
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) || defined(HAVE_RB_THREAD_BLOCKING_REGION)
+static void ubf_SDL_WaitEvent(void* unused)
+{
+  SDL_Event ev;
+  ev.type = SDL_USEREVENT;
+  ev.user.code = 19002; /* Code for interrupt */
+  ev.user.data1 = ev.user.data2 = NULL;
+  
+  SDL_PushEvent(&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, &event, RUBY_UBF_IO, NULL) == 1)
-#else
-  /* Ruby 1.8 and below: Call SDL_WaitEvent directly.
+   * SDL_WaitEvent, allowing other Ruby threads to execute. 
+   * Ruby 1.8 and below: Call SDL_WaitEvent directly.
    * No other threads can execute during this call. */
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+  if ((intptr_t)rb_thread_call_without_gvl(wait_event, &event, ubf_SDL_WaitEvent, NULL) == 1)
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
+  if( rb_thread_blocking_region(wait_event, &event, ubf_SDL_WaitEvent, NULL) == 1)
+#else
   if( SDL_WaitEvent(&event) == 1)
 #endif
     return event_creators[event.type](&event);
@@ -221,7 +243,6 @@ static VALUE Event_s_push(VALUE class, VALUE event)
 {
   SDL_Event e;
   VALUE eventClass;
-  rb_secure(4);
   eventClass = CLASS_OF(event);
   if(eventClass == cActiveEvent){
     e.type = SDL_ACTIVEEVENT;
@@ -306,13 +327,11 @@ static VALUE Event_s_getAppState(VALUE class)
 
 static VALUE Event_s_enableUNICODE(VALUE class)
 {
-  rb_secure(4);
   SDL_EnableUNICODE(1);
   return Qnil;
 }
 static VALUE Event_s_disableUNICODE(VALUE class)
 {
-  rb_secure(4);
   SDL_EnableUNICODE(0);
   return Qnil;
 }

data/rubysdl_event_key.c

@@ -307,7 +307,6 @@ static void define_const(void)
 
 static VALUE Key_s_scan(VALUE mod)
 {
-  rb_secure(4);
   key_state=SDL_GetKeyState(NULL);
   mod_state=SDL_GetModState();
   return Qnil;
@@ -316,7 +315,6 @@ static VALUE Key_s_scan(VALUE mod)
 static VALUE Key_s_press_p(VALUE mod, VALUE keysym)
 {
   int sym = NUM2INT(keysym);
-  rb_secure(4);
   if(sym < SDLK_FIRST || SDLK_LAST < sym )
     rb_raise(eSDLError, "%d is out of key", sym);
   if(key_state == NULL)
@@ -327,13 +325,11 @@ static VALUE Key_s_press_p(VALUE mod, VALUE keysym)
 
 static VALUE Key_s_modState(VALUE mod)
 {
-  rb_secure(4);
   return UINT2NUM(mod_state);
 }
 
 static VALUE Key_s_enableKeyRepeat(VALUE mod, VALUE delay, VALUE interval)
 {
-  rb_secure(4);
   if( SDL_EnableKeyRepeat(NUM2INT(delay), NUM2INT(interval))==-1 ){
     rb_raise(eSDLError, "enable key repeat fail: %s", SDL_GetError());
   }
@@ -342,7 +338,6 @@ static VALUE Key_s_enableKeyRepeat(VALUE mod, VALUE delay, VALUE interval)
 
 static VALUE Key_s_disableKeyRepeat(VALUE mod)
 {
-  rb_secure(4);
   if( SDL_EnableKeyRepeat(0, 0)==-1 ){
     rb_raise(eSDLError, "disable key repeat fail: %s", SDL_GetError());
   }