sdl2_ffi 0.0.3 → 0.0.4

data/lib/sdl2/hints.rb

@@ -1,47 +1,59 @@
 require 'sdl2'
 
 module SDL2
-
-  HINT_FRAMEBUFFER_ACCELERATION     = "SDL_FRAMEBUFFER_ACCELERATION"
-  HINT_RENDER_DRIVER                = "SDL_RENDER_DRIVER"
-  HINT_RENDER_OPENGL_SHADERS        = "SDL_RENDER_OPENGL_SHADERS"
-  HINT_RENDER_SCALE_QUALITY         = "SDL_RENDER_SCALE_QUALITY"
-  HINT_RENDER_VSYNC                 = "SDL_RENDER_VSYNC"
-  HINT_VIDEO_X11_XVIDMODE           = "SDL_VIDEO_X11_XVIDMODE"
-  HINT_VIDEO_X11_XINERAMA           = "SDL_VIDEO_X11_XINERAMA"
-  HINT_VIDEO_X11_XRANDR             = "SDL_VIDEO_X11_XRANDR"
-  HINT_GRAB_KEYBOARD                = "SDL_GRAB_KEYBOARD"
-  HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS = "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
-  HINT_IDLE_TIMER_DISABLED          = "SDL_IOS_IDLE_TIMER_DISABLED"
-  HINT_ORIENTATIONS                 = "SDL_IOS_ORIENTATIONS"
-  HINT_XINPUT_ENABLED               = "SDL_XINPUT_ENABLED"
-
-  HINT_GAMECONTROLLERCONFIG         = "SDL_GAMECONTROLLERCONFIG"
-
-  HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS = "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
-  HINT_ALLOW_TOPMOST                    = "SDL_ALLOW_TOPMOST"
-  HINT_TIMER_RESOLUTION                 = "SDL_TIMER_RESOLUTION"
+  
+  module HINT
+    include EnumerableConstants
+    FRAMEBUFFER_ACCELERATION     = "SDL_FRAMEBUFFER_ACCELERATION"
+    RENDER_DRIVER                = "SDL_RENDER_DRIVER"
+    RENDER_OPENGL_SHADERS        = "SDL_RENDER_OPENGL_SHADERS"
+    RENDER_SCALE_QUALITY         = "SDL_RENDER_SCALE_QUALITY"
+    RENDER_VSYNC                 = "SDL_RENDER_VSYNC"
+    VIDEO_X11_XVIDMODE           = "SDL_VIDEO_X11_XVIDMODE"
+    VIDEO_X11_XINERAMA           = "SDL_VIDEO_X11_XINERAMA"
+    VIDEO_X11_XRANDR             = "SDL_VIDEO_X11_XRANDR"
+    GRAB_KEYBOARD                = "SDL_GRAB_KEYBOARD"
+    VIDEO_MINIMIZE_ON_FOCUS_LOSS = "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
+    IDLE_TIMER_DISABLED          = "SDL_IOS_IDLE_TIMER_DISABLED"
+    ORIENTATIONS                 = "SDL_IOS_ORIENTATIONS"
+    XINPUT_ENABLED               = "SDL_XINPUT_ENABLED"
+  
+    GAMECONTROLLERCONFIG         = "SDL_GAMECONTROLLERCONFIG"
+  
+    JOYSTICK_ALLOW_BACKGROUND_EVENTS = "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
+    ALLOW_TOPMOST                    = "SDL_ALLOW_TOPMOST"
+    TIMER_RESOLUTION                 = "SDL_TIMER_RESOLUTION"
+  end
   
   enum :hint_priority, [:default, :normal, :override]
     
   class Hint
+    include HINT
+    # Get the named Hint's value.
+    # @returns String, the value.
     def self.[](name)
       SDL2.get_hint(name)
     end
     
-    # Sets the named Hint to Value.  Returns new value on success or existing value on failure
+    # Sets the named Hint to Value.  
+    # @returns String, the actual value. 
+    # @raises RuntimeError
     def self.[]=(name, value)
-      return SDL2.set_hint(name, value) == :true ? value : self[name]
+      SDL2.set_hint!(name, value)
+      self[name]
     end
     
+    # Sets the named Hint to Value, with a hint_priority.  
+    # @returns String, the actual value. 
     def self.set_with_priority(name, value, hint_priority)
-      return SDL2.set_hint_with_priority(name, value, hint_priority) == :true ? value : self[name]
+      SDL2.set_hint_with_priority(name, value, hint_priority) 
+      self[name]
     end
   end
 
   api :SDL_ClearHints, [], :void
   api :SDL_GetHint, [:string], :string
-  api :SDL_SetHint, [:string, :string], :bool
+  api :SDL_SetHint, [:string, :string], :bool, {error: true}
   api :SDL_SetHintWithPriority, [:string, :string, :hint_priority], :bool
 
 end

data/lib/sdl2/image.rb

@@ -6,23 +6,17 @@ require 'active_support/inflector'
 module SDL2
 
   module Image
-
     extend FFI::Library
+    extend Library
     ffi_lib SDL_IMAGE_MODULE
 
-    def self.api(func_name, args, type)
-      camelCaseName = func_name.to_s.gsub('IMG_', '')
-      methodName = ActiveSupport::Inflector.underscore(camelCaseName).to_sym
-      self.attach_function methodName, func_name, args, type
-      return methodName
-    end
 
     enum :init_flags, [:JPG, :PNG, :TIF, :WEBP]
 
     api :IMG_Init, [:init_flags], :int
     api :IMG_Quit, [], :void
     api :IMG_LoadTyped_RW, [RWops.by_ref, :int, :string], Surface.auto_ptr
-    api :IMG_Load, [:string], Surface.auto_ptr
+    api :IMG_Load, [:string], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL }
     api :IMG_Load_RW, [RWops.by_ref, :int], Surface.auto_ptr
 
     api :IMG_isICO, [RWops.by_ref], :int
@@ -55,9 +49,9 @@ module SDL2
     api :IMG_LoadXPM_RW, [RWops.by_ref], Surface.auto_ptr
     api :IMG_LoadXV_RW, [RWops.by_ref], Surface.auto_ptr
     api :IMG_LoadWEBP_RW, [RWops.by_ref], Surface.auto_ptr
