[simspark-cvs] simspark/spark/plugin/inputsdl inputsystemsdl.cpp,1.1,1.2 inputsystemsdl.h,1.1,1.2 keyboardsdl.cpp,1.1,1.2 mousesdl.cpp,1.1,1.2 timersdl.cpp,1.1,1.2 timersdl.h,1.1,1.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/inputsdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30903/plugin/inputsdl

Modified Files:
	inputsystemsdl.cpp inputsystemsdl.h keyboardsdl.cpp 
	mousesdl.cpp timersdl.cpp timersdl.h 
Log Message:
- input struct changes
- minor cleanups


Index: keyboardsdl.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/inputsdl/keyboardsdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** keyboardsdl.cpp	13 Dec 2005 21:48:48 -0000	1.1
--- keyboardsdl.cpp	25 Dec 2005 18:32:27 -0000	1.2
***************
*** 41,51 ****
      // symbols taken from <SDL/SDL_keysm.h>
  
!     mSymbols[SDLK_BACKSPACE]   = InputServer::IC_BACKSPACE;
!     mSymbols[SDLK_TAB]         = InputServer::InputServer::IC_TAB;
      // SDLK_CLEAR ??
!     mSymbols[SDLK_RETURN]      = InputServer::IC_RETURN;
!     mSymbols[SDLK_PAUSE]       = InputServer::IC_PAUSE;
!     mSymbols[SDLK_ESCAPE]      = InputServer::IC_ESCAPE;
!     mSymbols[SDLK_SPACE]       = InputServer::IC_SPACE;
      // SDLK_EXCLAIM
      // SDLK_QUOTEDBL
--- 41,51 ----
      // symbols taken from <SDL/SDL_keysm.h>
  
!     mSymbols[SDLK_BACKSPACE]   = Input::IC_BACKSPACE;
!     mSymbols[SDLK_TAB]         = Input::IC_TAB;
      // SDLK_CLEAR ??
!     mSymbols[SDLK_RETURN]      = Input::IC_RETURN;
!     mSymbols[SDLK_PAUSE]       = Input::IC_PAUSE;
!     mSymbols[SDLK_ESCAPE]      = Input::IC_ESCAPE;
!     mSymbols[SDLK_SPACE]       = Input::IC_SPACE;
      // SDLK_EXCLAIM
      // SDLK_QUOTEDBL
***************
*** 58,177 ****
      // SDLK_ASTERISK
      // SDLK_PLUS
!     mSymbols[SDLK_COMMA]        = InputServer::IC_COMMA;
!     mSymbols[SDLK_MINUS]        = InputServer::IC_MINUS;
!     mSymbols[SDLK_PERIOD]       = InputServer::IC_PERIOD;
!     mSymbols[SDLK_SLASH]        = InputServer::IC_SLASH;
!     mSymbols[SDLK_0]            = InputServer::IC_0;
!     mSymbols[SDLK_1]            = InputServer::IC_1;
!     mSymbols[SDLK_2]            = InputServer::IC_2;
!     mSymbols[SDLK_3]            = InputServer::IC_3;
!     mSymbols[SDLK_4]            = InputServer::IC_4;
!     mSymbols[SDLK_5]            = InputServer::IC_5;
!     mSymbols[SDLK_6]            = InputServer::IC_6;
!     mSymbols[SDLK_7]            = InputServer::IC_7;
!     mSymbols[SDLK_8]            = InputServer::IC_8;
!     mSymbols[SDLK_9]            = InputServer::IC_9;
      // SDLK_COLON
!     mSymbols[SDLK_SEMICOLON]    = InputServer::IC_SEMICOLON;
      // SDLK_LESS
      // SDLK_EQUALS
!     mSymbols[SDLK_EQUALS]       = InputServer::IC_EQUALS;
      // SDLK_GREATER
      // SDLK_QUESTION
      // SDLK_AT
!     mSymbols[SDLK_LEFTBRACKET]  = InputServer::IC_LBRACKET;
!     mSymbols[SDLK_BACKSLASH]    = InputServer::IC_BACKSLASH;
!     mSymbols[SDLK_RIGHTBRACKET] = InputServer::IC_RBRACKET;
      // SDLK_CARET
      // SDLK_UNDERSCORE
      // SDLK_BACKQUOTE
