ruby-sdl-ffi 0.2 → 0.3

data/ChangeLog.txt

@@ -1,3 +1,206 @@
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sun Aug 8 00:03:34 2010 -0500
+
+    Ruby-SDL-FFI 0.3 released.
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sat Aug 7 23:49:19 2010 -0500
+
+    Updated copyright on files modified in 2010.
+
+M	README.rdoc
+M	lib/ruby-sdl-ffi.rb
+M	lib/ruby-sdl-ffi/sdl.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sat Aug 7 23:19:44 2010 -0500
+
+    Fixed examples to use '#!/usr/bin/env ruby'.
+    
+    '#!/bin/env ruby' doesn't work on Mac.
+    
+    Also fixed a NameError in load_music.rb, due to FFI API changes.
+
+M	examples/load_image.rb
+M	examples/load_music.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sat Aug 7 23:13:40 2010 -0500
+
+    Updated NEWS.rdoc, README.rdoc, and ruby-sdl-ffi.gemspec for version 0.3.
+
+M	NEWS.rdoc
+M	README.rdoc
+M	ruby-sdl-ffi.gemspec
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sat Aug 7 23:11:40 2010 -0500
+
+    Improved how RUBYSDLFFI_PATH and SDL_PATHS are processed.
+
+M	lib/ruby-sdl-ffi/sdl.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Fri Aug 6 04:07:07 2010 -0500
+
+    Added SDL.set_app_name (and SDL::Mac.set_app_name).
+
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Fri Aug 6 01:35:14 2010 -0500
+
+    Removed unused Mac code and nibs.
+
+D	lib/ruby-sdl-ffi/sdl/EmptyMacMenu.nib/designable.nib
+D	lib/ruby-sdl-ffi/sdl/EmptyMacMenu.nib/keyedobjects.nib
+D	lib/ruby-sdl-ffi/sdl/MacMenu.nib/designable.nib
+D	lib/ruby-sdl-ffi/sdl/MacMenu.nib/keyedobjects.nib
+D	lib/ruby-sdl-ffi/sdl/SparseMacMenu.nib/designable.nib
+D	lib/ruby-sdl-ffi/sdl/SparseMacMenu.nib/keyedobjects.nib
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Tue Aug 3 22:53:14 2010 -0500
+
+    Extract paths from ENV["RUBYSDLFFI_PATH"] if present.
+    
+    RUBYSDLFFI_PATH should be a colon (on *nix/Mac) or semicolon
+    (Windows) separated list of paths to search for SDL libraries.
+    
+    (Alternative to setting the SDL_PATHS constant in Ruby.)
+
+M	lib/ruby-sdl-ffi/sdl.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sat Jul 10 22:53:30 2010 -0500
+
+    More progress on Mac support.
+
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Fri Jul 9 03:16:12 2010 -0500
+
+    More object-oriented style for Mac ObjC/Cocoa bindings.
+
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Thu Jul 8 05:03:35 2010 -0500
+
+    WIP experimental mac menu support
+
+A	lib/ruby-sdl-ffi/sdl/EmptyMacMenu.nib/designable.nib
+A	lib/ruby-sdl-ffi/sdl/EmptyMacMenu.nib/keyedobjects.nib
+A	lib/ruby-sdl-ffi/sdl/MacMenu.nib/designable.nib
+A	lib/ruby-sdl-ffi/sdl/MacMenu.nib/keyedobjects.nib
+A	lib/ruby-sdl-ffi/sdl/SparseMacMenu.nib/designable.nib
+A	lib/ruby-sdl-ffi/sdl/SparseMacMenu.nib/keyedobjects.nib
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Fri Jul 2 23:10:58 2010 -0500
+
+    Disable Mac magic if using rsdl or ENV["RUBYSDLFFI_NOCOCOA"] is true.
+
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Wed Jun 30 18:39:16 2010 -0500
+
+    Improved integration with the Mac window manager.
+    
+    The app now gets an application menu and dock icon, and the
+    SDL window can gain focus and have a title.
+
+M	lib/ruby-sdl-ffi/sdl/mac.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Tue Jun 29 03:45:58 2010 -0500
+
+    Preliminary support for Mac without rsdl.
+    
+    This allows the normal ruby interpreter to create a window on
+    Mac OS X. No special interpreter (i.e. rsdl) is needed.
+    However, some SDL functions have memory leaks, so we should wrap
+    those functions in NS{Push,Pop}AutoreleasePool.
+    
+    Eternal thanks to erisdiscord for pointing the way!
+
+M	lib/ruby-sdl-ffi/sdl.rb
+A	lib/ruby-sdl-ffi/sdl/mac.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Fri Jun 4 18:17:54 2010 -0500
+
+    Fixed SDL.GL_GetAttribute returning FFI::Buffer instead of integer.
+
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Sun Apr 11 05:13:04 2010 -0500
+
+    Made SDL::Palette enumerable, defined #each and #at.
+
+M	lib/ruby-sdl-ffi/sdl/video.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Thu Dec 10 14:20:10 2009 -0600
+
+    Made a nice wrapper around SDL::GetKeyRepeat().
+
+M	lib/ruby-sdl-ffi/sdl/keyboard.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Thu Dec 10 13:53:53 2009 -0600
+
+    Use Buffer instad of MemoryPointer in many places.
+    
+    There may be other places where Buffer should be used,
+    but these are the obvious ones.
+
+M	lib/ruby-sdl-ffi/gfx/rotozoom.rb
+M	lib/ruby-sdl-ffi/sdl/audio.rb
+M	lib/ruby-sdl-ffi/sdl/event.rb
+M	lib/ruby-sdl-ffi/sdl/keyboard.rb
+M	lib/ruby-sdl-ffi/sdl/mouse.rb
+M	lib/ruby-sdl-ffi/sdl/video.rb
+M	lib/ruby-sdl-ffi/ttf.rb
+
+------------------------------------------------------------
+Author: John Croisant <jacius@gmail.com>
+Date:   Thu Dec 10 02:53:55 2009 -0600
+
+    Fixed a mistake in SDL::WaitEvent().
+
+M	lib/ruby-sdl-ffi/sdl/event.rb
+
 ------------------------------------------------------------
 Author: John Croisant <jacius@gmail.com>
 Date:   Fri Oct 30 18:29:33 2009 -0500