-    
+
     api :IMG_ReadXPMFromArray, [:pointer], Surface.auto_ptr
-      
+
     api :IMG_SavePNG, [Surface.by_ref, :string], :int
     api :IMG_SavePNG_RW, [Surface.by_ref, RWops.by_ref, :int], :int
 

data/lib/sdl2/init.rb

@@ -2,40 +2,28 @@ require 'sdl2'
 require 'sdl2/error'
 
 module SDL2
-  # SDL Constants, for OR'ing them
-  INIT_TIMER          = 0x00000001
-  INIT_AUDIO          = 0x00000010
-  INIT_VIDEO          = 0x00000020
-  INIT_JOYSTICK       = 0x00000200
-  INIT_HAPTIC         = 0x00001000
-  INIT_GAMECONTROLLER = 0x00002000
-  INIT_EVENTS         = 0x00004000
-  INIT_NOPARACHUTE    = 0x00100000
-  INIT_EVERYTHING     = INIT_TIMER | INIT_AUDIO | INIT_VIDEO |
-  INIT_EVENTS | INIT_JOYSTICK | INIT_HAPTIC |
-  INIT_GAMECONTROLLER
-
-  enum :init_flag, [
-    :nothing, 0,
-    :timer, INIT_TIMER,
-    :audio, INIT_AUDIO,
-    :video, INIT_VIDEO,
-    :joystick, INIT_JOYSTICK,
-    :haptic, INIT_HAPTIC,
-    :game_controller, INIT_GAMECONTROLLER,
-    :events, INIT_EVENTS,
-    :no_parachute, INIT_NOPARACHUTE,
-    :everything, INIT_EVERYTHING
-  ]
+
+  # Enumeration of valid initialization flags.
+  module INIT
+    include EnumerableConstants
+
+    TIMER          = 0x00000001
+    AUDIO          = 0x00000010
+    VIDEO          = 0x00000020
+    JOYSTICK       = 0x00000200
+    HAPTIC         = 0x00001000
+    GAMECONTROLLER = 0x00002000
+    EVENTS         = 0x00004000
+    NOPARACHUTE    = 0x00100000
+    EVERYTHING     = TIMER | AUDIO | VIDEO | EVENTS | JOYSTICK | HAPTIC | GAMECONTROLLER
+
+  end
+  
+  enum :init_flag, INIT.flatten_consts
+  
 
   api :SDL_Init, [:init_flag], :int, {error: true}
 
-  #def self.init!(flags)
-  #  error_code = init(flags)
-  #  if (error_code != 0)
-  #    throw get_error()
-  #  end
-  #end
 
   api :SDL_InitSubSystem, [:init_flag], :int, {error: true}
 
@@ -47,6 +35,8 @@ module SDL2
   end
 
   api :SDL_WasInit, [:init_flag], :uint32
+    
+  boolean? :was_init, TRUE_WHEN_NOT_ZERO
 
   api :SDL_Quit, [], :void
 

data/lib/sdl2/joystick.rb

@@ -2,6 +2,7 @@ require 'sdl2'
 
 module SDL2
 
+  # Joystick structure used to internally identify a joystick
   class Joystick < Struct
 
     # TODO: Review if the Joystick layout should be hidden.
@@ -13,6 +14,7 @@ module SDL2
 
   end
 
+  # A structure that encodes the stable unique id for a joystick device
   class JoystickGUID < Struct
     layout :data, [:uint8, 16] #line 69
   end
@@ -38,18 +40,19 @@ module SDL2
   api :SDL_JoystickEventState, [:int], :int
   api :SDL_JoystickGetAxis, [Joystick.by_ref, :int], :int16
 
-  HAT_HASH = {
-    :CENTERED => 0x00,
-    :UP => 0x01,
-    :RIGHT =>  0x02,
-    :DOWN => 0x04,
-    :LEFT => 0x08
-  }
-  HAT_HASH[:RIGHTUP]=(HAT_HASH[:RIGHT]|HAT_HASH[:UP])
-  HAT_HASH[:RIGHTDOWN]=   (HAT_HASH[:RIGHT]|HAT_HASH[:DOWN])
-  HAT_HASH[:LEFTUP]=      (HAT_HASH[:LEFT]|HAT_HASH[:UP])
-  HAT_HASH[:LEFTDOWN]=    (HAT_HASH[:LEFT]|HAT_HASH[:DOWN])
-  Hat = Enum.new(:JOYSTICK_HAT, HAT_HASH)
+  # Hat positions
+  module HAT
+    include EnumerableConstants
+    CENTERED = 0x00
+    UP = 0x01
+    RIGHT =  0x02
+    DOWN = 0x04
+    LEFT = 0x08
+    RIGHTUP = RIGHT | UP
+    RIGHTDOWN = RIGHT | DOWN
+    LEFTUP = LEFT | UP
+    LEFTDOWN = LEFT | DOWN
+  end
 
   api :SDL_JoystickGetHat, [Joystick.by_ref, :int], :uint8
   api :SDL_JoystickGetBall, [Joystick.by_ref, :int, IntStruct.by_ref, IntStruct.by_ref], :int

data/lib/sdl2/keycode.rb

@@ -1,6 +1,5 @@
 require 'sdl2'
 require 'sdl2/scancode'
-require 'yinum'
 
 module SDL2
 
@@ -14,281 +13,282 @@ module SDL2
     scancode | SCANCODE_MASK
   end
 
