FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Andre Garneau,"Please find attached changes to have the GraphicsWindowWin32 class

Browse Source 
selectively set the pixel format for windows that are inherited, following
some discussions on the mailing list last week.

This is implemented through a new traits flag
(setInheritedWindowPixelFormat) with a default state of false (to avoid
breaking existing applications). When set to true, the pixel format of the
inherited window will be set according to the traits specifications.
"
This commit is contained in:
Robert Osfield
2007-05-17 10:33:44 +00:00
parent d80cf6b5ee
commit 8c10301d30
2 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/osgViewer/GraphicsWindowWin32.cpp
View File

@@ -890,7 +890,7 @@ bool Win32WindowingSystem::changeScreenSettings( const osg::GraphicsContext::Scr
{
case DISP_CHANGE_BADMODE : msg += " The specified graphics mode is not supported."; break;
case DISP_CHANGE_FAILED : msg += " The display driver failed the specified graphics mode."; break;
case DISP_CHANGE_RESTART : msg += " The computer must be restarted for the graphics mode to work."; break;
case DISP_CHANGE_RESTART : msg += " The computer must be restarted for the graphics mode to work."; break;
default : break;
}
@@ -1154,17 +1154,34 @@ bool GraphicsWindowWin32::setWindow( HWND handle )
}
//
// Create the OpenGL rendering context associated with this window
// Check if we must set the pixel format of the inherited window
//
_hglrc = ::wglCreateContext(_hdc);
if (_hglrc==0)
if (_traits.valid() && _traits->setInheritedWindowPixelFormat)
{
reportErrorForScreen("GraphicsWindowWin32::setWindow() - Unable to create OpenGL rendering context", _traits->screenNum, ::GetLastError());
::ReleaseDC(_hwnd, _hdc);
_hdc = 0;
_hwnd = 0;
return false;
if (!setPixelFormat())
{
reportErrorForScreen("GraphicsWindowWin32::setWindow() - Unable to set the inherited window pixel format", _traits->screenNum, ::GetLastError());
_hdc = 0;
_hwnd = 0;
return false;
}
}
else
{
//
// Create the OpenGL rendering context associated with this window
//
_hglrc = ::wglCreateContext(_hdc);
if (_hglrc==0)
{
reportErrorForScreen("GraphicsWindowWin32::setWindow() - Unable to create OpenGL rendering context", _traits->screenNum, ::GetLastError());
::ReleaseDC(_hwnd, _hdc);
_hdc = 0;
_hwnd = 0;
return false;
}
}
if (!registerWindowProcedure())
@@ -1974,31 +1991,6 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
}
break;
#ifdef NEXT_RELEASE_ONLY
//////////////////////
case WM_EXITSIZEMOVE :
//////////////////////
{
int vx = _traits->x + _screenOriginX;
int vy = _traits->y + _screenOriginY;
int screenNum = getScreenNumberContainingWindow(_screenOriginX, _screenOriginY);
if (screenNum!=_traits->screenNum)
{
_recreateWindow = true;
_traits->screenNum = screenNum;
int x = vx - _screenOriginX;
int y = vy - _screenOriginY;
resized(x, y, _traits->width, _traits->height);
getEventQueue()->windowResize(x, y, _traits->width, _traits->height, _timeOfLastCheckEvents);
}
}
break;
#endif
////////////////////
case WM_KEYDOWN :
case WM_SYSKEYDOWN :