rubysdl 1.3.1 → 2.0

data/{rubysdl_doc.en.rd → rubysdl_doc_old.en.rd}

@@ -1572,10 +1572,10 @@ Object
 === class method
 
 --- SDL::Joystick.pall
-      Return whether Joystick.updateAll is called automatically.
+      Return whether ((<SDL::Joystick.updateAll>)) is called automatically.
       
 --- SDL::JoyStick.pall=(polling)
-      Set whether Joystick.updateAll is called automatically and
+      Set whether ((<SDL::Joystick.updateAll>)) is called automatically and
       whether joystick events are processed.
       Default is true, and you shouldn't change.
 
@@ -1599,6 +1599,7 @@ Object
 
 --- SDL::Joystick.updateAll
 --- SDL::Joystick.update_all
+--- SDL::Joystick.update
       Updates the state(position, buttons, etc.) of all open joysticks.
 
 === method

data/rubysdl_event.c

@@ -17,330 +17,393 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
+
 #include "rubysdl.h"
 
-void eventCheck(int pred,char *msg)
+static VALUE cEvent;
+static VALUE cActiveEvent;
+static VALUE cKeyDownEvent;
+static VALUE cKeyUpEvent;
+static VALUE cMouseMotionEvent;
+static VALUE cMouseButtonDownEvent;
+static VALUE cMouseButtonUpEvent;
+static VALUE cJoyAxisEvent;
+static VALUE cJoyBallEvent;
+static VALUE cJoyHatEvent;
+static VALUE cJoyButtonUpEvent;
+static VALUE cJoyButtonDownEvent;
+static VALUE cQuitEvent;
+static VALUE cSysWMEvent;
+static VALUE cVideoResizeEvent;
+
+typedef VALUE (*event_creator)(SDL_Event *);
+static event_creator event_creators[SDL_NUMEVENTS];
+
+static VALUE createNoEvent(SDL_Event *event)
 {
-  if(!pred) 
-    rb_raise(eSDLError,"this event is not %s event",msg) ;
+  return Qnil;
 }
-    
-static VALUE createEventObject(VALUE class)
+
+static VALUE createActiveEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  return Data_Make_Struct(class,SDL_Event,0,free,event);
+  VALUE obj = rb_obj_alloc(cActiveEvent);
+  rb_iv_set(obj, "@gain", INT2BOOL(event->active.gain));
+  rb_iv_set(obj, "@state", INT2FIX(event->active.state));
+  return obj;
 }
 
-static VALUE sdl_pollEvent(VALUE obj)
+static VALUE createKeyEvent(VALUE obj, SDL_Event *event)
 {
-  SDL_Event *event;
+  rb_iv_set(obj, "@press", INT2BOOL(event->key.state == SDL_PRESSED));
+  rb_iv_set(obj, "@sym", INT2FIX(event->key.keysym.sym));
+  rb_iv_set(obj, "@mod", UINT2NUM(event->key.keysym.mod));
+  rb_iv_set(obj, "@unicode", UINT2NUM(event->key.keysym.unicode));
+  return obj;
+}
 
-  Data_Get_Struct(obj,SDL_Event,event);
-  return INT2NUM(SDL_PollEvent(event));
+static VALUE createKeyDownEvent(SDL_Event *event)
+{
+  VALUE obj = rb_obj_alloc(cKeyDownEvent);
+  return createKeyEvent(obj, event);
 }
-static VALUE sdl_waitEvent(VALUE obj)
+
+static VALUE createKeyUpEvent(SDL_Event *event)
 {
-  SDL_Event *event;
+  VALUE obj = rb_obj_alloc(cKeyUpEvent);
+  return createKeyEvent(obj, event);
+}
 
-  Data_Get_Struct(obj,SDL_Event,event);
-  if( SDL_WaitEvent(event)==0 )
-    rb_raise(eSDLError,"SDL_WaitEvent Failed :%s",SDL_GetError());
-  return Qnil;
+static VALUE createMouseMotionEvent(SDL_Event *event)
+{
+  VALUE obj = rb_obj_alloc(cMouseMotionEvent);
+  rb_iv_set(obj, "@state", INT2FIX(event->motion.state));
+  rb_iv_set(obj, "@x", INT2FIX(event->motion.x));
+  rb_iv_set(obj, "@y", INT2FIX(event->motion.y));
+  rb_iv_set(obj, "@xrel", INT2FIX(event->motion.xrel));
+  rb_iv_set(obj, "@yrel", INT2FIX(event->motion.yrel));
+  return obj;
 }
 