-  Keycode = Enum.new(:KEYCODE, {
-    :UNKNOWN => 0,
+  module KEYCODE
+    include EnumerableConstants
+    UNKNOWN  =  0
 
-    :RETURN => '\r',
-    :ESCAPE => '\033',
-    :BACKSPACE => '\b',
-    :TAB => '\t',
-    :SPACE => ' ',
-    :EXCLAIM => '!',
-    :QUOTEDBL => '"',
-    :HASH => '#',
-    :PERCENT => '%',
-    :DOLLAR => '$',
-    :AMPERSAND => '&',
-    :QUOTE => '\'',
-    :LEFTPAREN => '(',
-    :RIGHTPAREN => ')',
-    :ASTERISK => '*',
-    :PLUS => '+',
-    :COMMA => ',',
-    :MINUS => '-',
-    :PERIOD => '.',
-    :SLASH => '/',
-    :'0' => '0',
-    :'1' => '1',
-    :'2' => '2',
-    :'3' => '3',
-    :'4' => '4',
-    :'5' => '5',
-    :'6' => '6',
-    :'7' => '7',
-    :'8' => '8',
-    :'9' => '9',
-    :COLON => ':',
-    :SEMICOLON => ';',
-    :LESS => '<',
-    :EQUALS => '=',
-    :GREATER => '>',
-    :QUESTION => '?',
-    :AT => '@',
+    RETURN  =  '\r'
+    ESCAPE  =  '\033'
+    BACKSPACE  =  '\b'
+    TAB  =  '\t'
+    SPACE  =  ' '
+    EXCLAIM  =  '!'
+    QUOTEDBL  =  '"'
+    HASH  =  '#'
+    PERCENT  =  '%'
+    DOLLAR  =  '$'
+    AMPERSAND  =  '&'
+    QUOTE  =  '\''
+    LEFTPAREN  =  '('
+    RIGHTPAREN  =  ')'
+    ASTERISK  =  '*'
+    PLUS  =  '+'
+    COMMA  =  ','
+    MINUS  =  '-'
+    PERIOD  =  '.'
+    SLASH  =  '/'
+    N0  =  '0'
+    N1  =  '1'
+    N2  =  '2'
+    N3  =  '3'
+    N4  =  '4'
+    N5  =  '5'
+    N6  =  '6'
+    N7  =  '7'
+    N8  =  '8'
+    N9  =  '9'
+    COLON  =  ':'
+    SEMICOLON  =  ';'
+    LESS  =  '<'
+    EQUALS  =  '='
+    GREATER  =  '>'
+    QUESTION  =  '?'
+    AT  =  '@'
 
-    :LEFTBRACKET => '[',
-    :BACKSLASH => '\\',
-    :RIGHTBRACKET => ']',
-    :CARET => '^',
-    :UNDERSCORE => '_',
-    :BACKQUOTE => '`',
-    :a => 'a',
-    :b => 'b',
-    :c => 'c',
-    :d => 'd',
-    :e => 'e',
-    :f => 'f',
-    :g => 'g',
-    :h => 'h',
-    :i => 'i',
-    :j => 'j',
-    :k => 'k',
-    :l => 'l',
-    :m => 'm',
-    :n => 'n',
-    :o => 'o',
-    :p => 'p',
-    :q => 'q',
-    :r => 'r',
-    :s => 's',
-    :t => 't',
-    :u => 'u',
-    :v => 'v',
-    :w => 'w',
-    :x => 'x',
-    :y => 'y',
-    :z => 'z',
+    LEFTBRACKET  =  '['
+    BACKSLASH  =  '\\'
+    RIGHTBRACKET  =  ']'
+    CARET  =  '^'
+    UNDERSCORE  =  '_'
+    BACKQUOTE  =  '`'
+    a  =  'a'
+    b  =  'b'
+    c  =  'c'
+    d  =  'd'
+    e  =  'e'
+    f  =  'f'
+    g  =  'g'
+    h  =  'h'
+    i  =  'i'
+    j  =  'j'
+    k  =  'k'
+    l  =  'l'
+    m  =  'm'
+    n  =  'n'
+    o  =  'o'
+    p  =  'p'
+    q  =  'q'
+    r  =  'r'
+    s  =  's'
+    t  =  't'
+    u  =  'u'
+    v  =  'v'
+    w  =  'w'
+    x  =  'x'
+    y  =  'y'
+    z  =  'z'
 
-    :CAPSLOCK => scancode_to_keycode(Scancode.CAPSLOCK),
+    CAPSLOCK  =  SDL2.scancode_to_keycode(SCANCODE::CAPSLOCK)
 
-    :F1 => scancode_to_keycode(Scancode.F1),
-    :F2 => scancode_to_keycode(Scancode.F2),
-    :F3 => scancode_to_keycode(Scancode.F3),
-    :F4 => scancode_to_keycode(Scancode.F4),
-    :F5 => scancode_to_keycode(Scancode.F5),
-    :F6 => scancode_to_keycode(Scancode.F6),
-    :F7 => scancode_to_keycode(Scancode.F7),
-    :F8 => scancode_to_keycode(Scancode.F8),
-    :F9 => scancode_to_keycode(Scancode.F9),
-    :F10 => scancode_to_keycode(Scancode.F10),
-    :F11 => scancode_to_keycode(Scancode.F11),
-    :F12 => scancode_to_keycode(Scancode.F12),
+    F1  =  SDL2.scancode_to_keycode(SCANCODE::F1)
+    F2  =  SDL2.scancode_to_keycode(SCANCODE::F2)
+    F3  =  SDL2.scancode_to_keycode(SCANCODE::F3)
+    F4  =  SDL2.scancode_to_keycode(SCANCODE::F4)
+    F5  =  SDL2.scancode_to_keycode(SCANCODE::F5)
+    F6  =  SDL2.scancode_to_keycode(SCANCODE::F6)
+    F7  =  SDL2.scancode_to_keycode(SCANCODE::F7)
+    F8  =  SDL2.scancode_to_keycode(SCANCODE::F8)
+    F9  =  SDL2.scancode_to_keycode(SCANCODE::F9)
+    F10  =  SDL2.scancode_to_keycode(SCANCODE::F10)
+    F11  =  SDL2.scancode_to_keycode(SCANCODE::F11)
+    F12  =  SDL2.scancode_to_keycode(SCANCODE::F12)
 
-    :PRINTSCREEN => scancode_to_keycode(Scancode.PRINTSCREEN),
-    :SCROLLLOCK => scancode_to_keycode(Scancode.SCROLLLOCK),
-    :PAUSE => scancode_to_keycode(Scancode.PAUSE),
-    :INSERT => scancode_to_keycode(Scancode.INSERT),
-    :HOME => scancode_to_keycode(Scancode.HOME),
-    :PAGEUP => scancode_to_keycode(Scancode.PAGEUP),
-    :DELETE => '\177',
-    :END => scancode_to_keycode(Scancode.END),
-    :PAGEDOWN => scancode_to_keycode(Scancode.PAGEDOWN),
-    :RIGHT => scancode_to_keycode(Scancode.RIGHT),
-    :LEFT => scancode_to_keycode(Scancode.LEFT),
-    :DOWN => scancode_to_keycode(Scancode.DOWN),
-    :UP => scancode_to_keycode(Scancode.UP),
+    PRINTSCREEN  =  SDL2.scancode_to_keycode(SCANCODE::PRINTSCREEN)
+    SCROLLLOCK  =  SDL2.scancode_to_keycode(SCANCODE::SCROLLLOCK)
+    PAUSE  =  SDL2.scancode_to_keycode(SCANCODE::PAUSE)
+    INSERT  =  SDL2.scancode_to_keycode(SCANCODE::INSERT)
+    HOME  =  SDL2.scancode_to_keycode(SCANCODE::HOME)
+    PAGEUP  =  SDL2.scancode_to_keycode(SCANCODE::PAGEUP)
+    DELETE  =  '\177'
+    END_  =  SDL2.scancode_to_keycode(SCANCODE::END_)
+    PAGEDOWN  =  SDL2.scancode_to_keycode(SCANCODE::PAGEDOWN)
+    RIGHT  =  SDL2.scancode_to_keycode(SCANCODE::RIGHT)
+    LEFT  =  SDL2.scancode_to_keycode(SCANCODE::LEFT)
+    DOWN  =  SDL2.scancode_to_keycode(SCANCODE::DOWN)
+    UP  =  SDL2.scancode_to_keycode(SCANCODE::UP)
 
-    :NUMLOCKCLEAR => scancode_to_keycode(Scancode.NUMLOCKCLEAR),
-    :KP_DIVIDE => scancode_to_keycode(Scancode.KP_DIVIDE),
-    :KP_MULTIPLY => scancode_to_keycode(Scancode.KP_MULTIPLY),
-    :KP_MINUS => scancode_to_keycode(Scancode.KP_MINUS),
-    :KP_PLUS => scancode_to_keycode(Scancode.KP_PLUS),
-    :KP_ENTER => scancode_to_keycode(Scancode.KP_ENTER),
-    :KP_1 => scancode_to_keycode(Scancode.KP_1),
-    :KP_2 => scancode_to_keycode(Scancode.KP_2),
-    :KP_3 => scancode_to_keycode(Scancode.KP_3),
-    :KP_4 => scancode_to_keycode(Scancode.KP_4),
-    :KP_5 => scancode_to_keycode(Scancode.KP_5),
-    :KP_6 => scancode_to_keycode(Scancode.KP_6),
-    :KP_7 => scancode_to_keycode(Scancode.KP_7),
-    :KP_8 => scancode_to_keycode(Scancode.KP_8),
-    :KP_9 => scancode_to_keycode(Scancode.KP_9),
-    :KP_0 => scancode_to_keycode(Scancode.KP_0),
-    :KP_PERIOD => scancode_to_keycode(Scancode.KP_PERIOD),
+    NUMLOCKCLEAR  =  SDL2.scancode_to_keycode(SCANCODE::NUMLOCKCLEAR)
+    KP_DIVIDE  =  SDL2.scancode_to_keycode(SCANCODE::KP_DIVIDE)
+    KP_MULTIPLY  =  SDL2.scancode_to_keycode(SCANCODE::KP_MULTIPLY)
+    KP_MINUS  =  SDL2.scancode_to_keycode(SCANCODE::KP_MINUS)
+    KP_PLUS  =  SDL2.scancode_to_keycode(SCANCODE::KP_PLUS)
+    KP_ENTER  =  SDL2.scancode_to_keycode(SCANCODE::KP_ENTER)
+    KP_1  =  SDL2.scancode_to_keycode(SCANCODE::KP_1)
+    KP_2  =  SDL2.scancode_to_keycode(SCANCODE::KP_2)
+    KP_3  =  SDL2.scancode_to_keycode(SCANCODE::KP_3)
+    KP_4  =  SDL2.scancode_to_keycode(SCANCODE::KP_4)
+    KP_5  =  SDL2.scancode_to_keycode(SCANCODE::KP_5)
+    KP_6  =  SDL2.scancode_to_keycode(SCANCODE::KP_6)
+    KP_7  =  SDL2.scancode_to_keycode(SCANCODE::KP_7)
+    KP_8  =  SDL2.scancode_to_keycode(SCANCODE::KP_8)
+    KP_9  =  SDL2.scancode_to_keycode(SCANCODE::KP_9)
+    KP_0  =  SDL2.scancode_to_keycode(SCANCODE::KP_0)
+    KP_PERIOD  =  SDL2.scancode_to_keycode(SCANCODE::KP_PERIOD)
 
-    :APPLICATION => scancode_to_keycode(Scancode.APPLICATION),
-    :POWER => scancode_to_keycode(Scancode.POWER),
-    :KP_EQUALS => scancode_to_keycode(Scancode.KP_EQUALS),
-    :F13 => scancode_to_keycode(Scancode.F13),
-    :F14 => scancode_to_keycode(Scancode.F14),
-    :F15 => scancode_to_keycode(Scancode.F15),
-    :F16 => scancode_to_keycode(Scancode.F16),
-    :F17 => scancode_to_keycode(Scancode.F17),
-    :F18 => scancode_to_keycode(Scancode.F18),
-    :F19 => scancode_to_keycode(Scancode.F19),
-    :F20 => scancode_to_keycode(Scancode.F20),
-    :F21 => scancode_to_keycode(Scancode.F21),
-    :F22 => scancode_to_keycode(Scancode.F22),
-    :F23 => scancode_to_keycode(Scancode.F23),
-    :F24 => scancode_to_keycode(Scancode.F24),
-    :EXECUTE => scancode_to_keycode(Scancode.EXECUTE),
-    :HELP => scancode_to_keycode(Scancode.HELP),
-    :MENU => scancode_to_keycode(Scancode.MENU),
-    :SELECT => scancode_to_keycode(Scancode.SELECT),
-    :STOP => scancode_to_keycode(Scancode.STOP),
-    :AGAIN => scancode_to_keycode(Scancode.AGAIN),
-    :UNDO => scancode_to_keycode(Scancode.UNDO),
-    :CUT => scancode_to_keycode(Scancode.CUT),
-    :COPY => scancode_to_keycode(Scancode.COPY),
-    :PASTE => scancode_to_keycode(Scancode.PASTE),
-    :FIND => scancode_to_keycode(Scancode.FIND),
-    :MUTE => scancode_to_keycode(Scancode.MUTE),
-    :VOLUMEUP => scancode_to_keycode(Scancode.VOLUMEUP),
-    :VOLUMEDOWN => scancode_to_keycode(Scancode.VOLUMEDOWN),
-    :KP_COMMA => scancode_to_keycode(Scancode.KP_COMMA),
-    :KP_EQUALSAS400 => scancode_to_keycode(Scancode.KP_EQUALSAS400),
+    APPLICATION  =  SDL2.scancode_to_keycode(SCANCODE::APPLICATION)
+    POWER  =  SDL2.scancode_to_keycode(SCANCODE::POWER)
+    KP_EQUALS  =  SDL2.scancode_to_keycode(SCANCODE::KP_EQUALS)
+    F13  =  SDL2.scancode_to_keycode(SCANCODE::F13)
+    F14  =  SDL2.scancode_to_keycode(SCANCODE::F14)
+    F15  =  SDL2.scancode_to_keycode(SCANCODE::F15)
+    F16  =  SDL2.scancode_to_keycode(SCANCODE::F16)
+    F17  =  SDL2.scancode_to_keycode(SCANCODE::F17)
+    F18  =  SDL2.scancode_to_keycode(SCANCODE::F18)
+    F19  =  SDL2.scancode_to_keycode(SCANCODE::F19)
+    F20  =  SDL2.scancode_to_keycode(SCANCODE::F20)
+    F21  =  SDL2.scancode_to_keycode(SCANCODE::F21)
+    F22  =  SDL2.scancode_to_keycode(SCANCODE::F22)
+    F23  =  SDL2.scancode_to_keycode(SCANCODE::F23)
+    F24  =  SDL2.scancode_to_keycode(SCANCODE::F24)
+    EXECUTE  =  SDL2.scancode_to_keycode(SCANCODE::EXECUTE)
+    HELP  =  SDL2.scancode_to_keycode(SCANCODE::HELP)
+    MENU  =  SDL2.scancode_to_keycode(SCANCODE::MENU)
+    SELECT  =  SDL2.scancode_to_keycode(SCANCODE::SELECT)
+    STOP  =  SDL2.scancode_to_keycode(SCANCODE::STOP)
+    AGAIN  =  SDL2.scancode_to_keycode(SCANCODE::AGAIN)
+    UNDO  =  SDL2.scancode_to_keycode(SCANCODE::UNDO)
+    CUT  =  SDL2.scancode_to_keycode(SCANCODE::CUT)
+    COPY  =  SDL2.scancode_to_keycode(SCANCODE::COPY)
+    PASTE  =  SDL2.scancode_to_keycode(SCANCODE::PASTE)
+    FIND  =  SDL2.scancode_to_keycode(SCANCODE::FIND)
+    MUTE  =  SDL2.scancode_to_keycode(SCANCODE::MUTE)
+    VOLUMEUP  =  SDL2.scancode_to_keycode(SCANCODE::VOLUMEUP)
+    VOLUMEDOWN  =  SDL2.scancode_to_keycode(SCANCODE::VOLUMEDOWN)
+    KP_COMMA  =  SDL2.scancode_to_keycode(SCANCODE::KP_COMMA)
+    KP_EQUALSAS400  =  SDL2.scancode_to_keycode(SCANCODE::KP_EQUALSAS400)
 
-    :ALTERASE => scancode_to_keycode(Scancode.ALTERASE),
-    :SYSREQ => scancode_to_keycode(Scancode.SYSREQ),
-    :CANCEL => scancode_to_keycode(Scancode.CANCEL),
-    :CLEAR => scancode_to_keycode(Scancode.CLEAR),
-    :PRIOR => scancode_to_keycode(Scancode.PRIOR),
-    :RETURN2 => scancode_to_keycode(Scancode.RETURN2),
-    :SEPARATOR => scancode_to_keycode(Scancode.SEPARATOR),
-    :OUT => scancode_to_keycode(Scancode.OUT),
-    :OPER => scancode_to_keycode(Scancode.OPER),
-    :CLEARAGAIN => scancode_to_keycode(Scancode.CLEARAGAIN),
-    :CRSEL => scancode_to_keycode(Scancode.CRSEL),
-    :EXSEL => scancode_to_keycode(Scancode.EXSEL),
+    ALTERASE  =  SDL2.scancode_to_keycode(SCANCODE::ALTERASE)
+    SYSREQ  =  SDL2.scancode_to_keycode(SCANCODE::SYSREQ)
+    CANCEL  =  SDL2.scancode_to_keycode(SCANCODE::CANCEL)
+    CLEAR  =  SDL2.scancode_to_keycode(SCANCODE::CLEAR)
+    PRIOR  =  SDL2.scancode_to_keycode(SCANCODE::PRIOR)
+    RETURN2  =  SDL2.scancode_to_keycode(SCANCODE::RETURN2)
+    SEPARATOR  =  SDL2.scancode_to_keycode(SCANCODE::SEPARATOR)
+    OUT  =  SDL2.scancode_to_keycode(SCANCODE::OUT)
+    OPER  =  SDL2.scancode_to_keycode(SCANCODE::OPER)
+    CLEARAGAIN  =  SDL2.scancode_to_keycode(SCANCODE::CLEARAGAIN)
+    CRSEL  =  SDL2.scancode_to_keycode(SCANCODE::CRSEL)
+    EXSEL  =  SDL2.scancode_to_keycode(SCANCODE::EXSEL)
 
-    :KP_00 => scancode_to_keycode(Scancode.KP_00),
-    :KP_000 => scancode_to_keycode(Scancode.KP_000),
-    :THOUSANDSSEPARATOR => scancode_to_keycode(Scancode.THOUSANDSSEPARATOR),
-    :DECIMALSEPARATOR => scancode_to_keycode(Scancode.DECIMALSEPARATOR),
-    :CURRENCYUNIT => scancode_to_keycode(Scancode.CURRENCYUNIT),
-    :CURRENCYSUBUNIT => scancode_to_keycode(Scancode.CURRENCYSUBUNIT),
-    :KP_LEFTPAREN => scancode_to_keycode(Scancode.KP_LEFTPAREN),
-    :KP_RIGHTPAREN => scancode_to_keycode(Scancode.KP_RIGHTPAREN),
-    :KP_LEFTBRACE => scancode_to_keycode(Scancode.KP_LEFTBRACE),
-    :KP_RIGHTBRACE => scancode_to_keycode(Scancode.KP_RIGHTBRACE),
-    :KP_TAB => scancode_to_keycode(Scancode.KP_TAB),
-    :KP_BACKSPACE => scancode_to_keycode(Scancode.KP_BACKSPACE),
-    :KP_A => scancode_to_keycode(Scancode.KP_A),
-    :KP_B => scancode_to_keycode(Scancode.KP_B),
-    :KP_C => scancode_to_keycode(Scancode.KP_C),
-    :KP_D => scancode_to_keycode(Scancode.KP_D),
-    :KP_E => scancode_to_keycode(Scancode.KP_E),
-    :KP_F => scancode_to_keycode(Scancode.KP_F),
-    :KP_XOR => scancode_to_keycode(Scancode.KP_XOR),
-    :KP_POWER => scancode_to_keycode(Scancode.KP_POWER),
-    :KP_PERCENT => scancode_to_keycode(Scancode.KP_PERCENT),
-    :KP_LESS => scancode_to_keycode(Scancode.KP_LESS),
-    :KP_GREATER => scancode_to_keycode(Scancode.KP_GREATER),
-    :KP_AMPERSAND => scancode_to_keycode(Scancode.KP_AMPERSAND),
-    :KP_DBLAMPERSAND => scancode_to_keycode(Scancode.KP_DBLAMPERSAND),
-    :KP_VERTICALBAR => scancode_to_keycode(Scancode.KP_VERTICALBAR),
-    :KP_DBLVERTICALBAR => scancode_to_keycode(Scancode.KP_DBLVERTICALBAR),
-    :KP_COLON => scancode_to_keycode(Scancode.KP_COLON),
-    :KP_HASH => scancode_to_keycode(Scancode.KP_HASH),
-    :KP_SPACE => scancode_to_keycode(Scancode.KP_SPACE),
-    :KP_AT => scancode_to_keycode(Scancode.KP_AT),
-    :KP_EXCLAM => scancode_to_keycode(Scancode.KP_EXCLAM),
-    :KP_MEMSTORE => scancode_to_keycode(Scancode.KP_MEMSTORE),
-    :KP_MEMRECALL => scancode_to_keycode(Scancode.KP_MEMRECALL),
-    :KP_MEMCLEAR => scancode_to_keycode(Scancode.KP_MEMCLEAR),
-    :KP_MEMADD => scancode_to_keycode(Scancode.KP_MEMADD),
-    :KP_MEMSUBTRACT =>        scancode_to_keycode(Scancode.KP_MEMSUBTRACT),
-    :KP_MEMMULTIPLY =>        scancode_to_keycode(Scancode.KP_MEMMULTIPLY),
-    :KP_MEMDIVIDE => scancode_to_keycode(Scancode.KP_MEMDIVIDE),
-    :KP_PLUSMINUS => scancode_to_keycode(Scancode.KP_PLUSMINUS),
-    :KP_CLEAR => scancode_to_keycode(Scancode.KP_CLEAR),
-    :KP_CLEARENTRY => scancode_to_keycode(Scancode.KP_CLEARENTRY),
-    :KP_BINARY => scancode_to_keycode(Scancode.KP_BINARY),
-    :KP_OCTAL => scancode_to_keycode(Scancode.KP_OCTAL),
-    :KP_DECIMAL => scancode_to_keycode(Scancode.KP_DECIMAL),
-    :KP_HEXADECIMAL =>        scancode_to_keycode(Scancode.KP_HEXADECIMAL),
+    KP_00  =  SDL2.scancode_to_keycode(SCANCODE::KP_00)
+    KP_000  =  SDL2.scancode_to_keycode(SCANCODE::KP_000)
+    THOUSANDSSEPARATOR  =  SDL2.scancode_to_keycode(SCANCODE::THOUSANDSSEPARATOR)
+    DECIMALSEPARATOR  =  SDL2.scancode_to_keycode(SCANCODE::DECIMALSEPARATOR)
+    CURRENCYUNIT  =  SDL2.scancode_to_keycode(SCANCODE::CURRENCYUNIT)
+    CURRENCYSUBUNIT  =  SDL2.scancode_to_keycode(SCANCODE::CURRENCYSUBUNIT)
+    KP_LEFTPAREN  =  SDL2.scancode_to_keycode(SCANCODE::KP_LEFTPAREN)
+    KP_RIGHTPAREN  =  SDL2.scancode_to_keycode(SCANCODE::KP_RIGHTPAREN)
+    KP_LEFTBRACE  =  SDL2.scancode_to_keycode(SCANCODE::KP_LEFTBRACE)
+    KP_RIGHTBRACE  =  SDL2.scancode_to_keycode(SCANCODE::KP_RIGHTBRACE)
+    KP_TAB  =  SDL2.scancode_to_keycode(SCANCODE::KP_TAB)
+    KP_BACKSPACE  =  SDL2.scancode_to_keycode(SCANCODE::KP_BACKSPACE)
+    KP_A  =  SDL2.scancode_to_keycode(SCANCODE::KP_A)
+    KP_B  =  SDL2.scancode_to_keycode(SCANCODE::KP_B)
+    KP_C  =  SDL2.scancode_to_keycode(SCANCODE::KP_C)
+    KP_D  =  SDL2.scancode_to_keycode(SCANCODE::KP_D)
+    KP_E  =  SDL2.scancode_to_keycode(SCANCODE::KP_E)
+    KP_F  =  SDL2.scancode_to_keycode(SCANCODE::KP_F)
+    KP_XOR  =  SDL2.scancode_to_keycode(SCANCODE::KP_XOR)
+    KP_POWER  =  SDL2.scancode_to_keycode(SCANCODE::KP_POWER)
+    KP_PERCENT  =  SDL2.scancode_to_keycode(SCANCODE::KP_PERCENT)
+    KP_LESS  =  SDL2.scancode_to_keycode(SCANCODE::KP_LESS)
+    KP_GREATER  =  SDL2.scancode_to_keycode(SCANCODE::KP_GREATER)
+    KP_AMPERSAND  =  SDL2.scancode_to_keycode(SCANCODE::KP_AMPERSAND)
+    KP_DBLAMPERSAND  =  SDL2.scancode_to_keycode(SCANCODE::KP_DBLAMPERSAND)
+    KP_VERTICALBAR  =  SDL2.scancode_to_keycode(SCANCODE::KP_VERTICALBAR)
+    KP_DBLVERTICALBAR  =  SDL2.scancode_to_keycode(SCANCODE::KP_DBLVERTICALBAR)
+    KP_COLON  =  SDL2.scancode_to_keycode(SCANCODE::KP_COLON)
+    KP_HASH  =  SDL2.scancode_to_keycode(SCANCODE::KP_HASH)
+    KP_SPACE  =  SDL2.scancode_to_keycode(SCANCODE::KP_SPACE)
+    KP_AT  =  SDL2.scancode_to_keycode(SCANCODE::KP_AT)
+    KP_EXCLAM  =  SDL2.scancode_to_keycode(SCANCODE::KP_EXCLAM)
+    KP_MEMSTORE  =  SDL2.scancode_to_keycode(SCANCODE::KP_MEMSTORE)
+    KP_MEMRECALL  =  SDL2.scancode_to_keycode(SCANCODE::KP_MEMRECALL)
+    KP_MEMCLEAR  =  SDL2.scancode_to_keycode(SCANCODE::KP_MEMCLEAR)
+    KP_MEMADD  =  SDL2.scancode_to_keycode(SCANCODE::KP_MEMADD)
+    KP_MEMSUBTRACT  =         SDL2.scancode_to_keycode(SCANCODE::KP_MEMSUBTRACT)
+    KP_MEMMULTIPLY  =         SDL2.scancode_to_keycode(SCANCODE::KP_MEMMULTIPLY)
+    KP_MEMDIVIDE  =  SDL2.scancode_to_keycode(SCANCODE::KP_MEMDIVIDE)
+    KP_PLUSMINUS  =  SDL2.scancode_to_keycode(SCANCODE::KP_PLUSMINUS)
+    KP_CLEAR  =  SDL2.scancode_to_keycode(SCANCODE::KP_CLEAR)
+    KP_CLEARENTRY  =  SDL2.scancode_to_keycode(SCANCODE::KP_CLEARENTRY)
+    KP_BINARY  =  SDL2.scancode_to_keycode(SCANCODE::KP_BINARY)
+    KP_OCTAL  =  SDL2.scancode_to_keycode(SCANCODE::KP_OCTAL)
+    KP_DECIMAL  =  SDL2.scancode_to_keycode(SCANCODE::KP_DECIMAL)
+    KP_HEXADECIMAL  =         SDL2.scancode_to_keycode(SCANCODE::KP_HEXADECIMAL)
 
-    :LCTRL => scancode_to_keycode(Scancode.LCTRL),
-    :LSHIFT => scancode_to_keycode(Scancode.LSHIFT),
-    :LALT => scancode_to_keycode(Scancode.LALT),
-    :LGUI => scancode_to_keycode(Scancode.LGUI),
-    :RCTRL => scancode_to_keycode(Scancode.RCTRL),
-    :RSHIFT => scancode_to_keycode(Scancode.RSHIFT),
-    :RALT => scancode_to_keycode(Scancode.RALT),
-    :RGUI => scancode_to_keycode(Scancode.RGUI),
+    LCTRL  =  SDL2.scancode_to_keycode(SCANCODE::LCTRL)
+    LSHIFT  =  SDL2.scancode_to_keycode(SCANCODE::LSHIFT)
+    LALT  =  SDL2.scancode_to_keycode(SCANCODE::LALT)
+    LGUI  =  SDL2.scancode_to_keycode(SCANCODE::LGUI)
+    RCTRL  =  SDL2.scancode_to_keycode(SCANCODE::RCTRL)
+    RSHIFT  =  SDL2.scancode_to_keycode(SCANCODE::RSHIFT)
+    RALT  =  SDL2.scancode_to_keycode(SCANCODE::RALT)
+    RGUI  =  SDL2.scancode_to_keycode(SCANCODE::RGUI)
 
-    :MODE => scancode_to_keycode(Scancode.MODE),
+    MODE  =  SDL2.scancode_to_keycode(SCANCODE::MODE)
 
-    :AUDIONEXT => scancode_to_keycode(Scancode.AUDIONEXT),
-    :AUDIOPREV => scancode_to_keycode(Scancode.AUDIOPREV),
-    :AUDIOSTOP => scancode_to_keycode(Scancode.AUDIOSTOP),
-    :AUDIOPLAY => scancode_to_keycode(Scancode.AUDIOPLAY),
-    :AUDIOMUTE => scancode_to_keycode(Scancode.AUDIOMUTE),
-    :MEDIASELECT => scancode_to_keycode(Scancode.MEDIASELECT),
-    :WWW => scancode_to_keycode(Scancode.WWW),
-    :MAIL => scancode_to_keycode(Scancode.MAIL),
-    :CALCULATOR => scancode_to_keycode(Scancode.CALCULATOR),
-    :COMPUTER => scancode_to_keycode(Scancode.COMPUTER),
-    :AC_SEARCH => scancode_to_keycode(Scancode.AC_SEARCH),
-    :AC_HOME => scancode_to_keycode(Scancode.AC_HOME),
-    :AC_BACK => scancode_to_keycode(Scancode.AC_BACK),
-    :AC_FORWARD => scancode_to_keycode(Scancode.AC_FORWARD),
-    :AC_STOP => scancode_to_keycode(Scancode.AC_STOP),
-    :AC_REFRESH => scancode_to_keycode(Scancode.AC_REFRESH),
-    :AC_BOOKMARKS => scancode_to_keycode(Scancode.AC_BOOKMARKS),
+    AUDIONEXT  =  SDL2.scancode_to_keycode(SCANCODE::AUDIONEXT)
+    AUDIOPREV  =  SDL2.scancode_to_keycode(SCANCODE::AUDIOPREV)
+    AUDIOSTOP  =  SDL2.scancode_to_keycode(SCANCODE::AUDIOSTOP)
+    AUDIOPLAY  =  SDL2.scancode_to_keycode(SCANCODE::AUDIOPLAY)
+    AUDIOMUTE  =  SDL2.scancode_to_keycode(SCANCODE::AUDIOMUTE)
+    MEDIASELECT  =  SDL2.scancode_to_keycode(SCANCODE::MEDIASELECT)
+    WWW  =  SDL2.scancode_to_keycode(SCANCODE::WWW)
+    MAIL  =  SDL2.scancode_to_keycode(SCANCODE::MAIL)
+    CALCULATOR  =  SDL2.scancode_to_keycode(SCANCODE::CALCULATOR)
+    COMPUTER  =  SDL2.scancode_to_keycode(SCANCODE::COMPUTER)
+    AC_SEARCH  =  SDL2.scancode_to_keycode(SCANCODE::AC_SEARCH)
+    AC_HOME  =  SDL2.scancode_to_keycode(SCANCODE::AC_HOME)
+    AC_BACK  =  SDL2.scancode_to_keycode(SCANCODE::AC_BACK)
+    AC_FORWARD  =  SDL2.scancode_to_keycode(SCANCODE::AC_FORWARD)
+    AC_STOP  =  SDL2.scancode_to_keycode(SCANCODE::AC_STOP)
+    AC_REFRESH  =  SDL2.scancode_to_keycode(SCANCODE::AC_REFRESH)
+    AC_BOOKMARKS  =  SDL2.scancode_to_keycode(SCANCODE::AC_BOOKMARKS)
 
-    :BRIGHTNESSDOWN =>        scancode_to_keycode(Scancode.BRIGHTNESSDOWN),
-    :BRIGHTNESSUP => scancode_to_keycode(Scancode.BRIGHTNESSUP),
-    :DISPLAYSWITCH => scancode_to_keycode(Scancode.DISPLAYSWITCH),
-    :KBDILLUMTOGGLE =>        scancode_to_keycode(Scancode.KBDILLUMTOGGLE),
-    :KBDILLUMDOWN => scancode_to_keycode(Scancode.KBDILLUMDOWN),
-    :KBDILLUMUP => scancode_to_keycode(Scancode.KBDILLUMUP),
-    :EJECT => scancode_to_keycode(Scancode.EJECT),
-    :SLEEP => scancode_to_keycode(Scancode.SLEEP)
-  })
+    BRIGHTNESSDOWN  =         SDL2.scancode_to_keycode(SCANCODE::BRIGHTNESSDOWN)
+    BRIGHTNESSUP  =  SDL2.scancode_to_keycode(SCANCODE::BRIGHTNESSUP)
+    DISPLAYSWITCH  =  SDL2.scancode_to_keycode(SCANCODE::DISPLAYSWITCH)
+    KBDILLUMTOGGLE  =         SDL2.scancode_to_keycode(SCANCODE::KBDILLUMTOGGLE)
+    KBDILLUMDOWN  =  SDL2.scancode_to_keycode(SCANCODE::KBDILLUMDOWN)
+    KBDILLUMUP  =  SDL2.scancode_to_keycode(SCANCODE::KBDILLUMUP)
+    EJECT  =  SDL2.scancode_to_keycode(SCANCODE::EJECT)
+    SLEEP = SDL2.scancode_to_keycode(SCANCODE::SLEEP)
+  end
 