!     mSymbols[SDLK_a]            = InputServer::IC_A;
!     mSymbols[SDLK_b]            = InputServer::IC_B;
!     mSymbols[SDLK_c]            = InputServer::IC_C;
!     mSymbols[SDLK_d]            = InputServer::IC_D;
!     mSymbols[SDLK_e]            = InputServer::IC_E;
!     mSymbols[SDLK_f]            = InputServer::IC_F;
!     mSymbols[SDLK_g]            = InputServer::IC_G;
!     mSymbols[SDLK_h]            = InputServer::IC_H;
!     mSymbols[SDLK_i]            = InputServer::IC_I;
!     mSymbols[SDLK_j]            = InputServer::IC_J;
!     mSymbols[SDLK_k]            = InputServer::IC_K;
!     mSymbols[SDLK_l]            = InputServer::IC_L;
!     mSymbols[SDLK_m]            = InputServer::IC_M;
!     mSymbols[SDLK_n]            = InputServer::IC_N;
!     mSymbols[SDLK_o]            = InputServer::IC_O;
!     mSymbols[SDLK_p]            = InputServer::IC_P;
!     mSymbols[SDLK_q]            = InputServer::IC_Q;
!     mSymbols[SDLK_r]            = InputServer::IC_R;
!     mSymbols[SDLK_s]            = InputServer::IC_S;
!     mSymbols[SDLK_t]            = InputServer::IC_T;
!     mSymbols[SDLK_u]            = InputServer::IC_U;
!     mSymbols[SDLK_v]            = InputServer::IC_V;
!     mSymbols[SDLK_w]            = InputServer::IC_W;
!     mSymbols[SDLK_x]            = InputServer::IC_X;
!     mSymbols[SDLK_y]            = InputServer::IC_Y;
!     mSymbols[SDLK_z]            = InputServer::IC_Z;
!     mSymbols[SDLK_DELETE]       = InputServer::IC_DELETE;
      // SDLK_WORLD_0
      // [...]
      // SDLK_WORLD_95
!     mSymbols[SDLK_KP0]          = InputServer::IC_KP0;
!     mSymbols[SDLK_KP1]          = InputServer::IC_KP1;
!     mSymbols[SDLK_KP2]          = InputServer::IC_KP2;
!     mSymbols[SDLK_KP3]          = InputServer::IC_KP3;
!     mSymbols[SDLK_KP4]          = InputServer::IC_KP4;
!     mSymbols[SDLK_KP5]          = InputServer::IC_KP5;
!     mSymbols[SDLK_KP6]          = InputServer::IC_KP6;
!     mSymbols[SDLK_KP7]          = InputServer::IC_KP7;
!     mSymbols[SDLK_KP8]          = InputServer::IC_KP8;
!     mSymbols[SDLK_KP9]          = InputServer::IC_KP9;
!     mSymbols[SDLK_KP_PERIOD]    = InputServer::IC_KP_DECIMAL;
!     mSymbols[SDLK_KP_DIVIDE]    = InputServer::IC_KP_DIVIDE;
!     mSymbols[SDLK_KP_MULTIPLY]  = InputServer::IC_KP_MULTIPLY;
!     mSymbols[SDLK_KP_MINUS]     = InputServer::IC_KP_MINUS;
!     mSymbols[SDLK_KP_PLUS]      = InputServer::IC_KP_PLUS;
!     mSymbols[SDLK_KP_ENTER]     = InputServer::IC_KP_ENTER;
      // SDLK_KP_EQUALS
!     mSymbols[SDLK_UP]           = InputServer::IC_UP;
!     mSymbols[SDLK_DOWN]         = InputServer::IC_DOWN;
!     mSymbols[SDLK_RIGHT]        = InputServer::IC_RIGHT;
!     mSymbols[SDLK_LEFT]         = InputServer::IC_LEFT;
!     mSymbols[SDLK_INSERT]       = InputServer::IC_INSERT;
!     mSymbols[SDLK_HOME]         = InputServer::IC_HOME;
!     mSymbols[SDLK_END]          = InputServer::IC_END;
!     mSymbols[SDLK_PAGEUP]       = InputServer::IC_PAGEUP;
!     mSymbols[SDLK_PAGEDOWN]     = InputServer::IC_PAGEDOWN;
!     mSymbols[SDLK_F1]           = InputServer::IC_F1;
!     mSymbols[SDLK_F2]           = InputServer::IC_F2;
!     mSymbols[SDLK_F3]           = InputServer::IC_F3;
!     mSymbols[SDLK_F4]           = InputServer::IC_F4;
!     mSymbols[SDLK_F5]           = InputServer::IC_F5;
!     mSymbols[SDLK_F6]           = InputServer::IC_F6;
!     mSymbols[SDLK_F7]           = InputServer::IC_F7;
!     mSymbols[SDLK_F8]           = InputServer::IC_F8;
!     mSymbols[SDLK_F9]           = InputServer::IC_F9;
!     mSymbols[SDLK_F10]          = InputServer::IC_F10;
!     mSymbols[SDLK_F11]          = InputServer::IC_F11;
!     mSymbols[SDLK_F12]          = InputServer::IC_F12;
      // SDLK_F13
      // SDLK_F14
      // SDLK_F15