-static VALUE sdl_eventType(VALUE obj)
+static VALUE createMouseButtonEvent(VALUE obj, SDL_Event *event)
 {
-  SDL_Event *event;
+  rb_iv_set(obj, "@button", INT2FIX(event->button.button));
+  rb_iv_set(obj, "@press", INT2BOOL(event->button.state == SDL_PRESSED));
+  rb_iv_set(obj, "@x", INT2FIX(event->button.x));
+  rb_iv_set(obj, "@y", INT2FIX(event->button.y));
+  return obj;
+}
 
-  Data_Get_Struct(obj,SDL_Event,event);
-  return INT2FIX(event->type);
+static VALUE createMouseButtonDownEvent(SDL_Event *event)
+{
+  VALUE obj = rb_obj_alloc(cMouseButtonDownEvent);
+  return createMouseButtonEvent(obj, event);
 }
 
-/* --KeyboardEvent-- */
-static VALUE sdl_eventKeyPressed(VALUE obj)
+static VALUE createMouseButtonUpEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck((event->type == SDL_KEYDOWN)||(event->type == SDL_KEYUP),"key");
-  if( event->key.state==SDL_PRESSED )
-    return Qtrue;
-  else
-    return Qfalse;
+  VALUE obj = rb_obj_alloc(cMouseButtonUpEvent);
+  return createMouseButtonEvent(obj, event);
 }
-static VALUE sdl_eventKeyMod(VALUE obj)
+
+static VALUE createJoyAxisEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck((event->type == SDL_KEYDOWN)||(event->type == SDL_KEYUP),"key");
-  return INT2NUM(event->key.keysym.mod);
+  VALUE obj = rb_obj_alloc(cJoyAxisEvent);
+  rb_iv_set(obj, "@which", INT2FIX(event->jaxis.which));
+  rb_iv_set(obj, "@axis", INT2FIX(event->jaxis.axis));
+  rb_iv_set(obj, "@value", INT2FIX(event->jaxis.value));
+  return obj;
 }
-static VALUE sdl_eventKeySym(VALUE obj)
+
+static VALUE createJoyBallEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck((event->type == SDL_KEYDOWN)||(event->type == SDL_KEYUP),"key");
-  return INT2FIX(event->key.keysym.sym);
+  VALUE obj = rb_obj_alloc(cJoyBallEvent);
+  rb_iv_set(obj, "@which", INT2FIX(event->jball.which));
+  rb_iv_set(obj, "@ball", INT2FIX(event->jball.ball));
+  rb_iv_set(obj, "@xrel", INT2FIX(event->jball.xrel));
+  rb_iv_set(obj, "@yrel", INT2FIX(event->jball.yrel));
+  return obj;
 }
 
-/* --ActiveEvent-- */
-static VALUE sdl_eventActiveGained(VALUE obj)
+static VALUE createJoyHatEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck( event->type == SDL_ACTIVEEVENT , "active" );
-  return (event->active.gain)?Qtrue:Qfalse;
+  VALUE obj = rb_obj_alloc(cJoyHatEvent);
+  rb_iv_set(obj, "@which", INT2FIX(event->jhat.which));
+  rb_iv_set(obj, "@hat", INT2FIX(event->jhat.hat));
+  rb_iv_set(obj, "@value", INT2FIX(event->jhat.value));
+  return obj;
 }
-static VALUE sdl_eventActiveState(VALUE obj)
+
+static VALUE createJoyButtonEvent(VALUE obj, SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck( event->type == SDL_ACTIVEEVENT , "active" );
-  return INT2NUM(event->active.state);
+  rb_iv_set(obj, "@which", INT2FIX(event->jbutton.which));
+  rb_iv_set(obj, "@button", INT2FIX(event->jbutton.button));
+  rb_iv_set(obj, "@press", INT2BOOL(event->jbutton.state  ==  SDL_PRESSED));
+  return obj;
+}
+static VALUE createJoyButtonUpEvent(SDL_Event *event)
+{
+  VALUE obj = rb_obj_alloc(cJoyButtonUpEvent);
+  return createJoyButtonEvent(obj, event);
 }
 