data/NEWS.rdoc

@@ -1,5 +1,42 @@
 = NEWS
 
+
+== Ruby-SDL-FFI 0.3
+
+* Ruby-SDL-FFI can now work on Mac OS X without the need for a special
+  interpreter (i.e. rsdl). If this causes issues for you, you can
+  disable it by setting the RUBYSDLFFI_NOCOCOA environment variable to
+  "true".
+
+* Added the SDL::set_app_name() method. This sets the application name
+  in a platform-appropriate way, or does nothing if the platform is
+  not supported. On Mac OS X, it changes the text in the menu bar.
+  Support for other platforms may be added in the future.
+
+* Ruby-SDL-FFI now reads the RUBYSDLFFI_PATH environment variable for
+  additional library load paths. It should be a colon-separated
+  (Linux/Mac) or semicolon-separated (Windows) list of directories to
+  search for libraries.
+
+* The SDL::Palette class is now Enumerable. You can iterate over it
+  with #each, #collect, etc. You can also read a specific index using
+  #at (but not #[], which is reserved for struct access).
+
+* SDL.GL_GetAttribute() now returns an integer, like it should.
+  Before, it would return an FFI::Buffer.
+
+* SDL.GetKeyRepeat() is now easier to use. It returns an Array of two
+  integers: [delay, interval]. Before, you had to pass two output
+  buffers, then extract the integers afterwards.
+
+* Fixed a NoMethodError in SDL.WaitEvent().
+
+* Ruby-SDL-FFI now uses FFI::Buffer instead of FFI::MemoryPointer in
+  many places. This should give a slight performance boost on JRuby,
+  and potentially other platforms.
+
+
+
 == Ruby-SDL-FFI 0.2
 
 * The values of SDL::AUDIO_U16SYS and SDL::AUDIO_S16SYS are now
@@ -18,7 +55,6 @@
 
 
 
-
 == Ruby-SDL-FFI 0.1
 
 * Initial release of Ruby-SDL-FFI. Bindings are provided for these

data/README.rdoc

@@ -1,12 +1,12 @@
 
 = Ruby-SDL-FFI
 
-Version::    0.2
-Date::       2009-10-30
+Version::    0.3
+Date::       2010-08-08
 
 Homepage::   http://github.com/jacius/ruby-sdl-ffi/
 Author::     John Croisant <jacius@gmail.com>
-Copyright::  2009  John Croisant
+Copyright::  2009, 2010  John Croisant
 
 
 == Description
@@ -31,7 +31,7 @@ libraries (Rubygame [4], Gosu [5], etc.).
 
 == Caveats
 
-Ruby-SDL-FFI is still in VERY EARLY DEVELOPMENT STAGES. That means:
+Ruby-SDL-FFI is still in EARLY DEVELOPMENT STAGES. That means:
 
 * It may not work correctly (or at all).
 * It may not be complete.
@@ -62,7 +62,7 @@ Ruby-SDL-FFI may work with older versions, but hasn't been tried on them.
 
 Ruby-SDL-FFI is licensed under the following terms (the "MIT License"):
 
-Copyright (c) 2009 John Croisant
+Copyright (c) 2009, 2010  John Croisant
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/ruby-sdl-ffi.rb

@@ -4,7 +4,7 @@
 #
 # Ruby-SDL-FFI - Ruby-FFI bindings to SDL
 #
-# Copyright (c) 2009 John Croisant
+# Copyright (c) 2009, 2010  John Croisant
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/ruby-sdl-ffi/gfx/rotozoom.rb

@@ -54,11 +54,11 @@ module SDL
           SDL::Surface.typed_pointer
 
     func  :__rotozoomSurfaceSize, :rotozoomSurfaceSize,
-          [ :int, :int, :double, :double, :pointer, :pointer ], :void
+          [ :int, :int, :double, :double, :buffer_out, :buffer_out ], :void
 
     def self.rotozoomSurfaceSize( width, height, angle, zoom )
-      w = FFI::MemoryPointer.new( :int )
-      h = FFI::MemoryPointer.new( :int )
+      w = FFI::Buffer.new( :int )
+      h = FFI::Buffer.new( :int )
       __rotozoomSurfaceSize( width, height, angle, zoom, w, h )
       return [w.get_int(0), h.get_int(0)]
     end
@@ -70,11 +70,11 @@ module SDL
 
     func  :__rotozoomSurfaceSizeXY, :rotozoomSurfaceSizeXY,
           [ :int, :int, :double, :double, :double,
-            :pointer, :pointer ], :void
+            :buffer_out, :buffer_out ], :void
 
     def self.rotozoomSurfaceSizeXY( width, height, angle, zoomx, zoomy )
