Changeset 7506

Timestamp:

Oct 7, 2010, 8:21:33 PM (14 years ago)

Author:

rgrieder

Message:

Updated OIS source files to its current SVN trunk (r26).

Location:

code/branches/ois_update/src/external/ois

Files:

• OIS.h (modified) (1 diff)
• OISConfig.h (modified) (1 diff)
• OISInputManager.cpp (modified) (3 diffs)
• OISKeyboard.h (modified) (8 diffs)
• OISMultiTouch.h (added)
• OISPrereqs.h (modified) (4 diffs)
• ReadMe.txt (modified) (4 diffs)
• VERSION (modified) (1 diff)
• changes_orxonox.diff (modified) (1 diff)
• linux/LinuxInputManager.cpp (modified) (3 diffs)
• linux/LinuxInputManager.h (modified) (1 diff)
• linux/LinuxJoyStickEvents.cpp (modified) (1 diff)
• linux/LinuxKeyboard.cpp (modified) (6 diffs)
• linux/LinuxKeyboard.h (modified) (3 diffs)
• linux/LinuxMouse.cpp (modified) (2 diffs)
• linux/LinuxPrereqs.h (modified) (1 diff)
• mac/MacHIDManager.cpp (modified) (20 diffs)
• mac/MacHIDManager.h (modified) (1 diff)
• mac/MacInputManager.cpp (modified) (1 diff)
• mac/MacJoyStick.cpp (added)
• mac/MacJoyStick.h (added)
• win32/Win32ForceFeedback.cpp (modified) (1 diff)
• win32/Win32ForceFeedback.h (modified) (1 diff)
• win32/Win32InputManager.cpp (modified) (4 diffs)
• win32/Win32InputManager.h (modified) (1 diff)
• win32/Win32JoyStick.cpp (modified) (13 diffs)
• win32/Win32JoyStick.h (modified) (4 diffs)
• win32/Win32KeyBoard.cpp (modified) (3 diffs)
• win32/Win32KeyBoard.h (modified) (2 diffs)
• win32/Win32Mouse.cpp (modified) (1 diff)
• win32/Win32Mouse.h (modified) (1 diff)
• win32/Win32Prereqs.h (modified) (2 diffs)

code/branches/ois_update/src/external/ois/OIS.h

@@ -29 +29 @@
 #include "OISKeyboard.h"
 #include "OISJoyStick.h"
+#include "OISMultiTouch.h"
 #include "OISInputManager.h"
 #include "OISFactoryCreator.h"

code/branches/ois_update/src/external/ois/OISConfig.h

@@ -70 +70 @@
 @remarks
         Build in support for Win32 XInput (Xbox 360 Controller)
-@notes
-        Not Yet Implemented
 */
 //#define OIS_WIN32_XINPUT_SUPPORT

code/branches/ois_update/src/external/ois/OISInputManager.cpp

@@ -37 +37 @@
 #elif defined OIS_APPLE_PLATFORM
 #  include "mac/MacInputManager.h"
+#elif defined OIS_IPHONE_PLATFORM
+#  include "iphone/iPhoneInputManager.h"
 #elif defined OIS_XBOX_PLATFORM
 #  include "xbox/XBoxInputManager.h"
@@ -59 +61 @@
         m_wiiMoteSupport(0)
 {
+    mFactories.clear();
+    mFactoryObjects.clear();
 }
 
@@ -111 +115 @@
 #elif defined OIS_APPLE_PLATFORM
         im = new MacInputManager();
+#elif defined OIS_IPHONE_PLATFORM
+        im = new iPhoneInputManager();
 #else
         OIS_EXCEPT(E_General, "No platform library.. check build platform defines!");

code/branches/ois_update/src/external/ois/OISKeyboard.h

@@ -184 +184 @@
         {
         public:
-                KeyEvent( Object* obj, KeyCode kc, unsigned int txt ) : EventArg(obj), key(kc), text(txt) {}
+                KeyEvent(Object* obj, KeyCode kc, unsigned int txt) : EventArg(obj), key(kc), text(txt) {}
                 virtual ~KeyEvent() {}
 
@@ -201 +201 @@
         public:
                 virtual ~KeyListener() {}
-                virtual bool keyPressed( const KeyEvent &arg ) = 0;
-                virtual bool keyReleased( const KeyEvent &arg ) = 0;            
+                virtual bool keyPressed(const KeyEvent &arg) = 0;
+                virtual bool keyReleased(const KeyEvent &arg) = 0;              
         };
 
@@ -220 +220 @@
                         A KeyCode to check
                 */
-                virtual bool isKeyDown( KeyCode key ) const = 0;
+                virtual bool isKeyDown(KeyCode key) const = 0;
 
                 /**
@@ -229 +229 @@
                         Send a pointer to a class derived from KeyListener or 0 to clear the callback
                 */
-                virtual void setEventCallback( KeyListener *keyListener ) { mListener = keyListener;}
+                virtual void setEventCallback(KeyListener *keyListener) { mListener = keyListener;}
 
                 /**
@@ -254 +254 @@
                         Off, Unicode, Ascii
                 */
-                virtual void setTextTranslation( TextTranslationMode mode );
+                virtual void setTextTranslation(TextTranslationMode mode);
 
                 /**
@@ -272 +272 @@
                         The string as determined from the current locale
                 */
-                virtual const std::string& getAsString( KeyCode kc ) = 0;
+                virtual const std::string& getAsString(KeyCode kc) = 0;
 
                 //! Enum of bit position of modifer
@@ -286 +286 @@
                         Check modifier status
                 */
-                bool isModifierDown( Modifier mod ) const;
+                bool isModifierDown(Modifier mod) const;
 
                 /**
@@ -293 +293 @@
                         (in the form of 1 is down and 0 is up)
                 */
-                virtual void copyKeyStates( char keys[256] ) const = 0;
+                virtual void copyKeyStates(char keys[256]) const = 0;
                 
         protected:

code/branches/ois_update/src/external/ois/OISPrereqs.h

@@ -79 +79 @@
 #       endif
 #elif defined( __APPLE_CC__ ) // Apple OS X
-#       define OIS_APPLE_PLATFORM
-#       undef _OISExport
-#       define _OISExport __attribute__((visibility("default")))
+    // Device                                       Simulator
+#   if __IPHONE_OS_VERSION_MIN_REQUIRED >= 20201 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20000
+//#   if __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000
+#       define OIS_IPHONE_PLATFORM
+#   else
+#       define OIS_APPLE_PLATFORM
+#   endif
+#   undef _OISExport
+#   define _OISExport __attribute__((visibility("default")))
 #else //Probably Linux
 #       define OIS_LINUX_PLATFORM
@@ -95 +101 @@
 //-------------- Common Classes, Enums, and Typdef's -------------------------//
 #define OIS_VERSION_MAJOR 1
-#define OIS_VERSION_MINOR 2 
+#define OIS_VERSION_MINOR 4
 #define OIS_VERSION_PATCH 0
-#define OIS_VERSION_NAME "Smash"
+#define OIS_VERSION_NAME "1.4.0"
 
 #define OIS_VERSION ((OIS_VERSION_MAJOR << 16) | (OIS_VERSION_MINOR << 8) | OIS_VERSION_PATCH)
@@ -110 +116 @@
         class Mouse;
         class JoyStick;
+    class MultiTouch;
         class KeyListener;
         class MouseListener;
+    class MultiTouchListener;
         class JoyStickListener;
         class Interface;
@@ -130 +138 @@
     enum Type
         {
-                OISUnknown   = 0,
-                OISKeyboard  = 1,
-                OISMouse     = 2,
-                OISJoyStick  = 3,
-                OISTablet    = 4
+                OISUnknown       = 0,
+                OISKeyboard      = 1,
+                OISMouse         = 2,
+                OISJoyStick      = 3,
+                OISTablet        = 4,
+                OISMultiTouch    = 5
         };
 

code/branches/ois_update/src/external/ois/ReadMe.txt

@@ -5 +5 @@
 The zlib/libpng License
 
-Copyright (c) 2005-2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+Copyright (c) 2005-2010 Phillip Castaneda (pjcast -- www.wreckedgames.com)
 
 This software is provided 'as-is', without any express or implied warranty. In no 
@@ -46 +46 @@
 Win32/
         Contains Visual Studio .Net Solution Files
