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

From Stephan Huber, "attached you'll find an updated carbon-implementation, which implements

Browse Source 
the missing functionality for setWindowName and useCursor
"
This commit is contained in:
Robert Osfield
2007-12-17 10:24:20 +00:00
parent e883663072
commit 49696d776a
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgViewer/api/Carbon/GraphicsWindowCarbon
View File

@@ -101,6 +101,9 @@ class GraphicsWindowCarbon : public osgViewer::GraphicsWindow
virtual void resizedImplementation(int x, int y, int width, int height);
virtual void setWindowName (const std::string & name);
virtual void useCursor(bool cursorOn);
WindowRef getNativeWindowRef() { return _window; }
bool handleMouseEvent(EventRef theEvent);

47
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -603,9 +603,9 @@ bool GraphicsWindowCarbon::realizeImplementation()
if (!_traits) return false;
setWindowDecoration(_traits->windowDecoration);
useCursor(_traits->useCursor);
// move the window to the right screen
OSXCarbonWindowingSystemInterface* wsi = dynamic_cast<OSXCarbonWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
int screenLeft(0), screenTop(0);
if (wsi) {
@@ -646,10 +646,7 @@ bool GraphicsWindowCarbon::realizeImplementation()
installEventHandler();
// set the window title
if (!_traits->windowName.empty()) {
CFStringRef windowtitle = CFStringCreateWithBytes( kCFAllocatorDefault, (const UInt8*)(_traits->windowName.c_str()), _traits->windowName.length(),kCFStringEncodingUTF8, false );
SetWindowTitleWithCFString( _window, windowtitle );
}
setWindowName(_traits->windowName);
// create the context
AGLContext sharedContextCarbon = NULL;
@@ -1128,6 +1125,46 @@ void GraphicsWindowCarbon::grabFocusIfPointerInWindow()
}
void GraphicsWindowCarbon::useCursor(bool cursorOn)
{
if (_traits.valid())
_traits->useCursor = cursorOn;
OSXCarbonWindowingSystemInterface* wsi = dynamic_cast<OSXCarbonWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
if (wsi == NULL) {
osg::notify(osg::WARN) << "GraphicsWindowCarbon::useCursor :: could not get OSXCarbonWindowingSystemInterface" << std::endl;
return;
}
CGDirectDisplayID displayId = wsi->getDisplayID((*_traits));
CGDisplayErr err = kCGErrorSuccess;
switch (cursorOn)
{
case true:
err = CGDisplayShowCursor(displayId);
break;
case false:
err = CGDisplayHideCursor(displayId);
break;
}
if (err != kCGErrorSuccess) {
osg::notify(osg::WARN) << "GraphicsWindowCarbon::useCursor failed with " << err << std::endl;
}
}
void GraphicsWindowCarbon::setWindowName (const std::string& name)
{
_traits->windowName = name;
if (!_traits->windowName.empty())
{
CFStringRef windowtitle = CFStringCreateWithBytes( kCFAllocatorDefault, (const UInt8*)(_traits->windowName.c_str()), _traits->windowName.length(),kCFStringEncodingUTF8, false );
SetWindowTitleWithCFString( _window, windowtitle );
CFRelease(windowtitle);
}
}
void GraphicsWindowCarbon::transformMouseXY(float& x, float& y)
{