X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33e902756fa5e12d57b92c5b9262f2db8ab332da..d58526d55433162cef8ad2ed7f422689862c3019:/src/osx/cocoa/nonownedwnd.mm diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index b63421373c..2823a386cc 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/cocoa/nonownedwnd.mm +// Name: src/osx/cocoa/nonownedwnd.mm // Purpose: non owned window for cocoa // Author: DavidStefan Csomor // Modified by: @@ -10,26 +10,19 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" - -#if wxOSX_USE_COCOA -#include -#else -#include +#ifndef WX_PRECOMP + #include "wx/nonownedwnd.h" + #include "wx/frame.h" #endif -#ifdef __WXMAC__ #include "wx/osx/private.h" -#endif - -#if wxOSX_USE_COCOA - NSRect wxToNSRect( NSView* parent, const wxRect& r ) { NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; int y = r.y; int x = r.x ; - if ( parent != NULL && ![ parent isFlipped ] ) + if ( parent == NULL || ![ parent isFlipped ] ) y = frame.size.height - ( r.y + r.height ); return NSMakeRect(x, y, r.width , r.height); } @@ -39,7 +32,7 @@ wxRect wxFromNSRect( NSView* parent, const NSRect& rect ) NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; int y = rect.origin.y; int x = rect.origin.x; - if ( parent != NULL && ![ parent isFlipped ] ) + if ( parent == NULL || ![ parent isFlipped ] ) y = frame.size.height - (rect.origin.y + rect.size.height); return wxRect( x, y, rect.size.width, rect.size.height ); } @@ -49,7 +42,7 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ) NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; int x = p.x ; int y = p.y; - if ( parent != NULL && ![ parent isFlipped ] ) + if ( parent == NULL || ![ parent isFlipped ] ) y = frame.size.height - ( p.y ); return NSMakePoint(x, y); } @@ -59,11 +52,247 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; int x = p.x; int y = p.y; - if ( parent != NULL && ![ parent isFlipped ] ) + if ( parent == NULL || ![ parent isFlipped ] ) y = frame.size.height - ( p.y ); return wxPoint( x, y); } +bool shouldHandleSelector(SEL selector) +{ + if (selector == @selector(noop:) + || selector == @selector(complete:) + || selector == @selector(deleteBackward:) + || selector == @selector(deleteForward:) + || selector == @selector(insertNewline:) + || selector == @selector(insertTab:) + || selector == @selector(keyDown:) + || selector == @selector(keyUp:) + || selector == @selector(scrollPageUp:) + || selector == @selector(scrollPageDown:) + || selector == @selector(scrollToBeginningOfDocument:) + || selector == @selector(scrollToEndOfDocument:)) + return false; + + return true; + +} + +// +// wx native implementation classes +// + +typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector); + +@interface wxNSWindow : NSWindow +{ + wxNonOwnedWindowCocoaImpl* impl; +} + +- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation; +- (wxNonOwnedWindowCocoaImpl*) implementation; +- (void)noResponderFor: (SEL) selector; +@end + +@implementation wxNSWindow + +- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation +{ + impl = theImplementation; +} + +- (wxNonOwnedWindowCocoaImpl*) implementation +{ + return impl; +} + +- (void)doCommandBySelector:(SEL)selector +{ + if (shouldHandleSelector(selector) && + !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) ) + [super doCommandBySelector:selector]; +} + + +// NB: if we don't do this, all key downs that get handled lead to a NSBeep +- (void)noResponderFor: (SEL) selector +{ + if (selector != @selector(keyDown:) && selector != @selector(keyUp:)) + { + [super noResponderFor:selector]; +// wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; +// superimpl(self, @selector(noResponderFor:), selector); + } +} + +@end + +@interface wxNSPanel : NSPanel + +{ + wxNonOwnedWindowCocoaImpl* impl; +} + +- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation; +- (wxNonOwnedWindowCocoaImpl*) implementation; +- (void)noResponderFor: (SEL) selector; +@end + +@implementation wxNSPanel + +- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation +{ + impl = theImplementation; +} + +- (BOOL)canBecomeKeyWindow +{ + return YES; +} + +- (wxNonOwnedWindowCocoaImpl*) implementation +{ + return impl; +} + +- (void)doCommandBySelector:(SEL)selector +{ + if (shouldHandleSelector(selector)) + [super doCommandBySelector:selector]; +} + +// NB: if we don't do this, it seems that all events that end here lead to a NSBeep +- (void)noResponderFor: (SEL) selector +{ + if (selector != @selector(keyDown:) && selector != @selector(keyUp:)) + { + [super noResponderFor:selector]; +// wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; +// superimpl(self, @selector(noResponderFor:), selector); + } +} + +@end + + +// +// controller +// + +@interface wxNonOwnedWindowController : NSObject +{ +} + +- (void)windowDidResize:(NSNotification *)notification; +- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize; +- (void)windowDidResignKey:(NSNotification *)notification; +- (void)windowDidBecomeKey:(NSNotification *)notification; +- (void)windowDidMove:(NSNotification *)notification; +- (BOOL)windowShouldClose:(id)window; + +@end + +@implementation wxNonOwnedWindowController + +- (id) init +{ + [super init]; + return self; +} + +- (BOOL)windowShouldClose:(id)nwindow +{ + wxNSWindow* window = (wxNSWindow*) nwindow; + wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + if ( wxpeer ) + wxpeer->Close(); + } + return NO; +} + +- (NSSize)windowWillResize:(NSWindow *)win + toSize:(NSSize)proposedFrameSize +{ + NSRect frame = [win frame]; + wxRect wxframe = wxFromNSRect( NULL, frame ); + wxframe.SetWidth( proposedFrameSize.width ); + wxframe.SetHeight( proposedFrameSize.height ); + wxNSWindow* window = (wxNSWindow*) win; + wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + if ( wxpeer ) + { + wxpeer->HandleResizing( 0, &wxframe ); + NSSize newSize = NSMakeSize(wxframe.GetWidth(), wxframe.GetHeight()); + return newSize; + } + } + + return proposedFrameSize; +} + +- (void)windowDidResize:(NSNotification *)notification +{ + wxNSWindow* window = (wxNSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + if ( wxpeer ) + wxpeer->HandleResized(0); + } +} + +- (void)windowDidMove:(NSNotification *)notification +{ + wxNSWindow* window = (wxNSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + if ( wxpeer ) + wxpeer->HandleMoved(0); + } +} + +- (void)windowDidBecomeKey:(NSNotification *)notification +{ + wxNSWindow* window = (wxNSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + if ( wxpeer ) + wxpeer->HandleActivated(0, true); + } +} + +- (void)windowDidResignKey:(NSNotification *)notification +{ + wxNSWindow* window = (wxNSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + if ( wxpeer ) + { + wxpeer->HandleActivated(0, false); + // Needed for popup window since the firstResponder + // (focus in wx) doesn't change when this + // TLW becomes inactive. + wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId()); + event.SetEventObject(wxpeer); + wxpeer->HandleWindowEvent(event); + } + } +} + +@end + IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl ) wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) : @@ -81,6 +310,8 @@ wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl() wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl() { + [m_macWindow setImplementation:nil]; + [m_macWindow setDelegate:nil]; [m_macWindow release]; } @@ -89,25 +320,35 @@ void wxNonOwnedWindowCocoaImpl::Destroy() wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) ); } -void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, -long style, long extraStyle, const wxString& name ) +void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoint& pos, const wxSize& size, +long style, long extraStyle, const wxString& WXUNUSED(name) ) { + static wxNonOwnedWindowController* controller = NULL; + + if ( !controller ) + controller =[[wxNonOwnedWindowController alloc] init]; + + int windowstyle = NSBorderlessWindowMask; - if ( style & wxFRAME_TOOL_WINDOW ) - m_macWindow = [NSPanel alloc]; + if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) || + GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG ) + { + m_macWindow = [wxNSPanel alloc]; + } else - m_macWindow = [NSWindow alloc]; + m_macWindow = [wxNSWindow alloc]; - CGWindowLevel level = kCGNormalWindowLevelKey; + CGWindowLevel level = kCGNormalWindowLevel; if ( style & wxFRAME_TOOL_WINDOW ) { - if ( ( style & wxSTAY_ON_TOP ) ) - level = kCGUtilityWindowLevel; - else - level = kCGFloatingWindowLevel ; - + windowstyle |= NSUtilityWindowMask; + if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) || + ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) ) + { + windowstyle |= NSTitledWindowMask ; + } } else if ( ( style & wxPOPUP_WINDOW ) ) { @@ -171,15 +412,16 @@ long style, long extraStyle, const wxString& name ) if ( extraStyle & wxFRAME_EX_METAL) windowstyle |= NSTexturedBackgroundWindowMask; + if ( ( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW ) ) + level = kCGFloatingWindowLevel; + if ( ( style & wxSTAY_ON_TOP ) ) level = kCGUtilityWindowLevel; -/* - if ( ( style & wxFRAME_FLOAT_ON_PARENT ) ) - group = GetWindowGroupOfClass(kFloatingWindowClass); - */ NSRect r = wxToNSRect( NULL, wxRect( pos, size) ); + [m_macWindow setImplementation:this]; + [m_macWindow initWithContentRect:r styleMask:windowstyle backing:NSBackingStoreBuffered @@ -187,7 +429,10 @@ long style, long extraStyle, const wxString& name ) ]; [m_macWindow setLevel:level]; - // [m_macWindow makeKeyAndOrderFront:nil]; + + [m_macWindow setDelegate:controller]; + + [m_macWindow setAcceptsMouseMovedEvents: YES]; } @@ -210,7 +455,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show) { if ( show ) { - [m_macWindow orderFront:nil]; + [m_macWindow makeKeyAndOrderFront:nil]; [[m_macWindow contentView] setNeedsDisplay:YES]; } else @@ -218,7 +463,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show) return true; } -bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout) +bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout)) { return Show(show); } @@ -234,7 +479,7 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha) return true; } -bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col ) +bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) ) { return true; } @@ -256,7 +501,7 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle ) } } -bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle style) +bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style)) { return true; } @@ -269,7 +514,8 @@ bool wxNonOwnedWindowCocoaImpl::CanSetTransparent() void wxNonOwnedWindowCocoaImpl::MoveWindow(int x, int y, int width, int height) { NSRect r = wxToNSRect( NULL, wxRect(x,y,width, height) ); - [m_macWindow setFrame:r display:YES]; + // do not trigger refreshes upon invisible and possible partly created objects + [m_macWindow setFrame:r display:GetWXPeer()->IsShownOnScreen()]; } void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const @@ -286,16 +532,18 @@ void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const height = rect.size.height; } -void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &right, int &width, int &height ) const +void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width, int &height ) const { NSRect outer = NSMakeRect(100,100,100,100); NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ]; NSRect rect = [[m_macWindow contentView] frame]; + left = rect.origin.x; + top = rect.origin.y; width = rect.size.width; height = rect.size.height; } -bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& region) +bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region)) { return false; } @@ -323,7 +571,7 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize ) [m_macWindow deminiaturize:nil]; } -void wxNonOwnedWindowCocoaImpl::Maximize(bool maximize) +void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize)) { [m_macWindow zoom:nil]; } @@ -342,7 +590,7 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const return m_macFullScreenData != NULL ; } -bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style) +bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style)) { if ( show ) { @@ -373,4 +621,37 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style) void wxNonOwnedWindowCocoaImpl::RequestUserAttention(int WXUNUSED(flags)) { } -#endif + +void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y ) +{ + wxPoint p((x ? *x : 0), (y ? *y : 0) ); + NSPoint nspt = wxToNSPoint( NULL, p ); + nspt = [m_macWindow convertScreenToBase:nspt]; + nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil]; + p = wxFromNSPoint([m_macWindow contentView], nspt); + if ( x ) + *x = p.x; + if ( y ) + *y = p.y; +} + +void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y ) +{ + wxPoint p((x ? *x : 0), (y ? *y : 0) ); + NSPoint nspt = wxToNSPoint( [m_macWindow contentView], p ); + nspt = [[m_macWindow contentView] convertPoint:nspt toView:nil]; + nspt = [m_macWindow convertBaseToScreen:nspt]; + p = wxFromNSPoint( NULL, nspt); + if ( x ) + *x = p.x; + if ( y ) + *y = p.y; +} + +wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, + long style, long extraStyle, const wxString& name ) +{ + wxNonOwnedWindowImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer ); + now->Create( parent, pos, size, style , extraStyle, name ); + return now; +}