-        Contains CodeBlocks + MinGW + StlPort project files for OIS
+        Contains CodeBlocks project files for OIS
         
         ---- Dependencies ------------------------------------------------------
         DirectInput 8
-        Ogre & CEGUI 0.4.0 If building CEGUIOgre OIS Demo
 
-        SDL/
-                A test bed for an OIS InputManager with SDL as the backend. Not recommended;
-                however, useful for platforms with non-native OIS ports for temporary use.
 
 Linux/
         ---- Dependencies ------------------------------------------------------
         X11
-        Ogre (GLX Platform) & CEGUI 0.4.0 If building CEGUIOgre OIS Demo
-        Newer Linux Kernel (2.6+ ?) for Event API - else, use --disable-joyevents
+        Newer Linux Kernel (2.6+ ?) for Event API
 
         Steps to build on Linux:
@@ -69 +64 @@
         ---- Configure build options --------------------------------------------
         ./configure --help              --- List all configure options
-        ./configure --disable-ogre      --- Disables CEGUIOgre ActionMapping Demo
-        ./configure --disable-joyevents --- Uses /dev/input/jsX instead of 
-                                            /dev/input/eventX
+
 
 LinuxCB/
@@ -80 +73 @@
 
 Mac/
-        
-        XCode-1.5/
-                Non-complete native OIS port.
-
         XCode-2.2/
-                Working, complete, OIS port to OSX using SDL as a backend.
+                Working, mostly complete OSX vackend.

code/branches/ois_update/src/external/ois/VERSION

@@ -1 @@
-OIS v1_2 CVS updated on 2009/01/24
-Note that this is not CVS HEAD, but v1_2 branch!
-
+OIS SVN trunk updated on 2010/10/07 (revision 26)
+https://wgois.svn.sourceforge.net/svnroot/wgois/ois/trunk/

code/branches/ois_update/src/external/ois/changes_orxonox.diff

@@ -37 +37 @@
 +++ win32/Win32ForceFeedback.cpp
 @@ -25,7 +25,7 @@
- #include <Math.h>
+ #include <math.h>
  
  // 0 = No trace; 1 = Important traces; 2 = Debug traces

code/branches/ois_update/src/external/ois/linux/LinuxInputManager.cpp

@@ -40 +40 @@
         hideMouse = true;
         mGrabs = true;
-        useXRepeat = false;
         keyboardUsed = mouseUsed = false;
 
@@ -74 +73 @@
 
         //--------- Keyboard Settings ------------//
-        i = paramList.find("XAutoRepeatOn");
-        if( i != paramList.end() )
-                if( i->second == "true" )
-                        useXRepeat = true;
-
         i = paramList.find("x11_keyboard_grab");
         if( i != paramList.end() )
@@ -172 +166 @@
         {
                 if( keyboardUsed == false )
-                        obj = new LinuxKeyboard(this, bufferMode, grabKeyboard, useXRepeat);
+                        obj = new LinuxKeyboard(this, bufferMode, grabKeyboard);
                 break;
         }

code/branches/ois_update/src/external/ois/linux/LinuxInputManager.h

@@ -101 +101 @@
                 bool mGrabs;
                 bool hideMouse;
-
-                //! By default, keyboard disables XRepeatRate
-                bool useXRepeat;
         };
 }

code/branches/ois_update/src/external/ois/linux/LinuxJoyStickEvents.cpp

@@ -96 +96 @@
         //We are in non blocking mode - we just read once, and try to fill up buffer
         input_event js[JOY_BUFFERSIZE];