-      w = FFI::MemoryPointer.new( :int )
-      h = FFI::MemoryPointer.new( :int )
+      w = FFI::Buffer.new( :int )
+      h = FFI::Buffer.new( :int )
       __rotozoomSurfaceSizeXY( width, height, angle, zoomx, zoomy, w, h )
       return [w.get_int(0), h.get_int(0)]
     end
@@ -86,11 +86,11 @@ module SDL
 
 
     func  :__zoomSurfaceSize, :zoomSurfaceSize,
-          [ :int, :int, :double, :double, :pointer, :pointer ], :void
+          [ :int, :int, :double, :double, :buffer_out, :buffer_out ], :void
 
     def self.zoomSurfaceSize( width, height, zoomx, zoomy )
-      w = FFI::MemoryPointer.new( :int )
-      h = FFI::MemoryPointer.new( :int )
+      w = FFI::Buffer.new( :int )
+      h = FFI::Buffer.new( :int )
       __zoomSurfaceSize( width, height, zoomx, zoomy, w, h )
       return [w.get_int(0), h.get_int(0)]
     end

data/lib/ruby-sdl-ffi/sdl.rb

@@ -4,7 +4,7 @@
 #
 # Ruby-SDL-FFI - Ruby-FFI bindings to SDL
 #
-# Copyright (c) 2009 John Croisant
+# Copyright (c) 2009, 2010  John Croisant
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -35,13 +35,17 @@ module SDL
   extend NiceFFI::Library
 
   unless defined? SDL::LOAD_PATHS
-    # Check if the application has defined SDL_PATHS with some
-    # paths to check first for SDL libraries.
-    SDL::LOAD_PATHS = if defined? ::SDL_PATHS
-                        NiceFFI::PathSet::DEFAULT.prepend( ::SDL_PATHS )
-                      else
-                        NiceFFI::PathSet::DEFAULT
-                      end
+    SDL::LOAD_PATHS = NiceFFI::PathSet::DEFAULT.dup
+
+    rubysdlffi_path = ENV["RUBYSDLFFI_PATH"]
+    if rubysdlffi_path and not rubysdlffi_path.empty?
+      paths = rubysdlffi_path.split( File::PATH_SEPARATOR ).compact
+      SDL::LOAD_PATHS.prepend!(paths)
+    end
+
+    if defined? ::SDL_PATHS
+      SDL::LOAD_PATHS.prepend!(::SDL_PATHS)
+    end
   end
 
   load_library "SDL", SDL::LOAD_PATHS
