X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29b30405aaef61ac091dc26df946ad90d0bc4f1b..7948c0c24401c496c04da3c28f1f1f2f282ba327:/src/mac/textctrl.cpp diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index 7f26d48685..4f8d67ae6d 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -54,6 +54,7 @@ #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL extern wxApp *wxTheApp ; +extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ; // 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 @@ -196,8 +197,10 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart /* save the drawing state */ SetPort((**tpvars).fDrawingEnvironment); - /* verify our boundary */ + /* verify our boundary */ GetControlBounds(theControl, &bounds); + + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; if ( ! EqualRect(&bounds, &varsp->fRFocusOutline) ) { // scrollbar is on the border, we add one Rect oldbounds = varsp->fRFocusOutline ; @@ -224,6 +227,7 @@ static pascal void TPPaneDrawProc(ControlRef theControl, ControlPartCode thePart if ((**tpvars).fIsActive && varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, true); /* release our globals */ HSetState((Handle) tpvars, state); + } } @@ -284,6 +288,7 @@ static pascal ControlPartCode TPPaneTrackingProc(ControlHandle theControl, Point /* handle clicks in the text part */ case kmUPTextPart: { SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent()); } break; @@ -314,6 +319,7 @@ static pascal void TPPaneIdleProc(ControlHandle theControl) { varsp = *tpvars; /* get the current mouse coordinates (in our window) */ SetPortWindowPort(GetControlOwner(theControl)); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; GetMouse(&mousep); /* there's a 'focus thing' and an 'unfocused thing' */ if (varsp->fInFocus) { @@ -351,6 +357,7 @@ static pascal ControlPartCode TPPaneKeyDownProc(ControlHandle theControl, if ((**tpvars).fInFocus) { /* turn autoscrolling on and send the key event to text edit */ SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; EventRecord ev ; memset( &ev , 0 , sizeof( ev ) ) ; ev.what = keyDown ; @@ -378,6 +385,7 @@ static pascal void TPPaneActivateProc(ControlHandle theControl, Boolean activati varsp = *tpvars; /* de/activate the text edit record */ SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; GetControlBounds(theControl, &bounds); varsp->fIsActive = activating; TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus); @@ -423,6 +431,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF define your own value for handling click-to-focus type events. */ /* save the drawing state */ SetPort((**tpvars).fDrawingEnvironment); + wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ; /* calculate the next highlight state */ switch (action) { default: @@ -736,6 +745,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, m_macTXN = (**tpvars).fTXNRec ; m_macTXNvars = tpvars ; m_macUsesTXN = true ; + TXNSetSelection( (TXNObject) m_macTXN, 0, 0); + TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart); } return TRUE; @@ -813,8 +824,13 @@ void wxTextCtrl::SetValue(const wxString& st) } else { - TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), - kTXNStartOffset, kTXNEndOffset); + bool formerEditable = IsEditable() ; + SetEditable(true) ; + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNStartOffset, kTXNEndOffset); + TXNSetSelection( (TXNObject) m_macTXN, 0, 0); + TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart); + SetEditable(formerEditable) ; } MacRedrawControl() ; } @@ -828,6 +844,8 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) { if ( m_macUsesTXN ) { + bool formerEditable = IsEditable() ; + SetEditable(true) ; TXNTypeAttributes typeAttr[4] ; Str255 fontName = "\pMonaco" ; SInt16 fontSize = 12 ; @@ -871,7 +889,9 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) { OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr, start,end); + wxASSERT_MSG( status == noErr , "Couldn't set text attributes" ) ; } + SetEditable(formerEditable) ; } return TRUE ; } @@ -942,6 +962,7 @@ void wxTextCtrl::Paste() { TXNConvertFromPublicScrap(); TXNPaste((TXNObject)m_macTXN); + SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ; } wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); event.SetString( GetValue() ) ; @@ -975,7 +996,6 @@ bool wxTextCtrl::CanPaste() const if (!IsEditable()) return FALSE; - long offset ; #if TARGET_CARBON OSStatus err = noErr; ScrapRef scrapRef; @@ -997,6 +1017,7 @@ bool wxTextCtrl::CanPaste() const return FALSE; #else + long offset ; if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 ) { return TRUE ; @@ -1010,10 +1031,19 @@ void wxTextCtrl::SetEditable(bool editable) if ( editable != m_editable ) { m_editable = editable ; - if ( editable ) - UMAActivateControl( (ControlHandle) m_macControl ) ; + if ( !m_macUsesTXN ) + { + if ( editable ) + UMAActivateControl( (ControlHandle) m_macControl ) ; + else + UMADeactivateControl((ControlHandle) m_macControl ) ; + } else - UMADeactivateControl((ControlHandle) m_macControl ) ; + { + TXNControlTag tag[] = { kTXNIOPrivilegesTag } ; + TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ; + TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ; + } } } @@ -1075,10 +1105,13 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value) } else { - TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; - TXNClear( ((TXNObject) m_macTXN) ) ; - TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), - kTXNUseCurrentSelection, kTXNUseCurrentSelection); + bool formerEditable = IsEditable() ; + SetEditable(true) ; + TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; + TXNClear( ((TXNObject) m_macTXN) ) ; + TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), + kTXNUseCurrentSelection, kTXNUseCurrentSelection); + SetEditable( formerEditable ) ; } Refresh() ; } @@ -1096,8 +1129,11 @@ void wxTextCtrl::Remove(long from, long to) } else { + bool formerEditable = IsEditable() ; + SetEditable(true) ; TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; TXNClear( ((TXNObject) m_macTXN) ) ; + SetEditable( formerEditable ) ; } Refresh() ; } @@ -1124,6 +1160,7 @@ void wxTextCtrl::SetSelection(long from, long to) SetPort((**tpvars).fDrawingEnvironment); /* change the selection */ TXNSetSelection( (**tpvars).fTXNRec, from, to); + TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart); } } @@ -1150,12 +1187,15 @@ void wxTextCtrl::WriteText(const wxString& text) } else { + bool formerEditable = IsEditable() ; + SetEditable(true) ; long start , end , dummy ; GetSelection( &start , &dummy ) ; TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(), kTXNUseCurrentSelection, kTXNUseCurrentSelection); GetSelection( &dummy , &end ) ; SetStyle( start , end , GetDefaultStyle() ) ; + SetEditable( formerEditable ) ; } MacRedrawControl() ; } @@ -1178,8 +1218,8 @@ void wxTextCtrl::Clear() } else { - ClearCurrentScrap(); - TXNClear((TXNObject)m_macTXN); + TXNSetSelection( (TXNObject)m_macTXN , kTXNStartOffset , kTXNEndOffset ) ; + TXNClear((TXNObject)m_macTXN); } Refresh() ; } @@ -1273,7 +1313,7 @@ int wxTextCtrl::GetNumberOfLines() const wxString content = GetValue() ; int count = 1; - for (int i = 0; i < content.Length() ; i++) + for (size_t i = 0; i < content.Length() ; i++) { if (content[i] == '\r') count++; } @@ -1304,13 +1344,13 @@ int wxTextCtrl::GetLineLength(long lineNo) const // Find line first int count = 0; - for (int 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 (int j = i; j < content.Length(); j++) + for (size_t j = i; j < content.Length(); j++) { count++; if (content[j] == '\r') return count; @@ -1330,14 +1370,14 @@ wxString wxTextCtrl::GetLineText(long lineNo) const // Find line first int count = 0; - for (int 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 (int j = i; j < content.Length(); j++) + for (size_t j = i; j < content.Length(); j++) { if (content[j] == '\r') return tmp; @@ -1376,6 +1416,13 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) int key = event.GetKeyCode() ; bool eat_key = false ; + 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 */ @@ -1384,6 +1431,18 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) // eat it return ; } + if ( key == 'v' && event.MetaDown() ) + { + if ( CanPaste() ) + Paste() ; + return ; + } + if ( key == 'x' && event.MetaDown() ) + { + if ( CanCut() ) + Cut() ; + return ; + } switch ( key ) { case WXK_RETURN: @@ -1447,7 +1506,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) // default handling event.Skip() ; } - if ( key >= 0x20 || + if ( ( key >= 0x20 && key < WXK_START ) || key == WXK_RETURN || key == WXK_DELETE || key == WXK_BACK)