-        int ret = read(mJoyStick, &js, sizeof(struct input_event) * JOY_BUFFERSIZE);
-        if( ret <= 0 )
-                return;
-
-        //Determine how many whole events re read up
-        ret /= sizeof(struct input_event);
-        for(int i = 0; i < ret; ++i)
+        while(true)
         {
-                switch(js[i].type)
+                int ret = read(mJoyStick, &js, sizeof(struct input_event) * JOY_BUFFERSIZE);
+        if( ret < 0 )
+                        break;
+
+                //Determine how many whole events re read up
+                ret /= sizeof(struct input_event);
+                for(int i = 0; i < ret; ++i)
                 {
-                case EV_KEY:  //Button
-                {
-                        int button = mButtonMap[js[i].code];
-
-                        #ifdef OIS_LINUX_JOY_DEBUG
-                          cout << "\nButton Code: " << js[i].code << ", OIS Value: " << button << endl;
-                        #endif
-
-                        //Check to see whether push or released event...
-                        if(js[i].value)
-                        {
-                                mState.mButtons[button] = true;
-                                if( mBuffered && mListener )
-                                        if(!mListener->buttonPressed(JoyStickEvent(this,mState), button)) return;
-                        }
-                        else
-                        {
-                                mState.mButtons[button] = false;
-                                if( mBuffered && mListener )
-                                        if(!mListener->buttonReleased(JoyStickEvent(this,mState), button)) return;
-                        }
-                        break;
-                }
-
-                case EV_ABS:  //Absolute Axis
-                {
-                        //A Stick (BrakeDefine is the highest possible Axis)
-                        if( js[i].code <= ABS_BRAKE )
-                        {
-                                int axis = mAxisMap[js[i].code];
-                                assert( axis < 32 && "Too many axes (Max supported is 32). Report this to OIS forums!" );
-
-                                axisMoved[axis] = true;
-
-                                //check for rescaling:
-                                if( mRanges[axis].min == JoyStick::MIN_AXIS && mRanges[axis].max != JoyStick::MAX_AXIS )
-                                {       //Scale is perfect
-                                        mState.mAxes[axis].abs = js[i].value;
+                        switch(js[i].type)
+                        {
+                        case EV_KEY:  //Button
+                        {
+                                int button = mButtonMap[js[i].code];
+
+                                #ifdef OIS_LINUX_JOY_DEBUG
+                                  cout << "\nButton Code: " << js[i].code << ", OIS Value: " << button << endl;
+                                #endif
+
+                                //Check to see whether push or released event...
+                                if(js[i].value)
+                                {
+                                        mState.mButtons[button] = true;
+                                        if( mBuffered && mListener )
+                                                if(!mListener->buttonPressed(JoyStickEvent(this,mState), button)) return;
                                 }
                                 else
-                                {       //Rescale
-                                        float proportion = (float)(js[i].value-mRanges[axis].max)/(float)(mRanges[axis].min-mRanges[axis].max);
-                                        mState.mAxes[axis].abs = (int)(32767.0f - (65535.0f * proportion));
+                                {
+                                        mState.mButtons[button] = false;
+                                        if( mBuffered && mListener )
+                                                if(!mListener->buttonReleased(JoyStickEvent(this,mState), button)) return;
                                 }
-                        }
-                        else if( js[i].code <= ABS_HAT3Y ) //A POV - Max four POVs allowed
-                        {
-                                //Normalise the POV to between 0-7
-                                //Even is X Axis, Odd is Y Axis
-                                unsigned char LinuxPovNumber = js[i].code - 16;
-                                short OIS_POVIndex = POV_MASK[LinuxPovNumber];
-
-                                //Handle X Axis first (Even) (left right)
-                                if((LinuxPovNumber & 0x0001) == 0)
+                                break;
+                        }
+
+                        case EV_ABS:  //Absolute Axis
+                        {
+                                //A Stick (BrakeDefine is the highest possible Axis)
+                                if( js[i].code <= ABS_BRAKE )
                                 {
-                                        //Why do this? Because, we use a bit field, and when this axis is east,
-                                        //it can't possibly be west too. So clear out the two X axes, then refil
-                                        //it in with the new direction bit.
-                                        //Clear the East/West Bit Flags first
-                                        mState.mPOV[OIS_POVIndex].direction &= 0x11110011;
-                                        if( js[i].value == -1 ) //Left
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::West;
-                                        else if( js[i].value == 1 ) //Right
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::East;
+                                        int axis = mAxisMap[js[i].code];
+                                        assert( axis < 32 && "Too many axes (Max supported is 32). Report this to OIS forums!" );
+
+                                        axisMoved[axis] = true;
+
+                                        //check for rescaling:
+                                        if( mRanges[axis].min == JoyStick::MIN_AXIS && mRanges[axis].max != JoyStick::MAX_AXIS )
+                                        {       //Scale is perfect
+                                                mState.mAxes[axis].abs = js[i].value;
+                                        }
+                                        else
+                                        {       //Rescale
+                                                float proportion = (float)(js[i].value-mRanges[axis].max)/(float)(mRanges[axis].min-mRanges[axis].max);
+                                                mState.mAxes[axis].abs = (int)(32767.0f - (65535.0f * proportion));
+                                        }
                                 }
-                                //Handle Y Axis (Odd) (up down)
-                                else
+                                else if( js[i].code <= ABS_HAT3Y ) //A POV - Max four POVs allowed
                                 {
-                                        //Clear the North/South Bit Flags first
-                                        mState.mPOV[OIS_POVIndex].direction &= 0x11111100;
-                                        if( js[i].value == -1 ) //Up
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::North;
-                                        else if( js[i].value == 1 ) //Down
-                                                mState.mPOV[OIS_POVIndex].direction |= Pov::South;
+                                        //Normalise the POV to between 0-7
+                                        //Even is X Axis, Odd is Y Axis
+                                        unsigned char LinuxPovNumber = js[i].code - 16;
+                                        short OIS_POVIndex = POV_MASK[LinuxPovNumber];
+
+                                        //Handle X Axis first (Even) (left right)
+                                        if((LinuxPovNumber & 0x0001) == 0)
+                                        {
+                                                //Why do this? Because, we use a bit field, and when this axis is east,
+                                                //it can't possibly be west too. So clear out the two X axes, then refil
+                                                //it in with the new direction bit.
+                                                //Clear the East/West Bit Flags first
+                                                mState.mPOV[OIS_POVIndex].direction &= 0x11110011;
+                                                if( js[i].value == -1 ) //Left
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::West;
+                                                else if( js[i].value == 1 ) //Right
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::East;
+                                        }
+                                        //Handle Y Axis (Odd) (up down)
+                                        else
+                                        {
+                                                //Clear the North/South Bit Flags first
+                                                mState.mPOV[OIS_POVIndex].direction &= 0x11111100;
+                                                if( js[i].value == -1 ) //Up
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::North;
+                                                else if( js[i].value == 1 ) //Down
+                                                        mState.mPOV[OIS_POVIndex].direction |= Pov::South;
+                                        }
+
+                                        if( mBuffered && mListener )
+                                                if( mListener->povMoved( JoyStickEvent(this,mState), OIS_POVIndex) == false )
+                                                        return;
                                 }
-
-                                if( mBuffered && mListener )
-                                        if( mListener->povMoved( JoyStickEvent(this,mState), OIS_POVIndex) == false )
-                                                return;
-                        }
-                        break;
-                }
-
-                
-                case EV_REL: //Relative Axes (Do any joystick actually have a relative axis?)
-#ifdef OIS_LINUX_JOY_DEBUG
-                    cout << "\nWarning: Relatives axes not supported yet" << endl;
-#endif
-                        break;
-                default: break;
+                                break;
+                        }
+
+                        
+                        case EV_REL: //Relative Axes (Do any joystick actually have a relative axis?)
+        #ifdef OIS_LINUX_JOY_DEBUG
+                                cout << "\nWarning: Relatives axes not supported yet" << endl;
+        #endif
+                                break;
+                        default: break;
+                        }
                 }
         }

code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.cpp

@@ -33 +33 @@
 #include <iostream>
 //-------------------------------------------------------------------//
-LinuxKeyboard::LinuxKeyboard(InputManager* creator, bool buffered, bool grab, bool useXRepeat)
+LinuxKeyboard::LinuxKeyboard(InputManager* creator, bool buffered, bool grab)
         : Keyboard(creator->inputSystemName(), buffered, 0, creator)
 {
@@ -43 +43 @@
         grabKeyboard = grab;
         keyFocusLost = false;
-
-        xAutoRepeat = useXRepeat;
-        oldXAutoRepeat = false;
 
         //X Key Map to KeyCode
@@ -213 +210 @@
 
         keyFocusLost = false;
-
-        if( xAutoRepeat == false )
-        {
-                //We do not want to blindly turn on autorepeat later when quiting if
-                //it was not on to begin with.. So, let us check and see first
-                XKeyboardState old;
-                XGetKeyboardControl( display, &old );
-                oldXAutoRepeat = false;
-
-                if( old.global_auto_repeat == AutoRepeatModeOn )
-                        oldXAutoRepeat = true;
-
-                XAutoRepeatOff( display );
-        }
 }
 
@@ -234 +217 @@
         if( display )
         {
-                if( oldXAutoRepeat )
-                        XAutoRepeatOn(display);
-
                 if( grabKeyboard )
                         XUngrabKeyboard(display, CurrentTime);
@@ -303 +283 @@
 
         while( XPending(display) > 0 )
-        {               XNextEvent(display, &event);            if( KeyPress == event.type )
+        {
+                XNextEvent(display, &event);            if(KeyPress == event.type)
                 {
                         unsigned int character = 0;
 
-                        if( mTextMode != Off )
+                        if(mTextMode != Off)
                         {
                                 unsigned char buffer[6] = {0,0,0,0,0,0};
@@ -332 +313 @@
                         if( event.xkey.state & Mod1Mask && key == XK_Tab )
                                 linMan->_setGrabState(false);
-                }               else if( KeyRelease == event.type )
+                }
+                else if(KeyRelease == event.type)
                 {
-                        //Mask out the modifier states X sets.. or we will get improper values
-                        event.xkey.state &= ~ShiftMask;
-                        event.xkey.state &= ~LockMask;
-
-                        //Else, it is a valid key release
-                        XLookupString(&event.xkey,NULL,0,&key,NULL);
-                        _injectKeyUp(key);              }
+                        if(!_isKeyRepeat(event))
+                        {
+                                //Mask out the modifier states X sets.. or we will get improper values
+                                event.xkey.state &= ~ShiftMask;
+                                event.xkey.state &= ~LockMask;
+
+                                XLookupString(&event.xkey,NULL,0,&key,NULL);
+                                _injectKeyUp(key);
+                        }
+                }
         }
 

code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.h

@@ -34 +34 @@
         {
         public:
-                LinuxKeyboard(InputManager* creator, bool buffered, bool grab, bool useXRepeat );
+                LinuxKeyboard(InputManager* creator, bool buffered, bool grab);
                 virtual ~LinuxKeyboard();
 
@@ -59 +59 @@
 
         protected:
+                inline bool _isKeyRepeat(XEvent &event)
+                {
+                        //When a key is repeated, there will be two events: released, followed by another immediate pressed. So check to see if another pressed is present      
+                        if(!XPending(display))
+                                return false;
+
+                        XEvent e;
+                        XPeekEvent(display, &e);
+                        if(e.type == KeyPress && e.xkey.keycode == event.xkey.keycode && (e.xkey.time - event.xkey.time) < 2)
+                        {
+                                XNextEvent(display, &e);
+                                return true;
+                        }
+
+                        return false;
+                }
+
                 bool _injectKeyDown( KeySym key, int text );
                 bool _injectKeyUp( KeySym key );
@@ -75 +92 @@
                 bool keyFocusLost;
 
-                bool xAutoRepeat;
-                bool oldXAutoRepeat;
-
                 std::string mGetString;
         };

code/branches/ois_update/src/external/ois/linux/LinuxMouse.cpp

@@ -173 +173 @@
 
                         //Compute this frames Relative X & Y motion
-                        mState.X.rel = event.xmotion.x - oldXMouseX;
-                        mState.Y.rel = event.xmotion.y - oldXMouseY;
+                        int dx = event.xmotion.x - oldXMouseX;
+                        int dy = event.xmotion.y - oldXMouseY;
                 
                         //Store old values for next time to compute relative motion
@@ -180 +180 @@
                         oldXMouseY = event.xmotion.y;
 
-                        mState.X.abs += mState.X.rel;
-                        mState.Y.abs += mState.Y.rel;
+                        mState.X.abs += dx;
+                        mState.Y.abs += dy;
+                        mState.X.rel += dx;
+                        mState.Y.rel += dy;
 
                         //Check to see if we are grabbing the mouse to the window (requires clipping and warping)

code/branches/ois_update/src/external/ois/linux/LinuxPrereqs.h

@@ -32 +32 @@
 
 //! Max number of elements to collect from buffered input
-#define JOY_BUFFERSIZE 10
+#define JOY_BUFFERSIZE 64
 
 namespace OIS

code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp

@@ -20 +20 @@
  
  3. This notice may not be removed or altered from any source distribution.
-*/
+ */
 #include "mac/MacHIDManager.h"
+#include "mac/MacJoyStick.h"
 #include "OISException.h"
 #include "OISObject.h"
@@ -42 +43 @@
 {
         CFTypeRef temp = CFDictionaryGetValue(dict, OIS_CFString(keyName));
-
+        
         if(temp && CFGetTypeID(temp) == CFArrayGetTypeID())
                 return (CFArrayRef)temp;
@@ -53 +54 @@
 {
         CFTypeRef temp = CFDictionaryGetValue(dict, OIS_CFString(keyName));
-
+        
         if(temp && CFGetTypeID(temp) == CFStringGetTypeID())
                 return (CFStringRef)temp;
@@ -64 +65 @@
 {
         CFTypeRef temp = CFDictionaryGetValue(dict, OIS_CFString(keyName));
-
+        
         if(temp && CFGetTypeID(temp) == CFNumberGetTypeID())
                 return (CFNumberRef)temp;
@@ -83 +84 @@
 {
         CFTypeRef temp = CFArrayGetValueAtIndex(array, idx);
-
+        
         if(temp && CFGetTypeID(temp) == CFDictionaryGetTypeID())
                 return (CFDictionaryRef)temp;
@@ -93 +94 @@
 int getInt32(CFNumberRef ref)
 {
-   int r = 0;
-   if (r) 
-      CFNumberGetValue(ref, kCFNumberIntType, &r);
-   return r;
+        int r = 0;
+        if (r) 
+                CFNumberGetValue(ref, kCFNumberIntType, &r);
+        return r;
 }
 
@@ -111 +112 @@
 //------------------------------------------------------------------------------------------------------//
 void MacHIDManager::initialize()
+{
+        //Make the search more specific by adding usage flags
+        int usage = kHIDUsage_GD_Joystick;
+        int page = kHIDPage_GenericDesktop;
+        
+        io_iterator_t iterator = lookUpDevices(usage, page);
+        
+        if(iterator)
+                iterateAndOpenDevices(iterator);
+        
+        //Doesn't support multiple usage flags, iterate twice
+        usage = kHIDUsage_GD_GamePad;
+        iterator = lookUpDevices(usage, page);
+        
+        if(iterator)
+                iterateAndOpenDevices(iterator);
+}
+
+//------------------------------------------------------------------------------------------------------//
+io_iterator_t MacHIDManager::lookUpDevices(int usage, int page)
 {
         CFMutableDictionaryRef deviceLookupMap = IOServiceMatching(kIOHIDDeviceKey);
         if(!deviceLookupMap)
                 OIS_EXCEPT(E_General, "Could not setup HID device search parameters");
-
-        //Make the search more specific by adding usage flags
-        int usage = kHIDUsage_GD_GamePad | kHIDUsage_GD_Joystick,
-            page  = kHIDPage_GenericDesktop;
-
-        CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage),
-                                pageRef  = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
-
+        
+        CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage);
+        CFNumberRef pageRef  = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
+        
         CFDictionarySetValue(deviceLookupMap, CFSTR(kIOHIDPrimaryUsageKey), usageRef);
         CFDictionarySetValue(deviceLookupMap, CFSTR(kIOHIDPrimaryUsagePageKey), pageRef);
-
+        
         //IOServiceGetMatchingServices consumes the map so we do not have to release it ourself
         io_iterator_t iterator = 0;
         IOReturn result = IOServiceGetMatchingServices(kIOMasterPortDefault, deviceLookupMap, &iterator);
-        if (result == kIOReturnSuccess && iterator)
-        {
-                io_object_t hidDevice = 0;
-                while ((hidDevice = IOIteratorNext(iterator)) !=0)
+        
+        CFRelease(usageRef);
+        CFRelease(pageRef);
+        
+        if(result == kIOReturnSuccess)
+        {
+                return iterator;
+        }
+        //TODO: Throw exception instead?
+        else
+        {
+                return 0;
+        }
+}
+
+//------------------------------------------------------------------------------------------------------//
+void MacHIDManager::iterateAndOpenDevices(io_iterator_t iterator)
+{
+        io_object_t hidDevice = 0;
+        while ((hidDevice = IOIteratorNext(iterator)) !=0)
+        {
+                //Get the current registry items property map
+                CFMutableDictionaryRef propertyMap = 0;
+                if (IORegistryEntryCreateCFProperties(hidDevice, &propertyMap, kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS && propertyMap)
                 {
-                        //Get the current registry items property map
-                        CFMutableDictionaryRef propertyMap = 0;
-                        if (IORegistryEntryCreateCFProperties(hidDevice, &propertyMap, kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS && propertyMap)
+                        //Go through device to find all needed info
+                        HidInfo* hid = enumerateDeviceProperties(propertyMap);
+                        
+                        if(hid)
                         {
-                                //Go through device to find all needed info
-                                HidInfo* hid = enumerateDeviceProperties(propertyMap);
-                                if(hid)
-                                        mDeviceList.push_back(hid);
-                                        
                                 //todo - we need to hold an open interface so we do not have to enumerate again later
                                 //should be able to watch for device removals also
-
-                                /// Testing opening / closing interface
-                                //IOCFPlugInInterface **pluginInterface = NULL;
-                                //SInt32 score = 0;
-                                //if (IOCreatePlugInInterfaceForService(hidDevice, kIOHIDDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &pluginInterface, &score) == kIOReturnSuccess)
-                                //{
-                                //      IOHIDDeviceInterface **interface;
-                                //      HRESULT pluginResult = (*pluginInterface)->QueryInterface(pluginInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (void **)&(interface));
-                                //      if(pluginResult == S_OK)
-                                //              cout << "Successfully created plugin interface for device\n";
-                                //      else
-                                //              cout << "Not able to create plugin interface\n";
-
-                                //      IODestroyPlugInInterface(pluginInterface);
-
-                                //      if ((*interface)->open(interface, 0) == KERN_SUCCESS)
-                                //              cout << "Opened interface.\n";
-                                //      else
-                                //              cout << "Failed to open\n";
-
-                                //      (*interface)->close(interface);
-                                //}
-                                //
+                                
+                                // Testing opening / closing interface
+                                IOCFPlugInInterface **pluginInterface = NULL;
+                                SInt32 score = 0;
+                                if (IOCreatePlugInInterfaceForService(hidDevice, kIOHIDDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &pluginInterface, &score) == kIOReturnSuccess)
+                                {
+                                        IOHIDDeviceInterface **interface;
+                                        
+                                        HRESULT pluginResult = (*pluginInterface)->QueryInterface(pluginInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (void **)&(interface));
+                                        
+                                        if(pluginResult != S_OK)
+                                                OIS_EXCEPT(E_General, "Not able to create plugin interface");
+                                        
+                                        IODestroyPlugInInterface(pluginInterface);
+                                        
+                                        hid->interface = interface;
+                                        
+                                        //Check for duplicates - some devices have multiple usage
+                                        if(std::find(mDeviceList.begin(), mDeviceList.end(), hid) == mDeviceList.end())
+                                                mDeviceList.push_back(hid);
+                                }
                         }
                 }
-
-                IOObjectRelease(iterator);
-        }
-
-        CFRelease(usageRef);
-        CFRelease(pageRef);
+        }
+        
+        IOObjectRelease(iterator);
 }
 
@@ -188 +216 @@
         if (str)
                 info->vendor = CFStringGetCStringPtr(str, CFStringGetSystemEncoding());
-
+        
         str = getDictionaryItemAsRef<CFStringRef>(propertyMap, kIOHIDProductKey);
         if (str)
                 info->productKey = CFStringGetCStringPtr(str, CFStringGetSystemEncoding());
-                
+        
         info->combinedKey = info->vendor + " " + info->productKey;
-
+        
         //Go through all items in this device (i.e. buttons, hats, sticks, axes, etc)
         CFArrayRef array = getDictionaryItemAsRef<CFArrayRef>(propertyMap, kIOHIDElementKey);
@@ -200 +228 @@
                 for (int i = 0; i < CFArrayGetCount(array); i++)
                         parseDeviceProperties(getArrayItemAsRef<CFDictionaryRef>(array, i));
-
+        
         return info;
 }
@@ -209 +237 @@
         if(!properties)
                 return;
-
+        
         CFArrayRef array = getDictionaryItemAsRef<CFArrayRef>(properties, kIOHIDElementKey);
         if (array)
@@ -227 +255 @@
                                         switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsagePageKey)))
                                         {
-                                        case kHIDPage_GenericDesktop:
-                                                switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
+                                                case kHIDPage_GenericDesktop:
+                                                        switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
                                                 {
-                                                case kHIDUsage_GD_Pointer:
-                                                        cout << "\tkHIDUsage_GD_Pointer\n";
-                                                        parseDevicePropertiesGroup(element);
+                                                        case kHIDUsage_GD_Pointer:
+                                                                cout << "\tkHIDUsage_GD_Pointer\n";
+                                                                parseDevicePropertiesGroup(element);
+                                                                break;
+                                                        case kHIDUsage_GD_X:
+                                                        case kHIDUsage_GD_Y:
+                                                        case kHIDUsage_GD_Z:
+                                                        case kHIDUsage_GD_Rx:
+                                                        case kHIDUsage_GD_Ry:
+                                                        case kHIDUsage_GD_Rz:
+                                                                cout << "\tAxis\n";
+                                                                break;
+                                                        case kHIDUsage_GD_Slider:
+                                                        case kHIDUsage_GD_Dial:
+                                                        case kHIDUsage_GD_Wheel:
+                                                                cout << "\tUnsupported kHIDUsage_GD_Wheel\n";
+                                                                break;
+                                                        case kHIDUsage_GD_Hatswitch:
+                                                                cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
+                                                                break;
+                                                }
                                                         break;
-                                                case kHIDUsage_GD_X:
-                                                case kHIDUsage_GD_Y:
-                                                case kHIDUsage_GD_Z:
-                                                case kHIDUsage_GD_Rx:
-                                                case kHIDUsage_GD_Ry:
-                                                case kHIDUsage_GD_Rz:
-                                                        cout << "\tAxis\n";
+                                                case kHIDPage_Button:
+                                                        cout << "\tkHIDPage_Button\n";
                                                         break;
-                                                case kHIDUsage_GD_Slider:
-                                                case kHIDUsage_GD_Dial:
-                                                case kHIDUsage_GD_Wheel:
-                                                        cout << "\tUnsupported kHIDUsage_GD_Wheel\n";
-                                                        break;
-                                                case kHIDUsage_GD_Hatswitch:
-                                                        cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
-                                                        break;
-                                                }
-                                                break;
-                                        case kHIDPage_Button:
-                                                cout << "\tkHIDPage_Button\n";
-                                                break;
                                         }
                                 }
@@ -267 +295 @@
         if(!properties)
                 return;
-
+        
         CFArrayRef array = getDictionaryItemAsRef<CFArrayRef>(properties, kIOHIDElementKey);
         if(array)
@@ -278 +306 @@
                                 switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsagePageKey)))
                                 {
-                                case kHIDPage_GenericDesktop:
-                                        switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
+                                        case kHIDPage_GenericDesktop:
+                                                switch(getInt32(getDictionaryItemAsRef<CFNumberRef>(element, kIOHIDElementUsageKey)))
                                         {
-                                        case kHIDUsage_GD_X:
-                                        case kHIDUsage_GD_Y:
-                                        case kHIDUsage_GD_Z:
-                                        case kHIDUsage_GD_Rx:
-                                        case kHIDUsage_GD_Ry:
-                                        case kHIDUsage_GD_Rz:
-                                                cout << "\t\tAxis\n";
+                                                case kHIDUsage_GD_X:
+                                                case kHIDUsage_GD_Y:
+                                                case kHIDUsage_GD_Z:
+                                                case kHIDUsage_GD_Rx:
+                                                case kHIDUsage_GD_Ry:
+                                                case kHIDUsage_GD_Rz:
+                                                        cout << "\t\tAxis\n";
+                                                        break;
+                                                case kHIDUsage_GD_Slider:
+                                                case kHIDUsage_GD_Dial:
+                                                case kHIDUsage_GD_Wheel:
+                                                        cout << "\tUnsupported - kHIDUsage_GD_Wheel\n";
+                                                        break;
+                                                case kHIDUsage_GD_Hatswitch:
+                                                        cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
+                                                        break;
+                                        }
                                                 break;
-                                        case kHIDUsage_GD_Slider:
-                                        case kHIDUsage_GD_Dial:
-                                        case kHIDUsage_GD_Wheel:
-                                                cout << "\tUnsupported - kHIDUsage_GD_Wheel\n";
+                                        case kHIDPage_Button:
                                                 break;
-                                        case kHIDUsage_GD_Hatswitch:
-                                                cout << "\tUnsupported - kHIDUsage_GD_Hatswitch\n";
-                                                break;
-                                        }
-                                        break;
-                                case kHIDPage_Button:
-                                        break;
                                 }
                         }
