Changeset 7506 for code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.cpp

Timestamp:

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

Author:

rgrieder

Message:

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

File:

• code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.cpp (modified) (6 diffs)

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);
+                        }
+                }
         }