@@ -59,6 +63,7 @@ this_dir = File.expand_path( File.dirname(__FILE__) )
 # because event and mouse depend on them, respectively.
 
 %w{
+  mac
   core
   keyboard
   video

data/lib/ruby-sdl-ffi/sdl/audio.rb

@@ -91,12 +91,13 @@ module SDL
 #     end
 
 
-  sdl_func  :AudioInit,       [ :string            ], :int
-  sdl_func  :AudioQuit,       [                    ], :void
-  sdl_func  :OpenAudio,       [ :pointer, :pointer ], :int
+  sdl_func  :AudioInit,       [ :string                 ], :int
+  sdl_func  :AudioQuit,       [                         ], :void
+  sdl_func  :OpenAudio,       [ :buffer_in, :buffer_out ], :int
 
   
-  func  :__AudioDriverName, "SDL_AudioDriverName", [:pointer, :int], :pointer
+  func  :__AudioDriverName, "SDL_AudioDriverName",
+        [:buffer_out, :int], :pointer
 
   def self.AudioDriverName
     b = FFI::Buffer.new(:char, 1024)

data/lib/ruby-sdl-ffi/sdl/event.rb

@@ -310,10 +310,10 @@ module SDL
   end
 
 
-  func  :__SDL_PollEvent, "SDL_PollEvent", [ :pointer ], :int
+  func  :__SDL_PollEvent, "SDL_PollEvent", [ :buffer_out ], :int
 
   def self.PollEvent()
-    mp = FFI::MemoryPointer.new( SDL::Event, 1 )
+    mp = FFI::Buffer.new( SDL::Event, 1 )
     n = __SDL_PollEvent( mp )
     if n == 0
       nil
@@ -323,24 +323,24 @@ module SDL
   end
 
 
-  func  :__SDL_WaitEvent, "SDL_WaitEvent", [ :pointer ], :int
+  func  :__SDL_WaitEvent, "SDL_WaitEvent", [ :buffer_out ], :int
 
   def self.WaitEvent()
-    mp = FFI::MemoryPointer.new( SDL::Event, 1 )
+    mp = FFI::Buffer.new( SDL::Event, 1 )
     n = __SDL_WaitEvent( mp )
     if n == 0
       nil
     else
-      _extract_event( Event.new(mp) )
+      Event.new(mp).unwrap
     end
   end
 
 
-  sdl_func  :PushEvent, [ :pointer ], :int
+  sdl_func  :PushEvent, [ :buffer_in ], :int
 
 
 
-  callback(:eventfilter_cb, [ :pointer ], :int)
+  callback(:eventfilter_cb, [ :buffer_out ], :int)
 
   func  :__SDL_SetEventFilter, "SDL_SetEventFilter",
         [ :eventfilter_cb ], :void

data/lib/ruby-sdl-ffi/sdl/keyboard.rb

@@ -47,13 +47,23 @@ module SDL
   DEFAULT_REPEAT_INTERVAL = 30
 
   sdl_func  :EnableKeyRepeat, [ :int, :int ], :int
-  sdl_func  :GetKeyRepeat,    [ :pointer, :pointer ], :void
 
 
-  func  :__SDL_GetKeyState, "SDL_GetKeyState", [ :pointer ], :pointer
+  func  :__SDL_GetKeyRepeat, "SDL_GetKeyRepeat",
+        [ :buffer_out, :buffer_out ], :void
+
+  def self.GetKeyRepeat()
+    delay = FFI::Buffer.new( :int )
+    interval = FFI::Buffer.new( :int )
+    __SDL_GetKeyRepeat( delay, interval )
+    return [delay.get_int(0), interval.get_int(0)]
+  end
+
+
+  func  :__SDL_GetKeyState, "SDL_GetKeyState", [ :buffer_out ], :pointer
 
   def self.GetKeyState()
-    numkeys = FFI::MemoryPointer.new( :int )
+    numkeys = FFI::Buffer.new( :int )
     keys = __SDL_GetKeyState( numkeys )
     return keys.get_array_of_uint8( 0, numkeys.get_int(0) )
   end

data/lib/ruby-sdl-ffi/sdl/mac.rb

@@ -0,0 +1,437 @@
+#--
+#
+# This file is one part of:
+#
+# Ruby-SDL-FFI - Ruby-FFI bindings to SDL
+#
+# Copyright (c) 2010 John Croisant
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+#++
+
+#--
+# Some bindings to Mac OS X system framework to allow Ruby-SDL-FFI
+# to create a window on Mac without a special Ruby interpreter (rsdl).
+# These are for internal use only. They are NOT part of the API.
+#
+# Eternal thanks to erisdiscord and jlnr for pointing the way!
+
+
+# Only define this stuff if running on a Mac and not using rsdl and
+# the RUBYSDLFFI_NOCOCOA environment variable is not true-ish.
+if FFI::Platform.mac? and ($0 != "rsdl") and \
+  not (/^(1|t|true|y|yes)$/i =~ ENV["RUBYSDLFFI_NOCOCOA"])
+
+  module SDL::Mac
+
+    class << self
+      
+      def make_menus( app_name )
+        ptr = FFI.find_type(:pointer)
+        
+        nsapp = Cocoa.NSApp
+        menubar = Cocoa::NSMenu.new.initWithTitle("AMainMenu")
+        nsapp.msg( "setMainMenu:", ptr, menubar )
+        
+        remove_bold_menu( nsapp, menubar )
+        make_app_menu( menubar, app_name )
+        make_window_menu( nsapp, menubar )
+
+        nil
+      end
+      
+      
+      def set_app_name( app_name )
+        ptr = FFI.find_type(:pointer)
+        
+        if @appmenuitem
+          @appmenuitem.title = app_name
+          @hideitem.title = "Hide #{app_name}" if @hideitem
+          @quititem.title = "Quit #{app_name}" if @quititem
+        else
+          make_menus( app_name )
+        end
+        
+        nil
+      end
+      
+      
+      private
+      
+      # Hack to remove the bold "ruby" menu (aka the "Apple" menu).
+      # It's a ghost menu, it haunts us but can't be modified.
+      def remove_bold_menu( nsapp, menubar )
+        item = Cocoa::NSMenuItem.new.initWithTitle("AppleMenu")
+        menu = Cocoa::NSMenu.new.initWithTitle("AppleMenu")
+        item.submenu = menu
+        
+        nsapp.msg("setAppleMenu:", FFI.find_type(:pointer), menu)
+        menubar.addItem(item)
+        menubar.removeItem(item)
+        
+        item.release
+        menu.release
+      end
+      
+      
+      # Create the main menu with the app's name (Hide, Quit, etc.)
+      def make_app_menu( menubar, app_name )
+        item = Cocoa::NSMenuItem.new.initWithTitle( app_name )
+        menu = Cocoa::NSMenu.new.initWithTitle( app_name )
+        item.submenu = menu
+        menubar.addItem(item)
+        
+        @hideitem = menu.addItemWithTitle("Hide #{app_name}", "hide:")
+        menu.addItemWithTitle("Hide Others", "hideOtherApplications:")
+        menu.addItemWithTitle("Show All", "unhideAllApplications:")
+
+        # Can't get the Quit menu item to work right yet.
+        # menu.addItem( Cocoa::NSMenuItem.separatorItem )
+        # @quititem = menu.addItemWithTitle("Quit #{app_name}", "terminate:")
+        
+        @appmenuitem = item
+        menu.release
+      end
+      
+      
+      # Create the "Window" menu (Minimize, etc.)
+      def make_window_menu( nsapp, menubar )
+        ptr = FFI.find_type(:pointer)
+        
+        item = Cocoa::NSMenuItem.new.initWithTitle("Window")
+        menu = Cocoa::NSMenu.new.initWithTitle("Window")
+        item.submenu = menu
+        menubar.addItem(item)
+        nsapp.msg("setWindowsMenu:", ptr, menu)
+        
+        menu.addItemWithTitle("Minimize", "performMiniaturize:")
+        
+        item.release
+        menu.release
+      end
+
+
+      def inspect_menu( menu, indent="" )
+        puts "%s-%s  (%s \"%s\", %d items)"%[indent, menu, menu.classname,
+                                             menu.title, menu.length]
+        menu.each do |ob|
+          if ob.hasSubmenu?
+            inspect_menu( ob.submenu, indent+"  " )
+          else
+            puts "%s  -%s  (%s \"%s\")"%[indent, ob, ob.classname, ob.title]
+          end
+        end
+      end
+
+    end
+
+
+    module ObjC
+      extend NiceFFI::Library
+      load_library 'objc'
+
+      typedef :pointer, :id
+      typedef :pointer, :sel
+      typedef :pointer, :ivar
+      typedef :pointer, :nsclass
+      callback :imp, [:id, :sel, :varargs], :id
+
+
+      class NSObject < NiceFFI::OpaqueStruct
+        def self.nsclassname; name.split("::")[-1]; end
+
+        # define msg, msg_ptr, msg_str, msg_int, msg_bool (and class methods)
+        ["", "_ptr", "_str", "_int", "_bool"].each do |suffix|
+          module_eval("
+            def msg#{suffix}( message, *args )
+              ObjC.msgSend#{suffix}( @pointer, message, *args )
+            end
+
+            def self.msg#{suffix}( message, *args )
+              ObjC.msgSend#{suffix}( ObjC.NSClass(self.nsclassname),
+                                                  message, *args )
+            end")
+        end
+
+        def inspect; msg_str("description").to_s; end
+        def nsclassname; ObjC.object_getClassName(@pointer); end
+        def release; msg("release"); end
+      end
+
+      def self.NSObject( *args )
+        NSObject.new( *args )
+      end
+
+
+      class NSClass < NSObject
+        def initialize( str_or_ptr )
+          if str_or_ptr.is_a? String
+            super( ObjC.getClass(str_or_ptr) )
+          else
+            super
+          end
+        end
+      end
+
+      def self.NSClass( *args )
+        NSClass.new( *args )
+      end
+
+
+      class NSString < NSObject
+        def initialize( str_or_ptr )
+          if str_or_ptr.is_a? String
+            super( ObjC::NSClass("NSString").\
+                     msg_ptr("stringWithUTF8String:",
+                             FFI.find_type(:string), str_or_ptr) )
+          else
+            super
+          end
+        end
+
+        def to_s
+          str = msg_ptr( "UTF8String" )
+          (str.null?) ? "(NULL)" : str.read_string()
+        end
+      end
+
+      def self.NSString( *args )
+        NSString.new( *args )
+      end
+
+
+      func :__msgSend, :objc_msgSend, [:id, :sel, :varargs], :id
+      func :__msgSend_int, :objc_msgSend, [:id, :sel, :varargs], :long
+
+      def self.msgSend( id, selector, *args )
+        selector = self.sel(selector) if selector.is_a? String
+        NSObject.new( __msgSend( id, selector, *args ) )
+      end
+      def self.msgSend_ptr( id, selector, *args )
+        selector = self.sel(selector) if selector.is_a? String
+        __msgSend( id, selector, *args )
+      end
+      def self.msgSend_str( id, selector, *args )
+        selector = self.sel(selector) if selector.is_a? String
+        NSString.new( __msgSend( id, selector, *args ) )
+      end
+      def self.msgSend_int( id, selector, *args )
+        selector = self.sel(selector) if selector.is_a? String
+        __msgSend_int( id, selector, *args )
+      end
+      def self.msgSend_bool( id, selector, *args )
+        selector = self.sel(selector) if selector.is_a? String
+        ( __msgSend_int( id, selector, *args ) == 0 ) ? false : true
+      end
+
+      func :getClass, :objc_getClass, [:string], :id
+      func :class_replaceMethod, [:nsclass, :sel, :imp, :string], :imp
+
+      func :object_getClassName, [:id], :string
+      func :object_getInstanceVariable, [:id, :string, :pointer], :ivar
+      func :object_setInstanceVariable, [:id, :string, :pointer], :ivar
+
+      func :sel_registerName, [:string], :sel
+      func :sel_getName, [:sel], :string
+
+      def self.sel( name )
+        sel_registerName( name.to_s )
+      end
+
+    end
+
+
+    module Cocoa
+      extend NiceFFI::Library
+      load_library '/System/Library/Frameworks/Cocoa.framework/Cocoa'
+
+      func :NSApplicationLoad, [], :bool
+
+      func :NSPushAutoreleasePool, [], :void
+      func :NSPopAutoreleasePool, [], :void
+
+      NSApplicationLoad()
+      NSPushAutoreleasePool()
+
+      def self.NSApp
+        @nsapp ||= ObjC::NSClass("NSApplication").msg("sharedApplication")
+      end
+
+      class NSMenu < ObjC::NSObject
+        include Enumerable
+
+        def initialize( *args )
+          if args.empty?
+            super( ObjC::NSClass("NSMenu").msg_ptr("alloc") )
+          else
+            super( args[0] )
+          end
+        end
+
+        def initWithTitle( title )
+          msg( "initWithTitle:", FFI.find_type(:pointer), ObjC::NSString(title) )
+          self
+        end
+
+        def title
+          msg_str("title")
+        end
+
+        def title=( t )
+          msg("setTitle:", FFI.find_type(:pointer), ObjC::NSString(t))
+        end
+
+        def addItem( item )
+          msg("addItem:", FFI.find_type(:pointer), item)
+          self
+        end
+
+        def addItemWithTitle( title, action=nil, keyEquivalent="" )
+          ptr = FFI.find_type(:pointer)
+          action = ObjC.sel(action) if action.is_a? String
+          item = msg_ptr( "addItemWithTitle:action:keyEquivalent:",
+                      ptr, ObjC::NSString(title),
+                      ptr, action,
+                      ptr, ObjC::NSString(keyEquivalent))
+          NSMenuItem.new(item)
+        end
+
+        def removeItem( item )
+          msg("removeItem:", FFI.find_type(:pointer), item)
+          self
+        end
+
+        def removeItemAtIndex( index )
+          msg("removeItemAtIndex:", FFI.find_type(:long), index)
+          self
+        end
+
+        def length
+          msg_int( "numberOfItems" )
+        end
+
+        def [](index)
+          Cocoa::NSMenuItem( msg_ptr("itemAtIndex:", FFI.find_type(:long), index) )
+        end
+
+        def each
+          length.times{ |i| yield self[i] }
+        end
+      end
+
+      def self.NSMenu( *args )
+        NSMenu.new( *args )
+      end
+
+
+      class NSMenuItem < ObjC::NSObject
+        def self.separatorItem
+          new( msg_ptr("separatorItem") )
+        end
+
+        def initialize( *args )
+          if args.empty?
+            super( ObjC::NSClass("NSMenuItem").msg_ptr("alloc") )
+          else
+            super( args[0] )
+          end
+        end
+
+        def initWithTitle( title, action=nil, keyEquivalent="" )
+          ptr = FFI.find_type(:pointer)
+          action = ObjC.sel(action) if action.is_a? String
+          msg( "initWithTitle:action:keyEquivalent:",
+               ptr, ObjC::NSString(title),
+               ptr, action,
+               ptr, ObjC::NSString(keyEquivalent))
+          self
+        end
+
+        def title
+          msg_str("title")
+        end
+
+        def title=( t )
+          msg("setTitle:", FFI.find_type(:pointer), ObjC::NSString(t))
+        end
+
+        def hasSubmenu?
+          msg_bool("hasSubmenu")
+        end
+
+        def submenu
+          Cocoa::NSMenu( msg_ptr("submenu") ) if hasSubmenu?
+        end
+
+        def submenu=( menu )
+          msg("setSubmenu:", FFI.find_type(:pointer), menu)
+        end
+      end
+
+      def self.NSMenuItem( *args )
+        NSMenuItem.new( *args )
+      end
+
+
+      attach_variable "vNSNibOwner", "NSNibOwner", :pointer
+      NSNibOwner =
+        ObjC::NSString( ObjC::NSString(self.vNSNibOwner).to_s )
+
+      attach_variable "vNSNibTopLevelObjects", "NSNibTopLevelObjects", :pointer
+      NSNibTopLevelObjects =
+        ObjC::NSString( ObjC::NSString(self.vNSNibTopLevelObjects).to_s )
+
+      NSAlphaShiftKeyMask = 1 << 16
+      NSShiftKeyMask      = 1 << 17
+      NSControlKeyMask    = 1 << 18
+      NSAlternateKeyMask  = 1 << 19
+      NSCommandKeyMask    = 1 << 20
+      NSNumericPadKeyMask = 1 << 21
+      NSHelpKeyMask       = 1 << 22
+      NSFunctionKeyMask   = 1 << 23
+    end
+
+
+    module HIServices
+      extend NiceFFI::Library
+      load_library '/System/Library/Frameworks/ApplicationServices.framework/Frameworks/HIServices.framework/HIServices'
+
+      class ProcessSerialNumber < NiceFFI::Struct
+        layout :highLongOfPSN, :ulong, :lowLongOfPSN, :ulong
+      end
+
+      # Some relevant constants (but not part of the same enum)
+      KCurrentProcess = 2
+      KProcessTransformToForegroundApplication = 1
+
+      func :TransformProcessType, [:pointer, :long], :long
+      func :SetFrontProcess, [:pointer], :long
+
+      # Does the magic to make the current process a front process.
+      def self.make_current_front
+        current = ProcessSerialNumber.new( [0, KCurrentProcess] )
+        TransformProcessType(current,KProcessTransformToForegroundApplication)
+        SetFrontProcess( current )
+      end
+    end
+
+  end
+end

data/lib/ruby-sdl-ffi/sdl/mouse.rb

@@ -49,29 +49,29 @@ module SDL
   end
 
   func  :__SDL_GetMouseState, "SDL_GetMouseState",
-        [ :pointer, :pointer ], :uint8
+        [ :buffer_out, :buffer_out ], :uint8
 
   # Returns [buttons, x, y].
   #  buttons: buttons currently pressed (bitmask of BUTTON_*MASK constants).
   #  x, y: current position of the mouse cursor.
   def self.GetMouseState()
-    xmp = FFI::MemoryPointer.new( :int )
-    ymp = FFI::MemoryPointer.new( :int )
+    xmp = FFI::Buffer.new( :int )
+    ymp = FFI::Buffer.new( :int )
     buttons = __SDL_GetMouseState( xmp, ymp )
     return [buttons, xmp.get_int(0), ymp.get_int(0)]
   end
 
 
   func  :__SDL_GetRelativeMouseState, "SDL_GetRelativeMouseState",
-        [ :pointer, :pointer ], :uint8
+        [ :buffer_out, :buffer_out ], :uint8
 
   # Returns [buttons, x, y].
   #  buttons: buttons currently pressed (bitmask of BUTTON_*MASK constants).
   #  x, y: movement of the mouse cursor since last call of this method.
   # 
   def self.GetRelativeMouseState()
-    xmp = FFI::MemoryPointer.new( :int )
-    ymp = FFI::MemoryPointer.new( :int )
+    xmp = FFI::Buffer.new( :int )
+    ymp = FFI::Buffer.new( :int )
     buttons = __SDL_GetRelativeMouseState( xmp, ymp )
     return [buttons, xmp.get_int(0), ymp.get_int(0)]
   end

data/lib/ruby-sdl-ffi/sdl/video.rb

@@ -4,7 +4,7 @@
 #
 # Ruby-SDL-FFI - Ruby-FFI bindings to SDL
 #
-# Copyright (c) 2009 John Croisant
+# Copyright (c) 2009, 2010  John Croisant
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -50,11 +50,30 @@ module SDL
 
   end
 
+
   class Palette < NiceFFI::Struct
     layout( :ncolors, :int,
             :colors,  :pointer )
+
+    include Enumerable
+
+    # Returns the color at the given index in the palette, as an
+    # SDL::Color instance.
+    def at( index )
+      index = (0...ncolors).to_a.at(index)
+      if index
+        SDL::Color.new( self[:colors] + index * SDL::Color.size )
+      end
+    end
+
+    # Yields an SDL::Color for each color in the palette.
+    def each
+      ncolors.times{ |i|  yield at(i)  }
+    end
+
   end
 
+
   class PixelFormat < NiceFFI::Struct
     layout( :palette,       Palette.typed_pointer,
             :BitsPerPixel,  :uint8,
@@ -252,9 +271,40 @@ module SDL
   ## Don't know how to implement this one. :-\
   # sdl_func  :ListModes, [ :pointer, :uint32 ], :pointer
 
-  sdl_func  :SetVideoMode, [ :int, :int, :int, :uint32 ],
-            SDL::Surface.typed_pointer( :autorelease => false )
 
+  func  :__SetVideoMode, "SDL_SetVideoMode", [ :int, :int, :int, :uint32 ],
+        SDL::Surface.typed_pointer( :autorelease => false )
+
+  def self.SetVideoMode( *args )
+    result = __SetVideoMode(*args)
+    if defined? SDL::Mac
+      SDL::Mac::HIServices.make_current_front
+      SDL::Mac.make_menus("ruby")
+    end
+    return result
+  end
+
+
+  # Sets the application name, if the platform supports it. This
+  # method is safe to call even on platforms which do not support it
+  # (but does nothing). Currently this method only has an effect on
+  # Mac OS X.
+  # 
+  # The effect of this method depends on the platform. On Mac OS X, it
+  # sets the text used in the main application menu.
+  # 
+  # (Note: this method does not correspond to any part of the SDL API.
+  # It communicates with the platform directly.)
+  # 
+  # Example:
+  #   SDL.set_app_name("SpaceQuest 4000")
+  # 
+  def self.set_app_name( app_name )
+    if defined? SDL::Mac
+      SDL::Mac.set_app_name( app_name )
+    end
+    nil
+  end
 
 
   func  :__UpdateRects, "SDL_UpdateRects", [ :pointer, :int, :pointer ], :void
@@ -280,7 +330,7 @@ module SDL
 
 
   func  :__SDL_GetGammaRamp, "SDL_GetGammaRamp",
-        [ :pointer, :pointer, :pointer ], :int
+        [ :buffer_out, :buffer_out, :buffer_out ], :int
 
   def self.GetGammaRamp()
     rtable = FFI::Buffer.new( :uint16, 256 )
@@ -306,12 +356,12 @@ module SDL
 
 
   func  :__SDL_GetRGB, "SDL_GetRGB",
-        [ :uint32, :pointer, :pointer, :pointer, :pointer ], :void
+        [ :uint32, :pointer, :buffer_out, :buffer_out, :buffer_out ], :void
 
   def self.GetRGB( uint32, format )
-    r = FFI::MemoryPointer.new( :uint8 )
-    g = FFI::MemoryPointer.new( :uint8 )
-    b = FFI::MemoryPointer.new( :uint8 )
+    r = FFI::Buffer.new( :uint8 )
+    g = FFI::Buffer.new( :uint8 )
+    b = FFI::Buffer.new( :uint8 )
     __SDL_GetRGB( uint32, format, r, g, b )
     return [r.get_uint8(0), g.get_uint8(0), b.get_uint8(0)]
   end
@@ -319,13 +369,14 @@ module SDL
 
 
   func  :__SDL_GetRGBA, "SDL_GetRGBA",
-        [ :uint32, :pointer, :pointer, :pointer, :pointer, :pointer ], :void
+        [ :uint32, :pointer, :buffer_out,
+          :buffer_out, :buffer_out, :buffer_out ], :void
 
   def self.GetRGBA( uint32, format )
-    r = FFI::MemoryPointer.new( :uint8 )
-    g = FFI::MemoryPointer.new( :uint8 )
-    b = FFI::MemoryPointer.new( :uint8 )
-    a = FFI::MemoryPointer.new( :uint8 )
+    r = FFI::Buffer.new( :uint8 )
+    g = FFI::Buffer.new( :uint8 )
+    b = FFI::Buffer.new( :uint8 )
+    a = FFI::Buffer.new( :uint8 )
     __SDL_GetRGBA( uint32, format, r, g, b, a )
     return [r.get_uint8(0), g.get_uint8(0), b.get_uint8(0), a.get_uint8(0)]
   end
@@ -358,10 +409,10 @@ module SDL
 
   sdl_func  :SetClipRect, [ :pointer, :pointer ], SDL::BOOL
 
-  func  :__SDL_GetClipRect, "SDL_GetClipRect", [ :pointer, :pointer ], :void
+  func  :__SDL_GetClipRect, "SDL_GetClipRect", [ :pointer, :buffer_out ], :void
 
   def self.GetClipRect( surface )
-    mp = FFI::MemoryPointer.new( Rect )
+    mp = FFI::Buffer.new( Rect )
     __SDL_GetClipRect( surface, mp )
     return Rect.new( mp )
   end
@@ -397,15 +448,15 @@ module SDL
 
 
   func  :__GL_GetAttribute, "SDL_GL_GetAttribute",
-        [ SDL::GLATTR, :pointer ], :int
+        [ SDL::GLATTR, :buffer_out ], :int
 
   def self.GL_GetAttribute( attrib )
-    value = FFI::Buffer.new( :int )
-    result = __GL_GetAttribute( attrib, value )
+    buffer = FFI::Buffer.new( :int )
+    result = __GL_GetAttribute( attrib, buffer )
     if( result == -1 )
       return nil
     else
-      return value
+      return buffer.get_int(0)
     end
   end
 
@@ -420,11 +471,11 @@ module SDL
   sdl_func  :WM_SetCaption, [ :string, :string ], :void
 
   func  :__SDL_WM_GetCaption, "SDL_WM_GetCaption",
-        [ :pointer, :pointer ], :void
+        [ :buffer_out, :buffer_out ], :void
 
   def self.WM_GetCaption()
-    title = FFI::MemoryPointer.new( :pointer )
-    icont = FFI::MemoryPointer.new( :pointer )
+    title = FFI::Buffer.new( :pointer )
+    icont = FFI::Buffer.new( :pointer )
     __SDL_WM_GetCaption( title, icont )
     return [ title.get_pointer(0).get_string(0),
              icont.get_pointer(0).get_string(0) ]

data/lib/ruby-sdl-ffi/ttf.rb

@@ -103,15 +103,15 @@ module SDL
 
 
     func  :__GlyphMetrics, "TTF_GlyphMetrics",
-          [ :pointer, :uint16, :pointer, :pointer,
-            :pointer, :pointer, :pointer ], :int
+          [ :pointer, :uint16, :buffer_out, :buffer_out,
+            :buffer_out, :buffer_out, :buffer_out ], :int
 
     # Returns:: [minx, maxx, miny, maxy, advance], or nil on failure.
     # 
     def self.GlyphMetrics( font, char )
-      minx, maxx = FFI::MemoryPointer.new(:int), FFI::MemoryPointer.new(:int)
-      miny, maxy = FFI::MemoryPointer.new(:int), FFI::MemoryPointer.new(:int)
-      advance = FFI::MemoryPointer.new(:int)
+      minx, maxx = FFI::Buffer.new(:int), FFI::Buffer.new(:int)
+      miny, maxy = FFI::Buffer.new(:int), FFI::Buffer.new(:int)
+      advance = FFI::Buffer.new(:int)
       result = __GlyphMetrics( font, char, minx, maxx, miny, maxy, advance )
       if( result == 0 )
         return [minx.get_int(0), maxx.get_int(0),
@@ -124,11 +124,11 @@ module SDL
 
 
     func  :__SizeText, "TTF_SizeText",
-          [ :pointer, :string, :pointer, :pointer  ], :int
+          [ :pointer, :string, :buffer_out, :buffer_out  ], :int
 
     def self.SizeText( font, text )
-      w = FFI::MemoryPointer.new( :int )
-      h = FFI::MemoryPointer.new( :int )
+      w = FFI::Buffer.new( :int )
+      h = FFI::Buffer.new( :int )
       __SizeText( font, text, w, h )
       return [w.get_int(0),h.get_int(0)]
     end
@@ -136,11 +136,11 @@ module SDL
 
 
     func  :__SizeUTF8, "TTF_SizeUTF8",
-          [ :pointer, :string, :pointer, :pointer  ], :int
+          [ :pointer, :string, :buffer_out, :buffer_out  ], :int
 
     def self.SizeUTF( font, text )
-      w = FFI::MemoryPointer.new( :int )
-      h = FFI::MemoryPointer.new( :int )
+      w = FFI::Buffer.new( :int )
+      h = FFI::Buffer.new( :int )
       __SizeUTF( font, text, w, h )
       return [w.get_int(0),h.get_int(0)]
     end
@@ -148,11 +148,11 @@ module SDL
 
 
     func  :__SizeUNICODE, "TTF_SizeUNICODE",
-          [ :pointer, :pointer, :pointer, :pointer  ], :int
+          [ :pointer, :pointer, :buffer_out, :buffer_out  ], :int
 
     def self.SizeUNICODE( font, text )
-      w = FFI::MemoryPointer.new( :int )
-      h = FFI::MemoryPointer.new( :int )
+      w = FFI::Buffer.new( :int )
+      h = FFI::Buffer.new( :int )
       __SizeUNICODE( font, text, w, h )
       return [w.get_int(0),h.get_int(0)]
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-sdl-ffi
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - John Croisant
@@ -9,19 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -05:00
+date: 2010-08-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nice-ffi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
         version: "0.2"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: |
   Ruby-SDL-FFI is a low-level binding to SDL and related libraries
   using Ruby-FFI. It provides very basic access to SDL from
@@ -48,6 +58,7 @@ files:
 - lib/ruby-sdl-ffi/sdl/cdrom.rb
 - lib/ruby-sdl-ffi/sdl/video.rb
 - lib/ruby-sdl-ffi/sdl/core.rb
+- lib/ruby-sdl-ffi/sdl/mac.rb
 - lib/ruby-sdl-ffi/sdl/keysyms.rb
 - lib/ruby-sdl-ffi/sdl/timer.rb
 - lib/ruby-sdl-ffi/sdl/audio.rb
@@ -72,17 +83,24 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 31
+      segments: 
+      - 1
+      - 8
       version: "1.8"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - SDL       >= 1.2.13
 - SDL_image >= 1.2.7  (optional)
@@ -90,7 +108,7 @@ requirements:
 - SDL_mixer >= 1.2.8  (optional)
 - SDL_ttf   >= 2.0.9  (optional)
 rubyforge_project: ruby-sdl-ffi
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby-FFI bindings to SDL