@@ -317 +345 @@
                         ret.insert(std::make_pair((*it)->type, (*it)->combinedKey));
         }
-
+        
         return ret;
 }
@@ -326 +354 @@
         int ret = 0;
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
-
+        
         for(; it != end; ++it)
         {
@@ -341 +369 @@
         int ret = 0;
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
-
+        
         for(; it != end; ++it)
         {
@@ -347 +375 @@
                         ret++;
         }
-
+        
         return ret;
 }
@@ -355 +383 @@
 {
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
-
+        
         for(; it != end; ++it)
         {
@@ -367 +395 @@
 //--------------------------------------------------------------------------------//
 Object* MacHIDManager::createObject(InputManager* creator, Type iType, bool bufferMode, 
-                                                                          const std::string & vendor)
+                                                                        const std::string & vendor)
 {
         Object *obj = 0;
-
+        
         HidInfoList::iterator it = mDeviceList.begin(), end = mDeviceList.end();
         for(; it != end; ++it)
@@ -376 +404 @@
                 if((*it)->inUse == false && (*it)->type == iType && (vendor == "" || (*it)->combinedKey == vendor))
                 {
-                        //create device
+                        switch(iType)
+                        {
+                                case OISJoyStick:
+                                        int totalDevs = totalDevices(iType);
+                                        int freeDevs = freeDevices(iType);
+                                        int devID = totalDevs - freeDevs;
+                                        
+                                        obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID);
+                                        (*it)->inUse = true;
+                                        return obj;
+                                case OISTablet:
+                                        //Create MacTablet
+                                        break;
+                                default:
+                                        break;
+                        }
                 }
         }
