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

Refactored the initialization of OSX windowing settings so that it's done on demand rather than on startup.

Browse Source
This commit is contained in:
Robert Osfield
2010-03-13 11:28:00 +00:00
parent b8b536257c
commit f27c103ec7
4 changed files with 155 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgViewer/DarwinUtils.h
View File

@@ -90,7 +90,9 @@ struct DarwinWindowingSystemInterface : public osg::GraphicsContext::WindowingSy
unsigned int getScreenContaining(int x, int y, int w, int h);
protected:
virtual void _init();
/** implementation of setScreenResolution */
bool setScreenResolutionImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int width, unsigned int height) ;
@@ -117,6 +119,8 @@ struct DarwinWindowingSystemInterface : public osg::GraphicsContext::WindowingSy
private:
bool _initialized;
CGDisplayCount _displayCount;
CGDirectDisplayID* _displayIds;

168
src/osgViewer/DarwinUtils.mm
View File

@@ -221,21 +221,11 @@ static long getDictLong(CFDictionaryRef refDict, CFStringRef key) // cons
/** ctor, get a list of all attached displays */
DarwinWindowingSystemInterface::DarwinWindowingSystemInterface() :
_initialized(false),
_displayCount(0),
_displayIds(NULL)
{
ProcessSerialNumber sn = { 0, kCurrentProcess };
TransformProcessType(&sn,kProcessTransformToForegroundApplication);
SetFrontProcess(&sn);
if( CGGetActiveDisplayList( 0, NULL, &_displayCount ) != CGDisplayNoErr )
osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: could not get # of screens" << std::endl;
_displayIds = new CGDirectDisplayID[_displayCount];
if( CGGetActiveDisplayList( _displayCount, _displayIds, &_displayCount ) != CGDisplayNoErr )
osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: CGGetActiveDisplayList failed" << std::endl;
}
}
/** dtor */
DarwinWindowingSystemInterface::~DarwinWindowingSystemInterface()
@@ -250,12 +240,51 @@ DarwinWindowingSystemInterface::~DarwinWindowingSystemInterface()
_displayIds = NULL;
}
void DarwinWindowingSystemInterface::_init()
{
if (_initialized) return;
ProcessSerialNumber sn = { 0, kCurrentProcess };
TransformProcessType(&sn,kProcessTransformToForegroundApplication);
SetFrontProcess(&sn);
if( CGGetActiveDisplayList( 0, NULL, &_displayCount ) != CGDisplayNoErr )
{
osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: could not get # of screens" << std::endl;
_displayCount = 0;
_initialized = true;
return;
}
_displayIds = new CGDirectDisplayID[_displayCount];
if( CGGetActiveDisplayList( _displayCount, _displayIds, &_displayCount ) != CGDisplayNoErr )
{
osg::notify(osg::WARN) << "DarwinWindowingSystemInterface: CGGetActiveDisplayList failed" << std::endl;
}
_initialized = true;
}
/** @return a CGDirectDisplayID for a ScreenIdentifier */
CGDirectDisplayID DarwinWindowingSystemInterface::getDisplayID(const osg::GraphicsContext::ScreenIdentifier& si) {
CGDirectDisplayID DarwinWindowingSystemInterface::getDisplayID(const osg::GraphicsContext::ScreenIdentifier& si)
{
_init();
if (_displayCount==0)
{
osg::notify(osg::WARN) << "DarwinWindowingSystemInterface::getDisplayID(..) no valid screens available returning 0 instead." << std::endl;
return 0;
}
if (si.screenNum < static_cast<int>(_displayCount))
{
return _displayIds[si.screenNum];
else {
osg::notify(osg::WARN) << "GraphicsWindowCarbon :: invalid screen # " << si.screenNum << ", returning main-screen instead" << std::endl;
}
else
{
osg::notify(osg::WARN) << "DarwinWindowingSystemInterface::getDisplayID(..) invalid screen # " << si.screenNum << ", returning main-screen instead." << std::endl;
return _displayIds[0];
}
}
@@ -263,11 +292,24 @@ CGDirectDisplayID DarwinWindowingSystemInterface::getDisplayID(const osg::Graphi
/** @return count of attached screens */
unsigned int DarwinWindowingSystemInterface::getNumScreens(const osg::GraphicsContext::ScreenIdentifier& si)
{
_init();
return _displayCount;
}
void DarwinWindowingSystemInterface::getScreenSettings(const osg::GraphicsContext::ScreenIdentifier& si, osg::GraphicsContext::ScreenSettings & resolution)
{
_init();
if (_displayCount==0)
{
resolution.width = 0;
resolution.height = 0;
resolution.colorDepth = 0;
resolution.refreshRate = 0;
return;
}
CGDirectDisplayID id = getDisplayID(si);
resolution.width = CGDisplayPixelsWide(id);
resolution.height = CGDisplayPixelsHigh(id);
@@ -277,33 +319,51 @@ void DarwinWindowingSystemInterface::getScreenSettings(const osg::GraphicsContex
}
void DarwinWindowingSystemInterface::enumerateScreenSettings(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, osg::GraphicsContext::ScreenSettingsList & resolutionList) {
// Warning! This method has not been tested.
resolutionList.clear();
void DarwinWindowingSystemInterface::enumerateScreenSettings(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, osg::GraphicsContext::ScreenSettingsList & resolutionList)
{
_init();
CGDirectDisplayID displayid = getDisplayID(screenIdentifier);
CFArrayRef availableModes = CGDisplayAvailableModes(displayid);
unsigned int numberOfAvailableModes = CFArrayGetCount(availableModes);
for (unsigned int i=0; i<numberOfAvailableModes; ++i) {
// look at each mode in the available list
CFDictionaryRef mode = (CFDictionaryRef)CFArrayGetValueAtIndex(availableModes, i);
osg::GraphicsContext::ScreenSettings tmpSR;
// Warning! This method has not been tested.
resolutionList.clear();
long width = getDictLong(mode, kCGDisplayWidth);
tmpSR.width = width<=0 ? 0 : width;
long height = getDictLong(mode, kCGDisplayHeight);
tmpSR.height = height<=0 ? 0 : height;
long rate = getDictLong(mode, kCGDisplayRefreshRate);
tmpSR.refreshRate = rate<=0 ? 0 : rate;
long depth = getDictLong(mode, kCGDisplayBitsPerPixel);
tmpSR.colorDepth = depth<=0 ? 0 : depth;
resolutionList.push_back(tmpSR);
}
if (_displayCount==0)
{
return;
}
CGDirectDisplayID displayid = getDisplayID(screenIdentifier);
CFArrayRef availableModes = CGDisplayAvailableModes(displayid);
unsigned int numberOfAvailableModes = CFArrayGetCount(availableModes);
for (unsigned int i=0; i<numberOfAvailableModes; ++i) {
// look at each mode in the available list
CFDictionaryRef mode = (CFDictionaryRef)CFArrayGetValueAtIndex(availableModes, i);
osg::GraphicsContext::ScreenSettings tmpSR;
long width = getDictLong(mode, kCGDisplayWidth);
tmpSR.width = width<=0 ? 0 : width;
long height = getDictLong(mode, kCGDisplayHeight);
tmpSR.height = height<=0 ? 0 : height;
long rate = getDictLong(mode, kCGDisplayRefreshRate);
tmpSR.refreshRate = rate<=0 ? 0 : rate;
long depth = getDictLong(mode, kCGDisplayBitsPerPixel);
tmpSR.colorDepth = depth<=0 ? 0 : depth;
resolutionList.push_back(tmpSR);
}
}
/** return the top left coord of a specific screen in global screen space */
void DarwinWindowingSystemInterface::getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y) {
void DarwinWindowingSystemInterface::getScreenTopLeft(const osg::GraphicsContext::ScreenIdentifier& si, int& x, int& y)
{
_init();
if (_displayCount==0)
{
x = 0;
y = 0;
return;
}
CGRect bounds = CGDisplayBounds( getDisplayID(si) );
x = static_cast<int>(bounds.origin.x);
y = static_cast<int>(bounds.origin.y);
@@ -316,8 +376,10 @@ bool DarwinWindowingSystemInterface::setScreenSettings(const osg::GraphicsContex
{
bool result = setScreenResolutionImpl(si, settings.width, settings.height);
if (result)
{
setScreenRefreshRateImpl(si, settings.refreshRate);
}
return result;
}
@@ -326,6 +388,13 @@ bool DarwinWindowingSystemInterface::setScreenSettings(const osg::GraphicsContex
/** implementation of setScreenResolution */
bool DarwinWindowingSystemInterface::setScreenResolutionImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int width, unsigned int height)
{
_init();
if (_displayCount==0)
{
return false;
}
CGDirectDisplayID displayid = getDisplayID(screenIdentifier);
// add next line and on following line replace hard coded depth and refresh rate
@@ -344,8 +413,15 @@ bool DarwinWindowingSystemInterface::setScreenResolutionImpl(const osg::Graphics
}
/** implementation of setScreenRefreshRate */
bool DarwinWindowingSystemInterface::setScreenRefreshRateImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, double refreshRate) {
bool DarwinWindowingSystemInterface::setScreenRefreshRateImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, double refreshRate)
{
_init();
if (_displayCount==0)
{
return false;
}
boolean_t success(false);
unsigned width, height;
getScreenResolution(screenIdentifier, width, height);
@@ -371,6 +447,13 @@ bool DarwinWindowingSystemInterface::setScreenRefreshRateImpl(const osg::Graphic
unsigned int DarwinWindowingSystemInterface::getScreenContaining(int x, int y, int w, int h)
{
_init();
if (_displayCount==0)
{
return 0;
}
CGRect rect = CGRectMake(x,y,w,h);
for(unsigned int i = 0; i < _displayCount; ++i) {
CGRect bounds = CGDisplayBounds( getDisplayID(i) );
@@ -382,9 +465,4 @@ unsigned int DarwinWindowingSystemInterface::getScreenContaining(int x, int y, i
return 0;
}
}

24
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -1053,19 +1053,29 @@ void GraphicsWindowCarbon::transformMouseXY(float& x, float& y)
class CarbonWindowingSystemInterface : public DarwinWindowingSystemInterface {
public:
CarbonWindowingSystemInterface()
: DarwinWindowingSystemInterface()
CarbonWindowingSystemInterface() : DarwinWindowingSystemInterface()
{
}
virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
{
_init();
return createGraphicsContextImplementation<PixelBufferCarbon, GraphicsWindowCarbon>(traits);
}
virtual void _init()
{
if (_initialized) return;
DarwinWindowingSystemInterface::init();
// register application event handler and AppleEventHandler to get quit-events:
static const EventTypeSpec menueventSpec = {kEventClassCommand, kEventCommandProcess};
OSErr status = InstallEventHandler(GetApplicationEventTarget(), NewEventHandlerUPP(ApplicationEventHandler), 1, &menueventSpec, 0, NULL);
status = AEInstallEventHandler( kCoreEventClass, kAEQuitApplication, NewAEEventHandlerUPP(QuitAppleEventHandler), 0, false);
}
virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
{
return createGraphicsContextImplementation<PixelBufferCarbon, GraphicsWindowCarbon>(traits);
}
};

17
src/osgViewer/GraphicsWindowCocoa.mm
View File

@@ -1382,16 +1382,17 @@ GraphicsWindowCocoa::~GraphicsWindowCocoa()
// CocoaWindowingSystemInterface
// ----------------------------------------------------------------------------------------------------------
struct CocoaWindowingSystemInterface : public DarwinWindowingSystemInterface {
CocoaWindowingSystemInterface()
: DarwinWindowingSystemInterface()
{
struct CocoaWindowingSystemInterface : public DarwinWindowingSystemInterface
{
CocoaWindowingSystemInterface() : DarwinWindowingSystemInterface()
{
}
void initAsStandaloneApplication()
{
_init();
static bool s_inited = false;
if (s_inited) return;
s_inited = true;
@@ -1421,6 +1422,8 @@ struct CocoaWindowingSystemInterface : public DarwinWindowingSystemInterface {
virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits)
{
_init();
if (!traits->pbuffer)
{
GraphicsWindowCocoa::WindowData* windowData = traits->inheritedWindowData ? dynamic_cast<GraphicsWindowCocoa::WindowData*>(traits->inheritedWindowData.get()) : NULL;