rubysdl 2.0 → 2.0.1

data/NEWS.en

@@ -1,3 +1,7 @@
+version 2.0.1
+fix some compile errors/warnings
+raise SDL::Surface::VideoMemoryLost when video memory is lost when calling SDL::Surface.blit
+
 version 2.0
 some changes for ruby 1.9
 fix SDL_RWops code

data/NEWS.ja

@@ -1,3 +1,8 @@
+version 2.0.1
+$B%3%s%Q%$%k$G$-$J$$>l9g$,$"$k$N$r=$@5(B
+SDL::Surface.blit$B$G%S%G%*%a%b%j$,%m%9%H$7$?>l9g$K(B
+$BNc30(BSDL::Surface::VideoMemoryLost$B$rH/@8$5$;$k$h$&$K$7$?!#(B
+
 version 2.0 
 ruby 1.9$B$G;H$($k$h$&$KJQ99(B
 SDL_RWops$BBP1~$r=$@5$7!"(BSDL::Mixer::Wave.load_from_io$B$,;H$($k$h$&$K$7$?!#(B

data/README.en

@@ -1,5 +1,5 @@
 
-Ruby/SDL 2.0
+Ruby/SDL 2.0.1
 Ohbayashi Ippei
 
 1 What's Ruby/SDL

data/README.ja

@@ -1,5 +1,5 @@
 
-Ruby/SDL 2.0
+Ruby/SDL 2.0.1
 ���Ӱ�ʿ
 
 1 ����

data/doc/video.rsd

@@ -1462,7 +1462,7 @@ Surface.blit
 NAME blit_surface
 TYPE .
 PURPOSE ž���������ե�������ž���襵���ե����ع�® blit ž����Ԥ��ޤ���
-RVAL 0/-2
+RVAL 0
 OBSOLETE Surface.blit
 
 PROTO
@@ -1511,8 +1511,11 @@ Surface#set_alpha
 
 RET
 �������ˤ�0���֤��ޤ���
+
+EXCEPTION
 �ɤ��餫�Υ����ե������ӥǥ�����ˤ��ꡢ���Υ᥽�åɤ�
--2 ���֤����ϡ��ӥǥ����꤬����줿���ᡢ
+�㳰SDL::Surface::VideoMemoryLost��ȯ����������ϡ�
+�ӥǥ����꤬����줿���ᡢ
 �������ߤǤ⤦���٥����ɤ��� blit ����ɬ�פ�����ޤ���
 
 ����� DirextX5.0 �β��ǡ�

data/doc-en/general.rsd

@@ -16,7 +16,7 @@
 
 = Ruby/SDL Outline
 Ruby/SDL is Ruby extension library for
- ((<SDL|URL:http://www.libsdl.org/>)).
+((<SDL|URL:http://www.libsdl.org/>)).
 This library enables you to create games, demo, or so on.
 
 Ruby/SDL has following functions.

data/doc-en/video.rsd

@@ -1423,7 +1423,7 @@ NAME blit
 MOD Surface
 TYPE .
 PURPOSE This performs a fast blit from the source surface to the destination surface.
-RVAL 0/-2
+RVAL 0
 
 PROTO
 blit(src,srcX,srcY,srcW,srcH,dst,dstX,dstY)
@@ -1460,8 +1460,10 @@ interact with surface blitting, as the following pseudo-code should hopefully ex
 RET
 If the blit is successful, it returns 0.
 
+EXCEPTION
 If either of the surfaces were in video memory, 
-and the blit returns -2, the video memory was lost, so it
+and the blit raises SDL::Surface::VideoMemoryLost,
+the video memory was lost, so it
 should be reloaded with artwork and re-blitted.
 
 This happens under DirectX 5.0 when the system switches away from your fullscreen application. Locking

data/rubysdl_opengl.c

@@ -17,8 +17,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
-#ifdef ENABLE_OPENGL
 #include "rubysdl.h"
+#ifdef ENABLE_OPENGL
 static VALUE GL_getAttr(VALUE class, VALUE attr)
 {
   int val;

data/rubysdl_pixel.c

@@ -48,7 +48,11 @@
 	#define clip_ymin(pnt) pnt->clip_miny
 	#define clip_ymax(pnt) pnt->clip_maxy
 #endif
-     
+
+#ifdef HAVE_SGE
+#include <sge.h>
+#endif
+
 void rubysdl_putPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color)
 {
 #ifdef HAVE_SGE

data/rubysdl_ref.en.html

@@ -26,9 +26,9 @@
 <li><a href="#label-637">MPEG playback</a></li>
 </ul>
 <h1><a name="label-1" id="label-1">Ruby/SDL Outline</a></h1><!-- RDLabel: "Ruby/SDL Outline" -->
-<p>Ruby/SDL is Ruby extension library for</p>
-<pre>((&lt;SDL|URL:http://www.libsdl.org/&gt;)).</pre>
-<p>This library enables you to create games, demo, or so on.</p>
+<p>Ruby/SDL is Ruby extension library for
+<a href="http://www.libsdl.org/">SDL</a>.
+This library enables you to create games, demo, or so on.</p>
 <p>Ruby/SDL has following functions.</p>
 <ul>
 <li><a href="#label-17">access to 2D video framebuffer</a></li>
@@ -1317,7 +1317,8 @@ else
 end</pre>
 <p>If the blit is successful, it returns 0.</p>
 <p>If either of the surfaces were in video memory, 
-and the blit returns -2, the video memory was lost, so it
+and the blit raises SDL::Surface::VideoMemoryLost,
+the video memory was lost, so it
 should be reloaded with artwork and re-blitted.</p>
 <p>This happens under DirectX 5.0 when the system switches away from your fullscreen application. Locking
 the surface will also fail until you have access to the video memory again.</p></dd>

data/rubysdl_ref.en.rd

@@ -16,7 +16,7 @@
 
 = Ruby/SDL Outline
 Ruby/SDL is Ruby extension library for
- ((<SDL|URL:http://www.libsdl.org/>)).
+((<SDL|URL:http://www.libsdl.org/>)).
 This library enables you to create games, demo, or so on.
 
 Ruby/SDL has following functions.
@@ -1420,9 +1420,10 @@ Not documented yet.
       end
 
     If the blit is successful, it returns 0.
-    
+
     If either of the surfaces were in video memory, 
-    and the blit returns -2, the video memory was lost, so it
+    and the blit raises SDL::Surface::VideoMemoryLost,
+    the video memory was lost, so it
     should be reloaded with artwork and re-blitted.
     
     This happens under DirectX 5.0 when the system switches away from your fullscreen application. Locking

data/rubysdl_ref.html

@@ -1390,9 +1390,10 @@ elsif ž
 else
   ���̤ζ�� blit
 end</pre>
-<p>�������ˤ�0���֤��ޤ���
-�ɤ��餫�Υ����ե������ӥǥ�����ˤ��ꡢ���Υ᥽�åɤ�
--2 ���֤����ϡ��ӥǥ����꤬����줿���ᡢ
+<p>�������ˤ�0���֤��ޤ���</p>
+<p>�ɤ��餫�Υ����ե������ӥǥ�����ˤ��ꡢ���Υ᥽�åɤ�
+�㳰SDL::Surface::VideoMemoryLost��ȯ����������ϡ�
+�ӥǥ����꤬����줿���ᡢ
 �������ߤǤ⤦���٥����ɤ��� blit ����ɬ�פ�����ޤ���</p>
 <p>����� DirextX5.0 �β��ǡ�
 �����ƥब���ʤ��Υե륹���꡼�󥢥ץꥱ���������ڤ괹�������ȯ�����ޤ���

data/rubysdl_ref.rd

@@ -1510,8 +1510,10 @@ R,G,B
       end
 
     �������ˤ�0���֤��ޤ���
+
     �ɤ��餫�Υ����ե������ӥǥ�����ˤ��ꡢ���Υ᥽�åɤ�
-    -2 ���֤����ϡ��ӥǥ����꤬����줿���ᡢ
+    �㳰SDL::Surface::VideoMemoryLost��ȯ����������ϡ�
+    �ӥǥ����꤬����줿���ᡢ
     �������ߤǤ⤦���٥����ɤ��� blit ����ɬ�פ�����ޤ���
     
     ����� DirextX5.0 �β��ǡ�

data/rubysdl_video.c

@@ -23,6 +23,7 @@ static VALUE cScreen = Qnil;
 static VALUE cPixelFormat = Qnil;
 static VALUE cVideoInfo = Qnil;
 static VALUE cSurface = Qnil;
+static VALUE eSurfaceLostMem = Qnil;
 
 typedef struct {
   SDL_Surface* surface;
@@ -497,9 +498,14 @@ static VALUE Surface_s_blit(VALUE klass,VALUE src,VALUE srcX,VALUE srcY,
   dr = (zero_rect_p(dst_rect))?NULL:&dst_rect;
   
   result = SDL_BlitSurface(src_surface, sr, dst_surface, dr);
-  
-  if( result == -1 ){
+
+  switch(result) {
+  case -1:
     rb_raise(eSDLError,"SDL::Surface.blit fail: %s",SDL_GetError());
+    break;
+  case -2:
+    rb_raise(eSurfaceLostMem, "SDL::Surface lost video memory");
+    break;
   }
   return INT2NUM(result);
 }
@@ -777,7 +783,8 @@ VALUE rubysdl_init_video(VALUE mSDL)
   cSurface = rb_define_class_under(mSDL,"Surface",rb_cObject);
   cScreen = rb_define_class_under(mSDL,"Screen",cSurface);
   cPixelFormat = rb_define_class_under(mSDL, "PixelFormat", rb_cObject);
-  
+  eSurfaceLostMem = rb_define_class_under(cSurface, "VideoMemoryLost",
+                                          rb_eStandardError);
   rb_define_alloc_func(cSurface, Surface_s_alloc);
   rb_undef_alloc_func(cPixelFormat);
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubysdl
 version: !ruby/object:Gem::Version 
-  version: "2.0"
+  version: 2.0.1
 platform: ruby
 authors: 
 - Ohbayashi Ippei
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-20 00:00:00 +09:00
+date: 2008-04-23 00:00:00 +09:00
 default_executable: 
 dependencies: []