[Planeshift-cvs] CVS: planeshift/src/common/paws pawskeyselectbox.cpp,1.2,1.3 pawsmainwidget.cpp,1.16,1.17 pawsmanager.cpp,1.81,1.82 pawsmanager.h,1.41,1.42

[Jorrit T. <jo...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/paws
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14550/src/common/paws

Modified Files:
	pawskeyselectbox.cpp pawsmainwidget.cpp pawsmanager.cpp 
	pawsmanager.h 
Log Message:
- Fixed PS for latest CS event changes.



Index: pawskeyselectbox.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawskeyselectbox.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawskeyselectbox.cpp	1 Sep 2005 14:07:50 -0000	1.2
--- pawskeyselectbox.cpp	14 Dec 2005 06:25:34 -0000	1.3
***************
*** 78,82 ****
      csKeyModifiers mods;
      memset(&mods, 0, sizeof(mods));
!     text += csInputDefinition::GetKeyString(key, &mods, true);
      CalcTextPos();
  }
--- 78,83 ----
      csKeyModifiers mods;
      memset(&mods, 0, sizeof(mods));
!     text += csInputDefinition::GetKeyString(
! 	GetWindowManager ()->GetEventNameRegistry (), key, &mods, true);
      CalcTextPos();
  }
***************
*** 104,108 ****
      csKeyModifiers mods;
  
!     if (!csInputDefinition::ParseKey(text, &keyCode, &cookedCode, &mods))
      {
          SetKey(0,0);
--- 105,110 ----
      csKeyModifiers mods;
  
!     if (!csInputDefinition::ParseKey(GetWindowManager ()->GetEventNameRegistry (),
! 	  text, &keyCode, &cookedCode, &mods))
      {
          SetKey(0,0);

Index: pawsmainwidget.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmainwidget.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pawsmainwidget.cpp	1 Dec 2005 22:09:32 -0000	1.16
--- pawsmainwidget.cpp	14 Dec 2005 06:25:34 -0000	1.17
***************
*** 147,151 ****
              
          const char* keyvalue = node->GetAttributeValue ("key");
!         csInputDefinition::ParseKey ( keyvalue, &(key->key.codeRaw), &(key->key.codeCooked), &(key->key.modifiers) );
                          
              key->widgetName = node->GetAttributeValue("widgetname");
--- 147,152 ----
              
          const char* keyvalue = node->GetAttributeValue ("key");
!         csInputDefinition::ParseKey ( GetWindowManager ()->GetEventNameRegistry (),
! 	    keyvalue, &(key->key.codeRaw), &(key->key.codeCooked), &(key->key.modifiers) );
                          
              key->widgetName = node->GetAttributeValue("widgetname");

Index: pawsmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmanager.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** pawsmanager.cpp	8 Dec 2005 12:49:32 -0000	1.81
--- pawsmanager.cpp	14 Dec 2005 06:25:34 -0000	1.82
***************
*** 102,105 ****
--- 102,106 ----
      soundloader = CS_QUERY_REGISTRY( objectReg, iSoundLoader );
      soundrenderer = CS_QUERY_REGISTRY( objectReg, iSoundRender );
+     nameRegistry = csEventNameRegistry::GetRegistry (objectReg);
  
      vfs = CS_QUERY_REGISTRY( objectReg, iVFS );
***************
*** 222,238 ****
  bool PawsManager::HandleEvent( iEvent &event )
  {
!     switch ( event.Type )
!     {
!         case csevMouseMove: return HandleMouseMove( event );
!         case csevMouseDown: return HandleMouseDown( event );
!         case csevMouseDoubleClick: return HandleDoubleClick( event );
!         
!         case csevMouseUp  : return HandleMouseUp( event );
!         case csevKeyboard :
!             if ( (csKeyEventHelper::GetEventType (&event) == csKeyEventTypeDown) || 
!                 (csKeyEventHelper::GetEventType (&event) == csKeyEventTypeUp))
!                 return HandleKeyDown( event );
!     }
!     
      return false;
  }
--- 223,238 ----
  bool PawsManager::HandleEvent( iEvent &event )
  {
!     if (event.Name == csevMouseMove (nameRegistry, 0))
!       return HandleMouseMove (event);
!     if (event.Name == csevMouseDown (nameRegistry, 0))
!       return HandleMouseDown (event);
!     if (event.Name == csevMouseDoubleClick (nameRegistry, 0))
!       return HandleDoubleClick (event);
!     if (event.Name == csevMouseUp (nameRegistry, 0))
!       return HandleMouseUp (event);
!     if (event.Name == csevKeyboardDown (objectReg) ||
! 	event.Name == csevKeyboardUp (objectReg))
!       return HandleKeyDown( event );
! 
      return false;
  }

Index: pawsmanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmanager.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** pawsmanager.h	8 Dec 2005 12:49:32 -0000	1.41
--- pawsmanager.h	14 Dec 2005 06:25:34 -0000	1.42
***************
*** 94,97 ****
--- 94,100 ----
      iObjectRegistry* GetObjectRegistry() { return objectReg; }
  
+     /// Get the event name registry.
+     iEventNameRegistry* GetEventNameRegistry() { return nameRegistry; }
+ 
      /// Returns the texture manager.
      pawsTextureManager* GetTextureManager() { return textureManager; }
***************
*** 414,417 ****
--- 417,424 ----
      csRef<iGraphics3D> graphics3D;
  
+     /** For event parsing.
+      */
+     csRef<iEventNameRegistry> nameRegistry;
+ 
      /// The main handler widget.
      pawsMainWidget* mainWidget;