sdl2_ffi 0.0.5 → 0.0.6

data/lib/sdl2/color.rb

@@ -11,14 +11,19 @@ module SDL2
 
     member_readers *members
     member_writers *members
-    
+
+    def self.create(values = {})
+      values[:a] ||= ALPHA_OPAQUE
+       super(values)
+    end
+
     # If possible, convert argument into a SDL::Color
     def self.cast(something)
       if something.kind_of? Array
         something.map!(&:to_i)
         result = new
         result.set(*something)
-        
+
         return result
       else
         return super
@@ -37,7 +42,7 @@ module SDL2
         self.send("#{c}=", color.send(c))
       end
     end
-    
+
     def to_a
       [r, g, b, a]
     end

data/lib/sdl2/cpuinfo.rb

@@ -4,15 +4,35 @@ module SDL2
   
   CACHELINE_SIZE = 128
   
-  api :SDL_GetCPUCount, [], :int
-  api :SDL_GetCPUCacheLineSize, [], :int
-  api :SDL_HasRDTSC, [], :bool
-  api :SDL_HasAltiVec, [], :bool
-  api :SDL_Has3DNow, [], :bool
-  api :SDL_HasSSE, [], :bool
-  api :SDL_HasSSE2, [], :bool
-  api :SDL_HasSSE3, [], :bool
-  api :SDL_HasSSE41, [], :bool
-  api :SDL_HasSSE42, [], :bool
+  ##
+	#
+	api :SDL_GetCPUCount, [], :int
+  ##
+	#
+	api :SDL_GetCPUCacheLineSize, [], :int
+  ##
+	#
+	api :SDL_HasRDTSC, [], :bool
+  ##
+	#
+	api :SDL_HasAltiVec, [], :bool
+  ##
+	#
+	api :SDL_Has3DNow, [], :bool
+  ##
+	#
+	api :SDL_HasSSE, [], :bool
+  ##
+	#
+	api :SDL_HasSSE2, [], :bool
+  ##
+	#
+	api :SDL_HasSSE3, [], :bool
+  ##
+	#
+	api :SDL_HasSSE41, [], :bool
+  ##
+	#
+	api :SDL_HasSSE42, [], :bool
   
 end

data/lib/sdl2/engine.rb

@@ -0,0 +1,52 @@
+require 'sdl2'
+
+module SDL2
+
+  # Input/Output engine.
+  class Engine
+
+    def initialize(opts = {})
+
+      # TODO: ??
+    end
+
+    def quit()
+
+    end
+
+    attr_reader :surface
+
+    def on_handlers
+      @on_handlers ||= {}
+    end
+
+    def on(*args, &block)
+      raise "Must specify EVENTTYPEs to handle" if args.empty?
+      raise "Must give block to call on event" if args.empty? unless block.nil?
+      args.each do |event_hash|
+        raise "Expected Hash: #{event_hash.inspect}" unless event_hash.kind_of? Hash
+        on_handlers[event_hash] = block
+      end
+    end
+
+    def handle_event(event)
+
+      on_handlers.each_pair do |event_hash, handler|
+
+        return true if handler.call(event) if event == event_hash
+
+      end
+      
+      return false # if we get to here.
+    end
+
+    # This routine should be overriden.
+    def paint_to(surface)
+      false
+    end
+
+    protected
+
+  end
+
+end

data/lib/sdl2/engine/block_engine.rb

@@ -0,0 +1,27 @@
+require 'sdl2/engine'
+
+module SDL2
+
+  class Engine
+
+    class BlockEngine < Engine
+
+      def initialize(opts={})
+        super(opts)
+        painter = opts[:painter]
+      end
+
+      attr_accessor :painter
+
+      def paint_to(surface)
+        unless painter.nil?
+          return painter.call(surface)
+        else
+          return super(surface)
+        end
+      end
+    end
+
+  end
+
+end

data/lib/sdl2/engine/engines.rb

@@ -0,0 +1,46 @@
+require 'sdl2/engine'
+
+module SDL2
+
+  # An engine multiplexor.
+  # Only has one focus, but that focus can change.
+  class Engine::Engines < Engine
+
+    def initialize(opts)
+      super(opts)
+      @engines = [] #opts[:engines] || []
+      @current_idx = 0
+    end
+
+    attr_reader :engines
+
+    def current_engine
+      @engines[@current_idx]
+    end
+
+    def handle_event(event)
+      return true if super(event) # self swallowed event.
+      if current_engine
+        puts "Passing to current engine."if SDL2::PrintDebug
+        return true if current_engine.handle_event(event)
+      end
+      puts "Unable to handle"if SDL2::PrintDebug
+      return false # if we get to here.
+    end
+
+    def paint_to(surface)
+      if ce = current_engine
+        return ce.paint_to(surface)
+      else
+        return false
+      end
+    end
+    
+    def quit()
+      @engines.each(&:quit)
+      super()
+    end
+
+  end
+
+end

