X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f341e39bdff67c5532e719599a1217ead7c85867..0f314c30b8c4ffbd7d87146f72be7a061d506235:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index abfebd1375..79726b054c 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "textctrl.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/textctrl.h" #include "wx/utils.h" #include "wx/intl.h" @@ -18,6 +21,7 @@ #include "wx/settings.h" #include "wx/panel.h" #include "wx/strconv.h" +#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include @@ -46,12 +50,41 @@ extern wxWindowGTK *g_delayedFocus; // helpers // ---------------------------------------------------------------------------- +#ifdef __WXGTK20__ +static void wxGtkTextInsert(GtkWidget *text, + GtkTextBuffer *text_buffer, + const wxTextAttr& attr, + wxCharBuffer buffer) + +{ + PangoFontDescription *font_description = attr.HasFont() + ? attr.GetFont().GetNativeFontInfo()->description + : NULL; + + GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = attr.HasBackgroundColour() + ? attr.GetBackgroundColour().GetColor() + : NULL; + + GtkTextTag *tag; + tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description, + "foreground-gdk", colFg, + "background-gdk", colBg, NULL ); + + GtkTextIter iter; + gtk_text_buffer_get_iter_at_mark( text_buffer, &iter, + gtk_text_buffer_get_insert (text_buffer) ); + + gtk_text_buffer_insert_with_tags( text_buffer, &iter, buffer, strlen(buffer), tag, NULL ); +} +#else static void wxGtkTextInsert(GtkWidget *text, const wxTextAttr& attr, const char *txt, size_t len) { -#ifndef __WXGTK20__ GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont() : NULL; @@ -63,8 +96,8 @@ static void wxGtkTextInsert(GtkWidget *text, : NULL; gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); -#endif } +#endif // GTK 1.x // ---------------------------------------------------------------------------- // "insert_text" for GtkEntry @@ -120,10 +153,10 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) if (g_isIdle) wxapp_install_idle_handler(); - + win->SetModified(); win->UpdateFontIfNeeded(); - + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetEventObject( win ); event.SetString( win->GetValue() ); @@ -248,7 +281,7 @@ bool wxTextCtrl::Create( wxWindow *parent, m_vScrollbarVisible = FALSE; bool multi_line = (style & wxTE_MULTILINE) != 0; - + #ifdef __WXGTK20__ GtkTextBuffer *buffer = NULL; #endif @@ -258,17 +291,17 @@ bool wxTextCtrl::Create( wxWindow *parent, #ifdef __WXGTK20__ // Create view m_text = gtk_text_view_new(); - + buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - + // create scrolled window m_widget = gtk_scrolled_window_new( NULL, NULL ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - + // Insert view into scrolled window gtk_container_add( GTK_CONTAINER(m_widget), m_text ); - + // Global settings which can be overridden by tags, I guess. if (HasFlag( wxHSCROLL )) gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE ); @@ -314,8 +347,7 @@ bool wxTextCtrl::Create( wxWindow *parent, m_focusWidget = m_text; PostCreation(); - - SetFont( parent->GetFont() ); + InheritAttributes(); wxSize size_best( DoGetBestSize() ); wxSize new_size( size ); @@ -374,7 +406,7 @@ bool wxTextCtrl::Create( wxWindow *parent, // Bring editable's cursor uptodate. Bug in GTK. SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); } - + #endif } @@ -424,10 +456,8 @@ bool wxTextCtrl::Create( wxWindow *parent, m_cursor = wxCursor( wxCURSOR_IBEAM ); -#ifndef __WXGTK20__ wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() ); SetDefaultStyle( attrDef ); -#endif Show( TRUE ); @@ -469,20 +499,20 @@ wxString wxTextCtrl::GetValue() const { #ifdef __WXGTK20__ GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - + GtkTextIter start; gtk_text_buffer_get_start_iter( text_buffer, &start ); GtkTextIter end; gtk_text_buffer_get_end_iter( text_buffer, &end ); gchar *text = gtk_text_buffer_get_text( text_buffer, &start, &end, TRUE ); - + #if wxUSE_UNICODE wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) ); #else wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) ); #endif tmp = buffer; - + g_free( text ); #else gint len = gtk_text_get_length( GTK_TEXT(m_text) ); @@ -495,7 +525,7 @@ wxString wxTextCtrl::GetValue() const { tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) ); } - + return tmp; } @@ -511,10 +541,10 @@ void wxTextCtrl::SetValue( const wxString &value ) wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) ); #else wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) ); -#endif +#endif GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); gtk_text_buffer_set_text( text_buffer, buffer, strlen(buffer) ); - + #else gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); @@ -531,7 +561,7 @@ void wxTextCtrl::SetValue( const wxString &value ) // the lists. wxWindows 2.2 will have a set of flags to // customize this behaviour. SetInsertionPoint(0); - + m_modified = FALSE; } @@ -550,44 +580,61 @@ void wxTextCtrl::WriteText( const wxString &text ) wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); #else wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif +#endif GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) ); - -#else + + // TODO: Call whatever is needed to delete the selection. + wxGtkTextInsert( m_text, text_buffer, m_defaultStyle, buffer ); + + GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) ); + // Scroll to cursor, but only if scrollbar thumb is at the very bottom + if ( adj->value == adj->upper - adj->page_size ) + { + gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), + gtk_text_buffer_get_insert( text_buffer ), 0.0, FALSE, 0.0, 1.0 ); + } +#else // GTK 1.x // After cursor movements, gtk_text_get_point() is wrong by one. gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) ); // always use m_defaultStyle, even if it is empty as otherwise // resetting the style and appending some more text wouldn't work: if // we don't specify the style explicitly, the old style would be used + gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len()); + // we called wxGtkTextInsert with correct font, no need to do anything + // in UpdateFontIfNeeded() any longer + if ( !text.empty() ) + { + m_updateFont = FALSE; + } + // Bring editable's cursor back uptodate. SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); -#endif +#endif // GTK 1.x/2.0 } else // single line { + // First remove the selection if there is one + gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); + // This moves the cursor pos to behind the inserted text. gint len = GET_EDITABLE_POS(m_text); - + #ifdef __WXGTK20__ #if wxUSE_UNICODE wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); #else wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif +#endif gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); - + #else gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len ); #endif - // Bring editable's cursor uptodate. - len += text.Len(); - // Bring entry's cursor uptodate. gtk_entry_set_position( GTK_ENTRY(m_text), len ); } @@ -626,10 +673,21 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const return buf; } else -#endif { return wxEmptyString; } +#else + GtkTextBuffer *text_buffer; + text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(m_text)); + GtkTextIter line; + gtk_text_buffer_get_iter_at_line(text_buffer,&line,lineNo); + GtkTextIter end; + gtk_text_buffer_get_end_iter(text_buffer,&end ); + gchar *text = gtk_text_buffer_get_text(text_buffer,&line,&end,TRUE); + wxString result(wxGTK_CONV_BACK(text)); + g_free(text); + return result.BeforeFirst(wxT('\n')); +#endif } else { @@ -710,7 +768,7 @@ int wxTextCtrl::GetNumberOfLines() const { #ifdef __WXGTK20__ GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - + return gtk_text_buffer_get_line_count( buffer ); #else gint len = gtk_text_get_length( GTK_TEXT(m_text) ); @@ -864,6 +922,11 @@ void wxTextCtrl::OnParentEnable( bool enable ) } } +void wxTextCtrl::MarkDirty() +{ + m_modified = TRUE; +} + void wxTextCtrl::DiscardEdits() { m_modified = FALSE; @@ -928,6 +991,12 @@ void wxTextCtrl::SetSelection( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + if (from == -1 && to == -1) + { + from = 0; + to = GetValue().Length(); + } + #ifndef __WXGTK20__ if ( (m_windowStyle & wxTE_MULTILINE) && !GTK_TEXT(m_text)->line_start_cache ) @@ -941,7 +1010,14 @@ void wxTextCtrl::SetSelection( long from, long to ) if (m_windowStyle & wxTE_MULTILINE) { #ifdef __WXGTK20__ - // ???? + GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + + GtkTextIter fromi, toi; + gtk_text_buffer_get_iter_at_offset( buf, &fromi, from ); + gtk_text_buffer_get_iter_at_offset( buf, &toi, to ); + + gtk_text_buffer_place_cursor( buf, &toi ); + gtk_text_buffer_move_mark_by_name( buf, "selection_bound", &fromi ); #else gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); #endif @@ -954,9 +1030,16 @@ void wxTextCtrl::SetSelection( long from, long to ) void wxTextCtrl::ShowPosition( long pos ) { -#ifndef __WXGTK20__ if (m_windowStyle & wxTE_MULTILINE) { +#ifdef __WXGTK20__ + GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + GtkTextIter iter; + gtk_text_buffer_get_start_iter( buf, &iter ); + gtk_text_iter_set_offset( &iter, pos ); + GtkTextMark *mark = gtk_text_buffer_create_mark( buf, NULL, &iter, TRUE ); + gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 ); +#else // GTK 1.x GtkAdjustment *vp = GTK_TEXT(m_text)->vadj; float totalLines = (float) GetNumberOfLines(); long posX; @@ -965,8 +1048,8 @@ void wxTextCtrl::ShowPosition( long pos ) float posLine = (float) posY; float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower; gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p); +#endif // GTK 1.x/2.x } -#endif } long wxTextCtrl::GetInsertionPoint() const @@ -977,15 +1060,15 @@ long wxTextCtrl::GetInsertionPoint() const if (m_windowStyle & wxTE_MULTILINE) { GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - + // There is no direct accessor for the cursor, but // internally, the cursor is the "mark" called // "insert" in the text view's btree structure. - + GtkTextMark *mark = gtk_text_buffer_get_insert( text_buffer ); GtkTextIter cursor; gtk_text_buffer_get_iter_at_mark( text_buffer, &cursor, mark ); - + return gtk_text_iter_get_offset( &cursor ); } else @@ -1000,14 +1083,14 @@ long wxTextCtrl::GetLastPosition() const wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); int pos = 0; - + if (m_windowStyle & wxTE_MULTILINE) { #ifdef __WXGTK20__ GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); GtkTextIter end; gtk_text_buffer_get_end_iter( text_buffer, &end ); - + pos = gtk_text_iter_get_offset( &end ); #else pos = gtk_text_get_length( GTK_TEXT(m_text) ); @@ -1025,29 +1108,44 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifndef __WXGTK20__ - gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); +#ifdef __WXGTK20__ + if (m_windowStyle & wxTE_MULTILINE) + { + GtkTextBuffer * + text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + + GtkTextIter fromi, toi; + gtk_text_buffer_get_iter_at_offset( text_buffer, &fromi, from ); + gtk_text_buffer_get_iter_at_offset( text_buffer, &toi, to ); + + gtk_text_buffer_delete( text_buffer, &fromi, &toi ); + } + else // single line #endif + gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } void wxTextCtrl::Replace( long from, long to, const wxString &value ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifndef __WXGTK20__ - gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + Remove( from, to ); if (!value.IsEmpty()) { +#ifdef __WXGTK20__ + SetInsertionPoint( from ); + WriteText( value ); +#else // GTK 1.x gint pos = (gint)from; #if wxUSE_UNICODE wxWX2MBbuf buf = value.mbc_str(); gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos ); #else gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos ); -#endif +#endif // wxUSE_UNICODE +#endif // GTK 1.x/2.x } -#endif } void wxTextCtrl::Cut() @@ -1110,31 +1208,49 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - gint from, to; + gint from = -1; + gint to = -1; + bool haveSelection = FALSE; + #ifdef __WXGTK20__ - if ( !gtk_editable_get_selection_bounds(GTK_EDITABLE(m_text), &from, &to) ) -#else - if ( !(GTK_EDITABLE(m_text)->has_selection) ) -#endif - { - from = - to = GetInsertionPoint(); - } - else // got selection - { -#ifndef __WXGTK20__ - from = (long) GTK_EDITABLE(m_text)->selection_start_pos; - to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + if (m_windowStyle & wxTE_MULTILINE) + { + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (m_text)); + GtkTextIter ifrom, ito; + if ( gtk_text_buffer_get_selection_bounds(buffer, &ifrom, &ito) ) + { + haveSelection = TRUE; + from = gtk_text_iter_get_offset(&ifrom); + to = gtk_text_iter_get_offset(&ito); + } + } + else // not multi-line + { + if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text), + &from, &to) ) + { + haveSelection = TRUE; + } + } +#else // not GTK2 + if ( (GTK_EDITABLE(m_text)->has_selection) ) + { + haveSelection = TRUE; + from = (long) GTK_EDITABLE(m_text)->selection_start_pos; + to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + } #endif - if ( from > to ) - { - // exchange them to be compatible with wxMSW - gint tmp = from; - from = to; - to = tmp; - } - } + if (! haveSelection ) + from = to = GetInsertionPoint(); + + if ( from > to ) + { + // exchange them to be compatible with wxMSW + gint tmp = from; + from = to; + to = tmp; + } if ( fromOut ) *fromOut = from; @@ -1142,12 +1258,20 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const *toOut = to; } + bool wxTextCtrl::IsEditable() const { wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); #ifdef __WXGTK20__ - return gtk_editable_get_editable(GTK_EDITABLE(m_text)); + if (m_windowStyle & wxTE_MULTILINE) + { + return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)); + } + else + { + return gtk_editable_get_editable(GTK_EDITABLE(m_text)); + } #else return GTK_EDITABLE(m_text)->editable; #endif @@ -1167,7 +1291,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) + if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject(this); @@ -1175,15 +1299,15 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) if (GetEventHandler()->ProcessEvent(event)) return; } - if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) + if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) { // This will invoke the dialog default action, such // as the clicking the default button. - + wxWindow *top_frame = m_parent; while (top_frame->GetParent() && !(top_frame->IsTopLevel())) top_frame = top_frame->GetParent(); - + if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) { GtkWindow *window = GTK_WINDOW(top_frame->m_widget); @@ -1300,7 +1424,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if (m_windowStyle & wxTE_MULTILINE) { -#ifndef __WXGTK__ +#ifndef __WXGTK20__ GdkWindow *window = GTK_TEXT(m_text)->text_area; if (!window) return FALSE; @@ -1318,16 +1442,50 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) { - /* VERY dirty way to do that - removes the required text and re-adds it - with styling (FIXME) */ if ( m_windowStyle & wxTE_MULTILINE ) { -#ifndef __WXGTK20__ if ( style.IsDefault() ) { // nothing to do return TRUE; } +#ifdef __WXGTK20__ + GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + gint l = gtk_text_buffer_get_char_count( text_buffer ); + + wxCHECK_MSG( start >= 0 && end <= l, FALSE, + _T("invalid range in wxTextCtrl::SetStyle") ); + + GtkTextIter starti, endi; + gtk_text_buffer_get_iter_at_offset( text_buffer, &starti, start ); + gtk_text_buffer_get_iter_at_offset( text_buffer, &endi, end ); + + // use the attributes from style which are set in it and fall back + // first to the default style and then to the text control default + // colours for the others + wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this); + + PangoFontDescription *font_description = attr.HasFont() + ? attr.GetFont().GetNativeFontInfo()->description + : NULL; + + GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = attr.HasBackgroundColour() + ? attr.GetBackgroundColour().GetColor() + : NULL; + + GtkTextTag *tag; + tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description, + "foreground-gdk", colFg, + "background-gdk", colBg, NULL ); + gtk_text_buffer_apply_tag( text_buffer, tag, &starti, &endi ); + + return TRUE; +#else + // VERY dirty way to do that - removes the required text and re-adds it + // with styling (FIXME) gint l = gtk_text_get_length( GTK_TEXT(m_text) ); @@ -1470,7 +1628,8 @@ void wxTextCtrl::OnInternalIdle() } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } wxSize wxTextCtrl::DoGetBestSize() const