Changeset 8060

Timestamp:

Mar 12, 2011, 5:43:12 AM (14 years ago)

Author:

rgrieder

Message:

Reverted some changes to OIS v1.3.
@Kevin: hope this is OK for you.

Location:

code/branches/mac_osx/src/external/ois

Files:

• linux/LinuxKeyboard.cpp (modified) (1 diff)
• mac/MacKeyboard.cpp (modified) (1 diff)

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

@@ -284 +284 @@
         while( XPending(display) > 0 )
         {
-                XNextEvent(display, &event);            if(KeyPress == event.type)
+                XNextEvent(display, &event);
+
+                if(KeyPress == event.type)
                 {
                         unsigned int character = 0;

code/branches/mac_osx/src/external/ois/mac/MacKeyboard.cpp

@@ -199 +199 @@
         char macChar;
         
+        // TODO clean this up
         if (mTextMode == Unicode)
         {
                 //get string size
                 UInt32 stringsize;
+                //status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, 0, &stringsize, NULL);
+                //status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar)*10, NULL, &text );
                 status = GetEventParameter( theEvent, 'kuni', typeUnicodeText, NULL, sizeof(UniChar) * 10, &stringsize, &text );
+                std::cout << "String length: " << stringsize << std::endl;
+                
+                //wstring unitext;
+                //for (int i=0;i<10;i++) unitext += (wchar_t)text[i];
+                //wcout << "Unicode out: " << unitext << endl;
                 
                 if(stringsize > 0)