Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2609


Ignore:
Timestamp:
Jan 29, 2009, 8:55:41 PM (15 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:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/src/ois/OISException.cpp

    r1505 r2609  
    2626
    2727//----------------------------------------------------------------------------//
    28 /*const char* Exception::what() const throw()
     28const char* Exception::what() const throw()
    2929{
    3030        return eText;
    3131}
    32 */
     32
  • code/branches/buildsystem2/src/ois/OISException.h

    r1505 r2609  
    5858                        : eType(err), eLine(line), eFile(file), eText(str) {}
    5959
    60                 virtual const char* what() const throw()
    61             { return eText; }
     60                ~Exception() throw() {}
     61
     62                virtual const char* what() const throw();
    6263
    6364                //! The type of exception raised
  • code/branches/buildsystem2/src/ois/linux/LinuxKeyboard.cpp

    r1786 r2609  
    283283        }
    284284
    285         for(unsigned int i = 1; i < len; i++)
     285        for(int i = 1; i < len; i++)
    286286                val = (val << 6) | (buf[i] & 0x3F);
    287287
     
    303303
    304304        while( XPending(display) > 0 )
    305         {
    306                 XNextEvent(display, &event);
    307 
    308                 if( KeyPress == event.type )
     305        {               XNextEvent(display, &event);            if( KeyPress == event.type )
    309306                {
    310307                        unsigned int character = 0;
     
    335332                        if( event.xkey.state & Mod1Mask && key == XK_Tab )
    336333                                linMan->_setGrabState(false);
    337                 }
    338                 else if( KeyRelease == event.type )
     334                }               else if( KeyRelease == event.type )
    339335                {
    340336                        //Mask out the modifier states X sets.. or we will get improper values
     
    344340                        //Else, it is a valid key release
    345341                        XLookupString(&event.xkey,NULL,0,&key,NULL);
    346                         _injectKeyUp(key);
    347                 }
     342                        _injectKeyUp(key);              }
    348343        }
    349344
Note: See TracChangeset for help on using the changeset viewer.