-
-        if( obj == 0 )
-                OIS_EXCEPT(E_InputDeviceNonExistant, "No devices match requested type.");
-
+        
         return obj;
 }

code/branches/ois_update/src/external/ois/mac/MacHIDManager.h

@@ -70 +70 @@
 
                 void initialize();
+                
+                void iterateAndOpenDevices(io_iterator_t iterator);
+                io_iterator_t lookUpDevices(int usage, int page);
 
                 //FactoryCreator Overrides

code/branches/ois_update/src/external/ois/mac/MacInputManager.cpp

@@ -188 +188 @@
         }
         default:
+        {
+                obj = mHIDManager->createObject(creator, iType, bufferMode, vendor);
                 break;
+        }
         }
 

code/branches/ois_update/src/external/ois/win32/Win32ForceFeedback.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32ForceFeedback.h"
+#include "win32/Win32ForceFeedback.h"
 #include "OISException.h"
-#include <Math.h>
+#include <math.h>
 
 // 0 = No trace; 1 = Important traces; 2 = Debug traces

code/branches/ois_update/src/external/ois/win32/Win32ForceFeedback.h

@@ -26 +26 @@
 #include "OISPrereqs.h"
 #include "OISForceFeedback.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS

code/branches/ois_update/src/external/ois/win32/Win32InputManager.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32Keyboard.h"
-#include "Win32/Win32Mouse.h"
-#include "Win32/Win32JoyStick.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32KeyBoard.h"
+#include "win32/Win32Mouse.h"
+#include "win32/Win32JoyStick.h"
 #include "OISException.h"
 
@@ -75 +75 @@
         hInst = GetModuleHandle(0);
 