-/* --MouseMotionEvent-- */
-static VALUE sdl_eventMouseX(VALUE obj)
+static VALUE createJoyButtonDownEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  switch (event->type){
-  case SDL_MOUSEMOTION:
-    return INT2NUM(event->motion.x);
-  case SDL_MOUSEBUTTONUP:
-  case SDL_MOUSEBUTTONDOWN:
-    return INT2NUM(event->button.x);
-  default:
-    eventCheck(0,"mouse"); /* raise exception */
-  }
-  return Qnil; /* never reach */
+  VALUE obj = rb_obj_alloc(cJoyButtonDownEvent);
+  return createJoyButtonEvent(obj, event);
 }
-static VALUE sdl_eventMouseY(VALUE obj)
+
+static VALUE createQuitEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  switch (event->type){
-  case SDL_MOUSEMOTION:
-    return INT2NUM(event->motion.y);
-  case SDL_MOUSEBUTTONUP:
-  case SDL_MOUSEBUTTONDOWN:
-    return INT2NUM(event->button.y);
-  default:
-    eventCheck(0,"mouse"); /* raise exception */
-  }
-  return Qnil; /* never reach */
+  VALUE obj = rb_obj_alloc(cQuitEvent);
+  return obj;
+}
+
+static VALUE createSysWMEvent(SDL_Event *event)
+{
+  VALUE obj = rb_obj_alloc(cSysWMEvent);
+  return obj;
 }
-static VALUE sdl_eventMouseXrel(VALUE obj)
+
+static VALUE createVideoResizeEvent(SDL_Event *event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck(event->type==SDL_MOUSEMOTION,"mouse motion");
-  return INT2NUM(event->motion.xrel);
+  VALUE obj = rb_obj_alloc(cVideoResizeEvent);
+  rb_iv_set(obj, "@w", INT2FIX(event->resize.w));
+  rb_iv_set(obj, "@h", INT2FIX(event->resize.h));
+  return obj;
 }
-static VALUE sdl_eventMouseYrel(VALUE obj)
+
+/* class method */
+static VALUE Event_s_poll(VALUE class)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck(event->type==SDL_MOUSEMOTION,"mouse motion");
-  return INT2NUM(event->motion.yrel);
+  SDL_Event event;
+  rb_secure(4);
+  if( SDL_PollEvent(&event) == 1)
+    return event_creators[event.type](&event);
+  else
+    return Qnil;
+}
+static VALUE Event_s_wait(VALUE class)
+{
+  SDL_Event event;
+  rb_secure(4);
+  if( SDL_WaitEvent(&event) == 1)
+    return event_creators[event.type](&event);
+  else
+    rb_raise(eSDLError, "Event handling error");
 }
 
-/* --SDL_MouseButtonEvent-- */
-static VALUE sdl_eventMouseButton(VALUE obj)
+static VALUE Event_s_pump(VALUE class)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck( (event->type==SDL_MOUSEBUTTONUP)||
-	      (event->type==SDL_MOUSEBUTTONDOWN) , "mouse button" );
-  return INT2NUM( event->button.button );
+  SDL_PumpEvents();
+  return Qnil;
 }
-static VALUE sdl_eventMousePressed(VALUE obj)
+
+static VALUE Event_s_new(VALUE class)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  eventCheck( (event->type==SDL_MOUSEBUTTONUP)||
-	      ( event->type==SDL_MOUSEBUTTONDOWN)   , "mouse button" );
-  return (event->button.state==SDL_PRESSED)?Qtrue:Qfalse;
+  return rb_obj_alloc(class);
 }
 
