Changeset 2609

Timestamp:

Jan 29, 2009, 8:55:41 PM (16 years ago)

Author:

rgrieder

Message:

• Added unified diff file with our changes for OIS
• Added version info for OIS
• Updated OIS to the newest CVS version
• Reverted some unnecessary code changes

Location:

code/branches/buildsystem2/src/ois

Files:

• OISException.cpp (modified) (1 diff)
• OISException.h (modified) (1 diff)
• VERSION (added)
• changes_orxonox.diff (added)
• linux/LinuxKeyboard.cpp (modified) (4 diffs)

code/branches/buildsystem2/src/ois/OISException.cpp

@@ -26 +26 @@
 
 //----------------------------------------------------------------------------//
-/*const char* Exception::what() const throw()
+const char* Exception::what() const throw()
 {
         return eText;
 }
-*/
+

code/branches/buildsystem2/src/ois/OISException.h

@@ -58 +58 @@
                         : eType(err), eLine(line), eFile(file), eText(str) {}
 
-                virtual const char* what() const throw()
-            { return eText; }
+                ~Exception() throw() {}
+
+                virtual const char* what() const throw();
 
                 //! The type of exception raised

code/branches/buildsystem2/src/ois/linux/LinuxKeyboard.cpp

@@ -283 +283 @@
         }
 
-        for(unsigned int i = 1; i < len; i++)
+        for(int i = 1; i < len; i++)
                 val = (val << 6) | (buf[i] & 0x3F);
 
@@ -303 +303 @@
 
         while( XPending(display) > 0 )
-        {
-                XNextEvent(display, &event);
-
-                if( KeyPress == event.type )
+        {               XNextEvent(display, &event);            if( KeyPress == event.type )
                 {
                         unsigned int character = 0;
@@ -335 +332 @@
                         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
@@ -344 +340 @@
                         //Else, it is a valid key release
                         XLookupString(&event.xkey,NULL,0,&key,NULL);
-                        _injectKeyUp(key);
-                }
+                        _injectKeyUp(key);              }
         }