Return to patch-src_linux_LinuxInputManager_cpp CVS log

Up to [local] / ports / devel / ois / patches

Annotation of ports/devel/ois/patches/patch-src_linux_LinuxInputManager_cpp, Revision 1.2

1.2     ! yason       1: $OpenBSD$
        !             2: --- src/linux/LinuxInputManager.cpp.orig       Mon Aug 16 02:51:34 2010
        !             3: +++ src/linux/LinuxInputManager.cpp    Fri Sep 16 16:59:56 2011
        !             4: @@ -22,7 +22,6 @@ restrictions:
        !             5:  */
        !             6:  #include "linux/LinuxInputManager.h"
        !             7:  #include "linux/LinuxKeyboard.h"
        !             8: -#include "linux/LinuxJoyStickEvents.h"
        !             9:  #include "linux/LinuxMouse.h"
        !            10:  #include "OISException.h"
        !            11:  #include <cstdlib>
        !            12: @@ -48,8 +47,6 @@ LinuxInputManager::LinuxInputManager() : InputManager(
        !            13:  //--------------------------------------------------------------------------------//
        !            14:  LinuxInputManager::~LinuxInputManager()
        !            15:  {
        !            16: -      //Close all joysticks
        !            17: -      LinuxJoyStick::_clearJoys(unusedJoyStickList);
        !            18:  }
        !            19:  
        !            20:  //--------------------------------------------------------------------------------//
        !            21: @@ -92,9 +89,6 @@ void LinuxInputManager::_parseConfigSettings( ParamLis
        !            22:  //--------------------------------------------------------------------------------//
        !            23:  void LinuxInputManager::_enumerateDevices()
        !            24:  {
        !            25: -      //Enumerate all attached devices
        !            26: -      unusedJoyStickList = LinuxJoyStick::_scanJoys();
        !            27: -      joySticks = unusedJoyStickList.size();
        !            28:  }
        !            29:  
        !            30:  //----------------------------------------------------------------------------//
        !            31: @@ -174,19 +168,6 @@ Object* LinuxInputManager::createObject(InputManager *
        !            32:                        obj = new LinuxMouse(this, bufferMode, grabMouse, hideMouse);
        !            33:                break;
        !            34:        }
        !            35: -      case OISJoyStick:
        !            36: -      {
        !            37: -              for(JoyStickInfoList::iterator i = unusedJoyStickList.begin(); i != unusedJoyStickList.end(); ++i)
        !            38: -              {
        !            39: -                      if(vendor == "" || i->vendor == vendor)
        !            40: -                      {
        !            41: -                              obj = new LinuxJoyStick(this, bufferMode, *i);
        !            42: -                              unusedJoyStickList.erase(i);
        !            43: -                              break;
        !            44: -                      }
        !            45: -              }
        !            46: -              break;
        !            47: -      }
        !            48:        default:
        !            49:                break;
        !            50:        }
        !            51: @@ -204,7 +185,6 @@ void LinuxInputManager::destroyObject( Object* obj )
        !            52:        {
        !            53:                if( obj->type() == OISJoyStick )
        !            54:                {
        !            55: -                      unusedJoyStickList.push_back( ((LinuxJoyStick*)obj)->_getJoyInfo() );
        !            56:                }
        !            57:  
        !            58:                delete obj;