-        //Create the input system
+        //Create the device
         hr = DirectInput8Create( hInst, DIRECTINPUT_VERSION, IID_IDirectInput8, (VOID**)&mDirectInput, NULL );
     if (FAILED(hr))     
@@ -118 +118 @@
 {
         //Enumerate all attached devices
-        mDirectInput->EnumDevices(NULL , _DIEnumDevCallback, this, DIEDFL_ATTACHEDONLY); 
+        mDirectInput->EnumDevices(NULL, _DIEnumDevCallback, this, DIEDFL_ATTACHEDONLY);
+
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+        //let's check how many possible XInput devices we may have (max 4)... 
+        for(int i = 0; i < 3; ++i)
+        {
+                XINPUT_STATE state;
+                if(XInputGetState(i, &state) != ERROR_DEVICE_NOT_CONNECTED)
+                {       //Once we found 1, just check our whole list against devices
+                        Win32JoyStick::CheckXInputDevices(unusedJoyStickList);
+                        break;
+                }
+        }
+#endif
 }
 
@@ -134 +147 @@
         {
                 JoyStickInfo jsInfo;
+                jsInfo.isXInput = false;
+                jsInfo.productGuid = lpddi->guidProduct;
                 jsInfo.deviceID = lpddi->guidInstance;
                 jsInfo.vendor = lpddi->tszInstanceName;

code/branches/ois_update/src/external/ois/win32/Win32InputManager.h

@@ -26 +26 @@
 #include "OISInputManager.h"
 #include "OISFactoryCreator.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS

code/branches/ois_update/src/external/ois/win32/Win32JoyStick.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32JoyStick.h"
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32ForceFeedback.h"
+#include "win32/Win32JoyStick.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32ForceFeedback.h"
 #include "OISEvents.h"
 #include "OISException.h"
 
 #include <cassert>
+#include <wbemidl.h>
+#include <oleauto.h>
+//#include <wmsstd.h>
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(x) \
+   if(x != NULL)        \
+   {                    \
+      x->Release();     \
+      x = NULL;         \
+   }
+#endif
+
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+#       pragma comment(lib, "xinput.lib")
+#endif
 
 //DX Only defines macros for the JOYSTICK not JOYSTICK2, so fix it
@@ -40 +55 @@
 #define DIJOFS_SLIDER3(n) (FIELD_OFFSET(DIJOYSTATE2, rglFSlider)+(n) * sizeof(LONG))
 
+#define XINPUT_TRANSLATED_BUTTON_COUNT 12
+#define XINPUT_TRANSLATED_AXIS_COUNT 6
+
 using namespace OIS;
 
 //--------------------------------------------------------------------------------------------------//
-Win32JoyStick::Win32JoyStick( InputManager* creator, IDirectInput8* pDI,
-        bool buffered, DWORD coopSettings, const JoyStickInfo &info )
-        : JoyStick(info.vendor, buffered, info.devId, creator)
-{
-        mDirectInput = pDI;
-        coopSetting = coopSettings;
-        mJoyStick = 0;
-
-        deviceGuid = info.deviceID;
-
-        ff_device = 0;
+Win32JoyStick::Win32JoyStick( InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings, const JoyStickInfo &info ) :
+        JoyStick(info.vendor, buffered, info.devId, creator),
+        mDirectInput(pDI),
+        coopSetting(coopSettings),
+        mJoyStick(0),
+        mJoyInfo(info),
+        mFfDevice(0)
+{
 }
 
@@ -59 +74 @@
 Win32JoyStick::~Win32JoyStick()
 {
-        delete ff_device;
+        delete mFfDevice;
 
         if(mJoyStick)
@@ -69 +84 @@
 
         //Return joystick to pool
-        JoyStickInfo js;
-        js.deviceID = deviceGuid;
-        js.devId = mDevID;
-        js.vendor = mVendor;
-        static_cast<Win32InputManager*>(mCreator)->_returnJoyStick(js);
+        static_cast<Win32InputManager*>(mCreator)->_returnJoyStick(mJoyInfo);
 }
 
@@ -79 +90 @@
 void Win32JoyStick::_initialize()
 {
-        //Clear old state
-        mState.mAxes.clear();
-
-        if (ff_device)
-        {
-                delete ff_device;
-                ff_device = 0;
-        }
-
-        // Create direct input joystick device.
-        if(FAILED(mDirectInput->CreateDevice(deviceGuid, &mJoyStick, NULL)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
-
-        // Set DIJoystick2 data format.
-        if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
-
-        // Set cooperative level as specified when creating input manager.
-        HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
-        if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
-
-        // Set buffer size.
-        DIPROPDWORD dipdw;
-        dipdw.diph.dwSize       = sizeof(DIPROPDWORD);
-        dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-        dipdw.diph.dwObj        = 0;
-        dipdw.diph.dwHow        = DIPH_DEVICE;
-        dipdw.dwData            = JOYSTICK_DX_BUFFERSIZE;
-
-        if( FAILED(mJoyStick->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)) )
-                OIS_EXCEPT( E_General, "Win32JoyStick::_initialize >> Failed to set buffer size property" );
-
-        // Enumerate all axes/buttons/sliders/force feedback/etc before aquiring
-        _enumerate();
-
-        mState.clear();
-
-        capture();
+    if (mJoyInfo.isXInput)
+    {
+        _enumerate();
+    }
+    else
+    {
+            //Clear old state
+            mState.mAxes.clear();
+
+            delete mFfDevice;
+            mFfDevice = 0;
+
+            DIPROPDWORD dipdw;
+
+            dipdw.diph.dwSize       = sizeof(DIPROPDWORD);
+            dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+            dipdw.diph.dwObj        = 0;
+            dipdw.diph.dwHow        = DIPH_DEVICE;
+            dipdw.dwData            = JOYSTICK_DX_BUFFERSIZE;
+
+            if(FAILED(mDirectInput->CreateDevice(mJoyInfo.deviceID, &mJoyStick, NULL)))
+                    OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
+
+            if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
+                    OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
+
+            HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
+
+            if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
+                    OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
+
+            if( FAILED(mJoyStick->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)) )
+                    OIS_EXCEPT( E_General, "Win32Mouse::Win32Mouse >> Failed to set buffer size property" );
+
+            //Enumerate all axes/buttons/sliders/etc before aquiring
+            _enumerate();
+
+            mState.clear();
+
+            capture();
+    }
 }
 
@@ -123 +136 @@
 void Win32JoyStick::_enumerate()
 {
-        // Get joystick capabilities.
-        mDIJoyCaps.dwSize = sizeof(DIDEVCAPS);
-        if( FAILED(mJoyStick->GetCapabilities(&mDIJoyCaps)) )
-                OIS_EXCEPT( E_General, "Win32JoyStick::_enumerate >> Failed to get capabilities" );
-
-        // => Number of POVs
-        mPOVs = (short)mDIJoyCaps.dwPOVs;
-
-        // => Number of buttons and axes.
-        mState.mButtons.resize(mDIJoyCaps.dwButtons);
-        mState.mAxes.resize(mDIJoyCaps.dwAxes);
-
-        // Enumerate all Force Feedback effects (if any)
-        mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
-
-        //Reset the axis mapping enumeration value
-        _AxisNumber = 0;
-
-        // Enumerate and set axis constraints (and check FF Axes)
-        mJoyStick->EnumObjects(DIEnumDeviceObjectsCallback, this, DIDFT_AXIS);
+    if (mJoyInfo.isXInput)
+    {
+        mPOVs = 1;
+
+        mState.mButtons.resize(XINPUT_TRANSLATED_BUTTON_COUNT);
+            mState.mAxes.resize(XINPUT_TRANSLATED_AXIS_COUNT);
+    }
+    else
+    {
+                // Get joystick capabilities.
+                mDIJoyCaps.dwSize = sizeof(DIDEVCAPS);
+                if( FAILED(mJoyStick->GetCapabilities(&mDIJoyCaps)) )
+                        OIS_EXCEPT( E_General, "Win32JoyStick::_enumerate >> Failed to get capabilities" );
+
+            mPOVs = (short)mDIJoyCaps.dwPOVs;
+
+            mState.mButtons.resize(mDIJoyCaps.dwButtons);
+            mState.mAxes.resize(mDIJoyCaps.dwAxes);
+
+            //Reset the axis mapping enumeration value
+            _AxisNumber = 0;
+
+            //Enumerate Force Feedback (if any)
+            mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
+
+            //Enumerate and set axis constraints (and check FF Axes)
+            mJoyStick->EnumObjects(DIEnumDeviceObjectsCallback, this, DIDFT_AXIS);
+    }
 }
 
@@ -191 +212 @@
         if((lpddoi->dwFlags & DIDOI_FFACTUATOR) != 0 )
         {
-                if( _this->ff_device )
+                if( _this->mFfDevice )
                 {
-                        _this->ff_device->_addFFAxis();
+                        _this->mFfDevice->_addFFAxis();
                 }
         }
@@ -200 +221 @@
         //as DInput has no API to query the device for these capabilities
         //(the only way to know is to try them ...)
-        if( _this->ff_device )
-        {
-            _this->ff_device->_setGainSupport(true);
-            _this->ff_device->_setAutoCenterSupport(true);
+        if( _this->mFfDevice )
+        {
+            _this->mFfDevice->_setGainSupport(true);
+            _this->mFfDevice->_setAutoCenterSupport(true);
         }
 
@@ -215 +236 @@
 
         //Create the FF instance only after we know there is at least one effect type
-        if( _this->ff_device == 0 )
-          _this->ff_device = new Win32ForceFeedback(_this->mJoyStick, &_this->mDIJoyCaps);
-
-        _this->ff_device->_addEffectSupport( pdei );
+        if( _this->mFfDevice == 0 )
+                _this->mFfDevice = new Win32ForceFeedback(_this->mJoyStick, &_this->mDIJoyCaps);
+
+        _this->mFfDevice->_addEffectSupport(pdei);
 
         return DIENUM_CONTINUE;
@@ -226 +247 @@
 void Win32JoyStick::capture()
 {
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+        //handle xbox controller differently
+    if (mJoyInfo.isXInput)
+        {
+                captureXInput();
+                return;
+        }
+#endif
+
+        //handle directinput based devices
         DIDEVICEOBJECTDATA diBuff[JOYSTICK_DX_BUFFERSIZE];
         DWORD entries = JOYSTICK_DX_BUFFERSIZE;
@@ -241 +272 @@
 
                 // Poll the device to read the current state
-            mJoyStick->Poll();
+                mJoyStick->Poll();
                 hr = mJoyStick->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), diBuff, &entries, 0 );
                 //Perhaps the user just tabbed away
@@ -353 +384 @@
 
 //--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::captureXInput()
+{
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+    XINPUT_STATE inputState;
+        if (XInputGetState((DWORD)mJoyInfo.xInputDev, &inputState) != ERROR_SUCCESS)
+        memset(&inputState, 0, sizeof(inputState));
+
+    //Sticks and triggers
+        int value;
+    bool axisMoved[XINPUT_TRANSLATED_AXIS_COUNT] = {false,false,false,false,false,false};
+
+        //LeftY
+        value = -(int)inputState.Gamepad.sThumbLY;
+        mState.mAxes[0].rel = value - mState.mAxes[0].abs;
+        mState.mAxes[0].abs = value;
+        if(mState.mAxes[0].rel != 0)
+        axisMoved[0] = true;
+
+        //LeftX
+    mState.mAxes[1].rel = inputState.Gamepad.sThumbLX - mState.mAxes[1].abs;
+    mState.mAxes[1].abs = inputState.Gamepad.sThumbLX;
+
+        if(mState.mAxes[1].rel != 0)
+        axisMoved[1] = true;
+
+        //RightY
+        value = -(int)inputState.Gamepad.sThumbRY;           
+    mState.mAxes[2].rel = value - mState.mAxes[2].abs;
+    mState.mAxes[2].abs = value;
+        if(mState.mAxes[2].rel != 0)
+        axisMoved[2] = true;
+
+        //RightX
+    mState.mAxes[3].rel = inputState.Gamepad.sThumbRX - mState.mAxes[3].abs;
+    mState.mAxes[3].abs = inputState.Gamepad.sThumbRX;
+        if(mState.mAxes[3].rel != 0)
+                axisMoved[3] = true;
+
+        //Left trigger
+    value = inputState.Gamepad.bLeftTrigger * 129;
+        if(value > JoyStick::MAX_AXIS)
+                value = JoyStick::MAX_AXIS;
+
+    mState.mAxes[4].rel = value - mState.mAxes[4].abs;
+    mState.mAxes[4].abs = value;
+        if(mState.mAxes[4].rel != 0)
+                axisMoved[4] = true;
+
+        //Right trigger
+    value = (int)inputState.Gamepad.bRightTrigger * 129;
+        if(value > JoyStick::MAX_AXIS)
+                value = JoyStick::MAX_AXIS;
+
+        mState.mAxes[5].rel = value - mState.mAxes[5].abs;
+    mState.mAxes[5].abs = value;
+        if(mState.mAxes[5].rel != 0)
+                axisMoved[5] = true;
+    
+    //POV
+    int previousPov = mState.mPOV[0].direction;        
+    int& pov = mState.mPOV[0].direction;
+    pov = Pov::Centered;        
+    if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP)
+        pov |= Pov::North;
+    else if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN)
+        pov |= Pov::South;
+    if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT)
+        pov |= Pov::West;
+    else if (inputState.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT)
+        pov |= Pov::East;
+    
+    //Buttons - The first 4 buttons don't need to be checked since they represent the dpad
+    bool previousButtons[XINPUT_TRANSLATED_BUTTON_COUNT];
+    std::copy(mState.mButtons.begin(), mState.mButtons.end(), previousButtons);
+    for (size_t i = 0; i < XINPUT_TRANSLATED_BUTTON_COUNT; i++)
+        mState.mButtons[i] = (inputState.Gamepad.wButtons & (1 << (i + 4))) != 0;
+
+    //Send events
+    if (mBuffered && mListener)
+    {
+            JoyStickEvent joystickEvent(this, mState);
+
+            //Axes
+            for (int i = 0; i < XINPUT_TRANSLATED_AXIS_COUNT; i++)
+        {
+                    if (axisMoved[i] && !mListener->axisMoved(joystickEvent, i))
+                            return;
+        }
+
+        //POV
+        if (previousPov != pov && !mListener->povMoved(joystickEvent, 0))
+            return;
+
+        //Buttons
+        for (int i = 0; i < XINPUT_TRANSLATED_BUTTON_COUNT; i++)
+        {
+            if (!previousButtons[i] && mState.mButtons[i])
+            {
+                if (!mListener->buttonPressed(joystickEvent, i))
+                    return;
+            }
+            else if (previousButtons[i] && !mState.mButtons[i])
+            {
+                if (!mListener->buttonReleased(joystickEvent, i))
+                    return;
+            }
+        }
+    }
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------//
 bool Win32JoyStick::_doButtonClick( int button, DIDEVICEOBJECTDATA& di )
 {
@@ -410 +553 @@
 Interface* Win32JoyStick::queryInterface(Interface::IType type)
 {
-        //Thought about using covariant return type here.. however,
-        //some devices may allow LED light changing, or other interface stuff
-
-        if( ff_device && type == Interface::ForceFeedback )
-                return ff_device;
+        if( mFfDevice && type == Interface::ForceFeedback )
+                return mFfDevice;
         else
                 return 0;
 }
+
+//--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::CheckXInputDevices(JoyStickInfoList &joys)
+{
+    IWbemLocator*           pIWbemLocator  = NULL;
+    IEnumWbemClassObject*   pEnumDevices   = NULL;
+    IWbemClassObject*       pDevices[20]   = {0};
+    IWbemServices*          pIWbemServices = NULL;
+    BSTR                    bstrNamespace  = NULL;
+    BSTR                    bstrDeviceID   = NULL;
+    BSTR                    bstrClassName  = NULL;
+    DWORD                   uReturned      = 0;
+    bool                    bIsXinputDevice= false;
+        DWORD                   iDevice        = 0;
+        int                     xDevice        = 0;
+    VARIANT                 var;
+    HRESULT                 hr;
+
+        if(joys.size() == 0)
+                return;
+
+    // CoInit if needed
+    hr = CoInitialize(NULL);
+    bool bCleanupCOM = SUCCEEDED(hr);
+
+    // Create WMI
+    hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator);
+    if( FAILED(hr) || pIWbemLocator == NULL )
+        goto LCleanup;
+
+    bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );
+        if( bstrNamespace == NULL )
+                goto LCleanup;
+
+    bstrClassName = SysAllocString( L"Win32_PNPEntity" );
+        if( bstrClassName == NULL )
+                goto LCleanup;
+
+    bstrDeviceID  = SysAllocString( L"DeviceID" );
+        if( bstrDeviceID == NULL )
+                goto LCleanup;
+    
+    // Connect to WMI 
+    hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices );
+    if( FAILED(hr) || pIWbemServices == NULL )
+        goto LCleanup;
+
+    // Switch security level to IMPERSONATE. 
+    CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE );                    
+
+    hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); 
+    if( FAILED(hr) || pEnumDevices == NULL )
+        goto LCleanup;
+
+    // Loop over all devices
+    for( ;; )
+    {
+        // Get 20 at a time
+        hr = pEnumDevices->Next(5000, 20, pDevices, &uReturned);
+        if( FAILED(hr) )
+            goto LCleanup;
+
+        if( uReturned == 0 )
+            break;
+
+        for(iDevice = 0; iDevice < uReturned; iDevice++)
+        {
+            // For each device, get its device ID
+            hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL);
+            if(SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL)
+            {
+                // Check if the device ID contains "IG_".  If it does, then it's an XInput device - This information can not be found from DirectInput 
+                if(wcsstr(var.bstrVal, L"IG_"))
+                {
+                    // If it does, then get the VID/PID from var.bstrVal
+                    DWORD dwPid = 0, dwVid = 0;
+                    WCHAR* strVid = wcsstr( var.bstrVal, L"VID_" );
+                    if(strVid && swscanf_s( strVid, L"VID_%4X", &dwVid ) != 1)
+                                                dwVid = 0;
+
+                    WCHAR* strPid = wcsstr( var.bstrVal, L"PID_" );
+                    if(strPid && swscanf_s( strPid, L"PID_%4X", &dwPid ) != 1)
+                        dwPid = 0;
+
+                    // Compare the VID/PID to the DInput device
+                    DWORD dwVidPid = MAKELONG(dwVid, dwPid);
+                                        for(JoyStickInfoList::iterator i = joys.begin(); i != joys.end(); ++i)
+                                        {
+                                                if(dwVidPid == i->productGuid.Data1)
+                                                {
+                                                        i->isXInput = true;
+                                                        i->xInputDev = xDevice;
+                                                }
+                                        }
+
+                                        if(joys.size() == 0)
+                                                goto LCleanup;
+                }
+            }
+
+            SAFE_RELEASE(pDevices[iDevice]);
+        }
+    }
+
+LCleanup:
+    if(bstrNamespace)
+        SysFreeString(bstrNamespace);
+
+    if(bstrDeviceID)
+        SysFreeString(bstrDeviceID);
+
+    if(bstrClassName)
+        SysFreeString(bstrClassName);
+
+    for(iDevice=0; iDevice < 20; iDevice++)
+        SAFE_RELEASE(pDevices[iDevice]);
+
+    SAFE_RELEASE(pEnumDevices);
+    SAFE_RELEASE(pIWbemLocator);
+    SAFE_RELEASE(pIWbemServices);
+
+    if(bCleanupCOM)
+        CoUninitialize();
+}

