Changeset 1349 for code/trunk/src/ois/win32/Win32KeyBoard.cpp

Timestamp:

May 21, 2008, 9:07:08 PM (17 years ago)

Author:

rgrieder

Message:

• merged input branch back to trunk

File:

• code/trunk/src/ois/win32/Win32KeyBoard.cpp (modified) (6 diffs)

code/trunk/src/ois/win32/Win32KeyBoard.cpp

@@ -105 +105 @@
         DWORD entries = KEYBOARD_DX_BUFFERSIZE;
         HRESULT hr;
+        //Only one keyboard allowed per app, so static is ok
+        static bool verifyAfterAltTab = false;
 
         hr = mKeyboard->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), diBuff, &entries, 0 );
@@ -110 +112 @@
         {
                 hr = mKeyboard->Acquire();
+                if (hr == E_ACCESSDENIED)
+                        verifyAfterAltTab = true;
+
                 while( hr == DIERR_INPUTLOST )
                         hr = mKeyboard->Acquire();
+
                 return;
         }
@@ -121 +127 @@
         for(unsigned int i = 0; i < entries; ++i )
         {
-                //If the mListener returns false, that means that we are probably deleted...
+                //If the listener returns false, that means that we are probably deleted...
                 //send no more events and just leave as the this pointer is invalid now...
                 bool ret = true;
@@ -159 +165 @@
                 if(ret == false)
                         break;
+        }
+
+        // If a lost device/access denied was detected, recover gracefully with new events
+        if(verifyAfterAltTab)
+        {
+                bool ret = true;
+                
+                //Copy old buffer to temp location to compare against
+                unsigned char keyBufferCopy[256];
+                memcpy(keyBufferCopy, KeyBuffer, 256);
+
+                //Update new state
+                _read();
+
+                for (unsigned i = 0; i < 256; i++)
+                {
+                        if (keyBufferCopy[i] != KeyBuffer[i])
+                        {
+                                if (mListener)
+                                {
+                                        if (KeyBuffer[i])
+                                                ret = mListener->keyPressed( KeyEvent( this, (KeyCode)i, _translateText((KeyCode)i) ) );
+                                        else
+                                                ret = mListener->keyReleased( KeyEvent( this, (KeyCode)i, 0 ) );
+                                }
+                        }
+
+                        //If user returned false from callback, return immediately
+                        if(ret == false)
+                                return;
+                }
+
+                verifyAfterAltTab = false;
         }
 }
@@ -243 +282 @@
 
 //--------------------------------------------------------------------------------------------------//
-bool Win32Keyboard::isKeyDown( KeyCode key )
+bool Win32Keyboard::isKeyDown( KeyCode key ) const
 {
         return (KeyBuffer[key] & 0x80) != 0;
@@ -272 +311 @@
 
 //--------------------------------------------------------------------------------------------------//
-void Win32Keyboard::copyKeyStates( char keys[256] )
+void Win32Keyboard::copyKeyStates( char keys[256] ) const
 {
         for(int i = 0; i < 256; ++i)