#include "wx/window.h"
#include "wx/log.h"
+#include "wx/cocoa/autorelease.h"
+
#import <Appkit/NSView.h>
+#import <AppKit/NSEvent.h>
+
+// ========================================================================
+// wxWindowCocoaHider
+// ========================================================================
+class wxWindowCocoaHider: protected wxCocoaNSView
+{
+ DECLARE_NO_COPY_CLASS(wxWindowCocoaHider)
+public:
+ wxWindowCocoaHider(wxWindow *owner);
+ virtual ~wxWindowCocoaHider();
+ inline WX_NSView GetNSView() { return m_dummyNSView; }
+protected:
+ wxWindowCocoa *m_owner;
+ WX_NSView m_dummyNSView;
+ virtual void Cocoa_FrameChanged(void);
+private:
+ wxWindowCocoaHider();
+};
+
+// ========================================================================
+// wxWindowCocoaHider
+// ========================================================================
+wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner)
+: m_owner(owner)
+{
+ wxASSERT(owner);
+ wxASSERT(owner->GetNSViewForHiding());
+ m_dummyNSView = [[NSView alloc]
+ initWithFrame:[owner->GetNSViewForHiding() frame]];
+ AssociateNSView(m_dummyNSView);
+}
+wxWindowCocoaHider::~wxWindowCocoaHider()
+{
+ DisassociateNSView(m_dummyNSView);
+ [m_dummyNSView release];
+}
+
+void wxWindowCocoaHider::Cocoa_FrameChanged(void)
+{
+ // Keep the real window in synch with the dummy
+ wxASSERT(m_dummyNSView);
+ [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
+}
+
+// ========================================================================
+// wxWindowCocoa
+// ========================================================================
// normally the base classes aren't included, but wxWindow is special
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowCocoa, wxWindowBase)
BEGIN_EVENT_TABLE(wxWindowCocoa, wxWindowBase)
END_EVENT_TABLE()
+wxWindow *wxWindowCocoa::sm_capturedWindow = NULL;
+
// Constructor
void wxWindowCocoa::Init()
{
InitBase();
m_cocoaNSView = NULL;
- m_dummyNSView = NULL;
+ m_cocoaHider = NULL;
m_isBeingDeleted = FALSE;
+ m_isInPaint = FALSE;
}
// Constructor
return false;
// TODO: create the window
- NSRect cocoaRect = NSMakeRect(10,10,20,20);
m_cocoaNSView = NULL;
- SetNSView([[NSView alloc] initWithFrame: cocoaRect]);
+ SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release];
if (m_parent)
m_parent->AddChild(this);
m_parent->CocoaAddChild(this);
}
+ SetInitialFrameRect(pos,size);
return TRUE;
}
// Destructor
wxWindow::~wxWindow()
{
+ wxAutoNSAutoreleasePool pool;
DestroyChildren();
if(m_parent)
m_parent->RemoveChild(this);
CocoaRemoveFromParent();
+ delete m_cocoaHider;
SetNSView(NULL);
}
void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child)
{
- [child->m_cocoaNSView retain];
- // NOTE: addSubView takes ownership of, but does not retain the subview
- // Upon a removeFromView or closing the super view, the child WILL be
- // released!!! I think the idea here is that normally you would alloc
- // the subview and add it to the superview and this way you don't have
- // to release what you just alloced. Unfortunately, that doesn't
- // make sense for wxCocoa, so we do this instead.
- [m_cocoaNSView addSubview: child->m_cocoaNSView];
- wxASSERT(!child->m_dummyNSView);
- child->m_isShown = true;
+ NSView *childView = child->GetNSViewForSuperview();
+
+ wxASSERT(childView);
+ [m_cocoaNSView addSubview: childView];
+ child->m_isShown = !m_cocoaHider;
}
void wxWindowCocoa::CocoaRemoveFromParent(void)
{
- wxASSERT(m_cocoaNSView);
- if(m_dummyNSView)
- {
- // balances the alloc
- [m_dummyNSView removeFromSuperview];
- // But since we also retained it ourselves
- [m_dummyNSView release];
- m_dummyNSView = nil;
- // m_cocoaNSView has of course already been removed by virtue of
- // replaceSubview: m_cocoaNSView with: m_dummyNSView
- }
- else
- [m_cocoaNSView removeFromSuperview];
+ [GetNSViewForSuperview() removeFromSuperview];
}
void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
{
bool need_debug = cocoaNSView || m_cocoaNSView;
if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d",this,m_cocoaNSView,[m_cocoaNSView retainCount]);
- if(m_cocoaNSView)
- DisassociateNSView(m_cocoaNSView);
+ DisassociateNSView(m_cocoaNSView);
[cocoaNSView retain];
[m_cocoaNSView release];
m_cocoaNSView = cocoaNSView;
- if(m_cocoaNSView)
- AssociateNSView(m_cocoaNSView);
+ AssociateNSView(m_cocoaNSView);
if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]);
}
+WX_NSView wxWindowCocoa::GetNSViewForSuperview() const
+{
+ return m_cocoaHider
+ ? m_cocoaHider->GetNSView()
+ : m_cocoaNSView;
+}
+
+WX_NSView wxWindowCocoa::GetNSViewForHiding() const
+{
+ return m_cocoaNSView;
+}
+
+bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
+{
+ wxLogDebug("Cocoa_drawRect");
+ // Recursion can happen if the event loop runs from within the paint
+ // handler. For instance, if an assertion dialog is shown.
+ // FIXME: This seems less than ideal.
+ if(m_isInPaint)
+ {
+ wxLogDebug("Paint event recursion!");
+ return false;
+ }
+ //FIXME: should probably turn that rect into the update region
+ m_isInPaint = TRUE;
+ wxPaintEvent event(m_windowId);
+ event.SetEventObject(this);
+ bool ret = GetEventHandler()->ProcessEvent(event);
+ m_isInPaint = FALSE;
+ return ret;
+}
+
+void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
+{
+ wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],"Mouse event for different NSWindow");
+ NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];
+ NSRect cocoaRect = [m_cocoaNSView frame];
+ const wxPoint &clientorigin = GetClientAreaOrigin();
+ event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x;
+ event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y;
+
+ event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
+ event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;
+ event.m_altDown = [cocoaEvent modifierFlags] & NSAlternateKeyMask;
+ event.m_metaDown = [cocoaEvent modifierFlags] & NSCommandKeyMask;
+
+ // TODO: set timestamp?
+ event.SetEventObject(this);
+ event.SetId(GetId());
+}
+
+bool wxWindowCocoa::Cocoa_mouseMoved(WX_NSEvent theEvent)
+{
+ wxMouseEvent event(wxEVT_MOTION);
+ InitMouseEvent(event,theEvent);
+ wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_mouseDown(WX_NSEvent theEvent)
+{
+ wxMouseEvent event([theEvent clickCount]<2?wxEVT_LEFT_DOWN:wxEVT_LEFT_DCLICK);
+ InitMouseEvent(event,theEvent);
+ wxLogDebug("Mouse Down @%d,%d num clicks=%d",event.m_x,event.m_y,[theEvent clickCount]);
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_mouseDragged(WX_NSEvent theEvent)
+{
+ wxMouseEvent event(wxEVT_MOTION);
+ InitMouseEvent(event,theEvent);
+ event.m_leftDown = true;
+ wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_mouseUp(WX_NSEvent theEvent)
+{
+ wxMouseEvent event(wxEVT_LEFT_UP);
+ InitMouseEvent(event,theEvent);
+ wxLogDebug("Mouse Up @%d,%d",event.m_x,event.m_y);
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_otherMouseDragged(WX_NSEvent theEvent)
+{
+ return false;
+}
+
+bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent)
+{
+ return false;
+}
+
void wxWindowCocoa::Cocoa_FrameChanged(void)
{
wxLogDebug("Cocoa_FrameChanged");
return false;
}
+void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
+{
+ [[oldView superview] replaceSubview:oldView with:newView];
+}
+
bool wxWindow::Show(bool show)
{
+ wxAutoNSAutoreleasePool pool;
// If the window is marked as visible, then it shouldn't have a dummy view
// If the window is marked hidden, then it should have a dummy view
- wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView");
+ // wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic
+// wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView");
// Return false if there isn't a window to show or hide
- if(!m_cocoaNSView)
- return false;
- // Return false if the state isn't changing
- if( show == m_isShown )
+ NSView *cocoaView = GetNSViewForHiding();
+ if(!cocoaView)
return false;
if(show)
{
- // replaceSubView releases m_dummyNSView, balancing the alloc
- [m_cocoaNSView retain];
- [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView];
- // But since we also retained it ourselves
- [m_dummyNSView release];
- m_dummyNSView = nil;
- return true;
+ // If state isn't changing, return false
+ if(!m_cocoaHider)
+ return false;
+ CocoaReplaceView(m_cocoaHider->GetNSView(), cocoaView);
+ wxASSERT(![m_cocoaHider->GetNSView() superview]);
+ delete m_cocoaHider;
+ m_cocoaHider = NULL;
+ wxASSERT([cocoaView superview]);
}
else
{
- m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]];
- [m_dummyNSView retain];
- // NOTE: replaceSubView will cause m_cocaNSView to be released
- [[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView];
+ // If state isn't changing, return false
+ if(m_cocoaHider)
+ return false;
+ m_cocoaHider = new wxWindowCocoaHider(this);
+ // NOTE: replaceSubview:with will cause m_cocaNSView to be
+ // (auto)released which balances out addSubview
+ CocoaReplaceView(cocoaView, m_cocoaHider->GetNSView());
// m_coocaNSView is now only retained by us
- return true;
+ wxASSERT([m_cocoaHider->GetNSView() superview]);
+ wxASSERT(![cocoaView superview]);
}
+ m_isShown = show;
+ return true;
}
void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- wxLogDebug("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)",this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
+// wxLogDebug("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)",this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
int currentX, currentY;
int currentW, currentH;
DoGetPosition(¤tX, ¤tY);
void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
{
- wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+// wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
- NSView *superview = [m_cocoaNSView superview];
+ NSView *nsview = GetNSViewForSuperview();
+ NSView *superview = [nsview superview];
wxCHECK_RET(superview,"NSView does not have a superview");
NSRect parentRect = [superview frame];
NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height);
- [m_cocoaNSView setFrame: cocoaRect];
- // Also change the dummy's size
- if(m_dummyNSView)
- [m_dummyNSView setFrame: cocoaRect];
+ [nsview setFrame: cocoaRect];
+}
+
+void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
+{
+ NSView *nsview = GetNSViewForSuperview();
+ NSView *superview = [nsview superview];
+ wxCHECK_RET(superview,"NSView does not have a superview");
+ NSRect parentRect = [superview frame];
+ NSRect frameRect = [nsview frame];
+ if(size.x!=-1)
+ frameRect.size.width = size.x;
+ if(size.y!=-1)
+ frameRect.size.height = size.y;
+ frameRect.origin.x = pos.x;
+ frameRect.origin.y = parentRect.size.height-(pos.y+size.y);
+ [nsview setFrame: frameRect];
}
// Get total size
void wxWindow::DoGetSize(int *w, int *h) const
{
- NSRect cocoaRect = [m_cocoaNSView frame];
+ NSRect cocoaRect = [GetNSViewForSuperview() frame];
if(w)
*w=(int)cocoaRect.size.width;
if(h)
*h=(int)cocoaRect.size.height;
- wxLogDebug("wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+// wxLogDebug("wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
}
void wxWindow::DoGetPosition(int *x, int *y) const
{
- NSView *superview = [m_cocoaNSView superview];
+ NSView *nsview = GetNSViewForSuperview();
+ NSView *superview = [nsview superview];
wxCHECK_RET(superview,"NSView does not have a superview");
NSRect parentRect = [superview frame];
- NSRect cocoaRect = [m_cocoaNSView frame];
+ NSRect cocoaRect = [nsview frame];
if(x)
*x=(int)cocoaRect.origin.x;
if(y)
*y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
- wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+// wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
}
WXWidget wxWindow::GetHandle() const
return m_cocoaNSView;
}
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+{
+ [m_cocoaNSView setNeedsDisplay:YES];
+}
+
void wxWindow::SetFocus()
{
// TODO
void wxWindow::DoCaptureMouse()
{
// TODO
+ sm_capturedWindow = this;
}
void wxWindow::DoReleaseMouse()
{
// TODO
+ sm_capturedWindow = NULL;
}
void wxWindow::DoScreenToClient(int *x, int *y) const
// TODO
}
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
-{
- // TODO
-}
-
// Coordinates relative to the window
void wxWindow::WarpPointer (int x_pos, int y_pos)
{
return TRUE;
}
-void wxWindow::Clear()
+static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
{
- // TODO
+ // first should be ordered higher
+ if(first==target)
+ return NSOrderedDescending;
+ // second should be ordered higher
+ if(second==target)
+ return NSOrderedAscending;
+ return NSOrderedSame;
}
// Raise the window to the top of the Z order
void wxWindow::Raise()
{
- // TODO
+// wxAutoNSAutoreleasePool pool;
+ NSView *nsview = GetNSViewForSuperview();
+ [[nsview superview] sortSubviewsUsingFunction:
+ CocoaRaiseWindowCompareFunction
+ context: nsview];
+}
+
+static int CocoaLowerWindowCompareFunction(id first, id second, void *target)
+{
+ // first should be ordered lower
+ if(first==target)
+ return NSOrderedAscending;
+ // second should be ordered lower
+ if(second==target)
+ return NSOrderedDescending;
+ return NSOrderedSame;
}
// Lower the window to the bottom of the Z order
void wxWindow::Lower()
{
- // TODO
+ NSView *nsview = GetNSViewForSuperview();
+ [[nsview superview] sortSubviewsUsingFunction:
+ CocoaLowerWindowCompareFunction
+ context: nsview];
}
bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
/* static */ wxWindow *wxWindowBase::GetCapture()
{
// TODO
- return NULL;
+ return wxWindowCocoa::sm_capturedWindow;
}
wxWindow *wxGetActiveWindow()
return NULL;
}
+wxPoint wxGetMousePosition()
+{
+ // TODO
+ return wxDefaultPosition;
+}
+
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+ pt = wxGetMousePosition();
+ return NULL;
+}
+
projects / wxWidgets.git / blobdiff