rubysdl 1.3.1 → 2.0

data/MANIFEST

@@ -8,12 +8,15 @@ depend
 extconf.rb
 lib/rubysdl_aliases.rb
 lib/sdl.rb
+lib/rubysdl_compatible_ver1.rb
 rubysdl.h
 rubysdl_const_list.txt
 rubysdl_doc_old.rd
 rubysdl_ref.rd
 rubysdl_ref.html
-rubysdl_doc.en.rd
+rubysdl_ref.en.rd
+rubysdl_ref.en.html
+rubysdl_doc_old.en.rd
 rubysdl_event.c
 rubysdl_event_key.c
 rubysdl_main.c
@@ -29,7 +32,6 @@ rubysdl_joystick.c
 rubysdl_image.c
 rubysdl_opengl.c
 rubysdl_pixel.c
-rubysdl_event2.c
 rubysdl_smpeg.c
 rubysdl_sdlskk.c
 rubysdl_kanji.c
@@ -64,6 +66,9 @@ sample/bfont.rb
 sample/font.bmp
 sample/kanji.rb
 sample/sample.ttf
+sample/load_from_io.rb
+sample/icon.png
+sample/icon.bmp.gz
 doc/Makefile
 doc/rsd.rb
 doc/cdrom.rsd
@@ -79,3 +84,18 @@ doc/sdlskk.rsd
 doc/time.rsd
 doc/video.rsd
 doc/wm.rsd
+doc-en/Makefile
+doc-en/cdrom.rsd
+doc-en/collision.rsd
+doc-en/event.rsd
+doc-en/font.rsd
+doc-en/general.rsd
+doc-en/init.rsd
+doc-en/joystick.rsd
+doc-en/mixer.rsd
+doc-en/mpeg.rsd
+doc-en/opengl.rsd
+doc-en/sdlskk.rsd
+doc-en/time.rsd
+doc-en/video.rsd
+doc-en/wm.rsd

data/NEWS.en