!     mSymbols[SDLK_NUMLOCK]      = InputServer::IC_NUMLOCK;
!     mSymbols[SDLK_CAPSLOCK]     = InputServer::IC_CAPSLOCK;
!     mSymbols[SDLK_SCROLLOCK]    = InputServer::IC_SCROLLOCK;
!     mSymbols[SDLK_RSHIFT]       = InputServer::IC_RSHIFT;
!     mSymbols[SDLK_LSHIFT]       = InputServer::IC_LSHIFT;
!     mSymbols[SDLK_RCTRL]        = InputServer::IC_RCTRL;
!     mSymbols[SDLK_LCTRL]        = InputServer::IC_LCTRL;
!     mSymbols[SDLK_RALT]         = InputServer::IC_RALT;
!     mSymbols[SDLK_LALT]         = InputServer::IC_LALT;
      // SDLK_RMETA
      // SDLK_LMETA
!     mSymbols[SDLK_LSUPER]       = InputServer::IC_LSUPER;
!     mSymbols[SDLK_RSUPER]       = InputServer::IC_RSUPER;
      // SDLK_MODE
      // SDLK_COMPOSE
      // SDLK_HELP
!     mSymbols[SDLK_PRINT]        = InputServer::IC_PRINT;
      // SDLK_SYSREQ
      // SDLK_BREAK
--- 58,177 ----
      // SDLK_ASTERISK
      // SDLK_PLUS
!     mSymbols[SDLK_COMMA]        = Input::IC_COMMA;
!     mSymbols[SDLK_MINUS]        = Input::IC_MINUS;
!     mSymbols[SDLK_PERIOD]       = Input::IC_PERIOD;
!     mSymbols[SDLK_SLASH]        = Input::IC_SLASH;
!     mSymbols[SDLK_0]            = Input::IC_0;
!     mSymbols[SDLK_1]            = Input::IC_1;
!     mSymbols[SDLK_2]            = Input::IC_2;
!     mSymbols[SDLK_3]            = Input::IC_3;
!     mSymbols[SDLK_4]            = Input::IC_4;
!     mSymbols[SDLK_5]            = Input::IC_5;
!     mSymbols[SDLK_6]            = Input::IC_6;
!     mSymbols[SDLK_7]            = Input::IC_7;
!     mSymbols[SDLK_8]            = Input::IC_8;
!     mSymbols[SDLK_9]            = Input::IC_9;
      // SDLK_COLON
!     mSymbols[SDLK_SEMICOLON]    = Input::IC_SEMICOLON;
      // SDLK_LESS
      // SDLK_EQUALS
!     mSymbols[SDLK_EQUALS]       = Input::IC_EQUALS;
      // SDLK_GREATER
      // SDLK_QUESTION
      // SDLK_AT
!     mSymbols[SDLK_LEFTBRACKET]  = Input::IC_LBRACKET;
!     mSymbols[SDLK_BACKSLASH]    = Input::IC_BACKSLASH;
!     mSymbols[SDLK_RIGHTBRACKET] = Input::IC_RBRACKET;
      // SDLK_CARET
      // SDLK_UNDERSCORE
      // SDLK_BACKQUOTE
