///////////////////////////////////////////////////////////////////////////////
// Name: mac/toplevel.cpp
-// Purpose: implements wxTopLevelWindow for MSW
-// Author: Vadim Zeitlin
+// Purpose: implements wxTopLevelWindow for Mac
+// Author: Stefan Csomor
// Modified by:
// Created: 24.09.01
// RCS-ID: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// License: wxWindows license
+// Copyright: (c) 2001-2004 Stefan Csomor
+// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/app.h"
#include "wx/tooltip.h"
#include "wx/dnd.h"
+#if wxUSE_SYSTEM_OPTIONS
+ #include "wx/sysopt.h"
+#endif
+
+#include "ToolUtils.h"
+
#define wxMAC_DEBUG_REDRAW 0
#ifndef wxMAC_DEBUG_REDRAW
static Point gs_lastWhere;
static long gs_lastWhen = 0;
+
+#if TARGET_CARBON
+static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
+#endif
+
// ============================================================================
// wxTopLevelWindowMac implementation
// ============================================================================
extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
-static const EventTypeSpec eventList[] =
+static const EventTypeSpec eventList[] =
{
{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
- /*
- { kEventClassKeyboard, kEventRawKeyDown } ,
- { kEventClassKeyboard, kEventRawKeyRepeat } ,
- { kEventClassKeyboard, kEventRawKeyUp } ,
- { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
- */
+
+ { kEventClassKeyboard, kEventRawKeyDown } ,
+ { kEventClassKeyboard, kEventRawKeyRepeat } ,
+ { kEventClassKeyboard, kEventRawKeyUp } ,
+ { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
+
+ { kEventClassWindow , kEventWindowShown } ,
{ kEventClassWindow , kEventWindowUpdate } ,
{ kEventClassWindow , kEventWindowActivated } ,
{ kEventClassWindow , kEventWindowDeactivated } ,
{ kEventClassMouse , kEventMouseDown } ,
{ kEventClassMouse , kEventMouseUp } ,
+ { kEventClassMouse , kEventMouseWheelMoved } ,
{ kEventClassMouse , kEventMouseMoved } ,
{ kEventClassMouse , kEventMouseDragged } ,
static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
- EventRecord rec ;
- if ( wxMacConvertEventToRecord( event , &rec ) )
+ wxWindow* focus = wxWindow::FindFocus() ;
+ char charCode ;
+ UInt32 keyCode ;
+ UInt32 modifiers ;
+ Point point ;
+
+ EventRef rawEvent ;
+
+ GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ;
+
+ GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
+ GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
+ GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
+ GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
+ sizeof( Point ), NULL, &point );
+
+ switch ( GetEventKind( event ) )
{
- wxTheApp->m_macCurrentEvent = &rec ;
- wxWindow* focus = wxWindow::FindFocus() ;
- if ( (focus != NULL) && !UMAMenuEvent(&rec) && wxTheApp->MacSendKeyDownEvent( focus , rec.message , rec.modifiers , rec.when , rec.where.h , rec.where.v ) )
- {
- // was handled internally
- result = noErr ;
- }
+ case kEventTextInputUnicodeForKeyEvent :
+ // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
+ // get its own kEventTextInputUnicodeForKeyEvent, so we route back the
+ wxControl* control = wxDynamicCast( focus , wxControl ) ;
+ if ( control )
+ {
+ ControlHandle macControl = (ControlHandle) control->GetMacControl() ;
+ if ( macControl )
+ {
+ ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
+ result = noErr ;
+ }
+ }
+ /*
+ // this may lead to double events sent to a window in case all handlers have skipped the key down event
+ UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+ UInt32 message = (keyCode << 8) + charCode;
+
+ if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
+ focus , message , modifiers , when , point.h , point.v ) )
+ {
+ result = noErr ;
+ }
+ */
+ break ;
}
return result ;
}
-static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
- wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
- Point point ;
- UInt32 modifiers = 0;
- EventMouseButton button = 0 ;
- UInt32 click = 0 ;
-
- GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
- sizeof( Point ), NULL, &point );
- GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,
- sizeof( UInt32 ), NULL, &modifiers );
- GetEventParameter( event, kEventParamMouseButton, typeMouseButton, NULL,
- sizeof( EventMouseButton ), NULL, &button );
- GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
- sizeof( UInt32 ), NULL, &click );
-
- if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
- modifiers += btnState ;
-
- WindowRef window ;
- short windowPart = ::FindWindow(point, &window);
+ wxWindow* focus = wxWindow::FindFocus() ;
+ char charCode ;
+ UInt32 keyCode ;
+ UInt32 modifiers ;
+ Point point ;
+ UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+
+ GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
+ GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
+ GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
+ GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
+ sizeof( Point ), NULL, &point );
+
+ UInt32 message = (keyCode << 8) + charCode;
+ switch( GetEventKind( event ) )
+ {
+ case kEventRawKeyRepeat :
+ case kEventRawKeyDown :
+ {
+ WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+ WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+ if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
+ focus , message , modifiers , when , point.h , point.v ) )
+ {
+ result = noErr ;
+ }
+ wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
+ }
+ break ;
+ case kEventRawKeyUp :
+ if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent(
+ focus , message , modifiers , when , point.h , point.v ) )
+ {
+ result = noErr ;
+ }
+ break ;
+ case kEventRawKeyModifiersChanged :
+ {
+ wxKeyEvent event(wxEVT_KEY_DOWN);
+
+ event.m_shiftDown = modifiers & shiftKey;
+ event.m_controlDown = modifiers & controlKey;
+ event.m_altDown = modifiers & optionKey;
+ event.m_metaDown = modifiers & cmdKey;
+
+ event.m_x = point.h;
+ event.m_y = point.v;
+ event.m_timeStamp = when;
+ wxWindow* focus = wxWindow::FindFocus() ;
+ event.SetEventObject(focus);
+
+ if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )
+ {
+ event.m_keyCode = WXK_CONTROL ;
+ event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey )
+ {
+ event.m_keyCode = WXK_SHIFT ;
+ event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey )
+ {
+ event.m_keyCode = WXK_ALT ;
+ event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & cmdKey )
+ {
+ event.m_keyCode = WXK_COMMAND ;
+ event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+ focus->GetEventHandler()->ProcessEvent( event ) ;
+ }
+ wxTheApp->s_lastModifiers = modifiers ;
+ }
+ break ;
+ }
- if ( IsWindowActive(window) && windowPart == inContent )
- {
- switch ( GetEventKind( event ) )
- {
- case kEventMouseDown :
- toplevelWindow->MacFireMouseEvent( mouseDown , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
- result = noErr ;
- break ;
- case kEventMouseUp :
- toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
- result = noErr ;
- break ;
- case kEventMouseMoved :
- toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
- result = noErr ;
- break ;
- case kEventMouseDragged :
- toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
- result = noErr ;
- break ;
- default :
- break ;
- }
+ return result ;
+}
+
+pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+ Point point ;
+ UInt32 modifiers = 0;
+ EventMouseButton button = 0 ;
+ UInt32 click = 0 ;
+
+ GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
+ sizeof( Point ), NULL, &point );
+ GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,
+ sizeof( UInt32 ), NULL, &modifiers );
+ GetEventParameter( event, kEventParamMouseButton, typeMouseButton, NULL,
+ sizeof( EventMouseButton ), NULL, &button );
+ GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
+ sizeof( UInt32 ), NULL, &click );
+
+ if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
+ modifiers += btnState ;
+
+ // temporary hack to support true two button mouse
+ if ( button == kEventMouseButtonSecondary )
+ {
+ modifiers |= controlKey ;
}
-
- return result ;
-
+ WindowRef window ;
+ short windowPart = ::FindWindow(point, &window);
+
+ // either we really are active or we are capturing mouse events
+
+ if ( (IsWindowActive(window) && windowPart == inContent) ||
+ (wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindow() == toplevelWindow) )
+ {
+ switch ( GetEventKind( event ) )
+ {
+ case kEventMouseDown :
+ toplevelWindow->MacFireMouseEvent( mouseDown , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+ result = noErr ;
+ break ;
+ case kEventMouseUp :
+ toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+ result = noErr ;
+ break ;
+ case kEventMouseMoved :
+ wxTheApp->MacHandleMouseMovedEvent( point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+ result = noErr ;
+ break ;
+ case kEventMouseDragged :
+ toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+ result = noErr ;
+ break ;
+ case kEventMouseWheelMoved :
+ {
+ //bClearTooltip = false;
+ EventMouseWheelAxis axis = kEventMouseWheelAxisY;
+ SInt32 delta = 0;
+ Point mouseLoc = {0, 0};
+ if (::GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis,
+ NULL, sizeof(EventMouseWheelAxis), NULL, &axis) == noErr &&
+ ::GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger,
+ NULL, sizeof(SInt32), NULL, &delta) == noErr &&
+ ::GetEventParameter(event, kEventParamMouseLocation, typeQDPoint,
+ NULL, sizeof(Point), NULL, &mouseLoc) == noErr)
+ {
+ wxMouseEvent wheelEvent(wxEVT_MOUSEWHEEL);
+
+ wheelEvent.m_x = mouseLoc.h;
+ wheelEvent.m_y = mouseLoc.v;
+
+ wheelEvent.m_wheelRotation = delta;
+ wheelEvent.m_wheelDelta = 1;
+ wheelEvent.m_linesPerAction = 1;
+
+ wxWindow* currentMouseWindow = NULL;
+ wxWindow::MacGetWindowFromPoint(wxPoint(mouseLoc.h, mouseLoc.v), ¤tMouseWindow);
+
+ if (currentMouseWindow)
+ {
+ currentMouseWindow->GetEventHandler()->ProcessEvent(wheelEvent);
+ result = noErr;
+ }
+ }
+ }
+ break ;
+ default :
+ break ;
+ }
+ }
+
+ return result ;
+
}
static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
OSStatus result = eventNotHandledErr ;
OSStatus err = noErr ;
- UInt32 attributes;
- WindowRef windowRef ;
- wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
-
- GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
- sizeof( WindowRef ), NULL, &windowRef );
-
- switch( GetEventKind( event ) )
- {
- case kEventWindowUpdate :
- if ( !wxPendingDelete.Member(toplevelWindow) )
- toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
- result = noErr ;
- break ;
- case kEventWindowActivated :
- toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
- result = noErr ;
- break ;
- case kEventWindowDeactivated :
- toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
- result = noErr ;
- break ;
- case kEventWindowClose :
- toplevelWindow->Close() ;
- result = noErr ;
- break ;
- case kEventWindowBoundsChanged :
- err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
- NULL, sizeof( UInt32 ), NULL, &attributes );
- if ( err == noErr )
- {
- Rect newContentRect ;
-
- GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
- sizeof( newContentRect ), NULL, &newContentRect );
-
- toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
- newContentRect.right - newContentRect.left ,
+ UInt32 attributes;
+ WindowRef windowRef ;
+ wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+
+ GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
+ sizeof( WindowRef ), NULL, &windowRef );
+
+ switch( GetEventKind( event ) )
+ {
+ case kEventWindowUpdate :
+ if ( !wxPendingDelete.Member(toplevelWindow) )
+ toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
+ result = noErr ;
+ break ;
+ case kEventWindowActivated :
+ toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
+ result = noErr ;
+ break ;
+ case kEventWindowDeactivated :
+ toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
+ result = noErr ;
+ break ;
+ case kEventWindowShown :
+ toplevelWindow->Refresh() ;
+ result = noErr ;
+ break ;
+ case kEventWindowClose :
+ toplevelWindow->Close() ;
+ result = noErr ;
+ break ;
+ case kEventWindowBoundsChanged :
+ err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
+ NULL, sizeof( UInt32 ), NULL, &attributes );
+ if ( err == noErr )
+ {
+ Rect newContentRect ;
+
+ GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
+ sizeof( newContentRect ), NULL, &newContentRect );
+
+ toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
+ newContentRect.right - newContentRect.left ,
newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
- result = noErr;
- }
- break ;
- default :
- break ;
- }
- return result ;
+ result = noErr;
+ }
+ break ;
+ case kEventWindowBoundsChanging :
+ err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
+ NULL, sizeof( UInt32 ), NULL, &attributes );
+ if ( err == noErr )
+ {
+ Rect newContentRect ;
+
+ GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
+ sizeof( newContentRect ), NULL, &newContentRect );
+
+ wxSize formerSize = toplevelWindow->GetSize() ;
+
+ if ( (attributes & kWindowBoundsChangeSizeChanged ) ||
+ ( attributes & kWindowBoundsChangeOriginChanged ) )
+ toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
+ newContentRect.right - newContentRect.left ,
+ newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
+
+ int x , y , w , h ;
+ toplevelWindow->GetPosition( &x , &y ) ;
+ toplevelWindow->GetSize( &w , &h ) ;
+ Rect adjustedRect = { y , x , y + h , x + w } ;
+
+ if ( !EqualRect( &newContentRect , &adjustedRect ) )
+ {
+ SetEventParameter( event , kEventParamCurrentBounds , typeQDRectangle, sizeof( adjustedRect ) , &adjustedRect ) ;
+ }
+
+ if ( toplevelWindow->GetSize() != formerSize )
+ toplevelWindow->Update() ;
+
+ result = noErr ;
+ }
+ break ;
+ default :
+ break ;
+ }
+ return result ;
}
pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
switch ( GetEventClass( event ) )
{
+ case kEventClassKeyboard :
+ result = KeyboardEventHandler( handler, event , data ) ;
+ break ;
case kEventClassTextInput :
- result = TextInputEventHandler( handler, event , data ) ;
+ result = TextInputEventHandler( handler, event , data ) ;
break ;
case kEventClassWindow :
- result = WindowEventHandler( handler, event , data ) ;
- break ;
+ result = WindowEventHandler( handler, event , data ) ;
+ break ;
case kEventClassMouse :
- result = MouseEventHandler( handler, event , data ) ;
- break ;
+ result = MouseEventHandler( handler, event , data ) ;
+ break ;
default :
break ;
}
wxList *wxWinMacWindowList = NULL;
wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)
{
+ if ( wxWinMacWindowList == NULL )
+ return NULL ;
wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
if (!node)
return NULL;
{
// adding NULL WindowRef is (first) surely a result of an error and
// (secondly) breaks menu command processing
- wxCHECK_RET( inWindowRef != (WindowRef) NULL, "attempt to add a NULL WindowRef to window list" );
+ wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
if ( !wxWinMacWindowList->Find((long)inWindowRef) )
wxWinMacWindowList->Append((long)inWindowRef, win);
// ----------------------------------------------------------------------------
WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;
+wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;
+bool wxTopLevelWindowMac::s_macWindowCompositing = FALSE;
void wxTopLevelWindowMac::Init()
{
m_macNoEraseUpdateRgn = NewRgn() ;
m_macNeedsErasing = false ;
m_macWindow = NULL ;
+ m_macUsesCompositing = FALSE ;
#if TARGET_CARBON
m_macEventHandler = NULL ;
#endif
class wxMacDeferredWindowDeleter : public wxObject
{
public :
- wxMacDeferredWindowDeleter( WindowRef windowRef )
- {
- m_macWindow = windowRef ;
+ wxMacDeferredWindowDeleter( WindowRef windowRef )
+ {
+ m_macWindow = windowRef ;
}
- virtual ~wxMacDeferredWindowDeleter()
- {
- UMADisposeWindow( (WindowRef) m_macWindow ) ;
+ virtual ~wxMacDeferredWindowDeleter()
+ {
+ UMADisposeWindow( (WindowRef) m_macWindow ) ;
}
protected :
WindowRef m_macWindow ;
wxToolTip::NotifyWindowDelete(m_macWindow) ;
wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
}
-
+
#if TARGET_CARBON
if ( m_macEventHandler )
{
::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ;
}
-#endif
+#endif
wxRemoveMacWindowAssociation( this ) ;
void wxTopLevelWindowMac::Maximize(bool maximize)
{
- // not available on mac
+ wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
+ wxMacWindowClipper clip (this);
+ ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
+
+ Rect tempRect ;
+ GrafPtr port ;
+ GetPort( &port ) ;
+ Point pt = { 0, 0 } ;
+ SetPortWindowPort((WindowRef)m_macWindow) ;
+ LocalToGlobal( &pt ) ;
+ SetPort( port ) ;
+
+ GetWindowPortBounds((WindowRef)m_macWindow, &tempRect ) ;
+ SetSize( pt.h , pt.v , tempRect.right-tempRect.left ,
+ tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING);
}
bool wxTopLevelWindowMac::IsMaximized() const
{
- return false ;
+ return IsWindowInStandardState( (WindowRef)m_macWindow , NULL , NULL ) ;
}
void wxTopLevelWindowMac::Iconize(bool iconize)
{
- // not available on mac
+ if ( IsWindowCollapsable((WindowRef)m_macWindow) )
+ CollapseWindow((WindowRef)m_macWindow , iconize ) ;
}
bool wxTopLevelWindowMac::IsIconized() const
{
- // mac dialogs cannot be iconized
- return FALSE;
+ return IsWindowCollapsed((WindowRef)m_macWindow ) ;
}
void wxTopLevelWindowMac::Restore()
const wxPoint& pos,
const wxSize& size,
long style,
- const wxString& name )
+ const wxString& name )
{
- SetName(name);
- m_windowStyle = style;
- m_isShown = FALSE;
+ OSStatus err = noErr ;
+ SetName(name);
+ m_windowStyle = style;
+ m_isShown = FALSE;
- // create frame.
+ // create frame.
Rect theBoundsRect;
- m_x = (int)pos.x;
- m_y = (int)pos.y;
- if ( m_y < 50 )
- m_y = 50 ;
- if ( m_x < 20 )
- m_x = 20 ;
-
- m_width = size.x;
- if (m_width == -1)
+ m_x = (int)pos.x;
+ m_y = (int)pos.y;
+ if ( m_y < 50 )
+ m_y = 50 ;
+ if ( m_x < 20 )
+ m_x = 20 ;
+
+ m_width = size.x;
+ if (m_width == -1)
m_width = 20;
- m_height = size.y;
- if (m_height == -1)
+ m_height = size.y;
+ if (m_height == -1)
m_height = 20;
::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ;
-
+
if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{
- if (
+ if (
HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)
- )
+ )
{
wclass = kFloatingWindowClass ;
if ( HasFlag(wxTINY_CAPTION_VERT) )
}
else if ( HasFlag( wxCAPTION ) )
{
- if ( HasFlag( wxDIALOG_MODAL ) )
- {
- wclass = kDocumentWindowClass ; // kMovableModalWindowClass ;
- }
- else
- {
- wclass = kDocumentWindowClass ;
- }
+ wclass = kDocumentWindowClass ;
}
else
{
if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
- HasFlag( wxSYSTEM_MENU ) )
+ HasFlag( wxCLOSE_BOX ) || HasFlag( wxSYSTEM_MENU ) )
{
wclass = kDocumentWindowClass ;
}
#endif
}
}
-
- if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
+
+ if ( HasFlag( wxMINIMIZE_BOX ) )
{
- attr |= kWindowFullZoomAttribute ;
attr |= kWindowCollapseBoxAttribute ;
}
+ if ( HasFlag( wxMAXIMIZE_BOX ) )
+ {
+ attr |= kWindowFullZoomAttribute ;
+ }
if ( HasFlag( wxRESIZE_BORDER ) )
{
attr |= kWindowResizableAttribute ;
}
- if ( HasFlag( wxSYSTEM_MENU ) )
+ if ( HasFlag( wxCLOSE_BOX) )
{
attr |= kWindowCloseBoxAttribute ;
}
+
+ if (UMAGetSystemVersion() >= 0x1000)
+ {
+ //turn on live resizing (OS X only)
+ attr |= kWindowLiveResizeAttribute;
+ }
+
+#if TARGET_CARBON
+#if 0 // having problems right now with that
+ if (HasFlag(wxSTAY_ON_TOP))
+ wclass = kUtilityWindowClass;
+#endif
+#endif
+
+ //this setup lets us have compositing and non-compositing
+ //windows in the same application.
+
+#if UNIVERSAL_INTERFACES_VERSION >= 0x0400
+ if ( wxTopLevelWindowMac::s_macWindowCompositing )
+ {
+ attr |= kWindowCompositingAttribute;
+ m_macUsesCompositing = TRUE;
+ }
+ else
+#endif
+ {
+ m_macUsesCompositing = FALSE;
+ }
- ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
+#if TARGET_CARBON
+ if ( HasFlag(wxFRAME_SHAPED) )
+ {
+ WindowDefSpec customWindowDefSpec;
+ customWindowDefSpec.defType = kWindowDefProcPtr;
+ customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
+
+ err = ::CreateCustomWindow( &customWindowDefSpec, wclass,
+ attr, &theBoundsRect,
+ (WindowRef*) &m_macWindow);
+ }
+ else
+#endif
+ {
+ err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
+ }
+
+ wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
wxAssociateWinWithMacWindow( m_macWindow , this ) ;
- wxString label ;
- if( wxApp::s_macDefaultEncodingIsPC )
- label = wxMacMakeMacStringFromPC( title ) ;
+ UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
+ if ( wxTopLevelWindowMac::s_macWindowCompositing )
+ {
+ ::GetRootControl( (WindowRef)m_macWindow, (ControlHandle*)&m_macRootControl ) ;
+ }
else
- label = title ;
- UMASetWTitleC( (WindowRef)m_macWindow , label ) ;
- ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
+ {
+ ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
+ }
#if TARGET_CARBON
- InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
- InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
- GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
+ InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
+ InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);
#endif
m_macFocus = NULL ;
+
+
+#if TARGET_CARBON
+ if ( HasFlag(wxFRAME_SHAPED) )
+ {
+ // default shape matches the window size
+ wxRegion rgn(0, 0, m_width, m_height);
+ SetShape(rgn);
+ }
+#endif
+
+ wxWindowCreateEvent event(this);
+ GetEventHandler()->ProcessEvent(event);
}
-void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin)
+bool wxTopLevelWindowMac::MacEnableCompositing( bool useCompositing )
+{
+ bool oldval = s_macWindowCompositing;
+ s_macWindowCompositing = useCompositing;
+ return oldval;
+}
+
+void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin)
{
((Point*)localOrigin)->h = 0;
((Point*)localOrigin)->v = 0;
*rootwin = this ;
}
-void wxTopLevelWindowMac::Clear()
+void wxTopLevelWindowMac::ClearBackground()
{
- wxWindow::Clear() ;
+ wxWindow::ClearBackground() ;
}
-WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
+WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
{
return m_macRootControl ;
}
void wxTopLevelWindowMac::MacUpdate( long timestamp)
{
-
wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
+ RgnHandle visRgn = NewRgn() ;
+ GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), visRgn );
BeginUpdate( (WindowRef)m_macWindow ) ;
- RgnHandle updateRgn = NewRgn();
+ RgnHandle updateRgn = NewRgn();
RgnHandle diffRgn = NewRgn() ;
+
if ( updateRgn && diffRgn )
{
+#if 1
+ // macos internal control redraws clean up areas we'd like to redraw ourselves
+ // therefore we pick the boundary rect and make sure we can redraw it
+ // this has to be intersected by the visRgn in order to avoid drawing over its own
+ // boundaries
+ RgnHandle trueUpdateRgn = NewRgn() ;
+ Rect trueUpdateRgnBoundary ;
+ GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
+ GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
+ RectRgn( updateRgn , &trueUpdateRgnBoundary ) ;
+ SectRgn( updateRgn , visRgn , updateRgn ) ;
+ if ( trueUpdateRgn )
+ DisposeRgn( trueUpdateRgn ) ;
+ SetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;
+#else
GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
+#endif
DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
if ( !EmptyRgn( updateRgn ) )
{
DisposeRgn( updateRgn );
if ( diffRgn )
DisposeRgn( diffRgn );
+ if ( visRgn )
+ DisposeRgn( visRgn ) ;
+
EndUpdate( (WindowRef)m_macWindow ) ;
SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
m_macNeedsErasing = false ;
// Raise the window to the top of the Z order
void wxTopLevelWindowMac::Raise()
{
- ::BringToFront( (WindowRef)m_macWindow ) ;
+ ::SelectWindow( (WindowRef)m_macWindow ) ;
}
// Lower the window to the bottom of the Z order
::SendBehind( (WindowRef)m_macWindow , NULL ) ;
}
-void wxTopLevelWindowMac::MacFireMouseEvent(
- wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp )
+void wxTopLevelWindowMac::MacFireMouseEvent(
+ wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp )
{
wxMouseEvent event(wxEVT_LEFT_DOWN);
bool isDown = !(modifiers & btnState) ; // 1 is for up
bool controlDown = modifiers & controlKey ; // for simulating right mouse
-
+
event.m_leftDown = isDown && !controlDown;
-
+
event.m_middleDown = FALSE;
event.m_rightDown = isDown && controlDown;
Point localwhere ;
localwhere.h = x ;
localwhere.v = y ;
-
- GrafPtr port ;
+
+ GrafPtr port ;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
::GlobalToLocal( &localwhere ) ;
if ( kind == mouseDown )
{
- if ( timestamp - gs_lastWhen <= GetDblTime() )
+ if ( timestamp - gs_lastWhen <= (long) GetDblTime() )
{
if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
{
event.m_y = y ;
event.SetEventObject( wxTheApp->s_captureWindow ) ;
wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
-
+
if ( kind == mouseUp )
{
wxTheApp->s_captureWindow = NULL ;
MacDispatchMouseEvent( event ) ;
}
}
+
#if !TARGET_CARBON
void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
{
- MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
- ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
+ MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
+ ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
}
void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
{
switch (part)
{
- case inContent:
+ case inContent:
{
- MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
- ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
+ MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
+ ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
}
break ;
}
{
switch (part)
{
- case inContent:
+ case inContent:
{
- MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
- ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
+ MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
+ ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
}
break ;
}
#endif
+void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
+{
+ if(s_macDeactivateWindow)
+ {
+ wxLogDebug(wxT("Doing delayed deactivation of %p"),s_macDeactivateWindow);
+ s_macDeactivateWindow->MacActivate(timestamp, false);
+ }
+}
+
void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
{
+ // wxLogDebug(wxT("TopLevel=%p::MacActivate"),this);
+
+ if(s_macDeactivateWindow==this)
+ s_macDeactivateWindow=NULL;
+ MacDelayedDeactivation(timestamp);
wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
event.m_timeStamp = timestamp ;
event.SetEventObject(this);
-
+
GetEventHandler()->ProcessEvent(event);
-
+
UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
-
+
// Early versions of MacOS X don't refresh backgrounds properly,
// so refresh the whole window on activation and deactivation.
long osVersion = UMAGetSystemVersion();
- if (osVersion >= 0x1000 && osVersion < 0x1020)
+ if (osVersion >= 0x1000 && osVersion < 0x1020 )
+ {
Refresh(TRUE);
+ }
else
- MacSuperEnabled( inIsActivating ) ;
+ {
+ // for the moment we have to resolve some redrawing issues like this
+ // the OS is stealing some redrawing areas as soon as it draws a control
+ Refresh(TRUE);
+ }
}
#if !TARGET_CARBON
-void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
+void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
{
}
void wxTopLevelWindowMac::SetTitle(const wxString& title)
{
wxWindow::SetTitle( title ) ;
-
- wxString label ;
-
- if( wxApp::s_macDefaultEncodingIsPC )
- label = wxMacMakeMacStringFromPC( m_label ) ;
- else
- label = m_label ;
-
- UMASetWTitleC( (WindowRef)m_macWindow , label ) ;
+ UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
}
bool wxTopLevelWindowMac::Show(bool show)
return FALSE;
if (show)
- {
- ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
- ::SelectWindow( (WindowRef)m_macWindow ) ;
- // no need to generate events here, they will get them triggered by macos
- // actually they should be , but apparently they are not
- wxSize size(m_width, m_height);
- wxSizeEvent event(size, m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ {
+ #if wxUSE_SYSTEM_OPTIONS //code contributed by Ryan Wilcox December 18, 2003
+ if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) )
+ {
+ ::ShowWindow( (WindowRef)m_macWindow );
+ }
+ else
+ #endif
+ {
+ ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
+ }
+ ::SelectWindow( (WindowRef)m_macWindow ) ;
+ // no need to generate events here, they will get them triggered by macos
+ // actually they should be , but apparently they are not
+ wxSize size(m_width, m_height);
+ wxSizeEvent event(size, m_windowId);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
}
else
{
- ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
+ #if wxUSE_SYSTEM_OPTIONS
+ if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) )
+ {
+ ::HideWindow((WindowRef) m_macWindow );
+ }
+ else
+ #endif
+ {
+ ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
+ }
}
if ( !show )
}
else
{
- Refresh() ;
+ Refresh() ;
}
return TRUE;
void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
+ wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
+ wxMacWindowClipper clip (this);
+
int former_x = m_x ;
int former_y = m_y ;
int former_w = m_width ;
int former_h = m_height ;
-
- int actualWidth = width;
- int actualHeight = height;
- int actualX = x;
- int actualY = y;
-
- if ((m_minWidth != -1) && (actualWidth < m_minWidth))
+
+ int actualWidth = width;
+ int actualHeight = height;
+ int actualX = x;
+ int actualY = y;
+
+ if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth;
- if ((m_minHeight != -1) && (actualHeight < m_minHeight))
+ if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualHeight = m_minHeight;
- if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
+ if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
actualWidth = m_maxWidth;
- if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
+ if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight;
bool doMove = false ;
bool doResize = false ;
-
+
if ( actualX != former_x || actualY != former_y )
{
doMove = true ;
{
m_x = actualX ;
m_y = actualY ;
- m_width = actualWidth ;
- m_height = actualHeight ;
if ( doMove )
::MoveWindow((WindowRef)m_macWindow, m_x, m_y , false); // don't make frontmost
-
+
+ m_width = actualWidth ;
+ m_height = actualHeight ;
+
if ( doResize )
- ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
-
+ ::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
+
// the OS takes care of invalidating and erasing the new area so we only have to
// take care of refreshing for full repaints
- if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
+ if ( doResize && HasFlag(wxFULL_REPAINT_ON_RESIZE) )
Refresh() ;
-
-
+
+
if ( IsKindOf( CLASSINFO( wxFrame ) ) )
{
wxFrame* frame = (wxFrame*) this ;
+#if wxUSE_STATUSBAR
frame->PositionStatusBar();
+#endif
+#if wxUSE_TOOLBAR
frame->PositionToolBar();
+#endif
}
if ( doMove )
wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified
GetEventHandler()->ProcessEvent(event);
}
}
-
+
}
/*
* has been true for any part of the update rgn the background is erased in the entire region
* not just in the specified rect.
*
- * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have
+ * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have
* the eraseBackground flag set to false are also added to this rgn. upon receiving an update event
* the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window
* will get the eraseBackground event first
*/
-
-void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )
+
+void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )
{
- GrafPtr formerPort ;
- GetPort( &formerPort ) ;
- SetPortWindowPort( (WindowRef)m_macWindow ) ;
-
- m_macNeedsErasing |= eraseBackground ;
-
- // if we already know that we will have to erase, there's no need to track the rest
- if ( !m_macNeedsErasing)
- {
- // we end only here if eraseBackground is false
- // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
- // we will have to erase anyway
-
- RgnHandle updateRgn = NewRgn();
- RgnHandle diffRgn = NewRgn() ;
- if ( updateRgn && diffRgn )
+ GrafPtr formerPort ;
+ GetPort( &formerPort ) ;
+ SetPortWindowPort( (WindowRef)m_macWindow ) ;
+
+ m_macNeedsErasing |= eraseBackground ;
+
+ // if we already know that we will have to erase, there's no need to track the rest
+ if ( !m_macNeedsErasing)
{
- GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn );
- Point pt = {0,0} ;
- LocalToGlobal( &pt ) ;
- OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
- DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
- if ( !EmptyRgn( diffRgn ) )
+ // we end only here if eraseBackground is false
+ // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
+ // we will have to erase anyway
+
+ RgnHandle updateRgn = NewRgn();
+ RgnHandle diffRgn = NewRgn() ;
+ if ( updateRgn && diffRgn )
{
- m_macNeedsErasing = true ;
+ GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn );
+ Point pt = {0,0} ;
+ LocalToGlobal( &pt ) ;
+ OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
+ DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
+ if ( !EmptyRgn( diffRgn ) )
+ {
+ m_macNeedsErasing = true ;
+ }
+ }
+ if ( updateRgn )
+ DisposeRgn( updateRgn );
+ if ( diffRgn )
+ DisposeRgn( diffRgn );
+
+ if ( !m_macNeedsErasing )
+ {
+ RgnHandle rectRgn = NewRgn() ;
+ SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ;
+ UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ;
+ DisposeRgn( rectRgn ) ;
}
}
- if ( updateRgn )
- DisposeRgn( updateRgn );
- if ( diffRgn )
- DisposeRgn( diffRgn );
+ InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ;
+ // turn this on to debug the refreshing cycle
+#if wxMAC_DEBUG_REDRAW
+ PaintRect( rect ) ;
+#endif
+ SetPort( formerPort ) ;
+}
+
+
+bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
+{
+ wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
+ _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
- if ( !m_macNeedsErasing )
+#if TARGET_CARBON
+ // The empty region signifies that the shape should be removed from the
+ // window.
+ if ( region.IsEmpty() )
{
- RgnHandle rectRgn = NewRgn() ;
- SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ;
- UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ;
- DisposeRgn( rectRgn ) ;
+ wxSize sz = GetClientSize();
+ wxRegion rgn(0, 0, sz.x, sz.y);
+ return SetShape(rgn);
}
- }
- InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ;
- // turn this on to debug the refreshing cycle
-#if wxMAC_DEBUG_REDRAW
- PaintRect( rect ) ;
+
+ // Make a copy of the region
+ RgnHandle shapeRegion = NewRgn();
+ CopyRgn( (RgnHandle)region.GetWXHRGN(), shapeRegion );
+
+ // Dispose of any shape region we may already have
+ RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef)MacGetWindowRef() );
+ if ( oldRgn )
+ DisposeRgn(oldRgn);
+
+ // Save the region so we can use it later
+ SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
+
+ // Tell the window manager that the window has changed shape
+ ReshapeCustomWindow((WindowRef)MacGetWindowRef());
+ return TRUE;
+#else
+ return FALSE;
#endif
- SetPort( formerPort ) ;
}
+// ---------------------------------------------------------------------------
+// Support functions for shaped windows, based on Apple's CustomWindow sample at
+// http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
+// ---------------------------------------------------------------------------
+
+#if TARGET_CARBON
+
+static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
+{
+ GetWindowPortBounds(window, inRect);
+ Point pt = {inRect->left, inRect->top};
+ SetPort((GrafPtr) GetWindowPort(window));
+ LocalToGlobal(&pt);
+ inRect->top = pt.v;
+ inRect->left = pt.h;
+ inRect->bottom += pt.v;
+ inRect->right += pt.h;
+}
+
+
+static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
+{
+ /*------------------------------------------------------
+ Define which options your custom window supports.
+ --------------------------------------------------------*/
+ //just enable everything for our demo
+ *(OptionBits*)param=//kWindowCanGrow|
+ //kWindowCanZoom|
+ //kWindowCanCollapse|
+ //kWindowCanGetWindowRegion|
+ //kWindowHasTitleBar|
+ //kWindowSupportsDragHilite|
+ kWindowCanDrawInCurrentPort|
+ //kWindowCanMeasureTitle|
+ kWindowWantsDisposeAtProcessDeath|
+ kWindowSupportsSetGrowImageRegion|
+ kWindowDefSupportsColorGrafPort;
+ return 1;
+}
+
+// The content region is left as a rectangle matching the window size, this is
+// so the origin in the paint event, and etc. still matches what the
+// programmer expects.
+static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
+{
+ SetEmptyRgn(rgn);
+ wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window);
+ if (win)
+ {
+ wxRect r = win->GetRect();
+ SetRectRgn(rgn, r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
+ }
+}
+
+// The structure region is set to the shape given to the SetShape method.
+static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
+{
+ RgnHandle cachedRegion = (RgnHandle) GetWRefCon(window);
+
+ SetEmptyRgn(rgn);
+ if (cachedRegion)
+ {
+ Rect windowRect;
+ wxShapedMacWindowGetPos(window, &windowRect); //how big is the window
+ CopyRgn(cachedRegion, rgn); //make a copy of our cached region
+ OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window
+ //MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size
+ }
+}
+
+
+
+static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
+{
+ GetWindowRegionPtr rgnRec=(GetWindowRegionPtr)param;
+
+ switch(rgnRec->regionCode)
+ {
+ case kWindowStructureRgn:
+ wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
+ break;
+ case kWindowContentRgn:
+ wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
+ break;
+ default:
+ SetEmptyRgn(rgnRec->winRgn);
+ } //switch
+
+ return noErr;
+}
+
+
+static SInt32 wxShapedMacWindowHitTest(WindowRef window,SInt32 param)
+{
+ /*------------------------------------------------------
+ Determine the region of the window which was hit
+ --------------------------------------------------------*/
+ Point hitPoint;
+ static RgnHandle tempRgn=nil;
+
+ if(!tempRgn)
+ tempRgn=NewRgn();
+
+ SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked
+
+ //Mac OS 8.5 or later
+ wxShapedMacWindowStructureRegion(window, tempRgn);
+ if (PtInRgn(hitPoint, tempRgn)) //in window content region?
+ return wInContent;
+
+ return wNoHit;//no significant area was hit.
+}
+
+
+static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param)
+{
+ switch(message)
+ {
+ case kWindowMsgHitTest:
+ return wxShapedMacWindowHitTest(window,param);
+
+ case kWindowMsgGetFeatures:
+ return wxShapedMacWindowGetFeatures(window,param);
+
+ // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
+ case kWindowMsgGetRegion:
+ return wxShapedMacWindowGetRegion(window,param);
+ }
+
+ return 0;
+}
+
+#endif
+// ---------------------------------------------------------------------------
+
projects / wxWidgets.git / blobdiff