data/lib/sdl2/error.rb

@@ -2,8 +2,14 @@ require 'sdl2'
 
 module SDL2
 
-  api :SDL_ClearError, [], :void
-  api :SDL_GetError, [], :string
-  api :SDL_SetError, [:string, :varargs], :int
+  ##
+	#
+	api :SDL_ClearError, [], :void
+  ##
+	#
+	api :SDL_GetError, [], :string
+  ##
+	#
+	api :SDL_SetError, [:string, :varargs], :int
     
 end

data/lib/sdl2/events.rb

@@ -77,12 +77,14 @@ module SDL2
 
   class AbstractEvent < Struct
     SHARED = [:type, :event_type, :timestamp, :uint32]
+
   end
 
   # Fields shared by every event
   class CommonEvent < AbstractEvent
 
     layout *SHARED
+
   end
 
   # Window state change event data (event.window.*)
@@ -439,20 +441,48 @@ module SDL2
       end
       return tmp_event # May be nil if SDL2.poll_event fails.
     end
-    
+
+    def self.push(event)
+      event = Event.cast(event)
+      SDL2.push_event!(event)
+    end
+
     def self.cast(something)
       if something.kind_of? AbstractEvent
         return self.new(something.pointer)
+      elsif something.kind_of? Hash
+        raise "Must have type : #{something.inspect}" unless something.has_key? :type
+        tmp = self.new
+        fields = members & something.keys
+        fields.each do |field|
+          if tmp[field].kind_of? Struct and something[field].kind_of? Hash
+            tmp[field].update_members(something[field])
+          else
+            tmp[field] = something[field]
+          end
+        end
+        return tmp
       else
         raise "Is not an AbstractEvent!: #{something.inspect}"
       end
     end
 
-    # Converts SDL's type integer into a EVENTTYPE symbol
-    # Returns :UNKOWN on failure.
-    def type_symbol
-      sym = EVENTTYPE.by_value[self.type]
-      sym.nil? ? :UNKOWN : sym
+    def ==(other)
+      if other.kind_of?(Hash)
+        # False if there are fields that do not exist
+        return false unless (other.keys - members).empty?
+
+        (other.keys & members).each do |field|
+          return false unless self[field] == other[field]
+        end
+
+        return true #if we get this far
+
+      else
+
+        return super(other)
+
+      end
     end
 
   end
@@ -468,15 +498,33 @@ module SDL2
 
   ##
   # :class-method: peep_events
+  ##
+  #
   api :SDL_PeepEvents, [Event.by_ref, :count, :eventaction, :uint32, :uint32], :int
+  ##
+  #
   api :SDL_HasEvent, [:uint32], :bool
+  ##
+  #
   api :SDL_HasEvents, [:uint32, :uint32], :bool
+  ##
+  #
   api :SDL_FlushEvent, [:uint32], :void
+  ##
+  #
   api :SDL_FlushEvents, [:uint32, :uint32], :void
+  ##
+  #
   api :SDL_PollEvent, [Event.by_ref], :int
   boolean? :poll_event, TRUE_WHEN_ONE
+  ##
+  #
   api :SDL_WaitEvent, [Event.by_ref], :int
+  ##
+  #
   api :SDL_WaitEventTimeout, [Event.by_ref, :count], :int
+  ##
+  #
   api :SDL_PushEvent, [Event.by_ref], :int, {error: true, filter: TRUE_WHEN_ONE}
 
   ##
@@ -488,10 +536,20 @@ module SDL2
     layout :callback, :event_filter
   end
 
+  ##
+  #
   api :SDL_SetEventFilter, [:event_filter, :pointer], :void
+  ##
+  #
   api :SDL_GetEventFilter, [:pointer, :pointer], :bool
+  ##
+  #
   api :SDL_AddEventWatch, [:event_filter, :pointer], :void
+  ##
+  #
   api :SDL_DelEventWatch, [:event_filter, :pointer], :void
+  ##
+  #
   api :SDL_FilterEvents, [:event_filter, :pointer], :void
 
   # Enumeration of event_state query
@@ -505,6 +563,8 @@ module SDL2
 
   enum :event_state, EVENTSTATE.flatten_consts
 
+  ##
+  #
   ##
   #
   api :SDL_EventState, [:uint32, :event_state], :uint8
@@ -513,5 +573,7 @@ module SDL2
     event_state(type, EVENTSTATE::QUERY)
   end
 
