Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX, fixed tabulation

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1772 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
mantognini 2011-01-20 21:52:27 +00:00
parent f9c4740894
commit 0a7b98dd0b
18 changed files with 1330 additions and 1332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
src/SFML/Graphics/OSX/RenderImageImplPBuffer.cpp
View File

@ -37,149 +37,149 @@ namespace priv
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
RenderImageImplPBuffer::RenderImageImplPBuffer() : RenderImageImplPBuffer::RenderImageImplPBuffer() :
myPBuffer(NULL), myPBuffer(NULL),
myContext(NULL), myContext(NULL),
myWidth (0), myWidth (0),
myHeight (0) myHeight (0)
{ {
/* Nothing else */ /* Nothing else */
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
RenderImageImplPBuffer::~RenderImageImplPBuffer() RenderImageImplPBuffer::~RenderImageImplPBuffer()
{ {
if (myPBuffer && aglDestroyPBuffer(myPBuffer) == GL_FALSE) {
sf::Err()
<< "An error occurs while destroying the PBuffer in "
<< __PRETTY_FUNCTION__
<< ". The error code is "
<< aglGetError()
<< std::endl;
}
if (myPBuffer && aglDestroyPBuffer(myPBuffer) == GL_FALSE) { if (myContext && aglDestroyContext(myContext) == GL_FALSE) {
sf::Err() sf::Err()
<< "An error occurs while destroying the PBuffer in " << "An error occurs while destroying the context in "
<< __PRETTY_FUNCTION__ << __PRETTY_FUNCTION__
<< ". The error code is " << ". The error code is "
<< aglGetError() << aglGetError()
<< std::endl; << std::endl;
} }
if (myContext && aglDestroyContext(myContext) == GL_FALSE) { // This is to make sure that another valid context is made
sf::Err() // active after we destroy the P-Buffer's one
<< "An error occurs while destroying the context in " Context::SetReferenceActive();
<< __PRETTY_FUNCTION__
<< ". The error code is "
<< aglGetError()
<< std::endl;
}
// This is to make sure that another valid context is made
// active after we destroy the P-Buffer's one
Context::SetReferenceActive();
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool RenderImageImplPBuffer::IsSupported() bool RenderImageImplPBuffer::IsSupported()
{ {
const GLubyte* strExt = glGetString(GL_EXTENSIONS); const GLubyte* strExt = glGetString(GL_EXTENSIONS);
GLboolean isSupported = gluCheckExtension((const GLubyte*)"GL_APPLE_pixel_buffer", strExt); GLboolean isSupported = gluCheckExtension((const GLubyte*)"GL_APPLE_pixel_buffer", strExt);
return isSupported; return isSupported;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool RenderImageImplPBuffer::Create(unsigned int width, unsigned int height, unsigned int, bool depthBuffer) bool RenderImageImplPBuffer::Create(unsigned int width, unsigned int height, unsigned int, bool depthBuffer)
{ {
// Store the dimensions // Store the dimensions
myWidth = width; myWidth = width;
myHeight = height; myHeight = height;
// Create the pixel format. // Create the pixel format.
GLint attribs[] = { GLint attribs[] = {
AGL_RGBA, AGL_RGBA,
AGL_RED_SIZE, 8, AGL_RED_SIZE, 8,
AGL_GREEN_SIZE, 8, AGL_GREEN_SIZE, 8,
AGL_BLUE_SIZE, 8, AGL_BLUE_SIZE, 8,
AGL_ALPHA_SIZE, 8, AGL_ALPHA_SIZE, 8,
AGL_DEPTH_SIZE, (depthBuffer ? 24 : 0), AGL_DEPTH_SIZE, (depthBuffer ? 24 : 0),
0 0
}; };
AGLPixelFormat pf = aglChoosePixelFormat(NULL, 0, attribs);
if (!pf) {
sf::Err()
<< "Couldn't create the pixel format for the PBuffer."
<< std::endl;
return false; AGLPixelFormat pf = aglChoosePixelFormat(NULL, 0, attribs);
} if (!pf) {
sf::Err()
<< "Couldn't create the pixel format for the PBuffer."
<< std::endl;
// Create the context. return false;
myContext = aglCreateContext(pf, NULL); }
if (!myContext) {
sf::Err()
<< "Couldn't create the context for the PBuffer. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
return false; // Create the context.
} myContext = aglCreateContext(pf, NULL);
if (!myContext) {
sf::Err()
<< "Couldn't create the context for the PBuffer. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
// Create the PBuffer. return false;
GLboolean status = aglCreatePBuffer(myWidth, myHeight, GL_TEXTURE_RECTANGLE_EXT, GL_RGBA, 0, &myPBuffer); }
if (status == GL_FALSE) {
sf::Err()
<< "Couldn't create the PBuffer. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
return false; // Create the PBuffer.
} GLboolean status = aglCreatePBuffer(myWidth, myHeight, GL_TEXTURE_RECTANGLE_EXT, GL_RGBA, 0, &myPBuffer);
if (status == GL_FALSE) {
sf::Err()
<< "Couldn't create the PBuffer. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
// Set up the PBuffer with the context. return false;
GLint screen = aglGetVirtualScreen(myContext); }
if (screen == -1) {
sf::Err()
<< "Couldn't get the virtual screen of the context used with the PBuffer. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
return false; // Set up the PBuffer with the context.
} GLint screen = aglGetVirtualScreen(myContext);
if (screen == -1) {
sf::Err()
<< "Couldn't get the virtual screen of the context used with the PBuffer. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
status = aglSetPBuffer(myContext, myPBuffer, 0, 0, screen); return false;
if (status == GL_FALSE) { }
sf::Err()
<< "Couldn't set up the PBuffer with the context. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
return false; status = aglSetPBuffer(myContext, myPBuffer, 0, 0, screen);
} if (status == GL_FALSE) {
sf::Err()
<< "Couldn't set up the PBuffer with the context. (Error : "
<< aglGetError()
<< ")"
<< std::endl;
return true; return false;
}
return true;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool RenderImageImplPBuffer::Activate(bool active) bool RenderImageImplPBuffer::Activate(bool active)
{ {
if (active) { if (active) {
if (!myContext || !myPBuffer) { // Not created yet. if (!myContext || !myPBuffer) { // Not created yet.
return false; return false;
} }
if (aglGetCurrentContext() == myContext) { if (aglGetCurrentContext() == myContext) {
return true; return true;
} else { } else {
return aglSetCurrentContext(myContext); return aglSetCurrentContext(myContext);
} }
} else { } else {
// To deactivate the P-Buffer's context, we actually activate // To deactivate the P-Buffer's context, we actually activate
// another one so that we make sure that there is always an // another one so that we make sure that there is always an
// active context for subsequent graphics operations // active context for subsequent graphics operations
return Context::SetReferenceActive(); return Context::SetReferenceActive();
} }
} }

2
src/SFML/Graphics/OSX/RenderImageImplPBuffer.hpp
View File

@ -101,7 +101,7 @@ private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
AGLPbuffer myPBuffer; ///< P-Buffer AGLPbuffer myPBuffer; ///< P-Buffer
AGLContext myContext; ///< Associated OpenGL context AGLContext myContext; ///< Associated OpenGL context
unsigned int myWidth; ///< Width of the P-Buffer unsigned int myWidth; ///< Width of the P-Buffer
unsigned int myHeight; ///< Height of the P-Buffer unsigned int myHeight; ///< Height of the P-Buffer

1
src/SFML/Graphics/RenderImageImplFBO.cpp
View File

@ -129,7 +129,6 @@ bool RenderImageImplFBO::Activate(bool active)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void RenderImageImplFBO::UpdateTexture(unsigned int) void RenderImageImplFBO::UpdateTexture(unsigned int)
{ {
// Nothing to do: the FBO draws directly to the target image
glFlush(); glFlush();
} }

16
src/SFML/Window/OSX/Joystick.cpp
View File

@ -37,33 +37,33 @@ namespace priv
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Joystick::Initialize(unsigned int Index) void Joystick::Initialize(unsigned int Index)
{ {
// Reset the joystick state // Reset the joystick state
// Initialize the Index-th available joystick // Initialize the Index-th available joystick
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
JoystickState Joystick::UpdateState() JoystickState Joystick::UpdateState()
{ {
// Fill a JoystickState instance with the current joystick state // Fill a JoystickState instance with the current joystick state
JoystickState s; JoystickState s;
return s; return s;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Joystick::HasAxis(Joy::Axis Axis) const bool Joystick::HasAxis(Joy::Axis Axis) const
{ {
return false; return false;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int Joystick::GetButtonsCount() const unsigned int Joystick::GetButtonsCount() const
{ {
// Return number of supported buttons // Return number of supported buttons
return 0; return 0;
} }
} // namespace priv } // namespace priv

72
src/SFML/Window/OSX/Joystick.hpp
View File

@ -31,7 +31,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#if USE_OS_X_VERSION_10_6 #if USE_OS_X_VERSION_10_6
#include <IOKit/hid/IOHIDDevice.h> #include <IOKit/hid/IOHIDDevice.h>
#endif #endif
namespace sf namespace sf
@ -44,47 +44,47 @@ namespace priv
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
class Joystick class Joystick
{ {
public : public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Initialize the instance and bind it to a physical joystick /// \brief Initialize the instance and bind it to a physical joystick
/// ///
/// \param index Index of the physical joystick to bind to /// \param index Index of the physical joystick to bind to
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Initialize(unsigned int index); void Initialize(unsigned int index);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Update the current joystick and return its new state /// \brief Update the current joystick and return its new state
/// ///
/// \return Current state of the joystick /// \return Current state of the joystick
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
JoystickState UpdateState(); JoystickState UpdateState();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Check if the joystick supports the given axis /// \brief Check if the joystick supports the given axis
/// ///
/// \param axis Axis to check /// \param axis Axis to check
/// ///
/// \return True of the axis is supported, false otherwise /// \return True of the axis is supported, false otherwise
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool HasAxis(Joy::Axis Axis) const; bool HasAxis(Joy::Axis Axis) const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Get the number of buttons supported by the joystick /// \brief Get the number of buttons supported by the joystick
/// ///
/// \return Number of buttons /// \return Number of buttons
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int GetButtonsCount() const; unsigned int GetButtonsCount() const;
private : private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
}; };
} // namespace priv } // namespace priv

34
src/SFML/Window/OSX/SFApplication.m
View File

@ -37,25 +37,25 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
+(void)processEventWithBlockingMode:(BOOL)block +(void)processEventWithBlockingMode:(BOOL)block
{ {
[NSApplication sharedApplication]; // Make sure NSApp exists [NSApplication sharedApplication]; // Make sure NSApp exists
NSEvent* event = nil; NSEvent* event = nil;
if (block) { // At least one event is read. if (block) { // At least one event is read.
event = [NSApp nextEventMatchingMask:NSAnyEventMask event = [NSApp nextEventMatchingMask:NSAnyEventMask
untilDate:[NSDate distantFuture] untilDate:[NSDate distantFuture]
inMode:NSDefaultRunLoopMode inMode:NSDefaultRunLoopMode
dequeue:YES]; // Remove the event from the dequeue dequeue:YES]; // Remove the event from the dequeue
[NSApp sendEvent:event]; [NSApp sendEvent:event];
} }
// If there are some other event read them. // If there are some other event read them.
while (event = [NSApp nextEventMatchingMask:NSAnyEventMask while (event = [NSApp nextEventMatchingMask:NSAnyEventMask
untilDate:[NSDate distantPast] untilDate:[NSDate distantPast]
inMode:NSDefaultRunLoopMode inMode:NSDefaultRunLoopMode
dequeue:YES]) // Remove the event from the dequeue dequeue:YES]) // Remove the event from the dequeue
{ {
[NSApp sendEvent:event]; [NSApp sendEvent:event];
} }
} }

124
src/SFML/Window/OSX/SFContext.hpp
View File

@ -61,80 +61,80 @@ namespace priv
class SFContext : public GlContext class SFContext : public GlContext
{ {
public: public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Create a new context, not associated to a window /// \brief Create a new context, not associated to a window
/// ///
/// \param shared Context to share the new one with (can be NULL) /// \param shared Context to share the new one with (can be NULL)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SFContext(SFContext* shared); SFContext(SFContext* shared);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Create a new context attached to a window /// \brief Create a new context attached to a window
/// ///
/// \param shared Context to share the new one with (can be NULL) /// \param shared Context to share the new one with (can be NULL)
/// \param owner Pointer to the owner window /// \param owner Pointer to the owner window
/// \param bitsPerPixel Pixel depth (in bits per pixel) /// \param bitsPerPixel Pixel depth (in bits per pixel)
/// \param settings Creation parameters /// \param settings Creation parameters
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SFContext(SFContext* shared, const WindowImpl* owner, SFContext(SFContext* shared, const WindowImpl* owner,
unsigned int bitsPerPixel, const ContextSettings& settings); unsigned int bitsPerPixel, const ContextSettings& settings);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Destructor /// \brief Destructor
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
~SFContext(); ~SFContext();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Display what has been rendered to the context so far /// \brief Display what has been rendered to the context so far
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void Display(); virtual void Display();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Enable or disable vertical synchronization /// \brief Enable or disable vertical synchronization
/// ///
/// Activating vertical synchronization will limit the number /// Activating vertical synchronization will limit the number
/// of frames displayed to the refresh rate of the monitor. /// of frames displayed to the refresh rate of the monitor.
/// This can avoid some visual artifacts, and limit the framerate /// This can avoid some visual artifacts, and limit the framerate
/// to a good value (but not constant across different computers). /// to a good value (but not constant across different computers).
/// ///
/// \param enabled : True to enable v-sync, false to deactivate /// \param enabled : True to enable v-sync, false to deactivate
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void EnableVerticalSync(bool enabled); virtual void EnableVerticalSync(bool enabled);
protected: protected:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Activate the context as the current target /// \brief Activate the context as the current target
/// for rendering /// for rendering
/// ///
/// \return True on success, false if any error happened /// \return True on success, false if any error happened
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual bool MakeCurrent(); virtual bool MakeCurrent();
private: private:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Create the context /// \brief Create the context
/// \note Must only be called from Ctor. /// \note Must only be called from Ctor.
/// ///
/// \param shared Context to share the new one with (can be NULL) /// \param shared Context to share the new one with (can be NULL)
/// \param settings Creation parameters /// \param settings Creation parameters
/// \param bitsPerPixel bpp /// \param bitsPerPixel bpp
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void CreateContext(SFContext* shared, void CreateContext(SFContext* shared,
const ContextSettings& settings, const ContextSettings& settings,
unsigned int bitsPerPixel); unsigned int bitsPerPixel);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
NSOpenGLContextRef myContext; ///< OpenGL context NSOpenGLContextRef myContext; ///< OpenGL context
NSAutoreleasePoolRef myPool; ///< Memory manager for this class. NSAutoreleasePoolRef myPool; ///< Memory manager for this class.
}; };
} // namespace priv } // namespace priv

120
src/SFML/Window/OSX/SFContext.mm
View File

@ -36,13 +36,13 @@
* ============ * ============
* *
* [1] (2010_07) * [1] (2010_07)
* should AA-related NSOpenGLPixelFormatAttribute not be in the array * should AA-related NSOpenGLPixelFormatAttribute not be in the array
* if AA is not enable (settings.AntialiasingLevel == 0) ? * if AA is not enable (settings.AntialiasingLevel == 0) ?
* => will not be present in attributs array if 0. * => will not be present in attributs array if 0.
* *
* [2] (2010_07) * [2] (2010_07)
* how many buffer should be used for AA ? * how many buffer should be used for AA ?
* => «1» was choosen. * => «1» was choosen.
*/ */
namespace sf namespace sf
@ -53,10 +53,10 @@ namespace priv
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SFContext::SFContext(SFContext* shared) SFContext::SFContext(SFContext* shared)
{ {
myPool = [[NSAutoreleasePool alloc] init]; myPool = [[NSAutoreleasePool alloc] init];
// Create the context // Create the context
CreateContext(shared, ContextSettings(0, 0, 0), 0); CreateContext(shared, ContextSettings(0, 0, 0), 0);
} }
@ -64,25 +64,25 @@ SFContext::SFContext(SFContext* shared)
SFContext::SFContext(SFContext* shared, const WindowImpl* owner, SFContext::SFContext(SFContext* shared, const WindowImpl* owner,
unsigned int bitsPerPixel, const ContextSettings& settings) unsigned int bitsPerPixel, const ContextSettings& settings)
{ {
myPool = [[NSAutoreleasePool alloc] init]; myPool = [[NSAutoreleasePool alloc] init];
// Create the context. // Create the context.
CreateContext(shared, settings, bitsPerPixel); CreateContext(shared, settings, bitsPerPixel);
// Apply context. // Apply context.
WindowImplCocoa const * ownerCocoa = static_cast<WindowImplCocoa const *>(owner); WindowImplCocoa const * ownerCocoa = static_cast<WindowImplCocoa const *>(owner);
ownerCocoa->ApplyContext(myContext); ownerCocoa->ApplyContext(myContext);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SFContext::~SFContext() SFContext::~SFContext()
{ {
[myContext release]; [myContext release];
[myPool drain]; // [1] [myPool drain]; // [A]
/* /*
[1] : Produce sometimes "*** attempt to pop an unknown autorelease pool" [A] : Produce sometimes "*** attempt to pop an unknown autorelease pool"
*/ */
} }
@ -90,29 +90,29 @@ SFContext::~SFContext()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool SFContext::MakeCurrent() bool SFContext::MakeCurrent()
{ {
[myContext makeCurrentContext]; [myContext makeCurrentContext];
return myContext == [NSOpenGLContext currentContext]; // Should be true. return myContext == [NSOpenGLContext currentContext]; // Should be true.
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SFContext::Display() void SFContext::Display()
{ {
[myContext flushBuffer]; [myContext flushBuffer];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SFContext::EnableVerticalSync(bool enabled) void SFContext::EnableVerticalSync(bool enabled)
{ {
// Make compiler happy // Make compiler happy
#ifdef USE_OS_X_VERSION_10_4 #ifdef USE_OS_X_VERSION_10_4
long int swapInterval = enabled ? 1 : 0; long int swapInterval = enabled ? 1 : 0;
#else /* USE_OS_X_VERSION_10_6 */ #else /* USE_OS_X_VERSION_10_6 */
GLint swapInterval = enabled ? 1 : 0; GLint swapInterval = enabled ? 1 : 0;
#endif #endif
[myContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; [myContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
} }
@ -121,61 +121,61 @@ void SFContext::CreateContext(SFContext* shared,
const ContextSettings& settings, const ContextSettings& settings,
unsigned int bitsPerPixel) unsigned int bitsPerPixel)
{ {
// Choose the attributs of OGL context. // Choose the attributs of OGL context.
std::vector<NSOpenGLPixelFormatAttribute> attrs; std::vector<NSOpenGLPixelFormatAttribute> attrs;
attrs.reserve(20); // max attributs (estimation). attrs.reserve(20); // max attributs (estimation).
// These casts are safe. C++ is much more stric than Obj-C. // These casts are safe. C++ is much more stric than Obj-C.
attrs.push_back(NSOpenGLPFAClosestPolicy); attrs.push_back(NSOpenGLPFAClosestPolicy);
attrs.push_back(NSOpenGLPFADoubleBuffer); attrs.push_back(NSOpenGLPFADoubleBuffer);
if (bitsPerPixel > 24) { if (bitsPerPixel > 24) {
attrs.push_back(NSOpenGLPFAAlphaSize); attrs.push_back(NSOpenGLPFAAlphaSize);
attrs.push_back((NSOpenGLPixelFormatAttribute)8); attrs.push_back((NSOpenGLPixelFormatAttribute)8);
} }
attrs.push_back(NSOpenGLPFADepthSize); attrs.push_back(NSOpenGLPFADepthSize);
attrs.push_back((NSOpenGLPixelFormatAttribute)settings.DepthBits); attrs.push_back((NSOpenGLPixelFormatAttribute)settings.DepthBits);
attrs.push_back(NSOpenGLPFAStencilSize); attrs.push_back(NSOpenGLPFAStencilSize);
attrs.push_back((NSOpenGLPixelFormatAttribute)settings.StencilBits); attrs.push_back((NSOpenGLPixelFormatAttribute)settings.StencilBits);
if (settings.AntialiasingLevel > 0) { // [1] if (settings.AntialiasingLevel > 0) { // [1]
attrs.push_back(NSOpenGLPFAMultisample); attrs.push_back(NSOpenGLPFAMultisample);
attrs.push_back(NSOpenGLPFASampleBuffers); attrs.push_back(NSOpenGLPFASampleBuffers);
attrs.push_back((NSOpenGLPixelFormatAttribute)1); // [2] attrs.push_back((NSOpenGLPixelFormatAttribute)1); // [2]
attrs.push_back(NSOpenGLPFASamples); attrs.push_back(NSOpenGLPFASamples);
attrs.push_back((NSOpenGLPixelFormatAttribute)settings.AntialiasingLevel); attrs.push_back((NSOpenGLPixelFormatAttribute)settings.AntialiasingLevel);
} }
attrs.push_back((NSOpenGLPixelFormatAttribute)0); // end of array attrs.push_back((NSOpenGLPixelFormatAttribute)0); // end of array
// Create the pixel pormat. // Create the pixel pormat.
NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:&attrs[0]]; NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:&attrs[0]];
if(pixFmt == nil) { if(pixFmt == nil) {
sf::Err() << "Error. Unable to find a suitable pixel format." << std::endl; sf::Err() << "Error. Unable to find a suitable pixel format." << std::endl;
return; return;
} }
// Use the shared context if one is given. // Use the shared context if one is given.
NSOpenGLContext* sharedContext = shared != NULL ? shared->myContext : nil; NSOpenGLContext* sharedContext = shared != NULL ? shared->myContext : nil;
// Create the context. // Create the context.
myContext = [[NSOpenGLContext alloc] initWithFormat:pixFmt myContext = [[NSOpenGLContext alloc] initWithFormat:pixFmt
shareContext:sharedContext]; shareContext:sharedContext];
// Free up. // Free up.
[pixFmt release]; [pixFmt release];
#warning update settings with ogl version not yet implemented #warning update settings with ogl version not yet implemented
// Save the creation settings // Save the creation settings
mySettings = settings; mySettings = settings;
} }
} // namespace priv } // namespace priv

14
src/SFML/Window/OSX/SFOpenGLView.h
View File

@ -29,9 +29,9 @@
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
namespace sf { namespace sf {
namespace priv { namespace priv {
class WindowImplCocoa; class WindowImplCocoa;
} }
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -40,10 +40,10 @@ namespace sf {
/// Handle event and send them back to the requester. /// Handle event and send them back to the requester.
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@interface SFOpenGLView : NSOpenGLView { @interface SFOpenGLView : NSOpenGLView {
sf::priv::WindowImplCocoa* myRequester; sf::priv::WindowImplCocoa* myRequester;
BOOL myUseKeyRepeat; BOOL myUseKeyRepeat;
NSTrackingRectTag myTrackingTag; NSTrackingRectTag myTrackingTag;
BOOL myMouseIsIn; BOOL myMouseIsIn;
} }

302
src/SFML/Window/OSX/SFOpenGLView.mm
View File

@ -38,83 +38,83 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(id)initWithFrame:(NSRect)frameRect -(id)initWithFrame:(NSRect)frameRect
{ {
if (self = [super initWithFrame:frameRect]) { if (self = [super initWithFrame:frameRect]) {
[self setRequesterTo:0]; [self setRequesterTo:0];
[self enableKeyRepeat]; [self enableKeyRepeat];
// Register for mouse-move event // Register for mouse-move event
myMouseIsIn = [self isMouseInside]; myMouseIsIn = [self isMouseInside];
myTrackingTag = [self addTrackingRect:[self frame] myTrackingTag = [self addTrackingRect:[self frame]
owner:self owner:self
userData:nil userData:nil
assumeInside:myMouseIsIn]; assumeInside:myMouseIsIn];
// Register for resize event // Register for resize event
NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
[center addObserver:self [center addObserver:self
selector:@selector(frameDidChange:) selector:@selector(frameDidChange:)
name:NSViewFrameDidChangeNotification name:NSViewFrameDidChangeNotification
object:nil]; object:nil];
} }
return self; return self;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)setRequesterTo:(sf::priv::WindowImplCocoa*)requester -(void)setRequesterTo:(sf::priv::WindowImplCocoa*)requester
{ {
myRequester = requester; myRequester = requester;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)enableKeyRepeat -(void)enableKeyRepeat
{ {
myUseKeyRepeat = YES; myUseKeyRepeat = YES;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)disableKeyRepeat -(void)disableKeyRepeat
{ {
myUseKeyRepeat = NO; myUseKeyRepeat = NO;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)frameDidChange:(NSNotification*)notification -(void)frameDidChange:(NSNotification*)notification
{ {
// Adapt tracking area for mouse mouse event. // Adapt tracking area for mouse mouse event.
[self removeTrackingRect:myTrackingTag]; [self removeTrackingRect:myTrackingTag];
myTrackingTag = [self addTrackingRect:[self frame] myTrackingTag = [self addTrackingRect:[self frame]
owner:self owner:self
userData:nil userData:nil
assumeInside:myMouseIsIn]; assumeInside:myMouseIsIn];
// Update the OGL view to fit the new size. // Update the OGL view to fit the new size.
[self update]; [self update];
// Send an event // Send an event
if (myRequester == 0) return; if (myRequester == 0) return;
// The new size // The new size
NSSize newSize = [self frame].size; NSSize newSize = [self frame].size;
myRequester->WindowResized(newSize.width, newSize.height); myRequester->WindowResized(newSize.width, newSize.height);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(BOOL)isMouseInside -(BOOL)isMouseInside
{ {
NSPoint relativeToWindow = [[self window] mouseLocationOutsideOfEventStream]; NSPoint relativeToWindow = [[self window] mouseLocationOutsideOfEventStream];
NSPoint relativeToView = [self convertPoint:relativeToWindow fromView:nil]; NSPoint relativeToView = [self convertPoint:relativeToWindow fromView:nil];
if (NSPointInRect(relativeToView, [self frame])) { if (NSPointInRect(relativeToView, [self frame])) {
return YES; return YES;
} }
return NO; return NO;
} }
@ -125,27 +125,27 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)dealloc -(void)dealloc
{ {
// Unregister // Unregister
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
[self removeTrackingRect:myTrackingTag]; [self removeTrackingRect:myTrackingTag];
[super dealloc]; [super dealloc];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(BOOL)acceptsFirstResponder -(BOOL)acceptsFirstResponder
{ {
// Accepts key event. // Accepts key event.
return YES; return YES;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(BOOL)canBecomeKeyView -(BOOL)canBecomeKeyView
{ {
// Accepts key event. // Accepts key event.
return YES; return YES;
} }
@ -156,194 +156,194 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)mouseDown:(NSEvent*)theEvent -(void)mouseDown:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseDownAt(sf::Mouse::Left, loc.x, h - loc.y); myRequester->MouseDownAt(sf::Mouse::Left, loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)mouseUp:(NSEvent*)theEvent -(void)mouseUp:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseUpAt(sf::Mouse::Left, loc.x, h - loc.y); myRequester->MouseUpAt(sf::Mouse::Left, loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)mouseMoved:(NSEvent*)theEvent -(void)mouseMoved:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
// If the event is not useful. // If the event is not useful.
if (!myMouseIsIn) return; if (!myMouseIsIn) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseMovedAt(loc.x, h - loc.y); myRequester->MouseMovedAt(loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)scrollWheel:(NSEvent*)theEvent -(void)scrollWheel:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseWheelScrolledAt([theEvent deltaY], loc.x, h - loc.y); myRequester->MouseWheelScrolledAt([theEvent deltaY], loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)mouseEntered:(NSEvent*)theEvent -(void)mouseEntered:(NSEvent*)theEvent
{ {
myMouseIsIn = YES; myMouseIsIn = YES;
if (myRequester == 0) return; if (myRequester == 0) return;
myRequester->MouseMovedIn(); myRequester->MouseMovedIn();
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)mouseExited:(NSEvent*)theEvent -(void)mouseExited:(NSEvent*)theEvent
{ {
myMouseIsIn = NO; myMouseIsIn = NO;
if (myRequester == 0) return; if (myRequester == 0) return;
myRequester->MouseMovedOut(); myRequester->MouseMovedOut();
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)rightMouseDown:(NSEvent*)theEvent -(void)rightMouseDown:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseDownAt(sf::Mouse::Right, loc.x, h - loc.y); myRequester->MouseDownAt(sf::Mouse::Right, loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)rightMouseUp:(NSEvent*)theEvent -(void)rightMouseUp:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseUpAt(sf::Mouse::Right, loc.x, h - loc.y); myRequester->MouseUpAt(sf::Mouse::Right, loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)otherMouseDown:(NSEvent*)theEvent -(void)otherMouseDown:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
sf::Mouse::Button button; sf::Mouse::Button button;
switch ([theEvent buttonNumber]) { switch ([theEvent buttonNumber]) {
case 2: case 2:
button = sf::Mouse::Middle; button = sf::Mouse::Middle;
break; break;
case 3: case 3:
button = sf::Mouse::XButton1; button = sf::Mouse::XButton1;
break; break;
case 4: case 4:
button = sf::Mouse::XButton2; button = sf::Mouse::XButton2;
break; break;
default: default:
break; break;
} }
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseDownAt(button, loc.x, h - loc.y); myRequester->MouseDownAt(button, loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)otherMouseUp:(NSEvent*)theEvent -(void)otherMouseUp:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
sf::Mouse::Button button; sf::Mouse::Button button;
switch ([theEvent buttonNumber]) { switch ([theEvent buttonNumber]) {
case 2: case 2:
button = sf::Mouse::Middle; button = sf::Mouse::Middle;
break; break;
case 3: case 3:
button = sf::Mouse::XButton1; button = sf::Mouse::XButton1;
break; break;
case 4: case 4:
button = sf::Mouse::XButton2; button = sf::Mouse::XButton2;
break; break;
default: default:
break; break;
} }
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseUpAt(button, loc.x, h - loc.y); myRequester->MouseUpAt(button, loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)rightMouseDragged:(NSEvent*)theEvent -(void)rightMouseDragged:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
// If the event is not useful. // If the event is not useful.
if (!myMouseIsIn) return; if (!myMouseIsIn) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseMovedAt(loc.x, h - loc.y); myRequester->MouseMovedAt(loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)mouseDragged:(NSEvent*)theEvent -(void)mouseDragged:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
// If the event is not useful. // If the event is not useful.
if (!myMouseIsIn) return; if (!myMouseIsIn) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseMovedAt(loc.x, h - loc.y); myRequester->MouseMovedAt(loc.x, h - loc.y);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)otherMouseDragged:(NSEvent*)theEvent -(void)otherMouseDragged:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
// If the event is not useful. // If the event is not useful.
if (!myMouseIsIn) return; if (!myMouseIsIn) return;
NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; NSPoint loc = [self convertPoint:[theEvent locationInWindow] fromView:nil];
// Don't forget to change to SFML coord system. // Don't forget to change to SFML coord system.
float h = [self frame].size.height; float h = [self frame].size.height;
myRequester->MouseMovedAt(loc.x, h - loc.y); myRequester->MouseMovedAt(loc.x, h - loc.y);
} }
@ -354,22 +354,22 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)keyDown:(NSEvent*)theEvent -(void)keyDown:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
if (myUseKeyRepeat || ![theEvent isARepeat]) if (myUseKeyRepeat || ![theEvent isARepeat])
myRequester->KeyDown([theEvent keyCode], [theEvent modifierFlags]); myRequester->KeyDown([theEvent keyCode], [theEvent modifierFlags]);
if ((myUseKeyRepeat || ![theEvent isARepeat]) && [[theEvent characters] length] > 0) if ((myUseKeyRepeat || ![theEvent isARepeat]) && [[theEvent characters] length] > 0)
myRequester->TextEntred([[theEvent characters] characterAtIndex:0]); myRequester->TextEntred([[theEvent characters] characterAtIndex:0]);
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)keyUp:(NSEvent*)theEvent -(void)keyUp:(NSEvent*)theEvent
{ {
if (myRequester == 0) return; if (myRequester == 0) return;
myRequester->KeyUp([theEvent keyCode], [theEvent modifierFlags]); myRequester->KeyUp([theEvent keyCode], [theEvent modifierFlags]);
} }
@end @end

4
src/SFML/Window/OSX/SFWindow.m
View File

@ -33,13 +33,13 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(BOOL)acceptsFirstResponder { -(BOOL)acceptsFirstResponder {
return YES; return YES;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(BOOL)canBecomeKeyWindow { -(BOOL)canBecomeKeyWindow {
return YES; return YES;
} }
@end @end

14
src/SFML/Window/OSX/SFWindowController.h
View File

@ -33,10 +33,10 @@
/// Predefine some classes /// Predefine some classes
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
namespace sf { namespace sf {
namespace priv { namespace priv {
class WindowImplCocoa; class WindowImplCocoa;
} }
class VideoMode; class VideoMode;
} }
@class SFOpenGLView; @class SFOpenGLView;
@ -56,9 +56,9 @@ namespace sf {
#else #else
@interface SFWindowController : NSResponder <WindowImplDelegateProtocol, NSWindowDelegate> { @interface SFWindowController : NSResponder <WindowImplDelegateProtocol, NSWindowDelegate> {
#endif #endif
NSWindow* myWindow; NSWindow* myWindow;
SFOpenGLView* myOGLView; SFOpenGLView* myOGLView;
sf::priv::WindowImplCocoa* myRequester; sf::priv::WindowImplCocoa* myRequester;
} }
-(id)initWithWindow:(NSWindow*)window; -(id)initWithWindow:(NSWindow*)window;

370
src/SFML/Window/OSX/SFWindowController.mm
View File

@ -46,146 +46,146 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(id)initWithWindow:(NSWindow*)window -(id)initWithWindow:(NSWindow*)window
{ {
if (self = [super init]) { if (self = [super init]) {
myRequester = 0; myRequester = 0;
// Retain the window for our own use. // Retain the window for our own use.
myWindow = [window retain]; myWindow = [window retain];
if (myWindow == nil) { if (myWindow == nil) {
sf::Err() sf::Err()
<< "No window was given to initWithWindow:." << "No window was given to initWithWindow:."
<< std::endl; << std::endl;
return self; return self;
} }
// Create the view. // Create the view.
myOGLView = [[SFOpenGLView alloc] initWithFrame:[[myWindow contentView] frame]]; myOGLView = [[SFOpenGLView alloc] initWithFrame:[[myWindow contentView] frame]];
if (myOGLView == nil) { if (myOGLView == nil) {
sf::Err() sf::Err()
<< "Could not create an instance of NSOpenGLView " << "Could not create an instance of NSOpenGLView "
<< "in (SFWindowController -initWithMode:andStyle:)." << "in (SFWindowController -initWithMode:andStyle:)."
<< std::endl; << std::endl;
return self; return self;
} }
// Set the view to the window as its content view. // Set the view to the window as its content view.
[myWindow setContentView:myOGLView]; [myWindow setContentView:myOGLView];
} }
return self; return self;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(id)initWithMode:(sf::VideoMode const*)mode andStyle:(unsigned long)style -(id)initWithMode:(sf::VideoMode const*)mode andStyle:(unsigned long)style
{ {
if (self = [super init]) { if (self = [super init]) {
myRequester = 0; myRequester = 0;
// Create our window size. // Create our window size.
NSRect rect = NSMakeRect(0, 0, mode->Width, mode->Height); NSRect rect = NSMakeRect(0, 0, mode->Width, mode->Height);
// Convert the SFML window style to Cocoa window style. // Convert the SFML window style to Cocoa window style.
unsigned int nsStyle = NSBorderlessWindowMask; unsigned int nsStyle = NSBorderlessWindowMask;
if (!(style & sf::Style::Fullscreen)) { // if fullscrean we keep our NSBorderlessWindowMask. if (!(style & sf::Style::Fullscreen)) { // if fullscrean we keep our NSBorderlessWindowMask.
if (style & sf::Style::Titlebar) nsStyle |= NSTitledWindowMask | NSMiniaturizableWindowMask; if (style & sf::Style::Titlebar) nsStyle |= NSTitledWindowMask | NSMiniaturizableWindowMask;
if (style & sf::Style::Resize) nsStyle |= NSResizableWindowMask; if (style & sf::Style::Resize) nsStyle |= NSResizableWindowMask;
if (style & sf::Style::Close) nsStyle |= NSClosableWindowMask; if (style & sf::Style::Close) nsStyle |= NSClosableWindowMask;
} }
// Create the window. // Create the window.
myWindow = [[SFWindow alloc] initWithContentRect:rect myWindow = [[SFWindow alloc] initWithContentRect:rect
styleMask:nsStyle styleMask:nsStyle
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO]; defer:NO];
/* /*
"YES" produces some "invalid drawable". "YES" produces some "invalid drawable".
See http://www.cocoabuilder.com/archive/cocoa/152482-nsviews-and-nsopenglcontext-invalid-drawable-error.html See http://www.cocoabuilder.com/archive/cocoa/152482-nsviews-and-nsopenglcontext-invalid-drawable-error.html
[...] [...]
As best as I can figure, this is happening because the NSWindow (and As best as I can figure, this is happening because the NSWindow (and
hence my view) are not visible onscreen yet, and the system doesn't like that. hence my view) are not visible onscreen yet, and the system doesn't like that.
[...] [...]
*/ */
if (myWindow == nil) { if (myWindow == nil) {
sf::Err() sf::Err()
<< "Could not create an instance of NSWindow " << "Could not create an instance of NSWindow "
<< "in (SFWindowController -initWithMode:andStyle:)." << "in (SFWindowController -initWithMode:andStyle:)."
<< std::endl; << std::endl;
return self; return self;
} }
// Apply special feature for fullscreen window. // Apply special feature for fullscreen window.
if (style & sf::Style::Fullscreen) { if (style & sf::Style::Fullscreen) {
// We place the window above everything else. // We place the window above everything else.
[myWindow setLevel:NSMainMenuWindowLevel+1]; [myWindow setLevel:NSMainMenuWindowLevel+1];
[myWindow setOpaque:YES]; [myWindow setOpaque:YES];
[myWindow setHidesOnDeactivate:YES]; [myWindow setHidesOnDeactivate:YES];
/* --------------------------- /* ---------------------------
* | Note for future version | * | Note for future version |
* --------------------------- * ---------------------------
* *
* starting with OS 10.5 NSView provides * starting with OS 10.5 NSView provides
* a new method -enterFullScreenMode:withOptions: * a new method -enterFullScreenMode:withOptions:
* which could be a good alternative. * which could be a good alternative.
*/ */
} else { } else {
// Center the window to be cool =) // Center the window to be cool =)
[myWindow center]; [myWindow center];
} }
// Create the view. // Create the view.
myOGLView = [[SFOpenGLView alloc] initWithFrame:[[myWindow contentView] frame]]; myOGLView = [[SFOpenGLView alloc] initWithFrame:[[myWindow contentView] frame]];
if (myOGLView == nil) { if (myOGLView == nil) {
sf::Err() sf::Err()
<< "Could not create an instance of NSOpenGLView " << "Could not create an instance of NSOpenGLView "
<< "in (SFWindowController -initWithMode:andStyle:)." << "in (SFWindowController -initWithMode:andStyle:)."
<< std::endl; << std::endl;
return self; return self;
} }
// Set the view to the window as its content view. // Set the view to the window as its content view.
[myWindow setContentView:myOGLView]; [myWindow setContentView:myOGLView];
// Register for event. // Register for event.
[myWindow setDelegate:self]; [myWindow setDelegate:self];
[myWindow setAcceptsMouseMovedEvents:YES]; [myWindow setAcceptsMouseMovedEvents:YES];
[myWindow setIgnoresMouseEvents:NO]; [myWindow setIgnoresMouseEvents:NO];
// And some other things... // And some other things...
[myWindow setAutodisplay:YES]; [myWindow setAutodisplay:YES];
[myWindow setReleasedWhenClosed:NO]; [myWindow setReleasedWhenClosed:NO];
} // if super init ok } // if super init ok
return self; return self;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)dealloc -(void)dealloc
{ {
[self closeWindow]; [self closeWindow];
[myWindow release]; [myWindow release];
[myOGLView release]; [myOGLView release];
[super dealloc]; [super dealloc];
} }
@ -196,195 +196,195 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)setRequesterTo:(sf::priv::WindowImplCocoa*)requester -(void)setRequesterTo:(sf::priv::WindowImplCocoa*)requester
{ {
// Forward to the view. // Forward to the view.
[myOGLView setRequesterTo:requester]; [myOGLView setRequesterTo:requester];
myRequester = requester; myRequester = requester;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(sf::WindowHandle)getSystemHandle -(sf::WindowHandle)getSystemHandle
{ {
return myWindow; return myWindow;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)hideMouseCursor -(void)hideMouseCursor
{ {
[NSCursor hide]; [NSCursor hide];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)showMouseCursor -(void)showMouseCursor
{ {
[NSCursor unhide]; [NSCursor unhide];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)setCursorPositionToX:(unsigned int)x Y:(unsigned int)y -(void)setCursorPositionToX:(unsigned int)x Y:(unsigned int)y
{ {
// Create a SFML event. // Create a SFML event.
if (myRequester == 0) return; if (myRequester == 0) return;
myRequester->MouseMovedAt(x, y); myRequester->MouseMovedAt(x, y);
// Flip for SFML window coordinate system // Flip for SFML window coordinate system
y = NSHeight([myWindow frame]) - y; y = NSHeight([myWindow frame]) - y;
// Adjust for view reference instead of window // Adjust for view reference instead of window
y -= NSHeight([myWindow frame]) - NSHeight([myOGLView frame]); y -= NSHeight([myWindow frame]) - NSHeight([myOGLView frame]);
// Convert to screen coordinates // Convert to screen coordinates
NSPoint screenCoord = [myWindow convertBaseToScreen:NSMakePoint(x, y)]; NSPoint screenCoord = [myWindow convertBaseToScreen:NSMakePoint(x, y)];
// Flip screen coodinates // Flip screen coodinates
float const screenHeight = NSHeight([[myWindow screen] frame]); float const screenHeight = NSHeight([[myWindow screen] frame]);
screenCoord.y = screenHeight - screenCoord.y; screenCoord.y = screenHeight - screenCoord.y;
CGDirectDisplayID screenNumber = (CGDirectDisplayID)[[[[myWindow screen] deviceDescription] valueForKey:@"NSScreenNumber"] intValue]; CGDirectDisplayID screenNumber = (CGDirectDisplayID)[[[[myWindow screen] deviceDescription] valueForKey:@"NSScreenNumber"] intValue];
// Place the cursor. // Place the cursor.
CGDisplayMoveCursorToPoint(screenNumber, CGPointMake(screenCoord.x, screenCoord.y)); CGDisplayMoveCursorToPoint(screenNumber, CGPointMake(screenCoord.x, screenCoord.y));
/* /*
CGDisplayMoveCursorToPoint -- Discussion : CGDisplayMoveCursorToPoint -- Discussion :
No events are generated as a result of this move. No events are generated as a result of this move.
Points that lie outside the desktop are clipped to the desktop. Points that lie outside the desktop are clipped to the desktop.
*/ */
} }
////////////////////////////////////////////////////////. ////////////////////////////////////////////////////////.
-(void)setWindowPositionToX:(unsigned int)x Y:(unsigned int)y -(void)setWindowPositionToX:(unsigned int)x Y:(unsigned int)y
{ {
NSPoint point = NSMakePoint(x, y); NSPoint point = NSMakePoint(x, y);
// Flip for SFML window coordinate system. // Flip for SFML window coordinate system.
point.y = NSHeight([[myWindow screen] visibleFrame]) - point.y; point.y = NSHeight([[myWindow screen] visibleFrame]) - point.y;
// Place the window. // Place the window.
[myWindow setFrameTopLeftPoint:point]; [myWindow setFrameTopLeftPoint:point];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)resizeTo:(unsigned int)width by:(unsigned int)height -(void)resizeTo:(unsigned int)width by:(unsigned int)height
{ {
// Add titlebar height. // Add titlebar height.
NSRect frame = NSMakeRect([myWindow frame].origin.x, NSRect frame = NSMakeRect([myWindow frame].origin.x,
[myWindow frame].origin.y, [myWindow frame].origin.y,
width, width,
height + [self titlebarHeight]); height + [self titlebarHeight]);
[myWindow setFrame:frame display:YES]; [myWindow setFrame:frame display:YES];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)changeTitle:(NSString*)title -(void)changeTitle:(NSString*)title
{ {
[myWindow setTitle:title]; [myWindow setTitle:title];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)hideWindow -(void)hideWindow
{ {
[myWindow orderOut:nil]; [myWindow orderOut:nil];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)showWindow -(void)showWindow
{ {
[myWindow makeKeyAndOrderFront:nil]; [myWindow makeKeyAndOrderFront:nil];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)closeWindow -(void)closeWindow
{ {
[myWindow close]; [myWindow close];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)enableKeyRepeat -(void)enableKeyRepeat
{ {
[myOGLView enableKeyRepeat]; [myOGLView enableKeyRepeat];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)disableKeyRepeat -(void)disableKeyRepeat
{ {
[myOGLView disableKeyRepeat]; [myOGLView disableKeyRepeat];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)setIconTo:(unsigned int)width -(void)setIconTo:(unsigned int)width
by:(unsigned int)height by:(unsigned int)height
with:(sf::Uint8 const*)pixels with:(sf::Uint8 const*)pixels
{ {
// Create an empty image representation. // Create an empty image representation.
NSBitmapImageRep* bitmap = NSBitmapImageRep* bitmap =
[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:0 // if 0 : only allocate memory [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:0 // if 0 : only allocate memory
pixelsWide:width pixelsWide:width
pixelsHigh:height pixelsHigh:height
bitsPerSample:8 // The number of bits used to specify bitsPerSample:8 // The number of bits used to specify
// one pixel in a single component of the data. // one pixel in a single component of the data.
samplesPerPixel:4 // 3 if no alpha, 4 with it samplesPerPixel:4 // 3 if no alpha, 4 with it
hasAlpha:YES hasAlpha:YES
isPlanar:NO // I don't know what it is but it works isPlanar:NO // I don't know what it is but it works
colorSpaceName:NSCalibratedRGBColorSpace colorSpaceName:NSCalibratedRGBColorSpace
bytesPerRow:0 // 0 == determine automatically bytesPerRow:0 // 0 == determine automatically
bitsPerPixel:0]; // 0 == determine automatically bitsPerPixel:0]; // 0 == determine automatically
// Load data pixels. // Load data pixels.
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 // We may need to define NSUInteger. #if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 // We may need to define NSUInteger.
#define NSUInteger unsigned int #define NSUInteger unsigned int
#endif #endif
for (unsigned int y = 0; y < height; ++y) { for (unsigned int y = 0; y < height; ++y) {
for (unsigned int x = 0; x < width; ++x, pixels+=4) { for (unsigned int x = 0; x < width; ++x, pixels+=4) {
NSUInteger pixel[4] = { pixels[0], pixels[1], pixels[2], pixels[3] }; NSUInteger pixel[4] = { pixels[0], pixels[1], pixels[2], pixels[3] };
[bitmap setPixel:pixel [bitmap setPixel:pixel
atX:x atX:x
y:y]; y:y];
} }
} }
// Create an image from the representation. // Create an image from the representation.
NSImage* icon = [[NSImage alloc] initWithSize:NSMakeSize(width, height)]; NSImage* icon = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
[icon addRepresentation:bitmap]; [icon addRepresentation:bitmap];
// Set app icon. // Set app icon.
[[NSApplication sharedApplication] setApplicationIconImage:icon]; [[NSApplication sharedApplication] setApplicationIconImage:icon];
// Free up. // Free up.
[icon release]; [icon release];
[bitmap release]; [bitmap release];
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)processEventWithBlockingMode:(BOOL)block -(void)processEventWithBlockingMode:(BOOL)block
{ {
// If we don't have a requester we don't fetch event. // If we don't have a requester we don't fetch event.
if (myRequester != 0) { if (myRequester != 0) {
[SFApplication processEventWithBlockingMode:block]; [SFApplication processEventWithBlockingMode:block];
} }
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)applyContext:(NSOpenGLContext*)context -(void)applyContext:(NSOpenGLContext*)context
{ {
[myOGLView setOpenGLContext:context]; [myOGLView setOpenGLContext:context];
[context setView:myOGLView]; [context setView:myOGLView];
} }
@ -395,26 +395,26 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(BOOL)windowShouldClose:(id)sender -(BOOL)windowShouldClose:(id)sender
{ {
if (myRequester == 0) return YES; if (myRequester == 0) return YES;
myRequester->WindowClosed(); myRequester->WindowClosed();
return NO; return NO;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)windowDidBecomeKey:(NSNotification*)notification { -(void)windowDidBecomeKey:(NSNotification*)notification {
if (myRequester == 0) return; if (myRequester == 0) return;
myRequester->WindowGainedFocus(); myRequester->WindowGainedFocus();
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)windowDidResignKey:(NSNotification*)notification { -(void)windowDidResignKey:(NSNotification*)notification {
if (myRequester == 0) return; if (myRequester == 0) return;
myRequester->WindowLostFocus(); myRequester->WindowLostFocus();
} }
@ -423,7 +423,7 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(float)titlebarHeight { -(float)titlebarHeight {
return NSHeight([myWindow frame]) - NSHeight([[myWindow contentView] frame]); return NSHeight([myWindow frame]) - NSHeight([[myWindow contentView] frame]);
} }
@end @end

74
src/SFML/Window/OSX/VideoModeImpl.cpp
View File

@ -46,21 +46,21 @@ size_t DisplayBitsPerPixel(CGDirectDisplayID displayId)
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
return CGDisplayBitsPerPixel(displayId); return CGDisplayBitsPerPixel(displayId);
#else // MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 #else // MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId);
CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode); CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode);
if(CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) if(CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
return 32; return 32;
else if(CFStringCompare(pixEnc, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) else if(CFStringCompare(pixEnc, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
return 16; return 16;
else if(CFStringCompare(pixEnc, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) else if(CFStringCompare(pixEnc, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
return 8; return 8;
return 0; // no match return 0; // no match
#endif #endif
} }
@ -69,47 +69,47 @@ size_t DisplayBitsPerPixel(CGDirectDisplayID displayId)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
std::vector<VideoMode> VideoModeImpl::GetFullscreenModes() std::vector<VideoMode> VideoModeImpl::GetFullscreenModes()
{ {
std::vector<VideoMode> modes; std::vector<VideoMode> modes;
CGDisplayCount count = 0; CGDisplayCount count = 0;
int err = CGGetActiveDisplayList(0, NULL, &count); int err = CGGetActiveDisplayList(0, NULL, &count);
if (err != 0) { if (err != 0) {
sf::Err() << "Error when retrieving displays count"; sf::Err() << "Error when retrieving displays count";
return modes; return modes;
} }
CGDirectDisplayID* displays = new CGDirectDisplayID[count]; CGDirectDisplayID* displays = new CGDirectDisplayID[count];
err = CGGetActiveDisplayList(count, displays, &count); err = CGGetActiveDisplayList(count, displays, &count);
if (err != 0) { if (err != 0) {
sf::Err() << "Error when retrieving displays array"; sf::Err() << "Error when retrieving displays array";
return modes; return modes;
} }
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
VideoMode mode(CGDisplayPixelsWide(displays[i]), VideoMode mode(CGDisplayPixelsWide(displays[i]),
CGDisplayPixelsHigh(displays[i]), CGDisplayPixelsHigh(displays[i]),
DisplayBitsPerPixel(displays[i])); DisplayBitsPerPixel(displays[i]));
// Add it only if it isn't already in the array. // Add it only if it isn't already in the array.
if (std::find(modes.begin(), modes.end(), mode) == modes.end()) if (std::find(modes.begin(), modes.end(), mode) == modes.end())
modes.push_back(mode); modes.push_back(mode);
} }
delete[] displays; delete[] displays;
return modes; return modes;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
VideoMode VideoModeImpl::GetDesktopMode() VideoMode VideoModeImpl::GetDesktopMode()
{ {
CGDirectDisplayID display = CGMainDisplayID(); CGDirectDisplayID display = CGMainDisplayID();
return VideoMode(CGDisplayPixelsWide(display), return VideoMode(CGDisplayPixelsWide(display),
CGDisplayPixelsHigh(display), CGDisplayPixelsHigh(display),
DisplayBitsPerPixel(display)); DisplayBitsPerPixel(display));
} }
} // namespace priv } // namespace priv

256
src/SFML/Window/OSX/WindowImplCocoa.hpp
View File

@ -65,153 +65,153 @@ namespace priv
class WindowImplCocoa : public WindowImpl class WindowImplCocoa : public WindowImpl
{ {
public: public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Construct the window implementation from an existing control /// \brief Construct the window implementation from an existing control
/// ///
/// \param handle Platform-specific handle of the control /// \param handle Platform-specific handle of the control
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplCocoa(WindowHandle handle); WindowImplCocoa(WindowHandle handle);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Create the window implementation /// \brief Create the window implementation
/// ///
/// \param mode Video mode to use /// \param mode Video mode to use
/// \param title Title of the window /// \param title Title of the window
/// \param style Window style (resizable, fixed, or fullscren) /// \param style Window style (resizable, fixed, or fullscren)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplCocoa(VideoMode mode, const std::string& title, unsigned long style); WindowImplCocoa(VideoMode mode, const std::string& title, unsigned long style);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Destructor /// \brief Destructor
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
~WindowImplCocoa(); ~WindowImplCocoa();
/// Events /// Events
void WindowClosed(void); void WindowClosed(void);
void WindowResized(unsigned int width, unsigned int height); void WindowResized(unsigned int width, unsigned int height);
void WindowLostFocus(void); void WindowLostFocus(void);
void WindowGainedFocus(void); void WindowGainedFocus(void);
void MouseDownAt(Mouse::Button button, int x, int y); void MouseDownAt(Mouse::Button button, int x, int y);
void MouseUpAt(Mouse::Button button, int x, int y); void MouseUpAt(Mouse::Button button, int x, int y);
void MouseMovedAt(int x, int y); void MouseMovedAt(int x, int y);
void MouseWheelScrolledAt(float delta, int x, int y); void MouseWheelScrolledAt(float delta, int x, int y);
void MouseMovedIn(void); void MouseMovedIn(void);
void MouseMovedOut(void); void MouseMovedOut(void);
void KeyDown(unsigned short keycode, unsigned int modifierFlags); void KeyDown(unsigned short keycode, unsigned int modifierFlags);
void KeyUp(unsigned short keycode, unsigned int modifierFlags); void KeyUp(unsigned short keycode, unsigned int modifierFlags);
void TextEntred(Uint32 charcode); void TextEntred(Uint32 charcode);
static Key::Code NSKeyCodeToSFMLKeyCode(unsigned short rawchar); static Key::Code NSKeyCodeToSFMLKeyCode(unsigned short rawchar);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void ApplyContext(NSOpenGLContextRef context) const; void ApplyContext(NSOpenGLContextRef context) const;
private: private:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system /// \brief Process incoming events from the operating system
/// ///
/// \param block Use true to block the thread until an event arrives /// \param block Use true to block the thread until an event arrives
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void ProcessEvents(bool block); virtual void ProcessEvents(bool block);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Get the OS-specific handle of the window /// \brief Get the OS-specific handle of the window
/// ///
/// \return Handle of the window /// \return Handle of the window
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual WindowHandle GetSystemHandle() const; virtual WindowHandle GetSystemHandle() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Show or hide the mouse cursor /// \brief Show or hide the mouse cursor
/// ///
/// \param show True to show, false to hide /// \param show True to show, false to hide
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void ShowMouseCursor(bool show); virtual void ShowMouseCursor(bool show);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Change the position of the mouse cursor /// \brief Change the position of the mouse cursor
/// ///
/// \param x Left coordinate of the cursor, relative to the window /// \param x Left coordinate of the cursor, relative to the window
/// \param y Top coordinate of the cursor, relative to the window /// \param y Top coordinate of the cursor, relative to the window
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void SetCursorPosition(unsigned int x, unsigned int y); virtual void SetCursorPosition(unsigned int x, unsigned int y);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Change the position of the window on screen /// \brief Change the position of the window on screen
/// ///
/// \param x Left position /// \param x Left position
/// \param y Top position /// \param y Top position
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void SetPosition(int x, int y); virtual void SetPosition(int x, int y);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Change the size of the rendering region of the window /// \brief Change the size of the rendering region of the window
/// ///
/// \param width New width /// \param width New width
/// \param height New height /// \param height New height
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void SetSize(unsigned int width, unsigned int height); virtual void SetSize(unsigned int width, unsigned int height);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Change the title of the window /// \brief Change the title of the window
/// ///
/// \param title New title /// \param title New title
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void SetTitle(const std::string& title); virtual void SetTitle(const std::string& title);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Show or hide the window /// \brief Show or hide the window
/// ///
/// \param show True to show, false to hide /// \param show True to show, false to hide
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void Show(bool show); virtual void Show(bool show);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Enable or disable automatic key-repeat /// \brief Enable or disable automatic key-repeat
/// ///
/// \param enabled True to enable, false to disable /// \param enabled True to enable, false to disable
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void EnableKeyRepeat(bool enabled); virtual void EnableKeyRepeat(bool enabled);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Change the window's icon /// \brief Change the window's icon
/// ///
/// \param width Icon's width, in pixels /// \param width Icon's width, in pixels
/// \param height Icon's height, in pixels /// \param height Icon's height, in pixels
/// \param pixels Pointer to the pixels in memory, format must be RGBA 32 bits /// \param pixels Pointer to the pixels in memory, format must be RGBA 32 bits
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void SetIcon(unsigned int width, unsigned int height, const Uint8* pixels); virtual void SetIcon(unsigned int width, unsigned int height, const Uint8* pixels);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Construct the pool after ensuring NSApp is valid. /// \brief Construct the pool after ensuring NSApp is valid.
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetUpPoolAndApplication(void); void SetUpPoolAndApplication(void);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Change the type of the current process to become a full GUI app. /// \brief Change the type of the current process to become a full GUI app.
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static void SetUpProcessAsApplication(void); static void SetUpProcessAsApplication(void);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplDelegateRef myDelegate; ///< Implementation in Obj-C. WindowImplDelegateRef myDelegate; ///< Implementation in Obj-C.
NSAutoreleasePoolRef myPool; ///< Memory manager for this class. NSAutoreleasePoolRef myPool; ///< Memory manager for this class.
}; };
} // namespace priv } // namespace priv

521
src/SFML/Window/OSX/WindowImplCocoa.mm
View File

@ -45,73 +45,73 @@ namespace priv
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplCocoa::WindowImplCocoa(WindowHandle handle) WindowImplCocoa::WindowImplCocoa(WindowHandle handle)
{ {
sf::Err() << "Not yet fully supported." << std::endl; sf::Err() << "Not yet fully supported." << std::endl;
#warning WindowImplCocoa(WindowHandle handle) not yet fully implemented #warning WindowImplCocoa(WindowHandle handle) not yet fully implemented
SetUpPoolAndApplication(); SetUpPoolAndApplication();
// Treat the handle as it real type // Treat the handle as it real type
id nsHandle = (id)handle; id nsHandle = (id)handle;
if ([nsHandle isKindOfClass:[NSWindow class]]) { if ([nsHandle isKindOfClass:[NSWindow class]]) {
// We have a window. // We have a window.
myDelegate = [[SFWindowController alloc] initWithWindow:nsHandle]; myDelegate = [[SFWindowController alloc] initWithWindow:nsHandle];
} /*else if ([nsHandle isKindOfClass:[NSView class]]) { } /*else if ([nsHandle isKindOfClass:[NSView class]]) {
// We have a view. // We have a view.
myDelegate = [[SFViewController alloc] initWithView:nsHandle]; myDelegate = [[SFViewController alloc] initWithView:nsHandle];
} */ else { } */ else {
sf::Err() sf::Err()
<< "Cannot import this Window Handle because it is neither " << "Cannot import this Window Handle because it is neither "
<< "a <NSWindow*> nor <NSView*> object " << "a <NSWindow*> nor <NSView*> object "
<< "(or any of their subclasses). You gave a <" << "(or any of their subclasses). You gave a <"
<< [[nsHandle className] UTF8String] << [[nsHandle className] UTF8String]
<< "> object." << "> object."
<< std::endl; << std::endl;
return; return;
} }
// NO : // NO :
// [myDelegate setRequesterTo:this]; // [myDelegate setRequesterTo:this];
// because we don't handle event. // because we don't handle event.
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplCocoa::WindowImplCocoa(VideoMode mode, WindowImplCocoa::WindowImplCocoa(VideoMode mode,
const std::string& title, const std::string& title,
unsigned long style) unsigned long style)
{ {
SetUpPoolAndApplication(); SetUpPoolAndApplication();
// Don't forget to update our parent (that is, WindowImpl) size : // Don't forget to update our parent (that is, WindowImpl) size :
myWidth = mode.Width; myWidth = mode.Width;
myHeight = mode.Height; myHeight = mode.Height;
myDelegate = [[SFWindowController alloc] initWithMode:&mode andStyle:style]; myDelegate = [[SFWindowController alloc] initWithMode:&mode andStyle:style];
[myDelegate changeTitle:stringToNSString(title)]; [myDelegate changeTitle:stringToNSString(title)];
[myDelegate setRequesterTo:this]; [myDelegate setRequesterTo:this];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplCocoa::~WindowImplCocoa() WindowImplCocoa::~WindowImplCocoa()
{ {
[myDelegate closeWindow]; [myDelegate closeWindow];
[myDelegate release]; [myDelegate release];
[myPool drain]; [myPool drain];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::ApplyContext(NSOpenGLContextRef context) const void WindowImplCocoa::ApplyContext(NSOpenGLContextRef context) const
{ {
[myDelegate applyContext:context]; [myDelegate applyContext:context];
} }
@ -122,46 +122,46 @@ void WindowImplCocoa::ApplyContext(NSOpenGLContextRef context) const
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::WindowClosed(void) void WindowImplCocoa::WindowClosed(void)
{ {
Event event; Event event;
event.Type = Event::Closed; event.Type = Event::Closed;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::WindowResized(unsigned int width, unsigned int height) void WindowImplCocoa::WindowResized(unsigned int width, unsigned int height)
{ {
// Don't forget to update our parent (that is, WindowImpl) size : // Don't forget to update our parent (that is, WindowImpl) size :
myWidth = width; myWidth = width;
myHeight = height; myHeight = height;
Event event; Event event;
event.Type = Event::Resized; event.Type = Event::Resized;
event.Size.Width = myWidth; event.Size.Width = myWidth;
event.Size.Height = myHeight; event.Size.Height = myHeight;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::WindowLostFocus(void) void WindowImplCocoa::WindowLostFocus(void)
{ {
Event event; Event event;
event.Type = Event::LostFocus; event.Type = Event::LostFocus;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::WindowGainedFocus(void) void WindowImplCocoa::WindowGainedFocus(void)
{ {
Event event; Event event;
event.Type = Event::GainedFocus; event.Type = Event::GainedFocus;
PushEvent(event); PushEvent(event);
} }
#pragma mark #pragma mark
@ -171,68 +171,68 @@ void WindowImplCocoa::WindowGainedFocus(void)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::MouseDownAt(Mouse::Button button, int x, int y) void WindowImplCocoa::MouseDownAt(Mouse::Button button, int x, int y)
{ {
Event event; Event event;
event.Type = Event::MouseButtonPressed; event.Type = Event::MouseButtonPressed;
event.MouseButton.Button = button; event.MouseButton.Button = button;
event.MouseButton.X = x; event.MouseButton.X = x;
event.MouseButton.Y = y; event.MouseButton.Y = y;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::MouseUpAt(Mouse::Button button, int x, int y) void WindowImplCocoa::MouseUpAt(Mouse::Button button, int x, int y)
{ {
Event event; Event event;
event.Type = Event::MouseButtonReleased; event.Type = Event::MouseButtonReleased;
event.MouseButton.Button = button; event.MouseButton.Button = button;
event.MouseButton.X = x; event.MouseButton.X = x;
event.MouseButton.Y = y; event.MouseButton.Y = y;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::MouseMovedAt(int x, int y) void WindowImplCocoa::MouseMovedAt(int x, int y)
{ {
Event event; Event event;
event.Type = Event::MouseMoved; event.Type = Event::MouseMoved;
event.MouseMove.X = x; event.MouseMove.X = x;
event.MouseMove.Y = y; event.MouseMove.Y = y;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::MouseWheelScrolledAt(float delta, int x, int y) void WindowImplCocoa::MouseWheelScrolledAt(float delta, int x, int y)
{ {
Event event; Event event;
event.Type = Event::MouseWheelMoved; event.Type = Event::MouseWheelMoved;
event.MouseWheel.Delta = delta; event.MouseWheel.Delta = delta;
event.MouseWheel.X = x; event.MouseWheel.X = x;
event.MouseWheel.Y = y; event.MouseWheel.Y = y;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::MouseMovedIn(void) void WindowImplCocoa::MouseMovedIn(void)
{ {
Event event; Event event;
event.Type = Event::MouseEntered; event.Type = Event::MouseEntered;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::MouseMovedOut(void) void WindowImplCocoa::MouseMovedOut(void)
{ {
Event event; Event event;
event.Type = Event::MouseLeft; event.Type = Event::MouseLeft;
PushEvent(event); PushEvent(event);
} }
@ -243,166 +243,166 @@ void WindowImplCocoa::MouseMovedOut(void)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::KeyDown(unsigned short keycode, unsigned int modifierFlags) void WindowImplCocoa::KeyDown(unsigned short keycode, unsigned int modifierFlags)
{ {
Event event; Event event;
event.Type = Event::KeyPressed; event.Type = Event::KeyPressed;
event.Key.Code = NSKeyCodeToSFMLKeyCode(keycode); event.Key.Code = NSKeyCodeToSFMLKeyCode(keycode);
if (event.Key.Code == Key::Count) { if (event.Key.Code == Key::Count) {
sf::Err() << "Unknown key (pressed)" << std::endl; sf::Err() << "Unknown key (pressed)" << std::endl;
return; // Not a valid/supported key. return; // Not a valid/supported key.
} }
event.Key.Alt = modifierFlags & NSAlternateKeyMask; event.Key.Alt = modifierFlags & NSAlternateKeyMask;
event.Key.Control = modifierFlags & NSControlKeyMask; event.Key.Control = modifierFlags & NSControlKeyMask;
event.Key.Shift = modifierFlags & NSShiftKeyMask; event.Key.Shift = modifierFlags & NSShiftKeyMask;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::KeyUp(unsigned short keycode, unsigned int modifierFlags) void WindowImplCocoa::KeyUp(unsigned short keycode, unsigned int modifierFlags)
{ {
Event event; Event event;
event.Type = Event::KeyReleased; event.Type = Event::KeyReleased;
event.Key.Code = NSKeyCodeToSFMLKeyCode(keycode); event.Key.Code = NSKeyCodeToSFMLKeyCode(keycode);
if (event.Key.Code == Key::Count) { if (event.Key.Code == Key::Count) {
sf::Err() << "Unknown key (released)" << std::endl; sf::Err() << "Unknown key (released)" << std::endl;
return; // Not a valid/supported key. return; // Not a valid/supported key.
} }
event.Key.Alt = modifierFlags & NSAlternateKeyMask; event.Key.Alt = modifierFlags & NSAlternateKeyMask;
event.Key.Control = modifierFlags & NSControlKeyMask; event.Key.Control = modifierFlags & NSControlKeyMask;
event.Key.Shift = modifierFlags & NSShiftKeyMask; event.Key.Shift = modifierFlags & NSShiftKeyMask;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::TextEntred(Uint32 charcode) void WindowImplCocoa::TextEntred(Uint32 charcode)
{ {
Event event; Event event;
event.Type = Event::TextEntered; event.Type = Event::TextEntered;
event.Text.Unicode = charcode; event.Text.Unicode = charcode;
PushEvent(event); PushEvent(event);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Key::Code WindowImplCocoa::NSKeyCodeToSFMLKeyCode(unsigned short keycode) { Key::Code WindowImplCocoa::NSKeyCodeToSFMLKeyCode(unsigned short keycode) {
/* Based on http://forums.macrumors.com/showthread.php?t=780577 */ /* Based on http://forums.macrumors.com/showthread.php?t=780577 */
switch (keycode) { switch (keycode) {
case 0x00: return Key::A; case 0x00: return Key::A;
case 0x0b: return Key::B; case 0x0b: return Key::B;
case 0x08: return Key::C; case 0x08: return Key::C;
case 0x02: return Key::D; case 0x02: return Key::D;
case 0x0e: return Key::E; case 0x0e: return Key::E;
case 0x03: return Key::F; case 0x03: return Key::F;
case 0x05: return Key::G; case 0x05: return Key::G;
case 0x04: return Key::H; case 0x04: return Key::H;
case 0x22: return Key::I; case 0x22: return Key::I;
case 0x26: return Key::J; case 0x26: return Key::J;
case 0x28: return Key::K; case 0x28: return Key::K;
case 0x25: return Key::L; case 0x25: return Key::L;
case 0x2e: return Key::M; case 0x2e: return Key::M;
case 0x2d: return Key::N; case 0x2d: return Key::N;
case 0x1f: return Key::O; case 0x1f: return Key::O;
case 0x23: return Key::P; case 0x23: return Key::P;
case 0x0c: return Key::Q; case 0x0c: return Key::Q;
case 0x0f: return Key::R; case 0x0f: return Key::R;
case 0x01: return Key::S; case 0x01: return Key::S;
case 0x11: return Key::T; case 0x11: return Key::T;
case 0x20: return Key::U; case 0x20: return Key::U;
case 0x09: return Key::V; case 0x09: return Key::V;
case 0x0d: return Key::W; case 0x0d: return Key::W;
case 0x07: return Key::X; case 0x07: return Key::X;
case 0x10: return Key::Y; case 0x10: return Key::Y;
case 0x06: return Key::Z; case 0x06: return Key::Z;
case 0x1d: return Key::Num0; case 0x1d: return Key::Num0;
case 0x12: return Key::Num1; case 0x12: return Key::Num1;
case 0x13: return Key::Num2; case 0x13: return Key::Num2;
case 0x14: return Key::Num3; case 0x14: return Key::Num3;
case 0x15: return Key::Num4; case 0x15: return Key::Num4;
case 0x17: return Key::Num5; case 0x17: return Key::Num5;
case 0x16: return Key::Num6; case 0x16: return Key::Num6;
case 0x1a: return Key::Num7; case 0x1a: return Key::Num7;
case 0x1c: return Key::Num8; case 0x1c: return Key::Num8;
case 0x19: return Key::Num9; case 0x19: return Key::Num9;
case 0x35: return Key::Escape; case 0x35: return Key::Escape;
case 0x3b: return Key::LControl; case 0x3b: return Key::LControl;
case 0x38: return Key::LShift; case 0x38: return Key::LShift;
case 0x3a: return Key::LAlt; case 0x3a: return Key::LAlt;
case 0x37: return Key::LSystem; case 0x37: return Key::LSystem;
case 0x3e: return Key::RControl; case 0x3e: return Key::RControl;
case 0x3c: return Key::RShift; case 0x3c: return Key::RShift;
case 0x3d: return Key::RAlt; case 0x3d: return Key::RAlt;
case 0x36: return Key::RSystem; case 0x36: return Key::RSystem;
#warning unknown key code for Menu #warning unknown key code for Menu
// case 0x: return Key::Menu; // case 0x: return Key::Menu;
case 0x21: return Key::LBracket; case 0x21: return Key::LBracket;
case 0x1e: return Key::RBracket; case 0x1e: return Key::RBracket;
case 0x29: return Key::SemiColon; case 0x29: return Key::SemiColon;
case 0x2b: return Key::Comma; case 0x2b: return Key::Comma;
case 0x2f: return Key::Period; case 0x2f: return Key::Period;
case 0x27: return Key::Quote; case 0x27: return Key::Quote;
case 0x2c: return Key::Slash; case 0x2c: return Key::Slash;
case 0x2a: return Key::BackSlash; case 0x2a: return Key::BackSlash;
#warning 0x0a is for "Non-US Backslash" (from HID Calibrator, a sample provided by Apple). #warning 0x0a is for "Non-US Backslash" (from HID Calibrator, a sample provided by Apple).
case 0x0a: return Key::Tilde; case 0x0a: return Key::Tilde;
case 0x18: return Key::Equal; case 0x18: return Key::Equal;
case 0x32: return Key::Dash; case 0x32: return Key::Dash;
case 0x31: return Key::Space; case 0x31: return Key::Space;
case 0x24: return Key::Return; case 0x24: return Key::Return;
#warning unknown key code for Back #warning unknown key code for Back
// case 0x: return Key::Back; // case 0x: return Key::Back;
case 0x30: return Key::Tab; case 0x30: return Key::Tab;
case 0x74: return Key::PageUp; case 0x74: return Key::PageUp;
case 0x79: return Key::PageDown; case 0x79: return Key::PageDown;
case 0x77: return Key::End; case 0x77: return Key::End;
case 0x73: return Key::Home; case 0x73: return Key::Home;
#warning unknown key code for Insert #warning unknown key code for Insert
// case 0x: return Key::Insert; // case 0x: return Key::Insert;
case 0x33: return Key::Delete; case 0x33: return Key::Delete;
case 0x45: return Key::Add; case 0x45: return Key::Add;
case 0x4e: return Key::Subtract; case 0x4e: return Key::Subtract;
case 0x43: return Key::Multiply; case 0x43: return Key::Multiply;
case 0x4b: return Key::Divide; case 0x4b: return Key::Divide;
case 0x7b: return Key::Left; case 0x7b: return Key::Left;
case 0x7c: return Key::Right; case 0x7c: return Key::Right;
case 0x7e: return Key::Up; case 0x7e: return Key::Up;
case 0x7d: return Key::Down; case 0x7d: return Key::Down;
case 0x52: return Key::Numpad0; case 0x52: return Key::Numpad0;
case 0x53: return Key::Numpad1; case 0x53: return Key::Numpad1;
case 0x54: return Key::Numpad2; case 0x54: return Key::Numpad2;
case 0x55: return Key::Numpad3; case 0x55: return Key::Numpad3;
case 0x56: return Key::Numpad4; case 0x56: return Key::Numpad4;
case 0x57: return Key::Numpad5; case 0x57: return Key::Numpad5;
case 0x58: return Key::Numpad6; case 0x58: return Key::Numpad6;
case 0x59: return Key::Numpad7; case 0x59: return Key::Numpad7;
case 0x5b: return Key::Numpad8; case 0x5b: return Key::Numpad8;
case 0x5c: return Key::Numpad9; case 0x5c: return Key::Numpad9;
case 0x7a: return Key::F1; case 0x7a: return Key::F1;
case 0x78: return Key::F2; case 0x78: return Key::F2;
case 0x63: return Key::F3; case 0x63: return Key::F3;
case 0x76: return Key::F4; case 0x76: return Key::F4;
case 0x60: return Key::F5; case 0x60: return Key::F5;
case 0x61: return Key::F6; case 0x61: return Key::F6;
case 0x62: return Key::F7; case 0x62: return Key::F7;
case 0x64: return Key::F8; case 0x64: return Key::F8;
case 0x65: return Key::F9; case 0x65: return Key::F9;
case 0x6d: return Key::F10; case 0x6d: return Key::F10;
case 0x67: return Key::F11; case 0x67: return Key::F11;
case 0x6f: return Key::F12; case 0x6f: return Key::F12;
case 0x69: return Key::F13; case 0x69: return Key::F13;
case 0x6b: return Key::F14; case 0x6b: return Key::F14;
case 0x71: return Key::F15; case 0x71: return Key::F15;
#warning unknown key code for PAUSE #warning unknown key code for PAUSE
// case 0x: return Key::PAUSE; // case 0x: return Key::PAUSE;
default: return Key::Count; // An unknown key. default: return Key::Count; // An unknown key.
} }
} }
#pragma mark #pragma mark
@ -411,7 +411,7 @@ Key::Code WindowImplCocoa::NSKeyCodeToSFMLKeyCode(unsigned short keycode) {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::ProcessEvents(bool block) void WindowImplCocoa::ProcessEvents(bool block)
{ {
[myDelegate processEventWithBlockingMode:(block ? YES : NO)]; [myDelegate processEventWithBlockingMode:(block ? YES : NO)];
} }
#pragma mark #pragma mark
@ -420,80 +420,79 @@ void WindowImplCocoa::ProcessEvents(bool block)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowHandle WindowImplCocoa::GetSystemHandle() const WindowHandle WindowImplCocoa::GetSystemHandle() const
{ {
return [myDelegate getSystemHandle]; return [myDelegate getSystemHandle];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::ShowMouseCursor(bool show) void WindowImplCocoa::ShowMouseCursor(bool show)
{ {
if (show) { if (show) {
[myDelegate showMouseCursor]; [myDelegate showMouseCursor];
} else { } else {
[myDelegate hideMouseCursor]; [myDelegate hideMouseCursor];
} }
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetCursorPosition(unsigned int x, unsigned int y) void WindowImplCocoa::SetCursorPosition(unsigned int x, unsigned int y)
{ {
[myDelegate setCursorPositionToX:x Y:y]; [myDelegate setCursorPositionToX:x Y:y];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetPosition(int x, int y) void WindowImplCocoa::SetPosition(int x, int y)
{ {
[myDelegate setWindowPositionToX:x Y:y]; [myDelegate setWindowPositionToX:x Y:y];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetSize(unsigned int width, unsigned int height) void WindowImplCocoa::SetSize(unsigned int width, unsigned int height)
{ {
// Don't forget to update our parent (that is, WindowImpl) size : // Don't forget to update our parent (that is, WindowImpl) size :
myWidth = width; myWidth = width;
myHeight = height; myHeight = height;
[myDelegate resizeTo:width by:height]; [myDelegate resizeTo:width by:height];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetTitle(const std::string& title) void WindowImplCocoa::SetTitle(const std::string& title)
{ {
[myDelegate changeTitle:stringToNSString(title)]; [myDelegate changeTitle:stringToNSString(title)];
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::Show(bool show) void WindowImplCocoa::Show(bool show)
{ {
if (show) { if (show) {
[myDelegate showWindow]; [myDelegate showWindow];
} else { } else {
[myDelegate hideWindow]; [myDelegate hideWindow];
} }
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::EnableKeyRepeat(bool enabled) void WindowImplCocoa::EnableKeyRepeat(bool enabled)
{ {
if (enabled) { if (enabled) {
[myDelegate enableKeyRepeat]; [myDelegate enableKeyRepeat];
} else { } else {
[myDelegate disableKeyRepeat]; [myDelegate disableKeyRepeat];
} }
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetIcon(unsigned int width, unsigned int height, void WindowImplCocoa::SetIcon(unsigned int width, unsigned int height, const Uint8* pixels)
const Uint8* pixels)
{ {
[myDelegate setIconTo:width by:height with:pixels]; [myDelegate setIconTo:width by:height with:pixels];
} }
#pragma mark #pragma mark
@ -502,38 +501,38 @@ void WindowImplCocoa::SetIcon(unsigned int width, unsigned int height,
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetUpPoolAndApplication(void) void WindowImplCocoa::SetUpPoolAndApplication(void)
{ {
// Ensure NSApp exists. // Ensure NSApp exists.
[NSApplication sharedApplication]; [NSApplication sharedApplication];
// Create the pool. // Create the pool.
myPool = [[NSAutoreleasePool alloc] init]; myPool = [[NSAutoreleasePool alloc] init];
// Transform the app process. // Transform the app process.
SetUpProcessAsApplication(); SetUpProcessAsApplication();
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetUpProcessAsApplication(void) void WindowImplCocoa::SetUpProcessAsApplication(void)
{ {
static bool isTheProcessSetAsApplication = false; static bool isTheProcessSetAsApplication = false;
if (!isTheProcessSetAsApplication) { if (!isTheProcessSetAsApplication) {
// Do it only once ! // Do it only once !
isTheProcessSetAsApplication = true; isTheProcessSetAsApplication = true;
// Set the process as a normal application so it can get focus. // Set the process as a normal application so it can get focus.
ProcessSerialNumber psn; ProcessSerialNumber psn;
if (!GetCurrentProcess(&psn)) { if (!GetCurrentProcess(&psn)) {
TransformProcessType(&psn, kProcessTransformToForegroundApplication); TransformProcessType(&psn, kProcessTransformToForegroundApplication);
SetFrontProcess(&psn); SetFrontProcess(&psn);
} }
// Tell the application to stop bouncing in the Dock. // Tell the application to stop bouncing in the Dock.
[[NSApplication sharedApplication] finishLaunching]; [[NSApplication sharedApplication] finishLaunching];
// NOTE : This last call won't harm anything even if SFML window was // NOTE : This last call won't harm anything even if SFML window was
// created with an external handle. // created with an external handle.
} }
} }
} // namespace priv } // namespace priv

6
src/SFML/Window/OSX/WindowImplDelegateProtocol.h
View File

@ -32,9 +32,9 @@
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
namespace sf { namespace sf {
namespace priv { namespace priv {
class WindowImplCocoa; class WindowImplCocoa;
} }
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

8
src/SFML/Window/OSX/cpp_objc_conversion.mm
View File

@ -33,10 +33,10 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
NSString* stringToNSString(std::string const& string) NSString* stringToNSString(std::string const& string)
{ {
std::string utf8; utf8.reserve(string.size() + 1); std::string utf8; utf8.reserve(string.size() + 1);
sf::Utf8::FromAnsi(string.begin(), string.end(), std::back_inserter(utf8)); sf::Utf8::FromAnsi(string.begin(), string.end(), std::back_inserter(utf8));
NSString* str = [NSString stringWithCString:utf8.c_str() encoding:NSUTF8StringEncoding]; NSString* str = [NSString stringWithCString:utf8.c_str() encoding:NSUTF8StringEncoding];
return str; return str;
} }