code/branches/ois_update/src/external/ois/win32/Win32JoyStick.h

@@ -25 +25 @@
 
 #include "OISJoyStick.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS
@@ -41 +41 @@
                 virtual void capture();
 
+                //! hanlde xinput
+                void captureXInput();
+
                 /** @copydoc Object::queryInterface */
                 virtual Interface* queryInterface(Interface::IType type);
@@ -46 +49 @@
                 /** @copydoc Object::_initialize */
                 virtual void _initialize();
+
+                /**
+                @remarks
+                        Enum each PNP device using WMI and check each device ID to see if it contains 
+                        "IG_" (ex. "VID_045E&PID_028E&IG_00").  If it does, then it's an XInput device
+                        Unfortunately this information can not be found by just using DirectInput 
+                */
+                static void CheckXInputDevices(JoyStickInfoList &joys);
 
         protected:
@@ -61 +72 @@
                 IDirectInputDevice8* mJoyStick;
                 DIDEVCAPS mDIJoyCaps;
+                DWORD coopSetting;
 
-                DWORD coopSetting;
-                GUID deviceGuid;
+        JoyStickInfo mJoyInfo;
 
                 //! A force feedback device
-                Win32ForceFeedback* ff_device;
+                Win32ForceFeedback* mFfDevice;
 
                 //! Mapping