-static VALUE sdl_eventInfo(VALUE obj)
+static VALUE Event_s_push(VALUE class, VALUE event)
 {
-  SDL_Event *event;
-  
-  Data_Get_Struct(obj,SDL_Event,event);
-  switch(event->type){
-  case SDL_ACTIVEEVENT:
-    return rb_ary_new3(3,INT2FIX(SDL_ACTIVEEVENT),BOOL(event->active.gain),
-		       INT2FIX(event->active.state));
-  case SDL_KEYDOWN:
-  case SDL_KEYUP:
-    return rb_ary_new3( 4, INT2FIX(event->type),
-			BOOL(event->key.state==SDL_PRESSED),
-			INT2FIX(event->key.keysym.sym),
-			UINT2NUM(event->key.keysym.mod)
-			);
-  case SDL_MOUSEMOTION:
-    return rb_ary_new3( 6, INT2FIX(SDL_MOUSEMOTION),
-			INT2FIX(event->motion.state),
-			INT2FIX(event->motion.x),
-			INT2FIX(event->motion.y),
-			INT2FIX(event->motion.xrel),
-			INT2FIX(event->motion.yrel)
-			);
-  case SDL_MOUSEBUTTONDOWN:
-  case SDL_MOUSEBUTTONUP:
-    return rb_ary_new3( 5, INT2FIX(event->type),
-			INT2FIX(event->button.button),
-			BOOL(event->button.state==SDL_PRESSED),
-			INT2FIX(event->button.x),
-			INT2FIX(event->button.y)
-			);
-  case SDL_JOYAXISMOTION:
-    return rb_ary_new3( 4, INT2FIX(SDL_JOYAXISMOTION),
-			INT2FIX(event->jaxis.which),
-			INT2FIX(event->jaxis.axis),
-			INT2FIX(event->jaxis.value)
-			);
-  case SDL_JOYBALLMOTION:
-    return rb_ary_new3( 5, INT2FIX(SDL_JOYBALLMOTION),
-			INT2FIX(event->jball.which),
-			INT2FIX(event->jball.ball),
-			INT2FIX(event->jball.xrel),
-			INT2FIX(event->jball.yrel)
-			);
-  case SDL_JOYHATMOTION:
-    return rb_ary_new3( 4, INT2FIX(SDL_JOYHATMOTION),
-			INT2FIX(event->jhat.which),
-			INT2FIX(event->jhat.hat),
-			INT2FIX(event->jhat.value)
-			);
-  case SDL_JOYBUTTONDOWN:
-  case SDL_JOYBUTTONUP:
-    return rb_ary_new3( 4, INT2FIX(event->type),
-			INT2FIX(event->jbutton.which),
-			INT2FIX(event->jbutton.button),
-			BOOL(event->jbutton.state==SDL_PRESSED)
-			);
-  case SDL_QUIT:
-    return rb_ary_new3( 1, INT2FIX(SDL_QUIT));
-  case SDL_SYSWMEVENT:
-    return rb_ary_new3( 1, INT2FIX(SDL_SYSWMEVENT));
-  case SDL_VIDEORESIZE:
-    return rb_ary_new3( 3, INT2FIX(SDL_VIDEORESIZE),
-			INT2FIX(event->resize.w),
-			INT2FIX(event->resize.h)
-			);
+  SDL_Event e;
+  VALUE eventClass;
+  rb_secure(4);
+  eventClass = CLASS_OF(event);
+  if(eventClass == cActiveEvent){
+    e.type = SDL_ACTIVEEVENT;
+    e.active.gain = rb_iv_get(event, "@gain");
+    e.active.state = NUM2INT(rb_iv_get(event, "@state"));
+  }else if(eventClass == cKeyDownEvent){
+    e.type=SDL_KEYDOWN;
+    e.key.state = (rb_iv_get(event, "@press"))?SDL_PRESSED:SDL_RELEASED;
+    e.key.keysym.sym = NUM2INT(rb_iv_get(event, "@sym"));
+    e.key.keysym.mod = NUM2UINT(rb_iv_get(event, "@mod"));
+    e.key.keysym.unicode   = NUM2UINT( rb_iv_get(event, "@unicode") );
+  }else if(eventClass == cKeyUpEvent){
+    e.type = SDL_KEYUP;
+    e.key.state = (rb_iv_get(event, "@press"))?SDL_PRESSED:SDL_RELEASED;
+    e.key.keysym.sym = NUM2INT(rb_iv_get(event, "@sym"));
+    e.key.keysym.mod = NUM2UINT(rb_iv_get(event, "@mod"));
+    e.key.keysym.unicode = NUM2UINT( rb_iv_get(event, "@unicode") );
+  }else if(eventClass == cMouseMotionEvent){
+    e.type=SDL_MOUSEMOTION;
+    e.motion.state = NUM2INT(rb_iv_get(event, "@state"));
+    e.motion.x = NUM2INT(rb_iv_get(event, "@x"));
+    e.motion.y = NUM2INT(rb_iv_get(event, "@y"));
+    e.motion.xrel = NUM2INT(rb_iv_get(event, "@xrel"));
+    e.motion.yrel = NUM2INT(rb_iv_get(event, "@yrel"));
+  }else if(eventClass == cMouseButtonDownEvent){
+    e.type = SDL_MOUSEBUTTONDOWN;
+    e.button.button = NUM2INT(rb_iv_get(event, "@button"));
+    e.button.state = (rb_iv_get(event, "@press"))?SDL_PRESSED:SDL_RELEASED;
+    e.button.x = NUM2INT(rb_iv_get(event, "@x"));
+    e.button.y = NUM2INT(rb_iv_get(event, "@y"));
+  }else if(eventClass == cMouseButtonUpEvent){
+    e.type = SDL_MOUSEBUTTONUP;
+    e.button.button = NUM2INT(rb_iv_get(event, "@button"));
+    e.button.state = (rb_iv_get(event, "@press"))?SDL_PRESSED:SDL_RELEASED;
+    e.button.x = NUM2INT(rb_iv_get(event, "@x"));
+    e.button.y = NUM2INT(rb_iv_get(event, "@y"));\
+  }else if(eventClass == cJoyAxisEvent){
+    e.type = SDL_JOYAXISMOTION;
+    e.jaxis.which = NUM2INT(rb_iv_get(event, "@which"));
+    e.jaxis.axis = NUM2INT(rb_iv_get(event, "@axis"));
+    e.jaxis.value = NUM2INT(rb_iv_get(event, "@value"));
+  }else if(eventClass == cJoyBallEvent){
+    e.type = SDL_JOYBALLMOTION;
+    e.jball.which = NUM2INT(rb_iv_get(event, "@which"));
+    e.jball.ball = NUM2INT(rb_iv_get(event, "@ball"));
+    e.jball.xrel = NUM2INT(rb_iv_get(event, "@xrel"));
+    e.jball.yrel = NUM2INT(rb_iv_get(event, "@yrel"));
+  }else if(eventClass == cJoyHatEvent){
+    e.type = SDL_JOYHATMOTION;
+    e.jhat.which = NUM2INT(rb_iv_get(event, "@which"));
+    e.jhat.hat = NUM2INT(rb_iv_get(event, "@hat"));
+    e.jhat.value = NUM2INT(rb_iv_get(event, "@value"));
+  }else if(eventClass == cJoyButtonUpEvent){
+    e.type = SDL_JOYBUTTONUP;
+    e.jbutton.which = NUM2INT(rb_iv_get(event, "@which"));
+    e.jbutton.button = NUM2INT(rb_iv_get(event, "@button"));
+    e.jbutton.state = (rb_iv_get(event, "@press"))?SDL_PRESSED:SDL_RELEASED;
+  }else if(eventClass == cJoyButtonDownEvent){
+    e.type = SDL_JOYBUTTONDOWN;
+    e.jbutton.which = NUM2INT(rb_iv_get(event, "@which"));
+    e.jbutton.button = NUM2INT(rb_iv_get(event, "@button"));
+    e.jbutton.state = (rb_iv_get(event, "@press"))?SDL_PRESSED:SDL_RELEASED;
+  }else if(eventClass == cQuitEvent){
+    e.type = SDL_QUIT;
+  }else if(eventClass == cSysWMEvent){
+    e.type = SDL_SYSWMEVENT;
+  }else if(eventClass == cVideoResizeEvent){
+    e.type = SDL_VIDEORESIZE;
+    e.resize.w = NUM2INT(rb_iv_get(event, "@w"));
+    e.resize.h = NUM2INT(rb_iv_get(event, "@h"));
+  }else {
+    rb_raise(eSDLError, "This object couldn't be pushed");
   }
+  if(SDL_PushEvent(&e) == -1)
+    rb_raise(eSDLError, "the event couldn't be pushed");
   return Qnil;
 }
-
-static VALUE sdl_getAppState(VALUE class)
+static VALUE Event_s_getAppState(VALUE class)
 {
   return INT2FIX(SDL_GetAppState());
 }
 
-static VALUE sdl_enableUNICODE(VALUE class)
+static VALUE Event_s_enableUNICODE(VALUE class)
 {
+  rb_secure(4);
   SDL_EnableUNICODE(1);
   return Qnil;
 }
-static VALUE sdl_disableUNICODE(VALUE class)
+static VALUE Event_s_disableUNICODE(VALUE class)
 {
+  rb_secure(4);
   SDL_EnableUNICODE(0);
   return Qnil;
 }
-static VALUE sdl_is_enableUNICODE(VALUE class)
+static VALUE Event_s_is_enableUNICODE(VALUE class)
 {
-  return BOOL(SDL_EnableUNICODE(-1));
+  return INT2BOOL(SDL_EnableUNICODE(-1));
 }
 
-static void defineConstForEvent()
+void rubysdl_init_Event(VALUE mSDL)
 {
-  rb_define_const(cEvent,"NOEVENT",INT2NUM(SDL_NOEVENT));
-  rb_define_const(cEvent,"ACTIVEEVENT",INT2NUM(SDL_ACTIVEEVENT));
-  rb_define_const(cEvent,"KEYDOWN",INT2NUM(SDL_KEYDOWN));
-  rb_define_const(cEvent,"KEYUP",INT2NUM(SDL_KEYUP));
-  rb_define_const(cEvent,"MOUSEMOTION",INT2NUM(SDL_MOUSEMOTION));
-  rb_define_const(cEvent,"MOUSEBUTTONDOWN",INT2NUM(SDL_MOUSEBUTTONDOWN));
-  rb_define_const(cEvent,"MOUSEBUTTONUP",INT2NUM(SDL_MOUSEBUTTONUP));
-  rb_define_const(cEvent,"JOYAXISMOTION",INT2NUM(SDL_JOYAXISMOTION));
-  rb_define_const(cEvent,"JOYBALLMOTION",INT2NUM(SDL_JOYBALLMOTION));
-  rb_define_const(cEvent,"JOYHATMOTION",INT2NUM(SDL_JOYHATMOTION));
-  rb_define_const(cEvent,"JOYBUTTONDOWN",INT2NUM(SDL_JOYBUTTONDOWN));
-  rb_define_const(cEvent,"JOYBUTTONUP",INT2NUM(SDL_JOYBUTTONUP));
-  rb_define_const(cEvent,"QUIT",INT2NUM(SDL_QUIT));
-  rb_define_const(cEvent,"SYSWMEVENT",INT2NUM(SDL_SYSWMEVENT));
-  rb_define_const(cEvent,"EVENT_RESERVEDA",INT2NUM(SDL_EVENT_RESERVEDA));
-  rb_define_const(cEvent,"EVENT_RESERVEDB",INT2NUM(SDL_EVENT_RESERVEDB));
-  rb_define_const(cEvent,"VIDEORESIZE",INT2NUM(SDL_VIDEORESIZE));
-#if SDL_VERSION_ATLEAST(1,2,0)
-  rb_define_const(cEvent,"VIDEOEXPOSE",INT2NUM(SDL_VIDEOEXPOSE));
-#else
-  rb_define_const(cEvent,"EVENT_RESERVED1",INT2NUM(SDL_EVENT_RESERVED1));
-#endif
-  rb_define_const(cEvent,"EVENT_RESERVED2",INT2NUM(SDL_EVENT_RESERVED2));
-  rb_define_const(cEvent,"EVENT_RESERVED3",INT2NUM(SDL_EVENT_RESERVED3));
-  rb_define_const(cEvent,"EVENT_RESERVED4",INT2NUM(SDL_EVENT_RESERVED4));
-  rb_define_const(cEvent,"EVENT_RESERVED5",INT2NUM(SDL_EVENT_RESERVED5));
-  rb_define_const(cEvent,"EVENT_RESERVED6",INT2NUM(SDL_EVENT_RESERVED6));
-  rb_define_const(cEvent,"EVENT_RESERVED7",INT2NUM(SDL_EVENT_RESERVED7));
-  /* Events SDL_USEREVENT through SDL_MAXEVENTS-1 are for your use */
-  rb_define_const(cEvent,"USEREVENT",INT2NUM(SDL_USEREVENT));
-  /* This last event is only for bounding internal arrays
-     It is the number of bits in the event mask datatype -- Uint32
-     */
-  rb_define_const(cEvent,"NUMEVENTS",INT2NUM(SDL_NUMEVENTS));
-
-  /* The available application states */
-  rb_define_const(cEvent,"APPMOUSEFOCUS",UINT2NUM(SDL_APPMOUSEFOCUS));
-  rb_define_const(cEvent,"APPINPUTFOCUS",UINT2NUM(SDL_APPINPUTFOCUS));
-  rb_define_const(cEvent,"APPACTIVE",UINT2NUM(SDL_APPACTIVE));
-
-}
-
-
-void init_event()
-{
-  cEvent = rb_define_class_under(mSDL,"Event",rb_cObject);
-  rb_define_singleton_method(cEvent,"new",createEventObject,0);
+  int i;
   
-  rb_define_singleton_method(cEvent,"appState",sdl_getAppState,0);
-  rb_define_singleton_method(cEvent,"enableUNICODE",sdl_enableUNICODE,0);
-  rb_define_singleton_method(cEvent,"disableUNICODE",sdl_disableUNICODE,0);
-  rb_define_singleton_method(cEvent,"enableUNICODE?",sdl_is_enableUNICODE,0);
+  cEvent=rb_define_class_under(mSDL, "Event", rb_cObject);
+  rb_define_singleton_method(cEvent, "poll", Event_s_poll, 0);
+  rb_define_singleton_method(cEvent, "wait", Event_s_wait, 0);
+  rb_define_singleton_method(cEvent, "pump", Event_s_pump, 0);
+  rb_define_singleton_method(cEvent, "new", Event_s_new, 0);
+  rb_define_singleton_method(cEvent, "push", Event_s_push, 1);
+  rb_define_singleton_method(cEvent, "appState", Event_s_getAppState, 0);
+  rb_define_singleton_method(cEvent, "enableUNICODE", Event_s_enableUNICODE, 0);
+  rb_define_singleton_method(cEvent, "disableUNICODE", Event_s_disableUNICODE, 0);
+  rb_define_singleton_method(cEvent, "enableUNICODE?", Event_s_is_enableUNICODE, 0);
+  cActiveEvent=rb_define_class_under(cEvent, "Active", cEvent);
+  rb_define_attr(cActiveEvent, "gain", 1, 1);
+  rb_define_attr(cActiveEvent, "state", 1, 1);
   
-  rb_define_method(cEvent,"poll",sdl_pollEvent,0);
-  rb_define_method(cEvent,"wait",sdl_waitEvent,0);
+  cKeyDownEvent=rb_define_class_under(cEvent, "KeyDown", cEvent);
+  rb_define_attr(cKeyDownEvent, "press", 1, 1);
+  rb_define_attr(cKeyDownEvent, "sym", 1, 1);
+  rb_define_attr(cKeyDownEvent, "mod", 1, 1);
+  rb_define_attr(cKeyDownEvent, "unicode", 1, 1);
   
-  rb_define_method(cEvent,"type",sdl_eventType,0);
+  cKeyUpEvent=rb_define_class_under(cEvent, "KeyUp", cEvent);
+  rb_define_attr(cKeyUpEvent, "press", 1, 1);
+  rb_define_attr(cKeyUpEvent, "sym", 1, 1);
+  rb_define_attr(cKeyUpEvent, "mod", 1, 1);
+  rb_define_attr(cKeyUpEvent, "unicode", 1, 1);
   
-  rb_define_method(cEvent,"keyPress?",sdl_eventKeyPressed,0);
-  rb_define_method(cEvent,"keySym",sdl_eventKeySym,0);
-  rb_define_method(cEvent,"keyMod",sdl_eventKeyMod,0);
-
-  rb_define_method(cEvent,"gain?",sdl_eventActiveGained,0);
-  rb_define_method(cEvent,"appState",sdl_eventActiveState,0);
-
-  rb_define_method(cEvent,"mouseX",sdl_eventMouseX,0);
-  rb_define_method(cEvent,"mouseY",sdl_eventMouseY,0);
-  rb_define_method(cEvent,"mouseXrel",sdl_eventMouseXrel,0);
-  rb_define_method(cEvent,"mouseYrel",sdl_eventMouseYrel,0);
+  cMouseMotionEvent=rb_define_class_under(cEvent, "MouseMotion", cEvent);
+  rb_define_attr(cMouseMotionEvent, "state", 1, 1);
+  rb_define_attr(cMouseMotionEvent, "x", 1, 1);
+  rb_define_attr(cMouseMotionEvent, "y", 1, 1);
+  rb_define_attr(cMouseMotionEvent, "xrel", 1, 1);
+  rb_define_attr(cMouseMotionEvent, "yrel", 1, 1);
+  
+  cMouseButtonDownEvent=rb_define_class_under(cEvent, "MouseButtonDown", cEvent);
+  rb_define_attr(cMouseButtonDownEvent, "button", 1, 1);
+  rb_define_attr(cMouseButtonDownEvent, "press", 1, 1);
+  rb_define_attr(cMouseButtonDownEvent, "x", 1, 1);
+  rb_define_attr(cMouseButtonDownEvent, "y", 1, 1);
 
-  rb_define_method(cEvent,"mouseButton",sdl_eventMouseButton,0);
-  rb_define_method(cEvent,"mousePress?",sdl_eventMousePressed,0);
+  cMouseButtonUpEvent=rb_define_class_under(cEvent, "MouseButtonUp", cEvent);
+  rb_define_attr(cMouseButtonUpEvent, "button", 1, 1);
+  rb_define_attr(cMouseButtonUpEvent, "press", 1, 1);
+  rb_define_attr(cMouseButtonUpEvent, "x", 1, 1);
+  rb_define_attr(cMouseButtonUpEvent, "y", 1, 1);
+  
+  cJoyAxisEvent=rb_define_class_under(cEvent, "JoyAxis", cEvent);
+  rb_define_attr(cJoyAxisEvent, "which", 1, 1);
+  rb_define_attr(cJoyAxisEvent, "axis", 1, 1);
+  rb_define_attr(cJoyAxisEvent, "value", 1, 1);
+  
+  cJoyBallEvent=rb_define_class_under(cEvent, "JoyBall", cEvent);
+  rb_define_attr(cJoyBallEvent, "which", 1, 1);
+  rb_define_attr(cJoyBallEvent, "ball", 1, 1);
+  rb_define_attr(cJoyBallEvent, "xrel", 1, 1);
+  rb_define_attr(cJoyBallEvent, "yrel", 1, 1);
+  
+  cJoyHatEvent=rb_define_class_under(cEvent, "JoyHat", cEvent);
+  rb_define_attr(cJoyHatEvent, "which", 1, 1);
+  rb_define_attr(cJoyHatEvent, "hat", 1, 1);
+  rb_define_attr(cJoyHatEvent, "value", 1, 1);
+  
+  cJoyButtonUpEvent=rb_define_class_under(cEvent, "JoyButtonUp", cEvent);
+  rb_define_attr(cJoyButtonUpEvent, "which", 1, 1);
+  rb_define_attr(cJoyButtonUpEvent, "button", 1, 1);
+  rb_define_attr(cJoyButtonUpEvent, "press", 1, 1);
 
-  rb_define_method(cEvent,"info",sdl_eventInfo,0);
-  defineConstForEvent();
+  cJoyButtonDownEvent=rb_define_class_under(cEvent, "JoyButtonDown", cEvent);
+  rb_define_attr(cJoyButtonDownEvent, "which", 1, 1);
+  rb_define_attr(cJoyButtonDownEvent, "button", 1, 1);
+  rb_define_attr(cJoyButtonDownEvent, "press", 1, 1);
   
+  cQuitEvent=rb_define_class_under(cEvent, "Quit", cEvent);
+  
+  cSysWMEvent=rb_define_class_under(cEvent, "SysWM", cEvent);
+  
+  cVideoResizeEvent=rb_define_class_under(cEvent, "VideoResize", cEvent);
+  rb_define_attr(cVideoResizeEvent, "w", 1, 1);
+  rb_define_attr(cVideoResizeEvent, "h", 1, 1);
+
+  for(i=0;i<SDL_NUMEVENTS;++i)
+    event_creators[i]=createNoEvent;
+  event_creators[SDL_ACTIVEEVENT] = createActiveEvent;
+  event_creators[SDL_KEYDOWN] = createKeyDownEvent;
+  event_creators[SDL_KEYUP] = createKeyUpEvent;
+  event_creators[SDL_MOUSEMOTION] = createMouseMotionEvent;
+  event_creators[SDL_MOUSEBUTTONDOWN] = createMouseButtonDownEvent;
+  event_creators[SDL_MOUSEBUTTONUP] = createMouseButtonUpEvent;
+  event_creators[SDL_JOYAXISMOTION] = createJoyAxisEvent;
+  event_creators[SDL_JOYBALLMOTION] = createJoyBallEvent;
+  event_creators[SDL_JOYHATMOTION] = createJoyHatEvent;
+  event_creators[SDL_JOYBUTTONDOWN] = createJoyButtonDownEvent;
+  event_creators[SDL_JOYBUTTONUP] = createJoyButtonUpEvent;
+  event_creators[SDL_QUIT] = createQuitEvent;
+  event_creators[SDL_SYSWMEVENT] = createSysWMEvent;
+  event_creators[SDL_VIDEORESIZE] = createVideoResizeEvent;
 }