+  ##
+  #
   api :SDL_RegisterEvents, [:count], :uint32
 end

data/lib/sdl2/gamecontroller.rb

@@ -30,33 +30,73 @@ module SDL2
 
   end#GameController
   
-  api :SDL_GameControllerAddMapping, [:string], :int
-  api :SDL_GameControllerMappingForGUID, [JoystickGUID.by_value], :string
-  api :SDL_GameControllerMapping, [GameController.by_ref], :string
-  api :SDL_IsGameController, [:joystick_index], :bool
-  api :SDL_GameControllerNameForIndex, [:joystick_index], :string
-  api :SDL_GameControllerOpen, [:joystick_index], :string
-  api :SDL_GameControllerName, [GameController.by_ref], :string
-  api :SDL_GameControllerGetAttached, [GameController.by_ref], :bool
-  api :SDL_GameControllerGetJoystick, [GameController.by_ref], Joystick.by_ref
-  api :SDL_GameControllerEventState, [:int], :int
-  api :SDL_GameControllerUpdate, [], :void
+  ##
+	#
+	api :SDL_GameControllerAddMapping, [:string], :int
+  ##
+	#
+	api :SDL_GameControllerMappingForGUID, [JoystickGUID.by_value], :string
+  ##
+	#
+	api :SDL_GameControllerMapping, [GameController.by_ref], :string
+  ##
+	#
+	api :SDL_IsGameController, [:joystick_index], :bool
+  ##
+	#
+	api :SDL_GameControllerNameForIndex, [:joystick_index], :string
+  ##
+	#
+	api :SDL_GameControllerOpen, [:joystick_index], :string
+  ##
+	#
+	api :SDL_GameControllerName, [GameController.by_ref], :string
+  ##
+	#
+	api :SDL_GameControllerGetAttached, [GameController.by_ref], :bool
+  ##
+	#
+	api :SDL_GameControllerGetJoystick, [GameController.by_ref], Joystick.by_ref
+  ##
+	#
+	api :SDL_GameControllerEventState, [:int], :int
+  ##
+	#
+	api :SDL_GameControllerUpdate, [], :void
   
   enum :game_controller_axis, [:INVALID, -1, :LEFTX, :LEFTY, :RIGHTX, :RIGHTY, :TRIGGERLEFT, :TRIGGERRIGHT, :MAX]
   
-  api :SDL_GameControllerGetAxisFromString, [:string], :game_controller_axis  
-  api :SDL_GameControllerGetStringForAxis, [:game_controller_axis], :string
-  api :SDL_GameControllerGetBindForAxis, [GameController.by_ref, :game_controller_axis], GameController::ButtonBind
-  api :SDL_GameControllerGetAxis, [GameController.by_ref, :game_controller_axis], :int16
+  ##
+	#
+	api :SDL_GameControllerGetAxisFromString, [:string], :game_controller_axis  
+  ##
+	#
+	api :SDL_GameControllerGetStringForAxis, [:game_controller_axis], :string
+  ##
+	#
+	api :SDL_GameControllerGetBindForAxis, [GameController.by_ref, :game_controller_axis], GameController::ButtonBind
+  ##
+	#
+	api :SDL_GameControllerGetAxis, [GameController.by_ref, :game_controller_axis], :int16
   
   enum :game_controller_button, [:INVLIAD, -1, 
     :A, :B, :X, :Y, :BACK, :GUIDE, :START, 
     :LEFTSTICK, :RIGHTSTICK, :LEFTSHOULDER, :RIGHTSHOULDER, 
     :DPAD_UP, :DPAD_DOWN, :DPAD_LEFT, :DPAD_RIGHT]
     
-  api :SDL_GameControllerGetButtonFromString, [:string], :game_controller_button
-  api :SDL_GameControllerGetStringForButton, [:game_controller_button], :string
-  api :SDL_GameControllerGetBindForButton, [GameController.by_ref, :game_controller_button], GameController::ButtonBind
-  api :SDL_GameControllerGetButton, [GameController.by_ref, :game_controller_button], :uint8
-  api :SDL_GameControllerClose, [GameController.by_ref], :void
+  ##
+	#
+	api :SDL_GameControllerGetButtonFromString, [:string], :game_controller_button
+  ##
+	#
+	api :SDL_GameControllerGetStringForButton, [:game_controller_button], :string
+  ##
+	#
+	api :SDL_GameControllerGetBindForButton, [GameController.by_ref, :game_controller_button], GameController::ButtonBind
+  ##
+	#
+	api :SDL_GameControllerGetButton, [GameController.by_ref, :game_controller_button], :uint8
+  ##
+	#
+	api :SDL_GameControllerClose, [GameController.by_ref], :void
 end