code/branches/ois_update/src/external/ois/win32/Win32KeyBoard.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32KeyBoard.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32KeyBoard.h"
 #include "OISException.h"
 #include "OISEvents.h"
@@ -287 +287 @@
 
 //--------------------------------------------------------------------------------------------------//
-const std::string& Win32Keyboard::getAsString( KeyCode kc )
+const std::string& Win32Keyboard::getAsString(KeyCode kc)
 {
         char temp[256];
@@ -297 +297 @@
         prop.diph.dwHow = DIPH_BYOFFSET;
 
-        if ( SUCCEEDED( mKeyboard->GetProperty( DIPROP_KEYNAME, &prop.diph ) ) )
+        if (SUCCEEDED(mKeyboard->GetProperty(DIPROP_KEYNAME, &prop.diph)))
         {
                 // convert the WCHAR in "wsz" to multibyte
-                if ( WideCharToMultiByte( CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL) )
-                        return mGetString.assign( temp );
+                if (WideCharToMultiByte(CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL))
+                        return mGetString.assign(temp);
         }
 
         std::stringstream ss;
         ss << "Key_" << (int)kc;
-        return mGetString.assign( ss.str() );
+        return mGetString.assign(ss.str());
 }
 

code/branches/ois_update/src/external/ois/win32/Win32KeyBoard.h

@@ -25 +25 @@
 
 #include "OISKeyboard.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS
@@ -42 +42 @@
                         A combination of DI Flags (see DX Help for info on input device settings)
                 */
-                Win32Keyboard( InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings );
+                Win32Keyboard(InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings);
                 virtual ~Win32Keyboard();
 
                 /** @copydoc Keyboard::isKeyDown */
-                virtual bool isKeyDown( KeyCode key ) const;
+                virtual bool isKeyDown(KeyCode key) const;
                 
                 /** @copydoc Keyboard::getAsString */
-                virtual const std::string& getAsString( KeyCode kc );
+                virtual const std::string& getAsString(KeyCode kc);
 
                 /** @copydoc Keyboard::copyKeyStates */
-                virtual void copyKeyStates( char keys[256] ) const;
+                virtual void copyKeyStates(char keys[256]) const;
 
                 /** @copydoc Object::setBuffered */

code/branches/ois_update/src/external/ois/win32/Win32Mouse.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32Mouse.h"
-#include "Win32/Win32InputManager.h"
+#include "win32/Win32Mouse.h"
+#include "win32/Win32InputManager.h"
 #include "OISException.h"
 #include "OISEvents.h"

code/branches/ois_update/src/external/ois/win32/Win32Mouse.h

@@ -25 +25 @@
 
 #include "OISMouse.h"
-#include "Win32/Win32Prereqs.h"
+#include "win32/Win32Prereqs.h"
 
 namespace OIS

code/branches/ois_update/src/external/ois/win32/Win32Prereqs.h

@@ -29 +29 @@
 #include <dinput.h>
 
+#ifdef OIS_WIN32_XINPUT_SUPPORT
+#       include <XInput.h>
+#endif
+
 //Max number of elements to collect from buffered DirectInput
 #define KEYBOARD_DX_BUFFERSIZE 17
-#define MOUSE_DX_BUFFERSIZE 64
-#define JOYSTICK_DX_BUFFERSIZE 124
+#define MOUSE_DX_BUFFERSIZE 128
+#define JOYSTICK_DX_BUFFERSIZE 129
 
 //MinGW defines
@@ -55 +59 @@
                 int devId;
                 GUID deviceID;
+                GUID productGuid;
                 std::string vendor;
+        bool isXInput;
+                int xInputDev;
         };
 
-        typedef std::vector< JoyStickInfo > JoyStickInfoList;
+        typedef std::vector<JoyStickInfo> JoyStickInfoList;
 }