!     mSymbols[SDLK_a]            = Input::IC_A;
!     mSymbols[SDLK_b]            = Input::IC_B;
!     mSymbols[SDLK_c]            = Input::IC_C;
!     mSymbols[SDLK_d]            = Input::IC_D;
!     mSymbols[SDLK_e]            = Input::IC_E;
!     mSymbols[SDLK_f]            = Input::IC_F;
!     mSymbols[SDLK_g]            = Input::IC_G;
!     mSymbols[SDLK_h]            = Input::IC_H;
!     mSymbols[SDLK_i]            = Input::IC_I;
!     mSymbols[SDLK_j]            = Input::IC_J;
!     mSymbols[SDLK_k]            = Input::IC_K;
!     mSymbols[SDLK_l]            = Input::IC_L;
!     mSymbols[SDLK_m]            = Input::IC_M;
!     mSymbols[SDLK_n]            = Input::IC_N;
!     mSymbols[SDLK_o]            = Input::IC_O;
!     mSymbols[SDLK_p]            = Input::IC_P;
!     mSymbols[SDLK_q]            = Input::IC_Q;
!     mSymbols[SDLK_r]            = Input::IC_R;
!     mSymbols[SDLK_s]            = Input::IC_S;
!     mSymbols[SDLK_t]            = Input::IC_T;
!     mSymbols[SDLK_u]            = Input::IC_U;
!     mSymbols[SDLK_v]            = Input::IC_V;
!     mSymbols[SDLK_w]            = Input::IC_W;
!     mSymbols[SDLK_x]            = Input::IC_X;
!     mSymbols[SDLK_y]            = Input::IC_Y;
!     mSymbols[SDLK_z]            = Input::IC_Z;
!     mSymbols[SDLK_DELETE]       = Input::IC_DELETE;
      // SDLK_WORLD_0
      // [...]
      // SDLK_WORLD_95
!     mSymbols[SDLK_KP0]          = Input::IC_KP0;
!     mSymbols[SDLK_KP1]          = Input::IC_KP1;
!     mSymbols[SDLK_KP2]          = Input::IC_KP2;
!     mSymbols[SDLK_KP3]          = Input::IC_KP3;
!     mSymbols[SDLK_KP4]          = Input::IC_KP4;
!     mSymbols[SDLK_KP5]          = Input::IC_KP5;
!     mSymbols[SDLK_KP6]          = Input::IC_KP6;
!     mSymbols[SDLK_KP7]          = Input::IC_KP7;
!     mSymbols[SDLK_KP8]          = Input::IC_KP8;
!     mSymbols[SDLK_KP9]          = Input::IC_KP9;
!     mSymbols[SDLK_KP_PERIOD]    = Input::IC_KP_DECIMAL;
!     mSymbols[SDLK_KP_DIVIDE]    = Input::IC_KP_DIVIDE;
!     mSymbols[SDLK_KP_MULTIPLY]  = Input::IC_KP_MULTIPLY;
!     mSymbols[SDLK_KP_MINUS]     = Input::IC_KP_MINUS;
!     mSymbols[SDLK_KP_PLUS]      = Input::IC_KP_PLUS;
!     mSymbols[SDLK_KP_ENTER]     = Input::IC_KP_ENTER;
      // SDLK_KP_EQUALS
!     mSymbols[SDLK_UP]           = Input::IC_UP;
!     mSymbols[SDLK_DOWN]         = Input::IC_DOWN;
!     mSymbols[SDLK_RIGHT]        = Input::IC_RIGHT;
!     mSymbols[SDLK_LEFT]         = Input::IC_LEFT;
!     mSymbols[SDLK_INSERT]       = Input::IC_INSERT;
!     mSymbols[SDLK_HOME]         = Input::IC_HOME;
!     mSymbols[SDLK_END]          = Input::IC_END;
!     mSymbols[SDLK_PAGEUP]       = Input::IC_PAGEUP;
!     mSymbols[SDLK_PAGEDOWN]     = Input::IC_PAGEDOWN;
!     mSymbols[SDLK_F1]           = Input::IC_F1;
!     mSymbols[SDLK_F2]           = Input::IC_F2;
!     mSymbols[SDLK_F3]           = Input::IC_F3;
!     mSymbols[SDLK_F4]           = Input::IC_F4;
!     mSymbols[SDLK_F5]           = Input::IC_F5;
!     mSymbols[SDLK_F6]           = Input::IC_F6;
!     mSymbols[SDLK_F7]           = Input::IC_F7;
!     mSymbols[SDLK_F8]           = Input::IC_F8;
!     mSymbols[SDLK_F9]           = Input::IC_F9;
!     mSymbols[SDLK_F10]          = Input::IC_F10;
!     mSymbols[SDLK_F11]          = Input::IC_F11;
!     mSymbols[SDLK_F12]          = Input::IC_F12;
      // SDLK_F13
      // SDLK_F14
      // SDLK_F15
