Index: trunk/src/sdl/sdl_input.cc
===================================================================
--- trunk/src/sdl/sdl_input.cc	(revision 336)
+++ trunk/src/sdl/sdl_input.cc	(revision 338)
@@ -15,4 +15,5 @@
 {
 	if ( ! SDL_WasInit( SDL_INIT_JOYSTICK ) ) SDL_InitSubSystem( SDL_INIT_JOYSTICK );
+	if ( ! SDL_WasInit( SDL_INIT_GAMECONTROLLER ) ) SDL_InitSubSystem( SDL_INIT_GAMECONTROLLER );
 }
 
@@ -140,4 +141,23 @@
 }
 
+static bool sdl_pad_button_event_to_io_event( const SDL_ControllerButtonEvent& cb, io_event& cevent )
+{
+	cevent.type            = EV_PAD_BUTTON;
+	cevent.pbutton.id      = cb.which;
+	cevent.pbutton.button  = cb.button;
+	cevent.pbutton.pressed = (cb.type == SDL_PRESSED);
+	return true;
+}
+
+static bool sdl_pad_axis_event_to_io_event( const SDL_ControllerAxisEvent& ca, io_event& cevent )
+{
+	cevent.type          = EV_PAD_AXIS;
+	cevent.paxis.id      = ca.which;
+	cevent.paxis.axis    = ca.axis;
+	cevent.paxis.value   = ca.value;
+	return true;
+}
+
+
 static bool sdl_joy_button_event_to_io_event( const SDL_JoyButtonEvent& jb, io_event& jevent )
 {
@@ -202,4 +222,7 @@
 	case SDL_SYSWMEVENT      : ioevent.type = EV_SYSTEM; return true;
 	case SDL_QUIT            : ioevent.type = EV_QUIT;   return true;
+	case SDL_CONTROLLERAXISMOTION : return sdl_pad_axis_event_to_io_event( e.caxis, ioevent ); 
+	case SDL_CONTROLLERBUTTONDOWN : return sdl_pad_button_event_to_io_event( e.cbutton, ioevent ); 
+	case SDL_CONTROLLERBUTTONUP   :
 	case SDL_JOYAXISMOTION   : return sdl_joy_axis_event_to_io_event( e.jaxis, ioevent ); 
 	case SDL_JOYBALLMOTION   : return sdl_joy_ball_event_to_io_event( e.jball, ioevent );