X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a9263008b9c3f3fd32eae8ec162b513e09621fe..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/textctrl.cpp?ds=inline diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 1950549520..a8bcfbdef9 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textctrl.cpp +// Name: src/mac/carbon/textctrl.cpp // Purpose: wxTextCtrl // Author: Stefan Csomor // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText) @@ -9,24 +9,31 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "textctrl.h" -#endif - #include "wx/wxprec.h" #if wxUSE_TEXTCTRL +#include "wx/textctrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/dc.h" + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/toplevel.h" +#endif #ifdef __DARWIN__ - #include - #include + #include + #include #else - #include + #include #endif -#include "wx/msgdlg.h" - #if wxUSE_STD_IOSTREAM #if wxUSE_IOSTREAMH #include @@ -35,53 +42,22 @@ #endif #endif -#include "wx/app.h" -#include "wx/dc.h" -#include "wx/button.h" -#include "wx/toplevel.h" -#include "wx/textctrl.h" -#include "wx/notebook.h" -#include "wx/tabctrl.h" -#include "wx/settings.h" #include "wx/filefn.h" -#include "wx/utils.h" - -#if defined(__BORLANDC__) && !defined(__WIN32__) - #include -#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__) - #include -#endif - -#ifndef __DARWIN__ -#include -#endif - -// if this is set to 1 then under OSX 10.2 the 'classic' MLTE implementation will be used -// if set to 0 then the unicode textctrl will be used -#ifndef wxMAC_AWAYS_USE_MLTE -#define wxMAC_AWAYS_USE_MLTE 1 -#endif - -#ifndef __WXMAC_OSX__ -enum -{ - kTXNVisibilityTag = 'visb' /*set the visibility state of the object */ -}; -#endif +#include "wx/sysopt.h" +#include "wx/thread.h" -#include -#include -#include -#include #include "wx/mac/uma.h" +#include "wx/mac/carbon/private/mactext.h" class wxMacFunctor { public : - wxMacFunctor(){} + wxMacFunctor() {} virtual ~wxMacFunctor() {} + virtual void* operator()() = 0 ; - static void* CallBackProc(void *param) + + static void* CallBackProc( void *param ) { wxMacFunctor* f = (wxMacFunctor*) param ; void *result = (*f)() ; @@ -89,14 +65,15 @@ public : } } ; -template +template + class wxMacObjectFunctor1 : public wxMacFunctor { typedef void (classtype::*function)( param1type p1 ) ; typedef void (classtype::*ref_function)( const param1type& p1 ) ; public : wxMacObjectFunctor1( classtype *obj , function f , param1type p1 ) : - wxMacFunctor( ) + wxMacFunctor() { m_object = obj ; m_function = f ; @@ -104,45 +81,46 @@ public : } wxMacObjectFunctor1( classtype *obj , ref_function f , param1type p1 ) : - wxMacFunctor( ) + wxMacFunctor() { m_object = obj ; m_refFunction = f ; m_param1 = p1 ; } - ~wxMacObjectFunctor1() {} + virtual ~wxMacObjectFunctor1() {} virtual void* operator()() { - (m_object->*m_function)(m_param1) ; + (m_object->*m_function)( m_param1 ) ; return NULL ; } + private : classtype* m_object ; param1type m_param1 ; union { - function m_function ; - ref_function m_refFunction ; + function m_function ; + ref_function m_refFunction ; } ; } ; template void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( param1type p1 ) , param1type p1 ) { - wxMacObjectFunctor1 params(object,function,p1) ; + wxMacObjectFunctor1 params(object, function, p1) ; void *result = - MPRemoteCall( wxMacFunctor::CallBackProc , ¶ms , kMPOwningProcessRemoteContext ) ; + MPRemoteCall( wxMacFunctor::CallBackProc , ¶ms , kMPOwningProcessRemoteContext ) ; return result ; } template void* wxMacMPRemoteCall( classtype *object , void (classtype::*function)( const param1type& p1 ) , param1type p1 ) { - wxMacObjectFunctor1 params(object,function,p1) ; + wxMacObjectFunctor1 params(object, function, p1) ; void *result = - MPRemoteCall( wxMacFunctor::CallBackProc , ¶ms , kMPOwningProcessRemoteContext ) ; + MPRemoteCall( wxMacFunctor::CallBackProc , ¶ms , kMPOwningProcessRemoteContext ) ; return result ; } @@ -163,79 +141,122 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con wxMutexGuiEnter() ; return result ; } -// common interface for all implementations -class wxMacTextControl : public wxMacControl + +class WXDLLEXPORT wxMacPortSaver { -public : - wxMacTextControl( wxTextCtrl *peer ) ; - ~wxMacTextControl() ; + DECLARE_NO_COPY_CLASS(wxMacPortSaver) - virtual wxString GetStringValue() const = 0 ; - virtual void SetStringValue( const wxString &val ) = 0 ; - virtual void SetStyle(long start, long end, const wxTextAttr& style) ; - virtual void Copy() ; - virtual void Cut() ; - virtual void Paste() ; - virtual bool CanPaste() const ; - virtual void SetEditable(bool editable) ; - virtual wxTextPos GetLastPosition() const ; - virtual void Replace( long from , long to , const wxString str ) ; - virtual void Remove( long from , long to ) = 0 ; - virtual void SetSelection( long from , long to ) = 0 ; - virtual void GetSelection( long* from, long* to) const = 0 ; - virtual void WriteText(const wxString& str) = 0 ; +public: + wxMacPortSaver( GrafPtr port ); + ~wxMacPortSaver(); +private : + GrafPtr m_port; +}; - virtual void Clear() ; - virtual bool CanUndo() const; - virtual void Undo() ; - virtual bool CanRedo() const; - virtual void Redo() ; - virtual int GetNumberOfLines() const ; - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const ; - virtual void ShowPosition( long WXUNUSED(pos) ) ; - virtual int GetLineLength(long lineNo) const ; - virtual wxString GetLineText(long lineNo) const ; -#ifndef __WXMAC_OSX__ - virtual void MacControlUserPaneDrawProc(wxInt16 part) = 0 ; - virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) = 0 ; - virtual wxInt16 MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) = 0 ; - virtual void MacControlUserPaneIdleProc() = 0 ; - virtual wxInt16 MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) = 0 ; - virtual void MacControlUserPaneActivateProc(bool activating) = 0 ; - virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) = 0 ; - virtual void MacControlUserPaneBackgroundProc(void* info) = 0 ; -#endif -} ; +/* + Clips to the visible region of a control within the current port + */ + +class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver +{ + DECLARE_NO_COPY_CLASS(wxMacWindowClipper) + +public: + wxMacWindowClipper( const wxWindow* win ); + ~wxMacWindowClipper(); +private: + GrafPtr m_newPort; + RgnHandle m_formerClip; + RgnHandle m_newClip; +}; + +wxMacPortSaver::wxMacPortSaver( GrafPtr port ) +{ + ::GetPort( &m_port ); + ::SetPort( port ); +} + +wxMacPortSaver::~wxMacPortSaver() +{ + ::SetPort( m_port ); +} + +wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : +wxMacPortSaver( (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ) +{ + m_newPort = (GrafPtr) GetWindowPort( (WindowRef) win->MacGetTopLevelWindowRef() ) ; + m_formerClip = NewRgn() ; + m_newClip = NewRgn() ; + GetClip( m_formerClip ) ; + + if ( win ) + { + // guard against half constructed objects, this just leads to a empty clip + if ( win->GetPeer() ) + { + int x = 0 , y = 0; + win->MacWindowToRootWindow( &x, &y ) ; + + // get area including focus rect + HIShapeGetAsQDRgn( ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ); + if ( !EmptyRgn( m_newClip ) ) + OffsetRgn( m_newClip , x , y ) ; + } + + SetClip( m_newClip ) ; + } +} + +wxMacWindowClipper::~wxMacWindowClipper() +{ + SetPort( m_newPort ) ; + SetClip( m_formerClip ) ; + DisposeRgn( m_newClip ) ; + DisposeRgn( m_formerClip ) ; +} // common parts for implementations based on MLTE class wxMacMLTEControl : public wxMacTextControl { public : - wxMacMLTEControl( wxTextCtrl *peer ) : wxMacTextControl( peer ) {} + wxMacMLTEControl( wxTextCtrl *peer ) ; + virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; + virtual void SetStringValue( const wxString &str ) ; static TXNFrameOptions FrameOptionsFromWXStyle( long wxStyle ) ; - void AdjustCreationAttributes( const wxColour& background , bool visible ) ; - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ; - virtual void SetBackground( const wxBrush &brush) ; - virtual void SetStyle(long start, long end, const wxTextAttr& style) ; + void AdjustCreationAttributes( const wxColour& background, bool visible ) ; + + virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ; + virtual void SetBackgroundColour(const wxColour& col ); + virtual void SetStyle( long start, long end, const wxTextAttr& style ) ; virtual void Copy() ; virtual void Cut() ; virtual void Paste() ; virtual bool CanPaste() const ; - virtual void SetEditable(bool editable) ; + virtual void SetEditable( bool editable ) ; virtual wxTextPos GetLastPosition() const ; - virtual void Replace( long from , long to , const wxString str ) ; - virtual void Remove( long from , long to ) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ) ; + virtual void Replace( long from, long to, const wxString &str ) ; + virtual void Remove( long from, long to ) ; + virtual void GetSelection( long* from, long* to ) const ; + virtual void SetSelection( long from, long to ) ; + + virtual void WriteText( const wxString& str ) ; - virtual void WriteText(const wxString& str) ; + virtual bool HasOwnContextMenu() const + { + TXNCommandEventSupportOptions options ; + TXNGetCommandEventSupport( m_txn , & options ) ; + return options & kTXNSupportEditCommandProcessing ; + } + + virtual void CheckSpelling(bool check) + { + TXNSetSpellCheckAsYouType( m_txn, (Boolean) check ); + } virtual void Clear() ; virtual bool CanUndo() const ; @@ -250,18 +271,16 @@ public : virtual wxString GetLineText(long lineNo) const ; void SetTXNData( const wxString& st , TXNOffset start , TXNOffset end ) ; + TXNObject GetTXNObject() { return m_txn ; } protected : void TXNSetAttribute( const wxTextAttr& style , long from , long to ) ; + TXNObject m_txn ; } ; -#if TARGET_API_MAC_OSX - // implementation available under OSX -#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - class wxMacMLTEHIViewControl : public wxMacMLTEControl { public : @@ -269,42 +288,16 @@ public : const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; + virtual ~wxMacMLTEHIViewControl() ; + virtual OSStatus SetFocus( ControlFocusPart focusPart ) ; virtual bool HasFocus() const ; - virtual bool NeedsFocusRect() const; + virtual void SetBackgroundColour(const wxColour& col ) ; + protected : HIViewRef m_scrollView ; HIViewRef m_textView ; -} ; - -#endif - -class wxMacUnicodeTextControl : public wxMacTextControl -{ -public : - wxMacUnicodeTextControl( wxTextCtrl *wxPeer, - const wxString& str, - const wxPoint& pos, - const wxSize& size, long style ) ; - ~wxMacUnicodeTextControl(); - virtual void VisibilityChanged(bool shown); - virtual wxString GetStringValue() const ; - virtual void SetStringValue( const wxString &str) ; - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - virtual bool CanPaste() const; - virtual void SetEditable(bool editable) ; - virtual void Remove( long from , long to ) ; - virtual void GetSelection( long* from, long* to) const ; - virtual void SetSelection( long from , long to ) ; - virtual void WriteText(const wxString& str) ; -protected : - // contains the tag for the content (is different for password and non-password controls) - OSType m_valueTag ; -} ; - -#endif +}; // 'classic' MLTE implementation @@ -315,9 +308,10 @@ public : const wxString& str, const wxPoint& pos, const wxSize& size, long style ) ; - ~wxMacMLTEClassicControl() ; + virtual ~wxMacMLTEClassicControl() ; + virtual void VisibilityChanged(bool shown) ; - virtual bool NeedsFocusRect() const; + virtual void SuperChangedPosition() ; virtual void MacControlUserPaneDrawProc(wxInt16 part) ; virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ; @@ -328,35 +322,45 @@ public : virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) ; virtual void MacControlUserPaneBackgroundProc(void* info) ; + virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) ) + { + MacControlUserPaneIdleProc(); + return true; + } + virtual void SetRect( Rect *r ) ; protected : OSStatus DoCreate(); - + void MacUpdatePosition() ; - void MacActivatePaneText(Boolean setActive) ; - void MacFocusPaneText(Boolean setFocus) ; + void MacActivatePaneText(bool setActive) ; + void MacFocusPaneText(bool setFocus) ; + void MacSetObjectVisibility(bool vis) ; - void MacSetObjectVisibility(Boolean vis) ; private : TXNFrameID m_txnFrameID ; GrafPtr m_txnPort ; + WindowRef m_txnWindow ; // bounds of the control as we last did set the txn frames Rect m_txnControlBounds ; + Rect m_txnVisBounds ; - bool m_txnIsFocused ; - bool m_txnIsActive ; - bool m_txnIsVisible ; - bool m_controlIsActive ; -} ; + static pascal void TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) ; + static pascal void TXNScrollInfoProc( + SInt32 iValue, SInt32 iMaximumValue, + TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon ) ; + + ControlRef m_sbHorizontal ; + SInt32 m_lastHorizontalValue ; + ControlRef m_sbVertical ; + SInt32 m_lastVerticalValue ; +}; -#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) - EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground ) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) EVT_CHAR(wxTextCtrl::OnChar) EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) @@ -364,83 +368,120 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste) EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo) EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo) + EVT_MENU(wxID_CLEAR, wxTextCtrl::OnDelete) + EVT_MENU(wxID_SELECTALL, wxTextCtrl::OnSelectAll) + + EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu) EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut) EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy) EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) + EVT_UPDATE_UI(wxID_CLEAR, wxTextCtrl::OnUpdateDelete) + EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll) END_EVENT_TABLE() -#endif -// Text item + void wxTextCtrl::Init() { - m_editable = true ; - m_dirty = false; + m_editable = true ; + m_dirty = false; - m_maxLength = TE_UNLIMITED_LENGTH ; + m_maxLength = 0; + m_privateContextMenu = NULL; + m_triggerOnSetValue = true ; } wxTextCtrl::~wxTextCtrl() { + delete m_privateContextMenu; } - -bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, - const wxString& str, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxTextCtrl::Create( wxWindow *parent, + wxWindowID id, + const wxString& str, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name ) { m_macIsUserPane = false ; m_editable = true ; - if ( ! ( style & wxNO_BORDER) ) - style = ( style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ; + if ( ! (style & wxNO_BORDER) ) + style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ; - if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) ) + if ( !wxTextCtrlBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) ) return false; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - if ( m_windowStyle & wxTE_MULTILINE ) { - wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER), - wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") ); - + // always turn on this style for multi-line controls m_windowStyle |= wxTE_PROCESS_ENTER; style |= wxTE_PROCESS_ENTER ; } -#ifdef __WXMAC_OSX__ -#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - if ( UMAGetSystemVersion() >= 0x1030 ) + CreatePeer( str, pos, size, style ); + + MacPostControlCreate(pos, size) ; + + // only now the embedding is correct and we can do a positioning update + + MacSuperChangedPosition() ; + + if ( m_windowStyle & wxTE_READONLY) + SetEditable( false ) ; + + SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ; + + return true; +} + +void wxTextCtrl::CreatePeer( + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) +{ + bool forceMLTE = false ; + +#if wxUSE_SYSTEM_OPTIONS + if (wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_MLTE ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1)) { - m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ; + forceMLTE = true ; } #endif -#if !wxMAC_AWAYS_USE_MLTE - if ( !m_peer ) + + if ( UMAGetSystemVersion() >= 0x1050 ) + forceMLTE = false; + + if ( !forceMLTE ) { - m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ; + if ( m_windowStyle & wxTE_MULTILINE || ( UMAGetSystemVersion() >= 0x1050 ) ) + m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ; } -#endif -#endif + if ( !m_peer ) { - m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ; + if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE ) + { + m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ; + } } - MacPostControlCreate(pos,size) ; - - if ( m_windowStyle & wxTE_READONLY) - { - SetEditable( false ) ; - } + // the horizontal single line scrolling bug that made us keep the classic implementation + // is fixed in 10.5 +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + if ( !m_peer ) + m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ; +#endif +} - return true; +void wxTextCtrl::MacSuperChangedPosition() +{ + wxWindow::MacSuperChangedPosition() ; + GetPeer()->SuperChangedPosition() ; } void wxTextCtrl::MacVisibilityChanged() @@ -448,8 +489,9 @@ void wxTextCtrl::MacVisibilityChanged() GetPeer()->VisibilityChanged( MacIsReallyShown() ) ; } -void wxTextCtrl::MacEnabledStateChanged() +void wxTextCtrl::MacCheckSpelling(bool check) { + GetPeer()->CheckSpelling(check); } wxString wxTextCtrl::GetValue() const @@ -462,18 +504,18 @@ void wxTextCtrl::GetSelection(long* from, long* to) const GetPeer()->GetSelection( from , to ) ; } -void wxTextCtrl::SetValue(const wxString& str) +void wxTextCtrl::DoSetValue(const wxString& str, int flags) { // optimize redraws if ( GetValue() == str ) - return ; + return; - GetPeer()->SetStringValue(str) ; + GetPeer()->SetStringValue( str ) ; - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); - event.SetString( GetValue() ) ; - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue ) + { + SendTextUpdatedEvent(); + } } void wxTextCtrl::SetMaxLength(unsigned long len) @@ -487,12 +529,14 @@ bool wxTextCtrl::SetFont( const wxFont& font ) return false ; GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ; + return true ; } bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) { GetPeer()->SetStyle( start , end , style ) ; + return true ; } @@ -500,16 +544,16 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style) { wxTextCtrlBase::SetDefaultStyle( style ) ; SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ; + return true ; } // Clipboard operations + void wxTextCtrl::Copy() { if (CanCopy()) - { GetPeer()->Copy() ; - } } void wxTextCtrl::Cut() @@ -518,9 +562,9 @@ void wxTextCtrl::Cut() { GetPeer()->Cut() ; - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent( event ); } } @@ -529,11 +573,12 @@ void wxTextCtrl::Paste() if (CanPaste()) { GetPeer()->Paste() ; - // eventually we should add setting the default style again - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + // TODO: eventually we should add setting the default style again + + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent( event ); } } @@ -541,19 +586,20 @@ bool wxTextCtrl::CanCopy() const { // Can copy if there's a selection long from, to; - GetSelection(& from, & to); + GetSelection( &from, &to ); + return (from != to); } bool wxTextCtrl::CanCut() const { if ( !IsEditable() ) - { - return false ; - } + return false; + // Can cut if there's a selection long from, to; - GetSelection(& from, & to); + GetSelection( &from, &to ); + return (from != to); } @@ -582,24 +628,25 @@ void wxTextCtrl::SetInsertionPoint(long pos) void wxTextCtrl::SetInsertionPointEnd() { wxTextPos pos = GetLastPosition(); - SetInsertionPoint(pos); + SetInsertionPoint( pos ); } long wxTextCtrl::GetInsertionPoint() const { - long begin,end ; + long begin, end ; GetSelection( &begin , &end ) ; + return begin ; } wxTextPos wxTextCtrl::GetLastPosition() const { - return GetPeer()->GetLastPosition( ) ; + return GetPeer()->GetLastPosition() ; } void wxTextCtrl::Replace(long from, long to, const wxString& str) { - GetPeer()->Replace( from , to , str) ; + GetPeer()->Replace( from , to , str ) ; } void wxTextCtrl::Remove(long from, long to) @@ -612,36 +659,25 @@ void wxTextCtrl::SetSelection(long from, long to) GetPeer()->SetSelection( from , to ) ; } -bool wxTextCtrl::LoadFile(const wxString& file) -{ - if ( wxTextCtrlBase::LoadFile(file) ) - { - return true; - } - - return false; -} - void wxTextCtrl::WriteText(const wxString& str) { - // TODO this MPRemoting will be moved into a remoting peer proxy for any command + // TODO: this MPRemoting will be moved into a remoting peer proxy for any command if ( !wxIsMainThread() ) { - // unfortunately CW 8 is not able to correctly deduce the template types, so we have - // to instantiate explicitely + // unfortunately CW 8 is not able to correctly deduce the template types, + // so we have to instantiate explicitly wxMacMPRemoteGUICall( this , &wxTextCtrl::WriteText , str ) ; + return ; } - else - { - GetPeer()->WriteText( str ) ; - } + + GetPeer()->WriteText( str ) ; } void wxTextCtrl::AppendText(const wxString& text) { SetInsertionPointEnd(); - WriteText(text); + WriteText( text ); } void wxTextCtrl::Clear() @@ -667,24 +703,26 @@ bool wxTextCtrl::AcceptsFocus() const wxSize wxTextCtrl::DoGetBestSize() const { - int wText = 100 ; - - int hText; + int wText, hText; - // these are the numbers from the HIG, we reduce them by the borders - // first + // these are the numbers from the HIG: + // we reduce them by the borders first + wText = 100 ; - switch( m_windowVariant ) + switch ( m_windowVariant ) { case wxWINDOW_VARIANT_NORMAL : hText = 22 - 6 ; break ; + case wxWINDOW_VARIANT_SMALL : hText = 19 - 6 ; break ; + case wxWINDOW_VARIANT_MINI : - hText= 15 - 6 ; + hText = 15 - 6 ; break ; + default : hText = 22 - 6; break ; @@ -693,9 +731,7 @@ wxSize wxTextCtrl::DoGetBestSize() const // as the above numbers have some free space around the text // we get 5 lines like this anyway if ( m_windowStyle & wxTE_MULTILINE ) - { hText *= 5 ; - } if ( !HasFlag(wxNO_BORDER) ) hText += 6 ; @@ -710,34 +746,28 @@ wxSize wxTextCtrl::DoGetBestSize() const void wxTextCtrl::Undo() { if (CanUndo()) - { GetPeer()->Undo() ; - } } void wxTextCtrl::Redo() { if (CanRedo()) - { GetPeer()->Redo() ; - } } bool wxTextCtrl::CanUndo() const { if ( !IsEditable() ) - { return false ; - } + return GetPeer()->CanUndo() ; } bool wxTextCtrl::CanRedo() const { if ( !IsEditable() ) - { return false ; - } + return GetPeer()->CanRedo() ; } @@ -763,7 +793,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const { - return GetPeer()->PositionToXY(pos , x , y ) ; + return GetPeer()->PositionToXY( pos , x , y ) ; } void wxTextCtrl::ShowPosition(long pos) @@ -781,32 +811,17 @@ wxString wxTextCtrl::GetLineText(long lineNo) const return GetPeer()->GetLineText(lineNo) ; } -/* - * Text item - */ - void wxTextCtrl::Command(wxCommandEvent & event) { - SetValue (event.GetString()); - ProcessCommand (event); + SetValue(event.GetString()); + ProcessCommand(event); } void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) { // By default, load the first file into the text window. if (event.GetNumberOfFiles() > 0) - { - LoadFile(event.GetFiles()[0]); - } -} - -void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) -{ - // all erasing should be done by the real mac control implementation - // while this is true for MLTE under classic, the HITextView is somehow - // transparent but background erase is not working correctly, so intercept - // things while we can... - event.Skip() ; + LoadFile( event.GetFiles()[0] ); } void wxTextCtrl::OnChar(wxKeyEvent& event) @@ -814,29 +829,40 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) int key = event.GetKeyCode() ; bool eat_key = false ; + if ( key == 'a' && event.MetaDown() ) + { + SelectAll() ; + + return ; + } + if ( key == 'c' && event.MetaDown() ) { if ( CanCopy() ) Copy() ; + return ; } if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB && - !( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) ) -/* && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */ + !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) ) +// && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END ) { // eat it return ; } - // Check if we have reached the max # of chars, but still allow navigation and deletion - if ( !IsMultiLine() && GetValue().Length() >= m_maxLength && + // Check if we have reached the max # of chars (if it is set), but still + // allow navigation and deletion + if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB && - key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxPROCESS_ENTER) ) + key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) ) { // eat it, we don't want to add more than allowed # of characters + + // TODO: generate EVT_TEXT_MAXLEN() return; } @@ -847,50 +873,50 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) { if ( CanPaste() ) Paste() ; + return ; } + if ( key == 'x' && event.MetaDown() ) { if ( CanCut() ) Cut() ; + return ; } + switch ( key ) { case WXK_RETURN: - if (m_windowStyle & wxPROCESS_ENTER) + if (m_windowStyle & wxTE_PROCESS_ENTER) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject( this ); event.SetString( GetValue() ); - if ( GetEventHandler()->ProcessEvent(event) ) + if ( HandleWindowEvent(event) ) return; } + if ( !(m_windowStyle & wxTE_MULTILINE) ) { - wxWindow *parent = GetParent(); - while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { - parent = parent->GetParent() ; - } - if ( parent && parent->GetDefaultItem() ) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw && tlw->GetDefaultItem() ) { - wxButton *def = wxDynamicCast(parent->GetDefaultItem(), - wxButton); + wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton); if ( def && def->IsEnabled() ) { wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); + return ; - } + } } // this will make wxWidgets eat the ENTER key so that - // we actually prevent line wrapping in a single line - // text control + // we actually prevent line wrapping in a single line text control eat_key = true; } - break; case WXK_TAB: @@ -902,46 +928,37 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) if (event.ControlDown()) flags |= wxNavigationKeyEvent::WinChange ; Navigate(flags); + return; } else { - // This is necessary (don't know why) or the tab will not - // be inserted. + // This is necessary (don't know why); + // otherwise the tab will not be inserted. WriteText(wxT("\t")); + eat_key = true; } + break; + default: break; } if (!eat_key) { // perform keystroke handling - if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) - CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; - else - { - EventRecord rec ; - if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ) - { - EventRecord *ev = &rec ; - short keycode ; - short keychar ; - keychar = short(ev->message & charCodeMask); - keycode = short(ev->message & keyCodeMask) >> 8 ; - - m_peer->HandleKey( keycode , keychar , ev->modifiers ) ; - } - } + event.Skip(true) ; } + if ( ( key >= 0x20 && key < WXK_START ) || + ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) || key == WXK_RETURN || key == WXK_DELETE || key == WXK_BACK) { wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); event1.SetEventObject( this ); - wxPostEvent(GetEventHandler(),event1); + wxPostEvent( GetEventHandler(), event1 ); } } @@ -974,6 +991,20 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event)) Redo(); } +void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event)) +{ + long from, to; + + GetSelection( &from, &to ); + if (from != -1 && to != -1) + Remove( from, to ); +} + +void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event)) +{ + SetSelection(-1, -1); +} + void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event) { event.Enable( CanCut() ); @@ -999,55 +1030,55 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } -bool wxTextCtrl::MacSetupCursor( const wxPoint& pt ) +void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event) { - return true ; -} -#if !TARGET_API_MAC_OSX - -// user pane implementation + long from, to; -void wxTextCtrl::MacControlUserPaneDrawProc(wxInt16 part) -{ - GetPeer()->MacControlUserPaneDrawProc( part ) ; + GetSelection( &from, &to ); + event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ; } -wxInt16 wxTextCtrl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) +void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) { - return GetPeer()->MacControlUserPaneHitTestProc( x , y ) ; + event.Enable(GetLastPosition() > 0); } -wxInt16 wxTextCtrl::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) -{ - return GetPeer()->MacControlUserPaneTrackingProc( x , y , actionProc ) ; -} +// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment -void wxTextCtrl::MacControlUserPaneIdleProc() +void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event) { - GetPeer()->MacControlUserPaneIdleProc( ) ; -} + if ( GetPeer()->HasOwnContextMenu() ) + { + event.Skip() ; + return ; + } -wxInt16 wxTextCtrl::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) -{ - return GetPeer()->MacControlUserPaneKeyDownProc( keyCode , charCode , modifiers ) ; -} + if (m_privateContextMenu == NULL) + { + m_privateContextMenu = new wxMenu; + m_privateContextMenu->Append(wxID_UNDO, _("&Undo")); + m_privateContextMenu->Append(wxID_REDO, _("&Redo")); + m_privateContextMenu->AppendSeparator(); + m_privateContextMenu->Append(wxID_CUT, _("Cu&t")); + m_privateContextMenu->Append(wxID_COPY, _("&Copy")); + m_privateContextMenu->Append(wxID_PASTE, _("&Paste")); + m_privateContextMenu->Append(wxID_CLEAR, _("&Delete")); + m_privateContextMenu->AppendSeparator(); + m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All")); + } -void wxTextCtrl::MacControlUserPaneActivateProc(bool activating) -{ - GetPeer()->MacControlUserPaneActivateProc( activating ) ; + if (m_privateContextMenu != NULL) + PopupMenu(m_privateContextMenu); } -wxInt16 wxTextCtrl::MacControlUserPaneFocusProc(wxInt16 action) +bool wxTextCtrl::MacSetupCursor( const wxPoint& pt ) { - return GetPeer()->MacControlUserPaneFocusProc( action ) ; + if ( !GetPeer()->SetupCursor( pt ) ) + return wxWindow::MacSetupCursor( pt ) ; + else + return true ; } -void wxTextCtrl::MacControlUserPaneBackgroundProc(void* info) -{ - GetPeer()->MacControlUserPaneBackgroundProc( info ) ; -} - -#endif // ---------------------------------------------------------------------------- // implementation base class // ---------------------------------------------------------------------------- @@ -1061,7 +1092,9 @@ wxMacTextControl::~wxMacTextControl() { } -void wxMacTextControl::SetStyle(long start, long end, const wxTextAttr& style) +void wxMacTextControl::SetStyle(long WXUNUSED(start), + long WXUNUSED(end), + const wxTextAttr& WXUNUSED(style)) { } @@ -1082,17 +1115,25 @@ bool wxMacTextControl::CanPaste() const return false ; } -void wxMacTextControl::SetEditable(bool editable) +void wxMacTextControl::SetEditable(bool WXUNUSED(editable)) { } wxTextPos wxMacTextControl::GetLastPosition() const { - return GetStringValue().Length() ; + return GetStringValue().length() ; } -void wxMacTextControl::Replace( long from , long to , const wxString str ) +void wxMacTextControl::Replace( long from , long to , const wxString &val ) { + SetSelection( from , to ) ; + WriteText( val ) ; +} + +void wxMacTextControl::Remove( long from , long to ) +{ + SetSelection( from , to ) ; + WriteText( wxEmptyString) ; } void wxMacTextControl::Clear() @@ -1105,7 +1146,9 @@ bool wxMacTextControl::CanUndo() const return false ; } -void wxMacTextControl::Undo() { } +void wxMacTextControl::Undo() +{ +} bool wxMacTextControl::CanRedo() const { @@ -1116,12 +1159,14 @@ void wxMacTextControl::Redo() { } -long wxMacTextControl::XYToPosition(long x, long y) const +long wxMacTextControl::XYToPosition(long WXUNUSED(x), long WXUNUSED(y)) const { return 0 ; } -bool wxMacTextControl::PositionToXY(long pos, long *x, long *y) const +bool wxMacTextControl::PositionToXY(long WXUNUSED(pos), + long *WXUNUSED(x), + long *WXUNUSED(y)) const { return false ; } @@ -1135,28 +1180,31 @@ int wxMacTextControl::GetNumberOfLines() const ItemCount lines = 0 ; wxString content = GetStringValue() ; lines = 1; - for (size_t i = 0; i < content.Length() ; i++) + + for (size_t i = 0; i < content.length() ; i++) { - if (content[i] == '\r') lines++; + if (content[i] == '\r') + lines++; } + return lines ; } wxString wxMacTextControl::GetLineText(long lineNo) const { - // TODO change this if possible to reflect real lines + // TODO: change this if possible to reflect real lines wxString content = GetStringValue() ; // Find line first int count = 0; - for (size_t i = 0; i < content.Length() ; i++) + for (size_t i = 0; i < content.length() ; i++) { if (count == lineNo) { // Add chars in line then wxString tmp; - for (size_t j = i; j < content.Length(); j++) + for (size_t j = i; j < content.length(); j++) { if (content[j] == '\n') return tmp; @@ -1166,34 +1214,41 @@ wxString wxMacTextControl::GetLineText(long lineNo) const return tmp; } - if (content[i] == '\n') count++; + + if (content[i] == '\n') + count++; } + return wxEmptyString ; } -int wxMacTextControl::GetLineLength(long lineNo) const +int wxMacTextControl::GetLineLength(long lineNo) const { - // TODO change this if possible to reflect real lines + // TODO: change this if possible to reflect real lines wxString content = GetStringValue() ; // Find line first int count = 0; - for (size_t i = 0; i < content.Length() ; i++) + for (size_t i = 0; i < content.length() ; i++) { if (count == lineNo) { // Count chars in line then count = 0; - for (size_t j = i; j < content.Length(); j++) + for (size_t j = i; j < content.length(); j++) { count++; - if (content[j] == '\n') return count; + if (content[j] == '\n') + return count; } return count; } - if (content[i] == '\n') count++; + + if (content[i] == '\n') + count++; } + return 0 ; } @@ -1201,28 +1256,103 @@ int wxMacTextControl::GetLineLength(long lineNo) const // standard unicode control implementation // ---------------------------------------------------------------------------- -#if TARGET_API_MAC_OSX +// the current unicode textcontrol implementation has a bug : only if the control +// is currently having the focus, the selection can be retrieved by the corresponding +// data tag. So we have a mirroring using a member variable +// TODO : build event table using virtual member functions for wxMacControl + +static const EventTypeSpec unicodeTextControlEventList[] = +{ + { kEventClassControl , kEventControlSetFocusPart } , +} ; + +static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + wxMacUnicodeTextControl* focus = (wxMacUnicodeTextControl*) data ; + wxMacCarbonEvent cEvent( event ) ; + + switch ( GetEventKind( event ) ) + { + case kEventControlSetFocusPart : + { + ControlPartCode controlPart = cEvent.GetParameter(kEventParamControlPart , typeControlPartCode ); + if ( controlPart == kControlFocusNoPart ) + { + // about to loose focus -> store selection to field + focus->GetData( 0, kControlEditTextSelectionTag, &focus->m_selection ); + } + result = CallNextEventHandler(handler,event) ; + if ( controlPart != kControlFocusNoPart ) + { + // about to gain focus -> set selection from field + focus->SetData( 0, kControlEditTextSelectionTag, &focus->m_selection ); + } + break; + } + default: + break ; + } + + return result ; +} + +static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + switch ( GetEventClass( event ) ) + { + case kEventClassControl : + result = wxMacUnicodeTextControlControlEventHandler( handler , event , data ) ; + break ; + + default : + break ; + } + return result ; +} + +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler ) + +wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) : wxMacTextControl( wxPeer ) +{ +} wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer, - const wxString& str, - const wxPoint& pos, - const wxSize& size, long style ) : wxMacTextControl( wxPeer ) + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) + : wxMacTextControl( wxPeer ) +{ + Create( wxPeer, str, pos, size, style ); +} + +bool wxMacUnicodeTextControl::Create( wxTextCtrl *wxPeer, + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; + m_selection.selStart = m_selection.selEnd = 0; Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ; wxString st = str ; wxMacConvertNewlines10To13( &st ) ; - wxMacCFStringHolder cf(st , m_font.GetEncoding()) ; + wxCFStringRef cf(st , m_font.GetEncoding()) ; CFStringRef cfr = cf ; - Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ; - m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ; - CreateEditUnicodeTextControl( MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr , isPassword , NULL , &m_controlRef ) ; + + m_valueTag = kControlEditTextCFStringTag ; + CreateControl( wxPeer, &bounds, cfr ); if ( !(m_windowStyle & wxTE_MULTILINE) ) - { SetData( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ; - } + + InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(), + GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this, + NULL); + + return true; } wxMacUnicodeTextControl::~wxMacUnicodeTextControl() @@ -1233,114 +1363,170 @@ void wxMacUnicodeTextControl::VisibilityChanged(bool shown) { if ( !(m_windowStyle & wxTE_MULTILINE) && shown ) { - // work around a refresh issue insofar as not always the entire content is shown even if this would be possible + // work around a refresh issue insofar as not always the entire content is shown, + // even if this would be possible ControlEditTextSelectionRec sel ; CFStringRef value = NULL ; verify_noerr( GetData( 0, kControlEditTextSelectionTag, &sel ) ); - verify_noerr( GetData( 0, m_valueTag , &value ) ); + verify_noerr( GetData( 0, m_valueTag, &value ) ); verify_noerr( SetData( 0, m_valueTag, &value ) ); verify_noerr( SetData( 0, kControlEditTextSelectionTag, &sel ) ); CFRelease( value ) ; } } + wxString wxMacUnicodeTextControl::GetStringValue() const { wxString result ; - CFStringRef value = GetData(0,m_valueTag) ; + CFStringRef value = GetData(0, m_valueTag) ; if ( value ) { - wxMacCFStringHolder cf(value) ; + wxCFStringRef cf(value) ; result = cf.AsString() ; } + #if '\n' == 10 wxMacConvertNewlines13To10( &result ) ; #else wxMacConvertNewlines10To13( &result ) ; #endif + return result ; } -void wxMacUnicodeTextControl::SetStringValue( const wxString &str) + +void wxMacUnicodeTextControl::SetStringValue( const wxString &str ) { wxString st = str ; wxMacConvertNewlines10To13( &st ) ; - wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ; - verify_noerr( SetData( 0, m_valueTag , cf ) ) ; + wxCFStringRef cf( st , m_font.GetEncoding() ) ; + verify_noerr( SetData( 0, m_valueTag , cf ) ) ; +} + +void wxMacUnicodeTextControl::CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr ) +{ + Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ; + if ( isPassword ) + { + m_valueTag = kControlEditTextPasswordCFStringTag ; + } + OSStatus err = CreateEditUnicodeTextControl( + MAC_WXHWND(peer->MacGetTopLevelWindowRef()), bounds , cfr , + isPassword , NULL , &m_controlRef ) ; + verify_noerr( err ); } + void wxMacUnicodeTextControl::Copy() { SendHICommand( kHICommandCopy ) ; } + void wxMacUnicodeTextControl::Cut() { SendHICommand( kHICommandCut ) ; } + void wxMacUnicodeTextControl::Paste() { SendHICommand( kHICommandPaste ) ; } + bool wxMacUnicodeTextControl::CanPaste() const { return true ; } -void wxMacUnicodeTextControl::SetEditable(bool editable) -{ - SetData( 0 , kControlEditTextLockedTag , (Boolean) !editable ) ; -} -void wxMacUnicodeTextControl::Remove( long from , long to ) + +void wxMacUnicodeTextControl::SetEditable(bool WXUNUSED(editable)) { +#if 0 // leads to problem because text cannot be selected anymore + SetData( kControlEditTextPart , kControlEditTextLockedTag , (Boolean) !editable ) ; +#endif } -void wxMacUnicodeTextControl::GetSelection( long* from, long* to) const +void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const { ControlEditTextSelectionRec sel ; - verify_noerr(GetData( 0, kControlEditTextSelectionTag, &sel ) ) ; - if ( from ) *from = sel.selStart ; - if ( to ) *to = sel.selEnd ; + if (HasFocus()) + verify_noerr( GetData( 0, kControlEditTextSelectionTag, &sel ) ) ; + else + sel = m_selection ; + + if ( from ) + *from = sel.selStart ; + if ( to ) + *to = sel.selEnd ; } void wxMacUnicodeTextControl::SetSelection( long from , long to ) { ControlEditTextSelectionRec sel ; + wxString result ; + int textLength = 0 ; + CFStringRef value = GetData(0, m_valueTag) ; + if ( value ) + { + wxCFStringRef cf(value) ; + textLength = cf.AsString().length() ; + } + + if ((from == -1) && (to == -1)) + { + from = 0 ; + to = textLength ; + } + else + { + from = wxMin(textLength,wxMax(from,0)) ; + if ( to == -1 ) + to = textLength; + else + to = wxMax(0,wxMin(textLength,to)) ; + } + sel.selStart = from ; sel.selEnd = to ; - SetData( 0 , kControlEditTextSelectionTag, &sel ) ; + if ( HasFocus() ) + SetData( 0, kControlEditTextSelectionTag, &sel ) ; + else + m_selection = sel; } -void wxMacUnicodeTextControl::WriteText(const wxString& str) +void wxMacUnicodeTextControl::WriteText( const wxString& str ) { wxString st = str ; wxMacConvertNewlines10To13( &st ) ; - #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ; + + if ( HasFocus() ) + { + wxCFStringRef cf(st , m_font.GetEncoding() ) ; CFStringRef value = cf ; SetData( 0, kControlEditTextInsertCFStringRefTag, &value ); - #else + } + else + { wxString val = GetStringValue() ; long start , end ; GetSelection( &start , &end ) ; val.Remove( start , end - start ) ; val.insert( start , str ) ; SetStringValue( val ) ; - SetSelection( start + str.Length() , start + str.Length() ) ; - #endif + SetSelection( start + str.length() , start + str.length() ) ; + } } -#endif - // ---------------------------------------------------------------------------- // MLTE control implementation (common part) // ---------------------------------------------------------------------------- -// if mlte is on read only , no changes at all are allowed, not even from +// if MTLE is read only, no changes at all are allowed, not even from // procedural API, in order to allow changes via API all the same we must undo // the readonly status while we are executing, this class helps to do so -class EditHelper +class wxMacEditHelper { public : - EditHelper( TXNObject txn ) + wxMacEditHelper( TXNObject txn ) { TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; m_txn = txn ; @@ -1351,65 +1537,79 @@ public : TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ; } } - ~EditHelper() + + ~wxMacEditHelper() { TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; if ( m_data[0].uValue == kTXNReadOnly ) - { TXNSetTXNObjectControls( m_txn , false , 1 , tag , m_data ) ; - } } - protected : - TXNObject m_txn ; - TXNControlData m_data[1] ; + +protected : + TXNObject m_txn ; + TXNControlData m_data[1] ; } ; +wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer ) + : wxMacTextControl( peer ) +{ + SetNeedsFocusRect( true ) ; +} + wxString wxMacMLTEControl::GetStringValue() const { wxString result ; OSStatus err ; Size actualSize = 0; + { #if wxUSE_UNICODE Handle theText ; - err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNUnicodeTextData ); + err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData ); + // all done - if ( err ) + if ( err != noErr ) { actualSize = 0 ; } else { - actualSize = GetHandleSize( theText ) / sizeof( UniChar) ; + actualSize = GetHandleSize( theText ) / sizeof(UniChar) ; if ( actualSize > 0 ) { wxChar *ptr = NULL ; + #if SIZEOF_WCHAR_T == 2 - ptr = new wxChar[actualSize + 1 ] ; - wxStrncpy( ptr , (wxChar*) *theText , actualSize ) ; + ptr = new wxChar[actualSize + 1] ; + wxStrncpy( ptr , (wxChar*)(*theText) , actualSize ) ; #else - SetHandleSize( theText , ( actualSize + 1 ) * sizeof( UniChar ) ) ; + SetHandleSize( theText, (actualSize + 1) * sizeof(UniChar) ) ; HLock( theText ) ; (((UniChar*)*theText)[actualSize]) = 0 ; - wxMBConvUTF16BE converter ; + wxMBConvUTF16 converter ; size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ; + wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") ); ptr = new wxChar[noChars + 1] ; - noChars = converter.MB2WC( ptr , (const char*)*theText , noChars ) ; + noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ; + wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") ); ptr[noChars] = 0 ; HUnlock( theText ) ; #endif + ptr[actualSize] = 0 ; result = wxString( ptr ) ; - delete[] ptr ; + delete [] ptr ; } + DisposeHandle( theText ) ; } #else Handle theText ; - err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); + err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData ); + // all done - if ( err ) + if ( err != noErr ) { actualSize = 0 ; } @@ -1422,199 +1622,331 @@ wxString wxMacMLTEControl::GetStringValue() const result = wxString( *theText , wxConvLocal , actualSize ) ; HUnlock( theText ) ; } + DisposeHandle( theText ) ; } #endif } + #if '\n' == 10 wxMacConvertNewlines13To10( &result ) ; #else wxMacConvertNewlines10To13( &result ) ; #endif + return result ; } -void wxMacMLTEControl::SetStringValue( const wxString &str) +void wxMacMLTEControl::SetStringValue( const wxString &str ) { - wxString st = str ; + wxString st = str; + wxMacConvertNewlines10To13( &st ); - wxMacConvertNewlines10To13( &st ) ; - EditHelper help(m_txn) ; - -#if !TARGET_API_MAC_OSX - // otherwise scrolling might have problems ? -// MacUpdatePosition( m_controlRef ) ; + { +#ifndef __LP64__ + wxMacWindowClipper c( m_peer ) ; #endif - wxMacWindowClipper c( m_peer ) ; - SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; - TXNSetSelection( m_txn, 0, 0); - TXNShowSelection( m_txn, kTXNShowStart); + + { + wxMacEditHelper help( m_txn ); + SetTXNData( st, kTXNStartOffset, kTXNEndOffset ); + } + + TXNSetSelection( m_txn, 0, 0 ); + TXNShowSelection( m_txn, kTXNShowStart ); + } } TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle ) { - TXNFrameOptions frameOptions = - kTXNDontDrawCaretWhenInactiveMask ; - if ( ! ( wxStyle & wxTE_NOHIDESEL ) ) + TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask; + + frameOptions |= kTXNDoFontSubstitutionMask; + + if ( ! (wxStyle & wxTE_NOHIDESEL) ) frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ; + if ( wxStyle & (wxHSCROLL | wxTE_DONTWRAP) ) + frameOptions |= kTXNWantHScrollBarMask ; + if ( wxStyle & wxTE_MULTILINE ) { - if ( ! ( wxStyle & wxTE_DONTWRAP ) ) - frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ; - else - { + if ( ! (wxStyle & wxTE_DONTWRAP ) ) frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ; - frameOptions |= kTXNWantHScrollBarMask ; - } - if ( !(wxStyle & wxTE_NO_VSCROLL ) ) + if ( !(wxStyle & wxTE_NO_VSCROLL) ) + { frameOptions |= kTXNWantVScrollBarMask ; + + // The following code causes drawing problems on 10.4. Perhaps it can be restored for + // older versions of the OS, but I'm not sure it's appropriate to put a grow icon here + // anyways, as AFAIK users can't actually use it to resize the text ctrl. +// if ( frameOptions & kTXNWantHScrollBarMask ) +// frameOptions |= kTXNDrawGrowIconMask ; + } } else + { frameOptions |= kTXNSingleLineOnlyMask ; - - if ( wxStyle & wxHSCROLL ) - frameOptions |= kTXNWantHScrollBarMask ; + } return frameOptions ; } -void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, bool visible ) +void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background, + bool WXUNUSED(visible)) { - TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag }; - TXNControlData iControlData[3] = { {false}, {kTXNNoAutoWrap} }; - int toptag = 2 ; -#if TARGET_API_MAC_OSX - iControlTags[2] = kTXNVisibilityTag ; - iControlData[2].uValue = visible ; - toptag++ ; -#endif + TXNControlTag iControlTags[] = + { + kTXNDoFontSubstitution, + kTXNWordWrapStateTag , + }; + TXNControlData iControlData[] = + { + { true }, + { kTXNNoAutoWrap }, + }; + + int toptag = WXSIZEOF( iControlTags ) ; if ( m_windowStyle & wxTE_MULTILINE ) { - if (m_windowStyle & wxTE_DONTWRAP) - iControlData[1].uValue = kTXNNoAutoWrap ; - else - iControlData[1].uValue = kTXNAutoWrap ; + iControlData[1].uValue = + (m_windowStyle & wxTE_DONTWRAP) + ? kTXNNoAutoWrap + : kTXNAutoWrap; } - verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, - iControlTags, iControlData )) ; - // setting the default font + OSStatus err = TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ; + verify_noerr( err ); + + // setting the default font: + // under 10.2 this causes a visible caret, therefore we avoid it Str255 fontName ; SInt16 fontSize ; Style fontStyle ; - GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; + GetThemeFont( kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; TXNTypeAttributes typeAttr[] = { - { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } , - { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , - { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , + { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } , + { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } , + { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } , } ; - verify_noerr( TXNSetTypeAttributes (m_txn, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr, - kTXNStartOffset, - kTXNEndOffset) ); + err = TXNSetTypeAttributes( + m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes), + typeAttr, kTXNStartOffset, kTXNEndOffset ); + verify_noerr( err ); if ( m_windowStyle & wxTE_PASSWORD ) { - UniChar c = 0xA5 ; - verify_noerr(TXNEchoMode( m_txn , c , 0 , true )) ; + UniChar c = 0x00A5 ; + err = TXNEchoMode( m_txn , c , 0 , true ); + verify_noerr( err ); } TXNBackground tback; tback.bgType = kTXNBackgroundTypeRGB; - tback.bg.color = MAC_WXCOLORREF( background.GetPixel() ); - TXNSetBackground( m_txn , &tback); + background.GetRGBColor( &tback.bg.color ); + TXNSetBackground( m_txn , &tback ); + + + TXNCommandEventSupportOptions options ; + if ( TXNGetCommandEventSupport( m_txn, &options ) == noErr ) + { + options |= + kTXNSupportEditCommandProcessing + | kTXNSupportEditCommandUpdating + | kTXNSupportFontCommandProcessing + | kTXNSupportFontCommandUpdating; + + // only spell check when not read-only + // use system options for the default + bool checkSpelling = false ; + if ( !(m_windowStyle & wxTE_READONLY) ) + { +#if wxUSE_SYSTEM_OPTIONS + if ( wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_SPELL_CHECKER ) == 1) ) + { + checkSpelling = true ; + } +#endif + } + + if ( checkSpelling ) + options |= + kTXNSupportSpellCheckCommandProcessing + | kTXNSupportSpellCheckCommandUpdating; + + TXNSetCommandEventSupport( m_txn , options ) ; + } } -void wxMacMLTEControl::SetBackground( const wxBrush &brush ) +void wxMacMLTEControl::SetBackgroundColour(const wxColour& col ) { - // currently only solid background are supported TXNBackground tback; tback.bgType = kTXNBackgroundTypeRGB; - tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() ); - TXNSetBackground( m_txn , &tback); + col.GetRGBColor(&tback.bg.color); + TXNSetBackground( m_txn , &tback ); +} + +static inline int wxConvertToTXN(int x) +{ + return wx_static_cast(int, x / 254.0 * 72 + 0.5); } -void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to) +void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to ) { TXNTypeAttributes typeAttr[4] ; - Str255 fontName = "\pMonaco" ; - SInt16 fontSize = 12 ; - Style fontStyle = normal ; RGBColor color ; - int attrCounter = 0 ; + size_t typeAttrCount = 0 ; + + TXNMargins margins; + TXNControlTag controlTags[4]; + TXNControlData controlData[4]; + size_t controlAttrCount = 0; + + TXNTab* tabs = NULL; + + bool relayout = false; + if ( style.HasFont() ) { + wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) ); const wxFont &font = style.GetFont() ; - wxMacStringToPascal( font.GetFaceName() , fontName ) ; - fontSize = font.GetPointSize() ; - if ( font.GetUnderlined() ) - fontStyle |= underline ; - if ( font.GetWeight() == wxBOLD ) - fontStyle |= bold ; - if ( font.GetStyle() == wxITALIC ) - fontStyle |= italic ; - - typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ; - typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ; - typeAttr[attrCounter].data.dataPtr = (void*) fontName ; - typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ; - typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ; - typeAttr[attrCounter+1].data.dataValue = (fontSize << 16) ; - typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ; - typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ; - typeAttr[attrCounter+2].data.dataValue = fontStyle ; - attrCounter += 3 ; + typeAttr[typeAttrCount].tag = kTXNATSUIStyle ; + typeAttr[typeAttrCount].size = kTXNATSUIStyleSize ; + typeAttr[typeAttrCount].data.dataPtr = font.MacGetATSUStyle() ; + typeAttrCount++ ; } + if ( style.HasTextColour() ) { - typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ; - typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ; - typeAttr[attrCounter].data.dataPtr = (void*) &color ; - color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ; - attrCounter += 1 ; + wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) ); + style.GetTextColour().GetRGBColor( &color ); + typeAttr[typeAttrCount].tag = kTXNQDFontColorAttribute ; + typeAttr[typeAttrCount].size = kTXNQDFontColorAttributeSize ; + typeAttr[typeAttrCount].data.dataPtr = (void*) &color ; + typeAttrCount++ ; + } + + if ( style.HasAlignment() ) + { + wxASSERT( controlAttrCount < WXSIZEOF(controlTags) ); + SInt32 align; + + switch ( style.GetAlignment() ) + { + case wxTEXT_ALIGNMENT_LEFT: + align = kTXNFlushLeft; + break; + case wxTEXT_ALIGNMENT_CENTRE: + align = kTXNCenter; + break; + case wxTEXT_ALIGNMENT_RIGHT: + align = kTXNFlushRight; + break; + case wxTEXT_ALIGNMENT_JUSTIFIED: + align = kTXNFullJust; + break; + default : + case wxTEXT_ALIGNMENT_DEFAULT: + align = kTXNFlushDefault; + break; + } + + controlTags[controlAttrCount] = kTXNJustificationTag ; + controlData[controlAttrCount].sValue = align ; + controlAttrCount++ ; + } + + if ( style.HasLeftIndent() || style.HasRightIndent() ) + { + wxASSERT( controlAttrCount < WXSIZEOF(controlTags) ); + controlTags[controlAttrCount] = kTXNMarginsTag; + controlData[controlAttrCount].marginsPtr = &margins; + verify_noerr( TXNGetTXNObjectControls (m_txn, 1 , + &controlTags[controlAttrCount], &controlData[controlAttrCount]) ); + if ( style.HasLeftIndent() ) + { + margins.leftMargin = wxConvertToTXN(style.GetLeftIndent()); + } + if ( style.HasRightIndent() ) + { + margins.rightMargin = wxConvertToTXN(style.GetRightIndent()); + } + controlAttrCount++ ; + } + + if ( style.HasTabs() ) + { + const wxArrayInt& tabarray = style.GetTabs(); + // unfortunately Mac only applies a tab distance, not individually different tabs + controlTags[controlAttrCount] = kTXNTabSettingsTag; + if ( tabarray.size() > 0 ) + controlData[controlAttrCount].tabValue.value = wxConvertToTXN(tabarray[0]); + else + controlData[controlAttrCount].tabValue.value = 72 ; + + controlData[controlAttrCount].tabValue.tabType = kTXNLeftTab; + controlAttrCount++ ; + } + + // unfortunately the relayout is not automatic + if ( controlAttrCount > 0 ) + { + verify_noerr( TXNSetTXNObjectControls (m_txn, false /* don't clear all */, controlAttrCount, + controlTags, controlData) ); + relayout = true; + } + + if ( typeAttrCount > 0 ) + { + verify_noerr( TXNSetTypeAttributes( m_txn , typeAttrCount, typeAttr, from , to ) ); + relayout = true; } - if ( attrCounter > 0 ) + + if ( tabs != NULL ) + { + delete[] tabs; + } + + if ( relayout ) { - verify_noerr( TXNSetTypeAttributes ( m_txn , attrCounter , typeAttr, from , to) ); + TXNRecalcTextLayout( m_txn ); } } -void wxMacMLTEControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) +void wxMacMLTEControl::SetFont(const wxFont & font, + const wxColour& foreground, + long WXUNUSED(windowStyle)) { - EditHelper help(m_txn) ; - TXNSetAttribute( wxTextAttr(foreground,wxNullColour,font) , kTXNStartOffset,kTXNEndOffset ) ; + wxMacEditHelper help( m_txn ) ; + TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ; } -void wxMacMLTEControl::SetStyle(long start, long end, const wxTextAttr& style) + +void wxMacMLTEControl::SetStyle( long start, long end, const wxTextAttr& style ) { - EditHelper help(m_txn) ; - TXNSetAttribute( style , start,end ) ; + wxMacEditHelper help( m_txn ) ; + TXNSetAttribute( style, start, end ) ; } void wxMacMLTEControl::Copy() { - ClearCurrentScrap(); - TXNCopy(m_txn); - TXNConvertToPublicScrap(); + TXNCopy( m_txn ); } void wxMacMLTEControl::Cut() { - ClearCurrentScrap(); - TXNCut(m_txn); - TXNConvertToPublicScrap(); + TXNCut( m_txn ); } void wxMacMLTEControl::Paste() { - TXNConvertFromPublicScrap(); - TXNPaste(m_txn); + TXNPaste( m_txn ); } bool wxMacMLTEControl::CanPaste() const @@ -1626,7 +1958,7 @@ void wxMacMLTEControl::SetEditable(bool editable) { TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ; - TXNSetTXNObjectControls( m_txn , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ; + TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ; } wxTextPos wxMacMLTEControl::GetLastPosition() const @@ -1634,78 +1966,100 @@ wxTextPos wxMacMLTEControl::GetLastPosition() const wxTextPos actualsize = 0 ; Handle theText ; - OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData ); - /* all done */ - if ( err ) + OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData ); + + // all done + if ( err == noErr ) { - actualsize = 0 ; + actualsize = GetHandleSize( theText ) ; + DisposeHandle( theText ) ; } else { - actualsize = GetHandleSize( theText ) ; - DisposeHandle( theText ) ; + actualsize = 0 ; } return actualsize ; } -void wxMacMLTEControl::Replace( long from , long to , const wxString str ) +void wxMacMLTEControl::Replace( long from , long to , const wxString &str ) { wxString value = str ; wxMacConvertNewlines10To13( &value ) ; - EditHelper help( m_txn ) ; + wxMacEditHelper help( m_txn ) ; +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif - TXNSetSelection(m_txn , from , to ) ; + TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to ) ; TXNClear( m_txn ) ; - SetTXNData( value , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; + SetTXNData( value, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; } void wxMacMLTEControl::Remove( long from , long to ) { +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; - EditHelper help( m_txn ) ; - TXNSetSelection(m_txn , from , to ) ; +#endif + wxMacEditHelper help( m_txn ) ; + TXNSetSelection( m_txn , from , to ) ; TXNClear( m_txn ) ; } void wxMacMLTEControl::GetSelection( long* from, long* to) const { - TXNGetSelection( m_txn , (TXNOffset*) from , (TXNOffset*) to ) ; + TXNOffset f,t ; + TXNGetSelection( m_txn , &f , &t ) ; + *from = f; + *to = t; } void wxMacMLTEControl::SetSelection( long from , long to ) { +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; - /* change the selection */ +#endif + + // change the selection if ((from == -1) && (to == -1)) - TXNSelectAll(m_txn); + TXNSelectAll( m_txn ); else - TXNSetSelection( m_txn, from, to); - TXNShowSelection( m_txn, kTXNShowStart); + TXNSetSelection( m_txn, from, to == -1 ? kTXNEndOffset : to ); + + TXNShowSelection( m_txn, kTXNShowStart ); } -void wxMacMLTEControl::WriteText(const wxString& str) +void wxMacMLTEControl::WriteText( const wxString& str ) { - EditHelper helper( m_txn ) ; wxString st = str ; wxMacConvertNewlines10To13( &st ) ; - wxMacWindowClipper c( m_peer ) ; long start , end , dummy ; + GetSelection( &start , &dummy ) ; - SetTXNData( st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; - GetSelection( &dummy , &end ) ; - // TODO SetStyle( start , end , GetDefaultStyle() ) ; +#ifndef __LP64__ + wxMacWindowClipper c( m_peer ) ; +#endif + + { + wxMacEditHelper helper( m_txn ) ; + SetTXNData( st, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; + } + + GetSelection( &dummy, &end ) ; + + // TODO: SetStyle( start , end , GetDefaultStyle() ) ; } void wxMacMLTEControl::Clear() { - EditHelper st(m_txn) ; +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif + wxMacEditHelper st( m_txn ) ; TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ; - TXNClear(m_txn); + TXNClear( m_txn ) ; } bool wxMacMLTEControl::CanUndo() const @@ -1718,7 +2072,7 @@ void wxMacMLTEControl::Undo() TXNUndo( m_txn ) ; } -bool wxMacMLTEControl::CanRedo() const +bool wxMacMLTEControl::CanRedo() const { return TXNCanRedo( m_txn , NULL ) ; } @@ -1731,81 +2085,88 @@ void wxMacMLTEControl::Redo() int wxMacMLTEControl::GetNumberOfLines() const { ItemCount lines = 0 ; - TXNGetLineCount(m_txn, &lines ) ; + TXNGetLineCount( m_txn, &lines ) ; + return lines ; } long wxMacMLTEControl::XYToPosition(long x, long y) const { Point curpt ; + wxTextPos lastpos ; - wxTextPos lastpos = GetLastPosition() ; - - // TODO find a better implementation : while we can get the + // TODO: find a better implementation : while we can get the // line metrics of a certain line, we don't get its starting // position, so it would probably be rather a binary search // for the start position - long xpos = 0 ; - long ypos = 0 ; + long xpos = 0, ypos = 0 ; int lastHeight = 0 ; - ItemCount n ; + + lastpos = GetLastPosition() ; for ( n = 0 ; n <= (ItemCount) lastpos ; ++n ) { if ( y == ypos && x == xpos ) return n ; - TXNOffsetToPoint( m_txn , n , &curpt); + TXNOffsetToPoint( m_txn, n, &curpt ) ; if ( curpt.v > lastHeight ) { xpos = 0 ; if ( n > 0 ) ++ypos ; + lastHeight = curpt.v ; } else ++xpos ; } + return 0 ; } -bool wxMacMLTEControl::PositionToXY(long pos, long *x, long *y) const +bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const { Point curpt ; + wxTextPos lastpos ; - wxTextPos lastpos = GetLastPosition() ; - - if ( y ) *y = 0 ; - if ( x ) *x = 0 ; + if ( y ) + *y = 0 ; + if ( x ) + *x = 0 ; + lastpos = GetLastPosition() ; if ( pos <= lastpos ) { - // TODO find a better implementation : while we can get the + // TODO: find a better implementation - while we can get the // line metrics of a certain line, we don't get its starting // position, so it would probably be rather a binary search // for the start position - long xpos = 0 ; - long ypos = 0 ; + long xpos = 0, ypos = 0 ; int lastHeight = 0 ; - ItemCount n ; + for ( n = 0 ; n <= (ItemCount) pos ; ++n ) { - TXNOffsetToPoint(m_txn , n , &curpt); + TXNOffsetToPoint( m_txn, n, &curpt ) ; if ( curpt.v > lastHeight ) { xpos = 0 ; if ( n > 0 ) ++ypos ; + lastHeight = curpt.v ; } else ++xpos ; } - if ( y ) *y = ypos ; - if ( x ) *x = xpos ; + + if ( y ) + *y = ypos ; + if ( x ) + *x = xpos ; } return false ; @@ -1813,70 +2174,63 @@ bool wxMacMLTEControl::PositionToXY(long pos, long *x, long *y) const void wxMacMLTEControl::ShowPosition( long pos ) { -#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER) - { - Point current ; - Point desired ; - TXNOffset selstart , selend ; - TXNGetSelection( m_txn , &selstart , &selend) ; - TXNOffsetToPoint( m_txn, selstart , ¤t); - TXNOffsetToPoint( m_txn, pos , &desired); - //TODO use HIPoints for 10.3 and above - if ( (UInt32) TXNScroll != (UInt32) kUnresolvedCFragSymbolAddress ) - { - OSErr theErr = noErr; - SInt32 dv = desired.v - current.v ; - SInt32 dh = desired.h - current.h ; - TXNShowSelection( m_txn , true ) ; - theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh ); - wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); - } - } -#endif + Point current, desired ; + TXNOffset selstart, selend; + + TXNGetSelection( m_txn, &selstart, &selend ); + TXNOffsetToPoint( m_txn, selstart, ¤t ); + TXNOffsetToPoint( m_txn, pos, &desired ); + + // TODO: use HIPoints for 10.3 and above + + OSErr theErr = noErr; + long dv = desired.v - current.v; + long dh = desired.h - current.h; + TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ?? + theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh ); + + // there will be an error returned for classic MLTE implementation when the control is + // invisible, but HITextView works correctly, so we don't assert that one + // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") ); } -void wxMacMLTEControl::SetTXNData( const wxString& st , TXNOffset start , TXNOffset end ) +void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end ) { #if wxUSE_UNICODE #if SIZEOF_WCHAR_T == 2 - size_t len = st.Len() ; - TXNSetData( m_txn , kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, - start, end); + size_t len = st.length() ; + TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end ); #else - wxMBConvUTF16BE converter ; - ByteCount byteBufferLen = converter.WC2MB( NULL , st.wc_str() , 0 ) ; - UniChar *unibuf = (UniChar*) malloc(byteBufferLen) ; - converter.WC2MB( (char*) unibuf , st.wc_str() , byteBufferLen ) ; - TXNSetData( m_txn , kTXNUnicodeTextData, (void*)unibuf, byteBufferLen , - start, end); + wxMBConvUTF16 converter ; + ByteCount byteBufferLen = converter.WC2MB( NULL, st.wc_str(), 0 ) ; + UniChar *unibuf = (UniChar*)malloc( byteBufferLen ) ; + converter.WC2MB( (char*)unibuf, st.wc_str(), byteBufferLen ) ; + TXNSetData( m_txn, kTXNUnicodeTextData, (void*)unibuf, byteBufferLen, start, end ) ; free( unibuf ) ; #endif #else - wxCharBuffer text = st.mb_str(wxConvLocal) ; - TXNSetData( m_txn , kTXNTextData, (void*)text.data(), strlen( text ) , - start, end); + wxCharBuffer text = st.mb_str( wxConvLocal ) ; + TXNSetData( m_txn, kTXNTextData, (void*)text.data(), strlen( text ), start, end ) ; #endif } - wxString wxMacMLTEControl::GetLineText(long lineNo) const { wxString line ; if ( lineNo < GetNumberOfLines() ) { - long ypos = 0 ; - - Fixed lineWidth, - lineHeight, - currentHeight = 0; + Point firstPoint; + Fixed lineWidth, lineHeight, currentHeight; + long ypos ; // get the first possible position in the control - Point firstPoint; TXNOffsetToPoint(m_txn, 0, &firstPoint); // Iterate through the lines until we reach the one we want, // adding to our current y pixel point position + ypos = 0 ; + currentHeight = 0; while (ypos < lineNo) { TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight); @@ -1889,33 +2243,33 @@ wxString wxMacMLTEControl::GetLineText(long lineNo) const wxString content = GetStringValue() ; Point currentPoint = thePoint; - while(thePoint.v == currentPoint.v && theOffset < content.length()) + while (thePoint.v == currentPoint.v && theOffset < content.length()) { line += content[theOffset]; TXNOffsetToPoint(m_txn, ++theOffset, ¤tPoint); } } + return line ; } -int wxMacMLTEControl::GetLineLength(long lineNo) const +int wxMacMLTEControl::GetLineLength(long lineNo) const { int theLength = 0; if ( lineNo < GetNumberOfLines() ) { - long ypos = 0 ; - - Fixed lineWidth, - lineHeight, - currentHeight = 0; + Point firstPoint; + Fixed lineWidth, lineHeight, currentHeight; + long ypos; // get the first possible position in the control - Point firstPoint; TXNOffsetToPoint(m_txn, 0, &firstPoint); // Iterate through the lines until we reach the one we want, // adding to our current y pixel point position + ypos = 0; + currentHeight = 0; while (ypos < lineNo) { TXNGetLineMetrics(m_txn, ypos++, &lineWidth, &lineHeight); @@ -1928,182 +2282,283 @@ int wxMacMLTEControl::GetLineLength(long lineNo) const wxString content = GetStringValue() ; Point currentPoint = thePoint; - while(thePoint.v == currentPoint.v && theOffset < content.length()) + while (thePoint.v == currentPoint.v && theOffset < content.length()) { ++theLength; TXNOffsetToPoint(m_txn, ++theOffset, ¤tPoint); } } + return theLength ; } +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 // ---------------------------------------------------------------------------- // MLTE control implementation (classic part) // ---------------------------------------------------------------------------- -// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon -// the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the -// moment is to avoid setting the true focus on the control, the proper solution at the end would be to have -// an alternate path for carbon key events that routes automatically into the same wx flow of events +// OS X Notes : We still don't have a full replacement for MLTE, so this implementation +// has to live on. We have different problems coming from outdated implementations on the +// various OS X versions. Most deal with the scrollbars: they are not correctly embedded +// while this can be solved on 10.3 by reassigning them the correct place, on 10.2 there is +// no way out, therefore we are using our own implementation and our own scrollbars .... -/* part codes */ +TXNScrollInfoUPP gTXNScrollInfoProc = NULL ; +ControlActionUPP gTXNScrollActionProc = NULL ; -/* kmUPTextPart is the part code we return to indicate the user has clicked -in the text area of our control */ -#define kmUPTextPart 1 +pascal void wxMacMLTEClassicControl::TXNScrollInfoProc( + SInt32 iValue, SInt32 iMaximumValue, + TXNScrollBarOrientation iScrollBarOrientation, SInt32 iRefCon ) +{ + wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) iRefCon ; + SInt32 value = wxMax( iValue , 0 ) ; + SInt32 maximum = wxMax( iMaximumValue , 0 ) ; + if ( iScrollBarOrientation == kTXNHorizontal ) + { + if ( mlte->m_sbHorizontal ) + { + SetControl32BitValue( mlte->m_sbHorizontal , value ) ; + SetControl32BitMaximum( mlte->m_sbHorizontal , maximum ) ; + mlte->m_lastHorizontalValue = value ; + } + } + else if ( iScrollBarOrientation == kTXNVertical ) + { + if ( mlte->m_sbVertical ) + { + SetControl32BitValue( mlte->m_sbVertical , value ) ; + SetControl32BitMaximum( mlte->m_sbVertical , maximum ) ; + mlte->m_lastVerticalValue = value ; + } + } +} -/* routines for using existing user pane controls. -These routines are useful for cases where you would like to use an -existing user pane control in, say, a dialog window as a scrolling -text edit field.*/ +pascal void wxMacMLTEClassicControl::TXNScrollActionProc( ControlRef controlRef , ControlPartCode partCode ) +{ + wxMacMLTEClassicControl* mlte = (wxMacMLTEClassicControl*) GetControlReference( controlRef ) ; + if ( mlte == NULL ) + return ; -/* Utility Routines */ + if ( controlRef != mlte->m_sbVertical && controlRef != mlte->m_sbHorizontal ) + return ; -/* kUserClickedToFocusPart is a part code we pass to the SetKeyboardFocus -routine. In our focus switching routine this part code is understood -as meaning 'the user has clicked in the control and we need to switch -the current focus to ourselves before we can continue'. */ -#define kUserClickedToFocusPart 100 + OSStatus err ; + bool isHorizontal = ( controlRef == mlte->m_sbHorizontal ) ; -/* STPTextPaneVars is a structure used for storing the the mUP Control's -internal variables and state information. A handle to this record is -stored in the pane control's reference value field using the -SetControlReference routine. */ + SInt32 minimum = 0 ; + SInt32 maximum = GetControl32BitMaximum( controlRef ) ; + SInt32 value = GetControl32BitValue( controlRef ) ; + SInt32 delta = 0; -/* Univerals Procedure Pointer variables used by the -mUP Control. These variables are set up -the first time that mUPOpenControl is called. */ -ControlUserPaneDrawUPP gTPDrawProc = NULL; -ControlUserPaneHitTestUPP gTPHitProc = NULL; -ControlUserPaneTrackingUPP gTPTrackProc = NULL; -ControlUserPaneIdleUPP gTPIdleProc = NULL; -ControlUserPaneKeyDownUPP gTPKeyProc = NULL; -ControlUserPaneActivateUPP gTPActivateProc = NULL; -ControlUserPaneFocusUPP gTPFocusProc = NULL; + switch ( partCode ) + { + case kControlDownButtonPart : + delta = 10 ; + break ; + case kControlUpButtonPart : + delta = -10 ; + break ; -class wxMacMLTENoDraw -{ -public : - wxMacMLTENoDraw( TXNObject txn ) ; - ~wxMacMLTENoDraw() ; - -private : - bool m_formerDraw ; - TXNObject m_txn ; -} ; + case kControlPageDownPart : + delta = GetControlViewSize( controlRef ) ; + break ; -wxMacMLTENoDraw::wxMacMLTENoDraw( TXNObject txn ) -{ - m_txn = txn ; -#ifdef __WXMAC_OSX__ - TXNControlTag iControlTags[1] = { kTXNVisibilityTag }; - TXNControlData iControlData[1] ; - - TXNGetTXNObjectControls( m_txn , 1 , iControlTags , iControlData ) ; - m_formerDraw = iControlData[0].uValue ; - if ( m_formerDraw ) - { - iControlData[0].uValue = 0 ; - TXNSetTXNObjectControls( m_txn , 1 , true , iControlTags , iControlData ) ; + case kControlPageUpPart : + delta = -GetControlViewSize( controlRef ) ; + break ; + + case kControlIndicatorPart : + delta = value - (isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue) ; + break ; + + default : + break ; } -#endif -} -wxMacMLTENoDraw::~wxMacMLTENoDraw() -{ -#ifdef __WXMAC_OSX__ - if ( m_formerDraw ) + if ( delta != 0 ) { - TXNControlTag iControlTags[1] = { kTXNVisibilityTag }; - TXNControlData iControlData[1] ; - - iControlData[0].uValue = m_formerDraw ; - TXNSetTXNObjectControls( m_txn , 1 , true , iControlTags , iControlData ) ; + SInt32 newValue = value ; + + if ( partCode != kControlIndicatorPart ) + { + if ( value + delta < minimum ) + delta = minimum - value ; + if ( value + delta > maximum ) + delta = maximum - value ; + + SetControl32BitValue( controlRef , value + delta ) ; + newValue = value + delta ; + } + + SInt32 verticalDelta = isHorizontal ? 0 : delta ; + SInt32 horizontalDelta = isHorizontal ? delta : 0 ; + + err = TXNScroll( + mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, + &verticalDelta, &horizontalDelta ); + verify_noerr( err ); + + if ( isHorizontal ) + mlte->m_lastHorizontalValue = newValue ; + else + mlte->m_lastVerticalValue = newValue ; } -#endif } - // make correct activations -void wxMacMLTEClassicControl::MacActivatePaneText(Boolean setActive) +void wxMacMLTEClassicControl::MacActivatePaneText(bool setActive) { wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); - if (m_txnIsActive != setActive && textctrl->MacIsReallyShown() ) - { - m_txnIsActive = setActive; - // TXNSetScrollBarState - - TXNActivate(m_txn, m_txnFrameID, m_txnIsActive); - if (m_txnIsFocused) - TXNFocus( m_txn, m_txnIsActive); - } -} -// update TXN focus state -void wxMacMLTEClassicControl::MacFocusPaneText(Boolean setFocus) { -/* wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); */ + wxMacWindowClipper clipper( textctrl ) ; + TXNActivate( m_txn, m_txnFrameID, setActive ); + + ControlRef controlFocus = 0 ; + GetKeyboardFocus( m_txnWindow , &controlFocus ) ; + if ( controlFocus == m_controlRef ) + TXNFocus( m_txn, setActive ); +} - if (m_txnIsFocused != setFocus /*&& textctrl->MacIsReallyShown() */ ) { - m_txnIsFocused = setFocus; - TXNFocus( m_txn, m_txnIsFocused); - } +void wxMacMLTEClassicControl::MacFocusPaneText(bool setFocus) +{ + TXNFocus( m_txn, setFocus ); } -// makes sure that the TXNObject is either offscreen or on screen +// guards against inappropriate redraw (hidden objects drawing onto window) -void wxMacMLTEClassicControl::MacSetObjectVisibility(Boolean vis) +void wxMacMLTEClassicControl::MacSetObjectVisibility(bool vis) { -#ifdef __WXMAC_OSX__ - OSStatus err = noErr ; - - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); - if ( textctrl ) + ControlRef controlFocus = 0 ; + GetKeyboardFocus( m_txnWindow , &controlFocus ) ; + + if ( !vis && (controlFocus == m_controlRef ) ) + SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ; + + TXNControlTag iControlTags[1] = { kTXNVisibilityTag }; + TXNControlData iControlData[1] = { { (UInt32)false } }; + + verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ; + + if ( iControlData[0].uValue != vis ) { - UMAGetControlBoundsInWindowCoords( m_controlRef, &m_txnControlBounds); - TXNControlTag iControlTags[1] = { kTXNVisibilityTag }; - TXNControlData iControlData[1] = { { vis } }; - - TXNSetTXNObjectControls( m_txn , 1 , true , iControlTags , iControlData ) ; + iControlData[0].uValue = vis ; + verify_noerr( TXNSetTXNObjectControls( m_txn, false , 1, iControlTags, iControlData ) ) ; } -#endif + + // currently, we always clip as partial visibility (overlapped) visibility is also a problem, + // if we run into further problems we might set the FrameBounds to an empty rect here } // make sure that the TXNObject is at the right position -void wxMacMLTEClassicControl::MacUpdatePosition() + +void wxMacMLTEClassicControl::MacUpdatePosition() { - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef ); if ( textctrl == NULL ) return ; Rect bounds ; - UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds); - - if ( !EqualRect( &bounds , &m_txnControlBounds ) ) + GetRectInWindowCoords( &bounds ); + + wxRect visRect = textctrl->MacGetClippedClientRect() ; + Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ; + int x , y ; + x = y = 0 ; + textctrl->MacWindowToRootWindow( &x , &y ) ; + OffsetRect( &visBounds , x , y ) ; + + if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) ) { - // old position - Rect oldBounds = m_txnControlBounds ; m_txnControlBounds = bounds ; - wxMacWindowClipper cl(textctrl) ; - TXNSetFrameBounds( m_txn, m_txnControlBounds.top, m_txnControlBounds.left, - m_txnControlBounds.bottom, m_txnControlBounds.right, m_txnFrameID); + m_txnVisBounds = visBounds ; + wxMacWindowClipper cl( textctrl ) ; + + if ( m_sbHorizontal || m_sbVertical ) + { + int w = bounds.right - bounds.left ; + int h = bounds.bottom - bounds.top ; + + if ( m_sbHorizontal ) + { + Rect sbBounds ; + + sbBounds.left = -1 ; + sbBounds.top = h - 14 ; + sbBounds.right = w + 1 ; + sbBounds.bottom = h + 1 ; + + SetControlBounds( m_sbHorizontal , &sbBounds ) ; + SetControlViewSize( m_sbHorizontal , w ) ; + } + + if ( m_sbVertical ) + { + Rect sbBounds ; + + sbBounds.left = w - 14 ; + sbBounds.top = -1 ; + sbBounds.right = w + 1 ; + sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ; + + SetControlBounds( m_sbVertical , &sbBounds ) ; + SetControlViewSize( m_sbVertical , h ) ; + } + } + + Rect oldviewRect ; + TXNLongRect olddestRect ; + TXNGetRectBounds( m_txn , &oldviewRect , &olddestRect , NULL ) ; + + Rect viewRect = { m_txnControlBounds.top, m_txnControlBounds.left, + m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , + m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ; + TXNLongRect destRect = { m_txnControlBounds.top, m_txnControlBounds.left, + m_txnControlBounds.bottom - ( m_sbHorizontal ? 14 : 0 ) , + m_txnControlBounds.right - ( m_sbVertical ? 14 : 0 ) } ; + + if ( olddestRect.right >= 10000 ) + destRect.right = destRect.left + 32000 ; + + if ( olddestRect.bottom >= 0x20000000 ) + destRect.bottom = destRect.top + 0x40000000 ; + + SectRect( &viewRect , &visBounds , &viewRect ) ; + TXNSetRectBounds( m_txn , &viewRect , &destRect , true ) ; + +#if 0 + TXNSetFrameBounds( + m_txn, + m_txnControlBounds.top, + m_txnControlBounds.left, + m_txnControlBounds.bottom - (m_sbHorizontal ? 14 : 0), + m_txnControlBounds.right - (m_sbVertical ? 14 : 0), + m_txnFrameID ); +#endif + + // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a + // movement, therefore we have to force it + + // this problem has been reported in OSX as well, so we use this here once again + + TXNLongRect textRect ; + TXNGetRectBounds( m_txn , NULL , NULL , &textRect ) ; + if ( textRect.left < m_txnControlBounds.left ) + TXNShowSelection( m_txn , kTXNShowStart ) ; } } -void wxMacMLTEClassicControl::SetRect( Rect *r ) +void wxMacMLTEClassicControl::SetRect( Rect *r ) { wxMacControl::SetRect( r ) ; MacUpdatePosition() ; } -// draw the control -void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart) +void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 WXUNUSED(thePart)) { - /* set up our globals */ - - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef ); if ( textctrl == NULL ) return ; @@ -2114,327 +2569,232 @@ void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart) } } - -/* TPPaneHitTestProc is called when the control manager would -like to determine what part of the control the mouse resides over. -We also call this routine from our tracking proc to determine how -to handle mouse clicks. */ -wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) { Point where = { y , x } ; - ControlPartCode result; - /* set up our locals and lock down our globals*/ - result = 0; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); - if ( textctrl == NULL ) - return 0 ; - - if (textctrl->MacIsReallyShown() ) + ControlPartCode result = kControlNoPart; + + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef ); + if ( (textctrl != NULL) && textctrl->MacIsReallyShown() ) { - if (PtInRect(where, &m_txnControlBounds)) - result = kmUPTextPart; + if (PtInRect( where, &m_txnControlBounds )) + { + result = kControlEditTextPart ; + } else { // sometimes we get the coords also in control local coordinates, therefore test again - if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ) - { - int x = 0 , y = 0 ; - textctrl->MacClientToRootWindow( &x , &y ) ; - where.h += x ; - where.v += y ; - } - if (PtInRect(where, &m_txnControlBounds)) - result = kmUPTextPart; - else - result = 0; + int x = 0 , y = 0 ; + textctrl->MacClientToRootWindow( &x , &y ) ; + where.h += x ; + where.v += y ; + + if (PtInRect( where, &m_txnControlBounds )) + result = kControlEditTextPart ; } } + return result; } -/* TPPaneTrackingProc is called when the mouse is being held down -over our control. This routine handles clicks in the text area -and in the scroll bar. */ - -wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc ) +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* WXUNUSED(actionProc) ) { - Point startPt = { y ,x } ; - ControlPartCode partCodeResult; - /* make sure we have some variables... */ - partCodeResult = 0; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); - if ( textctrl == NULL ) - return 0; + ControlPartCode result = kControlNoPart; - if (textctrl->MacIsReallyShown() ) + wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference( m_controlRef ); + if ( (textctrl != NULL) && textctrl->MacIsReallyShown() ) { - /* we don't do any of these functions unless we're in focus */ - if ( ! m_txnIsFocused) { - WindowPtr owner; - owner = GetControlOwner(m_controlRef); - ClearKeyboardFocus(owner); - SetKeyboardFocus(owner, m_controlRef, kUserClickedToFocusPart); - } - /* find the location for the click */ + Point startPt = { y , x } ; + // for compositing, we must convert these into toplevel window coordinates, because hittesting expects them - if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ) - { - int x = 0 , y = 0 ; - textctrl->MacClientToRootWindow( &x , &y ) ; - startPt.h += x ; - startPt.v += y ; - } + int x = 0 , y = 0 ; + textctrl->MacClientToRootWindow( &x , &y ) ; + startPt.h += x ; + startPt.v += y ; switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v )) { - /* handle clicks in the text part */ - case kmUPTextPart: + case kControlEditTextPart : { wxMacWindowClipper clipper( textctrl ) ; - EventRecord rec ; + ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ; TXNClick( m_txn, &rec ); - } break; + default : + break; } } - return partCodeResult; -} + return result; +} -/* TPPaneIdleProc is our user pane idle routine. When our text field -is active and in focus, we use this routine to set the cursor. */ -void wxMacMLTEClassicControl::MacControlUserPaneIdleProc() +void wxMacMLTEClassicControl::MacControlUserPaneIdleProc() { - /* set up locals */ - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef ); if ( textctrl == NULL ) return ; - if (textctrl->MacIsReallyShown()) + if (textctrl->MacIsReallyShown()) { - /* if we're not active, then we have nothing to say about the cursor */ - if (m_controlIsActive) + if (IsControlActive(m_controlRef)) { - Rect bounds; Point mousep; wxMacWindowClipper clipper( textctrl ) ; GetMouse(&mousep); - /* there's a 'focus thing' and an 'unfocused thing' */ - if (m_txnIsFocused) - { - /* flash the cursor */ - SetPort(m_txnPort); - TXNIdle(m_txn); - /* set the cursor */ - if (PtInRect(mousep, &m_txnControlBounds)) - { - RgnHandle theRgn; - RectRgn((theRgn = NewRgn()), &m_txnControlBounds); - TXNAdjustCursor(m_txn, theRgn); - DisposeRgn(theRgn); - } - else - { - // SetThemeCursor(kThemeArrowCursor); - } - } - else + + TXNIdle(m_txn); + + if (PtInRect(mousep, &m_txnControlBounds)) { - /* if it's in our bounds, set the cursor */ - UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds); - if (PtInRect(mousep, &bounds)) - { - // SetThemeCursor(kThemeArrowCursor); - } + RgnHandle theRgn = NewRgn(); + RectRgn(theRgn, &m_txnControlBounds); + TXNAdjustCursor(m_txn, theRgn); + DisposeRgn(theRgn); } } } } - -/* TPPaneKeyDownProc is called whenever a keydown event is directed -at our control. Here, we direct the keydown event to the text -edit record and redraw the scroll bar and text field as appropriate. */ -wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) { - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef ); if ( textctrl == NULL ) - return 0; - // MacUpdatePosition() ; + return kControlNoPart; - if (m_txnIsFocused) - { - /* turn autoscrolling on and send the key event to text edit */ - wxMacWindowClipper clipper( textctrl ) ; - EventRecord ev ; - memset( &ev , 0 , sizeof( ev ) ) ; - ev.what = keyDown ; - ev.modifiers = modifiers ; - ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ; - TXNKeyDown( m_txn , &ev); - } - return kControlEntireControl; -} + wxMacWindowClipper clipper( textctrl ) ; + EventRecord ev ; + memset( &ev , 0 , sizeof( ev ) ) ; + ev.what = keyDown ; + ev.modifiers = modifiers ; + ev.message = ((keyCode << 8) & keyCodeMask) | (charCode & charCodeMask); + TXNKeyDown( m_txn , &ev ); -/* TPPaneActivateProc is called when the window containing -the user pane control receives activate events. Here, we redraw -the control and it's text as necessary for the activation state. */ + return kControlEntireControl; +} -void wxMacMLTEClassicControl::MacControlUserPaneActivateProc( bool activating) +void wxMacMLTEClassicControl::MacControlUserPaneActivateProc(bool activating) { - /* set up locals */ - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); - - if ( textctrl == NULL ) - return ; - - if ( m_controlIsActive != activating ) - { - wxLogDebug(wxString::Format( wxT("id %xd activating with %d") , (long) this , activating ) ) ; - // MacUpdatePosition() ; - m_controlIsActive = activating; - wxMacWindowClipper clipper( textctrl ) ; - MacActivatePaneText( activating ); - } - - + MacActivatePaneText( activating ); } - -/* TPPaneFocusProc is called when every the focus changes to or -from our control. Herein, switch the focus appropriately -according to the parameters and redraw the control as -necessary. */ -wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action) +wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action) { - wxLogDebug(wxString::Format( wxT("id %xd Focus Proc with action %d") , (long) this , action ) ) ; - ControlPartCode focusResult; + ControlPartCode focusResult = kControlFocusNoPart; - focusResult = kControlFocusNoPart; - wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef); + wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef ); if ( textctrl == NULL ) - return 0; + return focusResult; wxMacWindowClipper clipper( textctrl ) ; - - // MacUpdatePosition() ; - - /* if kControlFocusPrevPart and kControlFocusNextPart are received when the user is - tabbing forwards (or shift tabbing backwards) through the items in the dialog, - and kControlFocusNextPart will be received. When the user clicks in our field - and it is not the current focus, then the constant kUserClickedToFocusPart will - be received. The constant kControlFocusNoPart will be received when our control - is the current focus and the user clicks in another control. In your focus routine, - you should respond to these codes as follows: - - kControlFocusNoPart - turn off focus and return kControlFocusNoPart. redraw - the control and the focus rectangle as necessary. - - kControlFocusPrevPart or kControlFocusNextPart - toggle focus on or off - depending on its current state. redraw the control and the focus rectangle - as appropriate for the new focus state. If the focus state is 'off', return the constant - kControlFocusNoPart, otherwise return a non-zero part code. - kUserClickedToFocusPart - is a constant defined for this example. You should - define your own value for handling click-to-focus type events. */ - /* calculate the next highlight state */ - switch (action) + + ControlRef controlFocus = NULL ; + GetKeyboardFocus( m_txnWindow , &controlFocus ) ; + bool wasFocused = ( controlFocus == m_controlRef ) ; + + switch (action) { - default: - case kControlFocusNoPart: - MacFocusPaneText( false); - focusResult = kControlFocusNoPart; - break; - case kUserClickedToFocusPart: - MacFocusPaneText(true); - focusResult = 1; - break; case kControlFocusPrevPart: case kControlFocusNextPart: - MacFocusPaneText( ( ! m_txnIsFocused)); - focusResult = m_txnIsFocused ? 1 : kControlFocusNoPart; + MacFocusPaneText( !wasFocused ); + focusResult = (!wasFocused ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart); + break; + + case kControlFocusNoPart: + default: + MacFocusPaneText( false ); + focusResult = kControlFocusNoPart; break; } return focusResult; } -void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *info ) +void wxMacMLTEClassicControl::MacControlUserPaneBackgroundProc( void *WXUNUSED(info) ) { } wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer, - const wxString& str, - const wxPoint& pos, - const wxSize& size, long style ) : wxMacMLTEControl( wxPeer ) + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) + : wxMacMLTEControl( wxPeer ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ; - wxString st = str ; - wxMacConvertNewlines10To13( &st ) ; - - short featurSet; - featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle - | kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground - | kControlGetsFocusOnClick | kControlSupportsLiveFeedback; - /* create the control */ + short featureSet = + kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle + | kControlWantsActivate | kControlHandlesTracking +// | kControlHasSpecialBackground + | kControlGetsFocusOnClick | kControlSupportsLiveFeedback; - verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featurSet, &m_controlRef ) ); + OSStatus err = ::CreateUserPaneControl( + MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), + &bounds, featureSet, &m_controlRef ); + verify_noerr( err ); DoCreate(); - if ( wxPeer->MacIsReallyShown() ) - MacSetObjectVisibility( true ) ; - AdjustCreationAttributes( *wxWHITE , true ) ; + MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ; + { + wxString st = str ; + wxMacConvertNewlines10To13( &st ) ; wxMacWindowClipper clipper( m_peer ) ; SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; - TXNSetSelection( m_txn, 0, 0); - TXNShowSelection( m_txn, kTXNShowStart); + TXNSetSelection( m_txn, 0, 0 ) ; } } wxMacMLTEClassicControl::~wxMacMLTEClassicControl() { -// SetControlReference(m_controlRef , 0) ; - TXNDeleteObject(m_txn); + TXNDeleteObject( m_txn ); + m_txn = NULL ; } void wxMacMLTEClassicControl::VisibilityChanged(bool shown) { MacSetObjectVisibility( shown ) ; + wxMacControl::VisibilityChanged( shown ) ; } -bool wxMacMLTEClassicControl::NeedsFocusRect() const +void wxMacMLTEClassicControl::SuperChangedPosition() { - return true; + MacUpdatePosition() ; + wxMacControl::SuperChangedPosition() ; } -#ifdef __WXMAC_OSX__ +ControlUserPaneDrawUPP gTPDrawProc = NULL; +ControlUserPaneHitTestUPP gTPHitProc = NULL; +ControlUserPaneTrackingUPP gTPTrackProc = NULL; +ControlUserPaneIdleUPP gTPIdleProc = NULL; +ControlUserPaneKeyDownUPP gTPKeyProc = NULL; +ControlUserPaneActivateUPP gTPActivateProc = NULL; +ControlUserPaneFocusUPP gTPFocusProc = NULL; static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) - win->MacControlUserPaneDrawProc(part) ; + win->MacControlUserPaneDrawProc( part ) ; } static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) - return win->MacControlUserPaneHitTestProc(where.h , where.v) ; + return win->MacControlUserPaneHitTestProc( where.h , where.v ) ; else return kControlNoPart ; } @@ -2442,9 +2802,9 @@ static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) - return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; + return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ; else return kControlNoPart ; } @@ -2452,7 +2812,7 @@ static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef contro static pascal void wxMacControlUserPaneIdleProc(ControlRef control) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) win->MacControlUserPaneIdleProc() ; } @@ -2460,9 +2820,9 @@ static pascal void wxMacControlUserPaneIdleProc(ControlRef control) static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) - return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; + return win->MacControlUserPaneKeyDownProc( keyCode, charCode, modifiers ) ; else return kControlNoPart ; } @@ -2470,38 +2830,39 @@ static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) - win->MacControlUserPaneActivateProc(activating) ; + win->MacControlUserPaneActivateProc( activating ) ; } static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) - return win->MacControlUserPaneFocusProc(action) ; + return win->MacControlUserPaneFocusProc( action ) ; else return kControlNoPart ; } +#if 0 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info) { wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; - wxMacMLTEClassicControl * win = textCtrl ? dynamic_cast(textCtrl->GetPeer()) : NULL ; + wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ; if ( win ) win->MacControlUserPaneBackgroundProc(info) ; } #endif +// TXNRegisterScrollInfoProc + OSStatus wxMacMLTEClassicControl::DoCreate() { Rect bounds; - OSStatus err = noErr ; - /* set up our globals */ -#ifdef __WXMAC_OSX__ + // set up our globals if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(wxMacControlUserPaneDrawProc); if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(wxMacControlUserPaneHitTestProc); if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(wxMacControlUserPaneTrackingProc); @@ -2509,20 +2870,16 @@ OSStatus wxMacMLTEClassicControl::DoCreate() if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(wxMacControlUserPaneKeyDownProc); if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(wxMacControlUserPaneActivateProc); if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(wxMacControlUserPaneFocusProc); -#endif - /* set the initial settings for our private data */ + if (gTXNScrollInfoProc == NULL ) gTXNScrollInfoProc = NewTXNScrollInfoUPP(TXNScrollInfoProc) ; + if (gTXNScrollActionProc == NULL ) gTXNScrollActionProc = NewControlActionUPP(TXNScrollActionProc) ; - m_txnIsFocused = false; - m_controlIsActive = true; - m_txnIsActive = false; - m_txnIsVisible = true ; + // set the initial settings for our private data - WindowRef owningWindow = GetControlOwner(m_controlRef); - m_txnPort = (GrafPtr) GetWindowPort(owningWindow); + m_txnWindow = GetControlOwner(m_controlRef); + m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow); -#ifdef __WXMAC_OSX__ - /* set up the user pane procedures */ + // set up the user pane procedures SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneDrawProcTag, sizeof(gTPDrawProc), &gTPDrawProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneHitTestProcTag, sizeof(gTPHitProc), &gTPHitProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneTrackingProcTag, sizeof(gTPTrackProc), &gTPTrackProc); @@ -2530,48 +2887,138 @@ OSStatus wxMacMLTEClassicControl::DoCreate() SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneKeyDownProcTag, sizeof(gTPKeyProc), &gTPKeyProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc); SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc); -#endif - /* calculate the rectangles used by the control */ - UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds); - + + // calculate the rectangles used by the control + GetRectInWindowCoords( &bounds ); + m_txnControlBounds = bounds ; - - CGrafPtr origPort = NULL ; - GDHandle origDev = NULL ; - GetGWorld( &origPort , &origDev ) ; - SetPort(m_txnPort); - - /* create the new edit field */ - - TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ) ; - - verify_noerr(TXNNewObject(NULL, owningWindow , &bounds, - frameOptions , - kTXNTextEditStyleFrameType, - kTXNTextensionFile, - kTXNSystemDefaultEncoding, - &m_txn, &m_txnFrameID, NULL ) ); - - /* perform final activations and setup for our text field. Here, - we assume that the window is going to be the 'active' window. */ - // MacActivatePaneText(m_controlIsActive && m_txnIsFocused); - /* all done */ + m_txnVisBounds = bounds ; + + CGrafPtr origPort ; + GDHandle origDev ; + + GetGWorld( &origPort, &origDev ) ; + SetPort( m_txnPort ); + + // create the new edit field + TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ); + + // the scrollbars are not correctly embedded but are inserted at the root: + // this gives us problems as we have erratic redraws even over the structure area + + m_sbHorizontal = 0 ; + m_sbVertical = 0 ; + m_lastHorizontalValue = 0 ; + m_lastVerticalValue = 0 ; + + Rect sb = { 0 , 0 , 0 , 0 } ; + if ( frameOptions & kTXNWantVScrollBarMask ) + { + CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbVertical ); + SetControlReference( m_sbVertical, (SInt32)this ); + SetControlAction( m_sbVertical, gTXNScrollActionProc ); + ShowControl( m_sbVertical ); + EmbedControl( m_sbVertical , m_controlRef ); + frameOptions &= ~kTXNWantVScrollBarMask; + } + + if ( frameOptions & kTXNWantHScrollBarMask ) + { + CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbHorizontal ); + SetControlReference( m_sbHorizontal, (SInt32)this ); + SetControlAction( m_sbHorizontal, gTXNScrollActionProc ); + ShowControl( m_sbHorizontal ); + EmbedControl( m_sbHorizontal, m_controlRef ); + frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask); + } + + err = TXNNewObject( + NULL, m_txnWindow, &bounds, frameOptions, + kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding, + &m_txn, &m_txnFrameID, NULL ); + verify_noerr( err ); + +#if 0 + TXNControlTag iControlTags[] = { kTXNUseCarbonEvents }; + TXNControlData iControlData[] = { { (UInt32)&cInfo } }; + int toptag = WXSIZEOF( iControlTags ) ; + TXNCarbonEventInfo cInfo ; + cInfo.useCarbonEvents = false ; + cInfo.filler = 0 ; + cInfo.flags = 0 ; + cInfo.fDictionary = NULL ; + + verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ); +#endif + + TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this ); + SetGWorld( origPort , origDev ) ; + return err; } +#endif // ---------------------------------------------------------------------------- // MLTE control implementation (OSX part) // ---------------------------------------------------------------------------- -#if TARGET_API_MAC_OSX +// tiger multi-line textcontrols with no CR in the entire content +// don't scroll automatically, so we need a hack. +// This attempt only works 'before' the key (ie before CallNextEventHandler) +// is processed, thus the scrolling always occurs one character too late, but +// better than nothing ... + +static const EventTypeSpec eventList[] = +{ + { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , +} ; + +static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ; + + switch ( GetEventKind( event ) ) + { + case kEventTextInputUnicodeForKeyEvent : + { + TXNOffset from , to ; + TXNGetSelection( focus->GetTXNObject() , &from , &to ) ; + if ( from == to ) + TXNShowSelection( focus->GetTXNObject() , kTXNShowStart ); + result = CallNextEventHandler(handler,event); + break; + } + default: + break ; + } + + return result ; +} + +static pascal OSStatus wxMacTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + switch ( GetEventClass( event ) ) + { + case kEventClassTextInput : + result = wxMacUnicodeTextEventHandler( handler , event , data ) ; + break ; + + default : + break ; + } + return result ; +} -#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTextControlEventHandler ) wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, - const wxString& str, - const wxPoint& pos, - const wxSize& size, long style ) : wxMacMLTEControl( wxPeer ) + const wxString& str, + const wxPoint& pos, + const wxSize& size, long style ) : wxMacMLTEControl( wxPeer ) { m_font = wxPeer->GetFont() ; m_windowStyle = style ; @@ -2579,14 +3026,26 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, wxString st = str ; wxMacConvertNewlines10To13( &st ) ; - HIRect hr = { bounds.left , bounds.top , bounds.right - bounds.left , bounds.bottom- bounds.top } ; + HIRect hr = { + { bounds.left , bounds.top }, + { bounds.right - bounds.left, bounds.bottom - bounds.top } } ; m_scrollView = NULL ; TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ; - if ( frameOptions & (kTXNWantVScrollBarMask|kTXNWantHScrollBarMask) ) + if (( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask)) || (frameOptions &kTXNSingleLineOnlyMask)) { - HIScrollViewCreate(( frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) | - ( frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll: 0 ) , &m_scrollView ) ; + if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) ) + { + HIScrollViewCreate( + (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) + | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) , + &m_scrollView ) ; + } + else + { + HIScrollViewCreate(kHIScrollViewOptionsVertScroll,&m_scrollView); + HIScrollViewSetScrollBarAutoHide(m_scrollView,true); + } HIViewSetFrame( m_scrollView, &hr ); HIViewSetVisible( m_scrollView, true ); @@ -2594,13 +3053,13 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, m_textView = NULL ; HITextViewCreate( NULL , 0, frameOptions , &m_textView ) ; - m_txn = HITextViewGetTXNObject( m_textView) ; + m_txn = HITextViewGetTXNObject( m_textView ) ; HIViewSetVisible( m_textView , true ) ; if ( m_scrollView ) { HIViewAddSubview( m_scrollView , m_textView ) ; m_controlRef = m_scrollView ; - wxPeer->MacInstallEventHandler( (WXWidget) m_textView ) ; + wxPeer->MacInstallEventHandler( (WXWidget) m_textView ) ; } else { @@ -2609,36 +3068,41 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer, } AdjustCreationAttributes( *wxWHITE , true ) ; - +#ifndef __LP64__ wxMacWindowClipper c( m_peer ) ; +#endif SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ; - TXNSetSelection( m_txn, 0, 0); - TXNShowSelection( m_txn, kTXNShowStart); + TXNSetSelection( m_txn, 0, 0 ); + TXNShowSelection( m_txn, kTXNShowStart ); + + InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, + NULL); +} +wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl() +{ } OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart ) { - return SetKeyboardFocus( GetControlOwner( m_textView ) , - m_textView , focusPart ) ; + return SetKeyboardFocus( GetControlOwner( m_textView ), m_textView, focusPart ) ; } bool wxMacMLTEHIViewControl::HasFocus() const { ControlRef control ; + if ( GetUserFocusWindow() == NULL ) + return false; + GetKeyboardFocus( GetUserFocusWindow() , &control ) ; return control == m_textView ; } -bool wxMacMLTEHIViewControl::NeedsFocusRect() const +void wxMacMLTEHIViewControl::SetBackgroundColour(const wxColour& col ) { - return m_windowStyle & wxNO_BORDER ? false : true; + HITextViewSetBackgroundColor( m_textView, col.GetPixel() ); } -#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - - -#endif - #endif // wxUSE_TEXTCTRL