@@ -1,3 +1,83 @@
+version 2.0
+some changes for ruby 1.9
+fix SDL_RWops code
+Fix/Improve documents
+Improve English documents
+Add following methods
+* SDL::Surface#load_bmp_from_string
+* SDL::Surface#load_from_string
+* SDL::Mixer::Wave#load_from_string
+* SDL::Mixer.playing_channels
+
+version 2.0 alpha 1
+Remove following methods
+* SDL::Surface#draw_ellispe
+* SDL::Surface#draw_filled_ellispe
+* SDL::Surface#rotate_surface
+* SDL::Surface#rotate_scaled_surface
+* SDL.rotate
+* SDL.rotate_blit
+* SDL.rotate_scaled_blit
+* SDL.rotate_xy_scaled
+Remove Old SDL::Event, and rename SDL::Event2 to SDL::Event
+Change internal implementation
+Add following methods
+* SDL::Surface#destroy
+* SDL::Joystick#close
+* SDL::Mixer#close
+* SDL::Mixer::Wave#destroy
+* SDL::Mixer::Music#destroy
+Add module SDL::GL
+Change behavior of following methods
+* SDL::Surface#draw_line
+* SDL::Surface#draw_circle
+* SDL::Surface#draw_rect
+* SDL::Surface#draw_ellipse
+* SDL::Surface#draw_bezier
+Rename following methods
+* SDL.auto_lock? -> SDL::Surface.auto_lock?
+* SDL.auto_lock_on -> SDL::Surface.auto_lock_on
+* SDL.auto_lock_off -> SDL::Surface.auto_lock_off
+* SDL.transform_blit -> SDL::Surface#transform_blit
+* SDL.blitSurface -> SDL::Surface.blit
+* SDL.get_video_surface -> SDL::Screen.get
+* SDL.set_video_mode -> SDL::Screen.open
+* SDL.check_video_mode -> SDL::Screen.check_mode
+* SDL.list_modes -> SDL::Screen.list_modes
+* SDL.set_gamma -> SDL::Screen.set_gamma
+* SDL.get_gamma_ramp -> SDL::Screen.get_gamma_ramp
+* SDL.set_gamma_ramp -> SDL::Screen.set_gamma_ramp
+* SDL.video_driver_name -> SDL::Screen.driver_name
+* SDL.video_info -> SDL::Screen.info
+* SDL::Surface#get_rgb -> SDL::PixelFormat#get_rgb
+* SDL::Surface#get_rgba -> SDL::PixelFormat#get_rgba
+* SDL::Surface#map_rgb -> SDL::PixelFormat#map_rgb
+* SDL::Surface#map_rgba -> SDL::PixelFormat#map_rgba
+* SDL::Surface#get_palette -> SDL::PixelFormat#palette
+* SDL::Surface#bpp -> SDL::PixelFormat#bpp
+* SDL::Surface#bytes_per_pixel -> SDL::PixelFormat#bytes_per_pixel
+* SDL::Surface#[RGBA]mask -> SDL::PixelFormat#[RGBA]mask
+* SDL::Surface#[RGBA]shift -> SDL::PixelFormat#[RGBA]shift
+* SDL::Surface#[RGBA]loss -> SDL::PixelFormat#[RGBA]loss
+* SDL::Surface#colorkey -> SDL::PixelFormat#colorkey
+* SDL::Surface#alpha -> SDL::PixelFormat#alpha
+* SDL.get_GL_attr -> SDL::GL.get_attr
+* SDL.set_GL_attr -> SDL::GL.set_attr
+* SDL.GL_swap_buffers -> SDL::GL.swap_buffers
+Move following constants
+* GL_RED_SIZE -> GL::RED_SIZE
+* GL_GREEN_SIZE -> GL::GREEN_SIZE
+* GL_BLUE_SIZE -> GL::BLUE_SIZE
+* GL_ALPHA_SIZE -> GL::ALPHA_SIZE
+* GL_BUFFER_SIZE -> GL::BUFFER_SIZE
+* GL_DOUBLEBUFFER -> GL::DOUBLEBUFFER
+* GL_DEPTH_SIZE -> GL::DEPTH_SIZE
+* GL_STENCIL_SIZE -> GL::STENCIL_SIZE
+* GL_ACCUM_RED_SIZE -> GL::ACCUM_RED_SIZE
+* GL_ACCUM_GREEN_SIZE -> GL::ACCUM_GREEN_SIZE
+* GL_ACCUM_BLUE_SIZE -> GL::ACCUM_BLUE_SIZE
+* GL_ACCUM_ALPHA_SIZE -> GL::ACCUM_ALPHA_SIZE
+
 version 1.3.1
 Fix the bug that we cannot compile when SMEPG is installed but SDL_mixer is not installed.(1.2.0's change is incomplete)
 Add following methods

data/NEWS.ja

@@ -1,3 +1,86 @@
+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
+$B%I%-%e%a%s%H$N2~A1(B($BFC$K1Q8lHG(B)
+$B0J2<$N%a%=%C%I$rDI2C(B
+* SDL::Surface#load_bmp_from_string
+* SDL::Surface#load_from_string
+* SDL::Mixer::Wave#load_from_string
+* SDL::Mixer.playing_channels
+
+version 2.0 alpha 1
+$BFbIt9=B$$rBgI}$KJQ99(B
+SDL::Event2$B$r(BSDL::Event$B$KJQ99$7!"$+$D$F$N(BSDL::Event$B$OGQ;_(B
+$B0J2<$N%a%=%C%I$rGQ;_(B
+* SDL::Surface#draw_ellispe
+* SDL::Surface#draw_filled_ellispe
+* SDL::Surface#rotate_surface
+* SDL::Surface#rotate_scaled_surface
+* SDL.rotate
+* SDL.rotate_blit
+* SDL.rotate_scaled_blit
+* SDL.rotate_xy_scaled
+$B0J2<$N%a%=%C%I$rDI2C(B
+* SDL::Surface#destroy
+* SDL::Joystick#close
+* SDL::Mixer#close
+* SDL::Mixer::Wave#destroy
+* SDL::Mixer::Music#destroy
+SDL::GL$B%b%8%e!<%k$rDI2C(B
+SDL::PixelFormat(SDL::Surface::Format$B$N$[$&$,NI$$!)(B)$B$N<BAu$rJQ99(B
+Surface$B$N%U%)!<%^%C%H$r;XDj$9$k$N$K(BSDL::PixelFormat$B$,;H$($k$h$&$KJQ99(B
+$B0J2<$NIA2h%a%=%C%I$N(B(antialias, fill, alpha$B$r$"$i$o$9(B)$B0z?t$rDI2C(B
+* SDL::Surface#draw_line
+* SDL::Surface#draw_circle
+* SDL::Surface#draw_rect
+* SDL::Surface#draw_ellipse
+* SDL::Surface#draw_bezier
+$B0J2<$N$h$&$K%a%=%C%I$r0\F0!"5lMh$N$b$N$bMxMQ$O$G$-$^$9(B
+* SDL.auto_lock? -> SDL::Surface.auto_lock?
+* SDL.auto_lock_on -> SDL::Surface.auto_lock_on
+* SDL.auto_lock_off -> SDL::Surface.auto_lock_off
+* SDL.transform_blit -> SDL::Surface#transform_blit
+* SDL.blitSurface -> SDL::Surface.blit
+* SDL.get_video_surface -> SDL::Screen.get
+* SDL.set_video_mode -> SDL::Screen.open
+* SDL.check_video_mode -> SDL::Screen.check_mode
+* SDL.list_modes -> SDL::Screen.list_modes
+* SDL.set_gamma -> SDL::Screen.set_gamma
+* SDL.get_gamma_ramp -> SDL::Screen.get_gamma_ramp
+* SDL.set_gamma_ramp -> SDL::Screen.set_gamma_ramp
+* SDL.video_driver_name -> SDL::Screen.driver_name
+* SDL.video_info -> SDL::Screen.info
+* SDL::Surface#get_rgb -> SDL::PixelFormat#get_rgb
+* SDL::Surface#get_rgba -> SDL::PixelFormat#get_rgba
+* SDL::Surface#map_rgb -> SDL::PixelFormat#map_rgb
+* SDL::Surface#map_rgba -> SDL::PixelFormat#map_rgba
+* SDL::Surface#get_palette -> SDL::PixelFormat#palette
+* SDL::Surface#bpp -> SDL::PixelFormat#bpp
+* SDL::Surface#bytes_per_pixel -> SDL::PixelFormat#bytes_per_pixel
+* SDL::Surface#[RGBA]mask -> SDL::PixelFormat#[RGBA]mask
+* SDL::Surface#[RGBA]shift -> SDL::PixelFormat#[RGBA]shift
+* SDL::Surface#[RGBA]loss -> SDL::PixelFormat#[RGBA]loss
+* SDL::Surface#colorkey -> SDL::PixelFormat#colorkey
+* SDL::Surface#alpha -> SDL::PixelFormat#alpha
+* SDL.get_GL_attr -> SDL::GL.get_attr
+* SDL.set_GL_attr -> SDL::GL.set_attr
+* SDL.GL_swap_buffers -> SDL::GL.swap_buffers
+$B0J2<$N$h$&$KDj?t$r0\F0!#5lMh$N$b$N$bMxMQ$O$G$-$^$9!#(B
+* GL_RED_SIZE -> GL::RED_SIZE
+* GL_GREEN_SIZE -> GL::GREEN_SIZE
+* GL_BLUE_SIZE -> GL::BLUE_SIZE
+* GL_ALPHA_SIZE -> GL::ALPHA_SIZE
+* GL_BUFFER_SIZE -> GL::BUFFER_SIZE
+* GL_DOUBLEBUFFER -> GL::DOUBLEBUFFER
+* GL_DEPTH_SIZE -> GL::DEPTH_SIZE
+* GL_STENCIL_SIZE -> GL::STENCIL_SIZE
+* GL_ACCUM_RED_SIZE -> GL::ACCUM_RED_SIZE
+* GL_ACCUM_GREEN_SIZE -> GL::ACCUM_GREEN_SIZE
+* GL_ACCUM_BLUE_SIZE -> GL::ACCUM_BLUE_SIZE
+* GL_ACCUM_ALPHA_SIZE -> GL::ACCUM_ALPHA_SIZE
+OpenGL$B4XO"$N%I%-%e%a%s%H$rDI2C(B
+
+
 version 1.3.1
 SMPEG$BM-!"(BSDL_mixer$BL5$N>l9g$NLdBj$r=$@5(B
 $B0J2<$N%a%=%C%I$rDI2C(B

data/README.en

@@ -1,5 +1,5 @@
 
-Ruby/SDL 1.3.1
+Ruby/SDL 2.0
 Ohbayashi Ippei
 
 1 What's Ruby/SDL
@@ -106,6 +106,7 @@ install on Linux
   SDLdoc Japanese translation project : base of Ruby/SDL's reference manual
   Hara Yutaka: Sample TrueTypeFont
   Members of #sdl-fan-jp @ FriendChat: bug reports and advices
+  Cyross: Windows version maintainance
 
 9 OTHER
   Some functions, especially SDL::MPEG methods and pallete handling methods,

data/README.ja

@@ -1,5 +1,5 @@
 
-Ruby/SDL 1.3.1
+Ruby/SDL 2.0
 ���Ӱ�ʿ
 
 1 ����
@@ -152,7 +152,7 @@ FreeBSD
   * SDLdoc ���ܸ������ץ��������Ȥˤ�����ä��ߤʤ���
   * ����ץ��ѤΥե���Ȥ��󶡤��Ƥ��줿������
   * #sdl-fan-jp@friend chat �Τߤʤ���
-
+  * Windows�Ǥδ����򤷤Ƥ������륵����������
 9 ����¾
   �ޤ��ƥ��Ȥ���Ƥ��ʤ���ǽ��¿������ޤ�(�ѥ�åȴ�Ϣ
   ��MPEG��Ϣ�Υ᥽�åɤ����Ĥ��ʤ�)��

data/doc-en/Makefile

@@ -0,0 +1,18 @@
+
+RSD = ruby ../doc/rsd.rb -e
+RDFILES = general.rd init.rd video.rd opengl.rd wm.rd event.rd joystick.rd cdrom.rd mixer.rd time.rd font.rd collision.rd sdlskk.rd mpeg.rd
+RD2 = rd2
+RD2OPT = -r rd/rd2html-lib.rb --html-lang=ja --html-charset=EUC-JP
+
+
+rubysdl_ref.en.html: rubysdl_ref.en.rd
+	$(RD2) $(RD2OPT) --html-title="Ruby/SDL Reference Manual" $< > $@ || rm -f $@
+
+rubysdl_ref.en.rd: $(RDFILES)
+	cat $(RDFILES) > rubysdl_ref.en.rd
+
+%.rd: %.rsd
+	$(RSD) < $< > $@
+
+install: rubysdl_ref.en.html
+	cp rubysdl_ref.en.html rubysdl_ref.en.rd ..

data/doc-en/cdrom.rsd

@@ -0,0 +1,417 @@
+= CD-ROM
+* ((<CD-ROM outline>))
+* ((<SDL::CD>))
+* ((<CD-ROM methods>))
+TOC
+
+== CD-ROM outline
+SDL supports audio control of up to 32 local CD-ROM drives at once.
+
+You use this API to perform all the basic functions of a CD player, including
+listing the tracks, playing, stopping, and ejecting the CD-ROM. (Currently,
+multi-changer CD drives are not supported.)
+
+Before you call any of the SDL CD-ROM functions, you must first call
+@[init](SDL::INIT_CDROM),
+which scans the system for CD-ROM drives, and sets the program
+up for audio control.
+
+After you have initialized the library, you can find out how many drives are
+available using the @[CD.num_drives]. The first drive listed is the
+system default CD-ROM drive. After you have chosen a drive, and have opened it
+with @[CD.open], you can check the status and start playing if there's a CD in
+the drive.
+
+A CD-ROM is organized into one or more tracks, each consisting of a certain number
+of "frames". Each frame is ~2K in size, and at normal playing speed,
+a CD plays 75(SDL::CD::FPS)
+frames per second. SDL works with the number of frames on a CD, but this can
+easily be converted to the more familiar minutes/seconds format by using
+@[CD.frames_to_msf].
+
+== SDL::CD
+This class represents opened CDROM device and stores information on the
+layout of the tracks on the disc.
+
+== CD-ROM methods
+%%%
+NAME num_drives
+MOD CD
+TYPE .
+PURPOSE Returns the number of CD-ROM drives on the system.
+RVAL Integer
+
+PROTO
+num_drives
+numDrives
+
+DESC
+Returns the number of CD-ROM drives on the system.
+
+SEEALSO
+CD.open
+
+%%
+NAME index_name
+MOD CD
+TYPE .
+PURPOSE Returns a human-readable, system-dependent identifier for the CD-ROM.
+RVAL String
+
+PROTO
+index_name(drive)
+indexName(drive)
+
+DESC
+Returns a human-readable, system-dependent identifier for the CD-ROM. $[drive]
+is the index of the drive.
+Drive indices start to 0 and end at @[CD.num_drives]-1.
+
+Examples of return strings.
+* "/dev/cdrom"
+* "E:"
+* "/dev/disk/ide/1/master"
+
+SEEALSO
+CD.num_drives
+
+%%
+NAME open
+MOD CD
+TYPE .
+PURPOSE Opens a CD-ROM drive for access.
+RVAL SDL::CD
+
+PROTO
+open(drive)
+
+DESC
+Opens a CD-ROM drive for access. It returns @[CD] object on success.
+
+Drives are numbered starting with 0. Drive 0 is the system default CD-ROM.
+
+EXCEPTION
+Raise @[Error] if the drive was invalid or busy.
+
+EXAMPLE
+SDL.init SDL::INIT_CDROM
+
+# Check for CD drives
+if SDL::CD.num_drives == 0
+  # None found
+  STDERR.print "No CDROM devices available\n"
+  exit 255
+end
+
+begin
+  # Open the default drive
+  cdrom = SDL::CD.open(0)
+rescue SDL::Error
+  STDERR.puts "Couldn't open drive"
+  exit 255
+end
+
+# Print volume info
+printf "Name: %s\n", SDL::CD.index_name(0)
+printf "Tracks: %d\n", cdrom.num_tracks
+num_tracks.times do |cur_track|
+  min, sec, frame = SDL::CD.frames_to_msf(cdrom.track_length(cur_track))
+  printf "\tTrack %d: Length %d:%d\n", cur_track, min, sec
+end
+
+%%
+NAME status
+MOD CD
+TYPE #
+PURPOSE Returns the current status of the given drive.
+RVAL UINT
+
+PROTO
+status
+
+DESC
+This method returns the current status of the given drive. Status is described
+like so:
+* SDL::CD::TRAYEMPTY
+* SDL::CD::STOPPED
+* SDL::CD::PLAYING
+* SDL::CD::PAUSED
+* SDL::CD::ERROR
+
+If the drive has a CD in it,
+@[current_track], @[current_frame], @[num_tracks], @[track_type],
+and @[track_length] are updated.
+
+EXAMPLE
+def play_track(track)
+  raise "not cd in drive" unless $cdrom.in_drive?
+
+  # clamp to the actual number of tracks on the CD
+  track = $cdrom.num_tracks-1 if track >= $cdrom.num_tracks
+  $cdrom.play_tracks(track, 0, 1, 0)
+end
+
+%%
+NAME play
+MOD CD
+TYPE #
+PURPOSE Play a CD
+
+PROTO
+play(start, length)
+
+DESC
+Plays the given cdrom, starting a frame $[start] for length $[frames].
+
+EXCEPTION *
+
+SEEALSO
+CD#play_tracks
+
+%%
+NAME play_tracks
+MOD CD
+TYPE #
+PURPOSE Play the given CD track(s)
+
+PROTO
+play_tracks(start_track, start_frame, ntracks, nframes)
+
+DESC
+This method plays the given CD starting at track $[start_track], for $[ntracks]
+tracks.
+
+$[start_frame] is the frame offset, from the beginning of the $[start_track],
+at which to start. $nframes] is the frame offset, from the beginning
+of the last track
+($[start_track]+$[ntracks]), at which to end playing.
+
+THis methods should only be called after calling @[CD#status] to get track
+information about the CD.
+
+NOTES
+Data tracks are ignored.
+
+EXCEPTION *
+
+EXAMPLE
+# assuming cdrom is a previously opened device
+# Play the entire CD
+if cdrom.in_drive?
+  cdrom.play_tracks 0, 0, 0, 0
+end
+# Play the first track
+if cdrom.in_drive?
+  cdrom.play_tracks 0, 0, 1, 0
+end
+# 2 Play first 15 seconds of the 2nd track
+if cdrom.in_drive?
+  cdrom.play_tracks 1, 0, 0, SDL::CD::FPS*15
+end
+SEEALSO
+CD#play
+CD#status
+
+%%
+NAME pause
+MOD CD
+TYPE #
+PURPOSE Pauses a CDROM
+
+PROTO
+pause
+
+DESC
+Pauses play on the given cdrom.
+
+EXCEPTION *
+
+SEEALSO
+CD#play
+CD#resume
+
+%%
+NAME resume
+MOD CD
+TYPE #
+PURPOSE Resumes a CDROM
+
+PROTO
+resume
+
+DESC
+Resumes play on the given cdrom.
+
+EXCEPTION *
+
+SEEALSO
+CD#play
+CD#pause
+
+%%
+NAME stop
+MOD CD
+TYPE #
+PURPOSE Stops a CDROM
+
+PROTO
+stop
+
+DESC
+Stops play on the given cdrom.
+
+EXCEPTION *
+
+SEEALSO
+CD#play
+
+%%
+NAME eject
+MOD CD
+TYPE #
+PURPOSE Ejects a CDROM
+
+PROTO
+eject
+
+DESC
+Ejects the given cdrom.
+
+EXCEPTION *
+
+%%
+NAME num_tracks
+MOD CD
+TYPE #
+PURPOSE Gets number of tracks on the CD.
+RVAL Integer
+
+PROTO
+num_tracks
+numTracks
+
+DESC
+Returns the number of tracks on the given cdrom.
+@[CD#status] updates this value.
+
+SEEALSO
+CD#status
+
+%%
+NAME current_track
+MOD CD
+TYPE #
+PURPOSE Gets current track.
+RVAL Integer
+
+PROTO
+current_track
+currentTrack
+
+DESC
+Returns the currently playing track.
+@[CD#status] updates this value.
+
+SEEALSO
+CD#status
+
+%%
+NAME current_frame
+MOD CD
+TYPE #
+PURPOSE Gets current frame offset within the track
+RVAL Integer
+
+PROTO
+current_frame
+currentFrame
+
+DESC
+Returns the current frame offset with the playing track.
+@[CD#status] updates this value.
+
+SEEALSO
+CD#status
+
+%%
+NAME track_type
+MOD CD
+TYPE #
+PURPOSE Gets track type.
+RVAL UINT
+
+PROTO
+track_type(track)
+trackType(track)
+
+DESC
+Returns the track type in $[track].
+SDL::CD::AUDIO_TRACK or SDL::CD::DATA_TRACK is returned.
+
+%%
+NAME track_length
+MOD CD
+TYPE #
+PURPOSE Gets length of track.
+RVAL Integer
+
+PROTO
+track_length(track)
+trackLength(track)
+
+DESC
+Returns length, in frame, of $[track].
+
+%%
+NAME in_drive?
+MOD CD
+TYPE #
+PURPOSE Check disc in drive
+RVAL true/false
+
+PROTO
+in_drive?
+
+DESC
+Returns true if drive is not empty, otherwise returns false.
+
+SEEALSO
+CD#status
+
+%%
+NAME frames_to_msf
+MOD CD
+TYPE .
+PURPOSE Convert frames into minitus/seconds/frames
+RVAL [Integer, Integer, Integer]
+
+PROTO
+frames_to_msf(frames)
+framesToMSF(frames)
+
+DESC
+Converts frames into minitus/seconds/frames, and returns an array like
+[min, sec, frames].
+
+SEEALSO
+CD.msf_to_frames
+
+%%
+NAME msf_to_frames
+MOD CD
+TYPE .
+PURPOSE Convert minitus/seconds/frames into frames
+RVAL Integer
+
+PROTO
+msf_to_frames(min, sec, frames)
+MSFToFrames(min, sec, frames)
+
+DESC
+Convert minitus/seconds/frames into frames and returns frames.
+
+SEEALSO
+CD.frames_to_msf
+
+
+