-  enum :keycode, Keycode.by_name
+  enum :keycode, KEYCODE.flatten_consts
 
-  KEYMOD_HASH = {
-    :NONE =>   0x0000,
-    :LSHIFT =>   0x0001,
-    :RSHIFT =>   0x0002,
-    :LCTRL =>  0x0040,
-    :RCTRL =>  0x0080,
-    :LALT =>   0x0100,
-    :RALT =>   0x0200,
-    :LGUI =>   0x0400,
-    :RGUI =>   0x0800,
-    :NUM  =>   0x1000,
-    :CAPS =>  0x2000,
-    :MODE =>  0x4000,
-    :RESERVED =>   0x8000
-  }
-  KEYMOD_HASH[:CTRL] = KEYMOD_HASH[:LCTRL]|KEYMOD_HASH[:RCTRL]
-  KEYMOD_HASH[:SHIFT] = KEYMOD_HASH[:LSHIFT]|KEYMOD_HASH[:RSHIFT]
-  KEYMOD_HASH[:ALT] = KEYMOD_HASH[:LALT]|KEYMOD_HASH[:RALT]
-  KEYMOD_HASH[:GUI] = KEYMOD_HASH[:LGUI]|KEYMOD_HASH[:RGUI]
+  module KEYMOD
+    include EnumerableConstants
+    NONE = 0x0000
+    LSHIFT = 0x0001
+    RSHIFT = 0x0002
+    LCTRL = 0x0040
+    RCTRL = 0x0080
+    LALT = 0x0100
+    RALT = 0x0200
+    LGUI = 0x0400
+    RGUI = 0x0800
+    NUM  = 0x1000
+    CAPS = 0x2000
+    MODE = 0x4000
+    RESERVED =   0x8000
+    CTRL = LCTRL|RCTRL
+    SHIFT = LSHIFT|RSHIFT
+    ALT = LALT|RALT
+    GUI = LGUI|RGUI
+  end
 
-  Keymod = Enum.new( :KEYMOD, KEYMOD_HASH)  
-  
+  enum :keymod, KEYMOD.flatten_consts
 
 end