!     mSymbols[SDLK_NUMLOCK]      = Input::IC_NUMLOCK;
!     mSymbols[SDLK_CAPSLOCK]     = Input::IC_CAPSLOCK;
!     mSymbols[SDLK_SCROLLOCK]    = Input::IC_SCROLLOCK;
!     mSymbols[SDLK_RSHIFT]       = Input::IC_RSHIFT;
!     mSymbols[SDLK_LSHIFT]       = Input::IC_LSHIFT;
!     mSymbols[SDLK_RCTRL]        = Input::IC_RCTRL;
!     mSymbols[SDLK_LCTRL]        = Input::IC_LCTRL;
!     mSymbols[SDLK_RALT]         = Input::IC_RALT;
!     mSymbols[SDLK_LALT]         = Input::IC_LALT;
      // SDLK_RMETA
      // SDLK_LMETA
!     mSymbols[SDLK_LSUPER]       = Input::IC_LSUPER;
!     mSymbols[SDLK_RSUPER]       = Input::IC_RSUPER;
      // SDLK_MODE
      // SDLK_COMPOSE
      // SDLK_HELP
!     mSymbols[SDLK_PRINT]        = Input::IC_PRINT;
      // SDLK_SYSREQ
      // SDLK_BREAK
***************
*** 214,237 ****
  
      unsigned int& modState =
!         mInputSystem->GetInputServer()->mModifierState;
  
      if (event->key.keysym.mod & KMOD_LSHIFT)
      {
!         modState |= InputServer::eLShift;
      }
  
      if (event->key.keysym.mod & KMOD_RSHIFT)
      {
!         modState |= InputServer::eRShift;
      }
  
      if (event->key.keysym.mod & KMOD_LALT)
      {
!         modState |= InputServer::eLAlt;
      }
  
      if (event->key.keysym.mod & KMOD_RALT)
      {
!         modState |= InputServer::eRAlt;
      }
  
--- 214,237 ----
  
      unsigned int& modState =
!         mInputSystem->GetInputServer()->GetModifierState();
  
      if (event->key.keysym.mod & KMOD_LSHIFT)
      {
!         modState |= Input::eLShift;
      }
  
      if (event->key.keysym.mod & KMOD_RSHIFT)
      {
!         modState |= Input::eRShift;
      }
  
      if (event->key.keysym.mod & KMOD_LALT)
      {
!         modState |= Input::eLAlt;
      }
  
      if (event->key.keysym.mod & KMOD_RALT)
      {
!         modState |= Input::eRAlt;
      }
  
***************
*** 250,255 ****
      }
  
!     InputServer::Input input(InputServer::eButton, sym);
!     input.data.l = (event->type == SDL_KEYDOWN);
      mInputSystem->AddInputInternal(input);
  
--- 250,255 ----
      }
  
!     Input input(Input::eButton, sym);
!     input.mData.l = (event->type == SDL_KEYDOWN);
      mInputSystem->AddInputInternal(input);
  

Index: timersdl.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/inputsdl/timersdl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** timersdl.h	13 Dec 2005 21:48:48 -0000	1.1
--- timersdl.h	25 Dec 2005 18:32:27 -0000	1.2
***************
*** 49,53 ****
  
      //! return an Input
!     void GetInput(kerosin::InputServer::Input &input);
  
  protected:
--- 49,53 ----
  
      //! return an Input
!     void GetInput(kerosin::Input &input);
  
  protected:

