f5f29a03c1
key, but it didn't pick up the initial state. So, if NumLock was on for the OS at startup (LED on), it was still off for OSG. And the first keypress turned the LED off, and NumLock on for OSG. The attached fix picks up the state on every FocusIn, just like it was done in the last commits for CapsLock. The difference is, that the NumLock mask isn't standardized (e.g. 0x10 for Linux, and 0x80 for AIX), so we have to do a reverse lookup (::rescanModifierMapping()). Note that I could not reproduce the problem on my system, but someone else confirmed it twice on his, and the patch fixed it for him. Changed files: ./include/osgViewer/api/X11/GraphicsWindowX11 ./src/osgViewer/GraphicsWindowX11.cpp "
201 lines
6.3 KiB
C++
201 lines
6.3 KiB
C++
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
|
|
*
|
|
* This library is open source and may be redistributed and/or modified under
|
|
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
|
|
* (at your option) any later version. The full license is in LICENSE file
|
|
* included with this distribution, and on the openscenegraph.org website.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* OpenSceneGraph Public License for more details.
|
|
*/
|
|
|
|
/* Note, elements of GraphicsWindowX11 have used Prodcer/RenderSurface_X11.cpp as both
|
|
* a guide to use of X11/GLX and copiying directly in the case of setBorder().
|
|
* These elements are license under OSGPL as above, with Copyright (C) 2001-2004 Don Burns.
|
|
*/
|
|
|
|
#ifndef OSGVIEWER_GRAPHICSWINDOWX11
|
|
#define OSGVIEWER_GRAPHICSWINDOWX11 1
|
|
|
|
#include <osgViewer/GraphicsWindow>
|
|
|
|
#define GLX_GLXEXT_PROTOTYPES 1
|
|
|
|
#include <X11/X.h>
|
|
#include <GL/glx.h>
|
|
#include <string.h>
|
|
|
|
namespace osgViewer
|
|
{
|
|
|
|
class OSGVIEWER_EXPORT GraphicsWindowX11 : public osgViewer::GraphicsWindow
|
|
{
|
|
public:
|
|
|
|
GraphicsWindowX11(osg::GraphicsContext::Traits* traits):
|
|
_valid(false),
|
|
_display(0),
|
|
_eventDisplay(0),
|
|
_parent(0),
|
|
_window(0),
|
|
_visualInfo(0),
|
|
_glxContext(0),
|
|
_currentCursor(0),
|
|
_initialized(false),
|
|
_realized(false),
|
|
_timeOfLastCheckEvents(-1.0),
|
|
_lastEventType(0),
|
|
_modifierState(0),
|
|
_numLockMask(0)
|
|
{
|
|
_traits = traits;
|
|
memset(_keyMap, 0, 32);
|
|
|
|
init();
|
|
|
|
if (valid())
|
|
{
|
|
setState( new osg::State );
|
|
getState()->setGraphicsContext(this);
|
|
|
|
if (_traits.valid() && _traits->sharedContext)
|
|
{
|
|
getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
|
|
incrementContextIDUsageCount( getState()->getContextID() );
|
|
}
|
|
else
|
|
{
|
|
getState()->setContextID( osg::GraphicsContext::createNewContextID() );
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
virtual bool isSameKindAs(const Object* object) const { return dynamic_cast<const GraphicsWindowX11*>(object)!=0; }
|
|
virtual const char* libraryName() const { return "osgViewer"; }
|
|
virtual const char* className() const { return "GraphicsWindowX11"; }
|
|
|
|
virtual bool valid() const { return _valid; }
|
|
|
|
/** Realise the GraphicsContext.*/
|
|
virtual bool realizeImplementation();
|
|
|
|
/** Return true if the graphics context has been realised and is ready to use.*/
|
|
virtual bool isRealizedImplementation() const { return _realized; }
|
|
|
|
/** Close the graphics context.*/
|
|
virtual void closeImplementation();
|
|
|
|
/** Make this graphics context current.*/
|
|
virtual bool makeCurrentImplementation();
|
|
|
|
/** Release the graphics context.*/
|
|
virtual bool releaseContextImplementation();
|
|
|
|
/** Swap the front and back buffers.*/
|
|
virtual void swapBuffersImplementation();
|
|
|
|
/** Check to see if any events have been generated.*/
|
|
virtual void checkEvents();
|
|
|
|
/** Set Window decoration.*/
|
|
virtual bool setWindowDecorationImplementation(bool flag);
|
|
|
|
/** Get focus.*/
|
|
virtual void grabFocus();
|
|
|
|
/** Get focus on if the pointer is in this window.*/
|
|
virtual void grabFocusIfPointerInWindow();
|
|
|
|
// Override from GUIActionAdapter
|
|
virtual void requestWarpPointer(float x,float y);
|
|
|
|
/** Set the window's position and size.*/
|
|
virtual bool setWindowRectangleImplementation(int x, int y, int width, int height);
|
|
|
|
/** Set the name of the window */
|
|
virtual void setWindowName(const std::string& name);
|
|
|
|
/** Set mouse cursor to a specific shape.*/
|
|
virtual void setCursor(MouseCursor cursor);
|
|
|
|
/** WindowData is used to pass in the X11 window handle attached the GraphicsContext::Traits structure. */
|
|
struct WindowData : public osg::Referenced
|
|
{
|
|
WindowData(Window window):
|
|
_window(window) {}
|
|
|
|
Window _window;
|
|
};
|
|
|
|
public:
|
|
|
|
// X11 specific aces functions
|
|
|
|
Display* getDisplay() const { return _display; }
|
|
Display* getEventDisplay() const { return _eventDisplay; }
|
|
Display* getDisplayToUse() const ;
|
|
|
|
|
|
Window& getParent() { return _parent; }
|
|
Window& getWindow() { return _window; }
|
|
GLXContext& getGLXContext() { return _glxContext; }
|
|
|
|
Cursor getCurrentCursor() { return _currentCursor; }
|
|
|
|
protected:
|
|
|
|
~GraphicsWindowX11();
|
|
|
|
Cursor getOrCreateCursor(MouseCursor mouseShape);
|
|
|
|
bool createVisualInfo();
|
|
|
|
bool createWindow();
|
|
|
|
bool setWindow(Window window);
|
|
|
|
void init();
|
|
|
|
bool checkAndSendEventFullScreenIfNeeded(Display* display, int x, int y, int width, int height, bool windowDecoration);
|
|
|
|
|
|
void transformMouseXY(float& x, float& y);
|
|
void adaptKey(XKeyEvent& keyevent, int& keySymbol);
|
|
void forceKey(int key, double time, bool state);
|
|
void rescanModifierMapping();
|
|
void getModifierMap(char* keymap) const;
|
|
int getModifierMask() const;
|
|
void syncLocks();
|
|
|
|
bool _valid;
|
|
Display* _display;
|
|
Display* _eventDisplay;
|
|
Window _parent;
|
|
Window _window;
|
|
XVisualInfo* _visualInfo;
|
|
GLXContext _glxContext;
|
|
|
|
Cursor _currentCursor;
|
|
|
|
Atom _deleteWindow;
|
|
|
|
bool _initialized;
|
|
bool _realized;
|
|
bool _ownsWindow;
|
|
|
|
double _timeOfLastCheckEvents;
|
|
int _lastEventType;
|
|
int _modifierState;
|
|
int _numLockMask;
|
|
|
|
char _keyMap[32];
|
|
std::map<MouseCursor,Cursor> _mouseCursorMap;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|