Index: mousesdl.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/inputsdl/mousesdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mousesdl.cpp	13 Dec 2005 21:48:48 -0000	1.1
--- mousesdl.cpp	25 Dec 2005 18:32:27 -0000	1.2
***************
*** 48,68 ****
      case SDL_MOUSEBUTTONUP:
      {
!         InputServer::Input input(InputServer::eButton);
  
          switch (event->button.button)
          {
          case SDL_BUTTON_LEFT:
!             input.code =
!                 mInputSystem->GetInputServer()->IC_MOUSE_LEFT;
              break;
  
          case SDL_BUTTON_RIGHT:
!             input.code =
!                 mInputSystem->GetInputServer()->IC_MOUSE_RIGHT;
              break;
  
          case SDL_BUTTON_MIDDLE:
!             input.code =
!                 mInputSystem->GetInputServer()->IC_MOUSE_MIDDLE;
              break;
  
--- 48,65 ----
      case SDL_MOUSEBUTTONUP:
      {
!         Input input(Input::eButton);
  
          switch (event->button.button)
          {
          case SDL_BUTTON_LEFT:
!             input.mCode = Input::IC_MOUSE_LEFT;
              break;
  
          case SDL_BUTTON_RIGHT:
!             input.mCode = Input::IC_MOUSE_RIGHT;
              break;
  
          case SDL_BUTTON_MIDDLE:
!             input.mCode = Input::IC_MOUSE_MIDDLE;
              break;
  
***************
*** 71,75 ****
          }
  
!         input.data.l = (event->type == SDL_MOUSEBUTTONDOWN);
          mInputSystem->AddInputInternal(input);
          return 0;
--- 68,72 ----
          }
  
!         input.mData.l = (event->type == SDL_MOUSEBUTTONDOWN);
          mInputSystem->AddInputInternal(input);
          return 0;
***************
*** 79,92 ****
      case SDL_MOUSEMOTION:
      {
!         InputServer::Input input
!             (
!                 InputServer::eAxis,
!                 mInputSystem->GetInputServer()->IC_AXISX
!                 );
!         input.data.l = event->motion.xrel;
          mInputSystem->AddInputInternal(input);
  
!         input.code = mInputSystem->GetInputServer()->IC_AXISY;
!         input.data.l = event->motion.yrel;
          mInputSystem->AddInputInternal(input);
          return 0;
--- 76,85 ----
      case SDL_MOUSEMOTION:
      {
!         Input input(Input::eAxis,Input::IC_AXISX);
!         input.mData.l = event->motion.xrel;
          mInputSystem->AddInputInternal(input);
  
!         input.mCode = Input::IC_AXISY;
!         input.mData.l = event->motion.yrel;
          mInputSystem->AddInputInternal(input);
          return 0;

Index: inputsystemsdl.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/inputsdl/inputsystemsdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** inputsystemsdl.cpp	13 Dec 2005 21:48:48 -0000	1.1
--- inputsystemsdl.cpp	25 Dec 2005 18:32:27 -0000	1.2
***************
*** 165,169 ****
  }
  
! void InputSystemSDL::AddInput(kerosin::InputServer::Input &input)
  {
      SDL_LockMutex(mMutex);
--- 165,169 ----
  }
  
! void InputSystemSDL::AddInput(Input &input)
  {
      SDL_LockMutex(mMutex);
***************
*** 172,176 ****
  }
  
! bool InputSystemSDL::GetInput(kerosin::InputServer::Input &input)
  {
      SDL_LockMutex(mMutex);
--- 172,176 ----
  }
  
! bool InputSystemSDL::GetInput(Input &input)
  {
      SDL_LockMutex(mMutex);
***************
*** 181,185 ****
  }
  
! bool InputSystemSDL::UpdateTimerInput(InputServer::Input &input)
  {
      if (mTimer.get() == NULL)
--- 181,185 ----
  }
  
! bool InputSystemSDL::UpdateTimerInput(Input &input)
  {
      if (mTimer.get() == NULL)

Index: timersdl.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/inputsdl/timersdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** timersdl.cpp	13 Dec 2005 21:48:48 -0000	1.1
--- timersdl.cpp	25 Dec 2005 18:32:27 -0000	1.2
***************
*** 53,65 ****
  
  void
! TimerSDL::GetInput(kerosin::InputServer::Input& input)
  {
!     input.type      = InputServer::eAxis;
!     input.code      = mInputSystem->GetInputServer()->IC_AXIST;
  
      unsigned int ticks = SDL_GetTicks();
  
      // FIXME: ticks might wrap
!     input.data.l = ticks - mLastTicks;
      mLastTicks = ticks;
  }
--- 53,65 ----
  
  void
! TimerSDL::GetInput(Input& input)
  {
!     input.mType = Input::eAxis;
!     input.mCode = Input::IC_AXIST;
  
      unsigned int ticks = SDL_GetTicks();
  
      // FIXME: ticks might wrap
!     input.mData.l = ticks - mLastTicks;
      mLastTicks = ticks;
  }

Index: inputsystemsdl.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/inputsdl/inputsystemsdl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** inputsystemsdl.h	13 Dec 2005 21:48:48 -0000	1.1
--- inputsystemsdl.h	25 Dec 2005 18:32:27 -0000	1.2
***************
*** 54,63 ****
  
      //! add the input to the queue
!     virtual void AddInput(kerosin::InputServer::Input& input);
      //! retrieve an input from the queue
!     virtual bool GetInput(kerosin::InputServer::Input& input);
  
  protected:
!     virtual bool UpdateTimerInput(kerosin::InputServer::Input& input);
  
      //
--- 54,63 ----
  
      //! add the input to the queue
!     virtual void AddInput(kerosin::Input::Input& input);
      //! retrieve an input from the queue
!     virtual bool GetInput(kerosin::Input::Input& input);
  
  protected:
!     virtual bool UpdateTimerInput(kerosin::Input& input);
  
      //