X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c35b54e2da67f4c633a894f9b88fa3d0d156519..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index bfa26d0b92..79726b054c 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -7,27 +7,27 @@ // 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" #include "wx/log.h" #include "wx/settings.h" #include "wx/panel.h" +#include "wx/strconv.h" +#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include #include #include // for fabs -// TODO: reimplement wxTextCtrl using GtkTextView -#ifdef __WXGTK20__ - #define GTK_ENABLE_BROKEN // need this to get GtkText at all -#endif // __WXGTK20__ - #include "wx/gtk/private.h" #include @@ -50,6 +50,36 @@ 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, @@ -67,6 +97,7 @@ static void wxGtkTextInsert(GtkWidget *text, gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); } +#endif // GTK 1.x // ---------------------------------------------------------------------------- // "insert_text" for GtkEntry @@ -136,6 +167,7 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) // "changed" from vertical scrollbar //----------------------------------------------------------------------------- +#ifndef __WXGTK20__ static void gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { @@ -146,6 +178,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) win->CalculateScrollbar(); } +#endif // ---------------------------------------------------------------------------- // redraw callback for multiline text @@ -160,7 +193,9 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) extern bool wxIsInsideYield; -typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect); +extern "C" { + typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect); +} static GtkDrawCallback gs_gtk_text_draw = NULL; @@ -246,20 +281,41 @@ bool wxTextCtrl::Create( wxWindow *parent, m_vScrollbarVisible = FALSE; bool multi_line = (style & wxTE_MULTILINE) != 0; + +#ifdef __WXGTK20__ + GtkTextBuffer *buffer = NULL; +#endif + if (multi_line) { -#ifdef __WXGTK13__ - /* a multi-line edit control: create a vertical scrollbar by default and - horizontal if requested */ - bool bHasHScrollbar = (style & wxHSCROLL) != 0; -#else - bool bHasHScrollbar = FALSE; -#endif +#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 ); - /* create our control ... */ + // 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 ); + else + gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD ); + + if (!HasFlag(wxNO_BORDER)) + gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); +#else + // create our control ... m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); - /* ... and put into the upper left hand corner of the table */ + // ... and put into the upper left hand corner of the table + bool bHasHScrollbar = FALSE; m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1, @@ -267,37 +323,21 @@ bool wxTextCtrl::Create( wxWindow *parent, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), 0, 0); - /* always wrap words */ + // always wrap words gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE ); -#ifdef __WXGTK13__ - /* put the horizontal scrollbar in the lower left hand corner */ - if (bHasHScrollbar) - { - GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); - GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS ); - gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), - GTK_FILL, - 0, 0); - gtk_widget_show(hscrollbar); - - /* don't wrap lines, otherwise we wouldn't need the scrollbar */ - gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE ); - } -#endif - - /* finally, put the vertical scrollbar in the upper right corner */ + // finally, put the vertical scrollbar in the upper right corner m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj ); GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS ); gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1, GTK_FILL, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), 0, 0); +#endif } else { - /* a single-line text control: no need for scrollbars */ + // a single-line text control: no need for scrollbars m_widget = m_text = gtk_entry_new(); } @@ -307,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 ); @@ -322,12 +361,12 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) gtk_widget_show(m_text); +#ifndef __WXGTK20__ if (multi_line) { gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this ); -#ifndef __WXGTK20__ // only initialize gs_gtk_text_draw once, starting from the next the // klass::draw will already be wxgtk_text_draw if ( !gs_gtk_text_draw ) @@ -339,12 +378,14 @@ bool wxTextCtrl::Create( wxWindow *parent, draw = wxgtk_text_draw; } -#endif // GTK+ 1.x } +#endif // GTK+ 1.x if (!value.IsEmpty()) { - gint tmp = 0; +#ifdef __WXGTK20__ + SetValue( value ); +#else #if !GTK_CHECK_VERSION(1, 2, 0) // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in @@ -352,18 +393,21 @@ bool wxTextCtrl::Create( wxWindow *parent, gtk_widget_realize(m_text); #endif // GTK 1.0 + gint tmp = 0; #if wxUSE_UNICODE wxWX2MBbuf val = value.mbc_str(); gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp ); -#else // !Unicode +#else gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); -#endif // Unicode/!Unicode +#endif if (multi_line) { - /* bring editable's cursor uptodate. bug in GTK. */ + // Bring editable's cursor uptodate. Bug in GTK. SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); } + +#endif } if (style & wxTE_PASSWORD) @@ -376,19 +420,35 @@ bool wxTextCtrl::Create( wxWindow *parent, { if (!multi_line) gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); +#ifdef __WXGTK20__ + else + gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE); + } +#else } else { if (multi_line) gtk_text_set_editable( GTK_TEXT(m_text), 1 ); } +#endif - /* we want to be notified about text changes */ + // We want to be notified about text changes. +#ifdef __WXGTK20__ + if (multi_line) + { + g_signal_connect( G_OBJECT(buffer), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + } + else +#endif + { gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + } - /* we don't set a valid background colour, because the window - manager should use a default one */ + // we don't set a valid background colour, because the window + // manager should use a default one m_backgroundColour = wxColour(); wxColour colFg = parent->GetForegroundColour(); @@ -406,6 +466,7 @@ bool wxTextCtrl::Create( wxWindow *parent, void wxTextCtrl::CalculateScrollbar() { +#ifndef __WXGTK20__ if ((m_windowStyle & wxTE_MULTILINE) == 0) return; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; @@ -426,6 +487,7 @@ void wxTextCtrl::CalculateScrollbar() m_vScrollbarVisible = TRUE; } } +#endif } wxString wxTextCtrl::GetValue() const @@ -435,15 +497,35 @@ wxString wxTextCtrl::GetValue() const wxString tmp; if (m_windowStyle & wxTE_MULTILINE) { +#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) ); char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - tmp = wxString(text,*wxConvCurrent); + tmp = text; g_free( text ); +#endif } else { - tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent); + tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) ); } + return tmp; } @@ -453,19 +535,26 @@ void wxTextCtrl::SetValue( const wxString &value ) if (m_windowStyle & wxTE_MULTILINE) { +#ifdef __WXGTK20__ + +#if wxUSE_UNICODE + wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) ); +#else + wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) ); +#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 ); len = 0; -#if wxUSE_UNICODE - wxWX2MBbuf tmpbuf = value.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len ); -#else gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); #endif } else { - gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) ); } // GRG, Jun/2000: Changed this after a lot of discussion in @@ -483,36 +572,68 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( text.empty() ) return; + if ( m_windowStyle & wxTE_MULTILINE ) + { +#ifdef __WXGTK20__ + #if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - const char *txt = buf; - size_t txtlen = strlen(buf); + wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); #else - const char *txt = text; - size_t txtlen = text.length(); + wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); #endif + GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); - if ( m_windowStyle & wxTE_MULTILINE ) - { + // 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 - wxGtkTextInsert(m_text, m_defaultStyle, txt, txtlen); + 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 // 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); - gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); - // Bring editable's cursor uptodate. - len += text.Len(); +#ifdef __WXGTK20__ + +#if wxUSE_UNICODE + wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); +#else + wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); +#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 entry's cursor uptodate. gtk_entry_set_position( GTK_ENTRY(m_text), len ); @@ -531,6 +652,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const { if (m_windowStyle & wxTE_MULTILINE) { +#ifndef __WXGTK20__ gint len = gtk_text_get_length( GTK_TEXT(m_text) ); char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); @@ -554,6 +676,18 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const { 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 { @@ -632,6 +766,11 @@ int wxTextCtrl::GetNumberOfLines() const { if (m_windowStyle & wxTE_MULTILINE) { +#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) ); char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); @@ -652,6 +791,7 @@ int wxTextCtrl::GetNumberOfLines() const { return 0; } +#endif } else { @@ -665,14 +805,17 @@ void wxTextCtrl::SetInsertionPoint( long pos ) if (m_windowStyle & wxTE_MULTILINE) { - /* seems to be broken in GTK 1.0.X: - gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */ - +#ifdef __WXGTK20__ + GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset( text_buffer, &iter, pos ); + gtk_text_buffer_place_cursor( text_buffer, &iter ); +#else gtk_signal_disconnect_by_func( GTK_OBJECT(m_text), GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); /* we fake a set_point by inserting and deleting. as the user - isn't supposed to get to know about thos non-sense, we + isn't supposed to get to know about this non-sense, we disconnect so that no events are sent to the user program. */ gint tmp = (gint)pos; @@ -682,16 +825,15 @@ void wxTextCtrl::SetInsertionPoint( long pos ) gtk_signal_connect( GTK_OBJECT(m_text), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - /* bring editable's cursor uptodate. another bug in GTK. */ - + // bring editable's cursor uptodate. Bug in GTK. SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); +#endif } else { gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos ); - /* bring editable's cursor uptodate. bug in GTK. */ - + // Bring editable's cursor uptodate. Bug in GTK. SET_EDITABLE_POS(m_text, (guint32)pos); } } @@ -701,9 +843,20 @@ void wxTextCtrl::SetInsertionPointEnd() wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); 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 ); + gtk_text_buffer_place_cursor( text_buffer, &end ); +#else SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); +#endif + } else + { gtk_entry_set_position( GTK_ENTRY(m_text), -1 ); + } } void wxTextCtrl::SetEditable( bool editable ) @@ -711,9 +864,17 @@ void wxTextCtrl::SetEditable( bool editable ) wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (m_windowStyle & wxTE_MULTILINE) + { +#ifdef __WXGTK20__ + gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable ); +#else gtk_text_set_editable( GTK_TEXT(m_text), editable ); +#endif + } else + { gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); + } } bool wxTextCtrl::Enable( bool enable ) @@ -726,8 +887,12 @@ bool wxTextCtrl::Enable( bool enable ) if (m_windowStyle & wxTE_MULTILINE) { +#ifdef __WXGTK20__ + SetEditable( enable ); +#else gtk_text_set_editable( GTK_TEXT(m_text), enable ); OnParentEnable(enable); +#endif } else { @@ -757,6 +922,11 @@ void wxTextCtrl::OnParentEnable( bool enable ) } } +void wxTextCtrl::MarkDirty() +{ + m_modified = TRUE; +} + void wxTextCtrl::DiscardEdits() { m_modified = FALSE; @@ -821,6 +991,13 @@ 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 ) { @@ -828,14 +1005,41 @@ void wxTextCtrl::SetSelection( long from, long to ) wxLogDebug(_T("Can't call SetSelection() before realizing the control")); return; } +#endif - gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)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 + } + else + { + gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + } } void wxTextCtrl::ShowPosition( long pos ) { 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; @@ -844,6 +1048,7 @@ 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 } } @@ -851,7 +1056,26 @@ long wxTextCtrl::GetInsertionPoint() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); +#ifdef __WXGTK20__ + 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 +#endif + { return (long) GET_EDITABLE_POS(m_text); + } } long wxTextCtrl::GetLastPosition() const @@ -859,10 +1083,23 @@ 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) ); +#endif + } else + { pos = GTK_ENTRY(m_text)->text_length; + } return (long)pos; } @@ -871,6 +1108,20 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); +#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 ); } @@ -878,17 +1129,22 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - 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 } } @@ -896,21 +1152,27 @@ void wxTextCtrl::Cut() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); +#ifndef __WXGTK20__ gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG ); +#endif } void wxTextCtrl::Copy() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); +#ifndef __WXGTK20__ gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG ); +#endif } void wxTextCtrl::Paste() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); +#ifndef __WXGTK20__ gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG ); +#endif } // Undo/redo @@ -929,14 +1191,14 @@ void wxTextCtrl::Redo() bool wxTextCtrl::CanUndo() const { // TODO - wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); + //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); return FALSE; } bool wxTextCtrl::CanRedo() const { // TODO - wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); + //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); return FALSE; } @@ -946,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; @@ -978,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 @@ -1003,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); @@ -1011,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); @@ -1043,9 +1331,17 @@ GtkWidget* wxTextCtrl::GetConnectWidget() bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) { if (m_windowStyle & wxTE_MULTILINE) + { +#ifdef __WXGTK20__ + return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork +#else return (window == GTK_TEXT(m_text)->text_area); +#endif + } else + { return (window == GTK_ENTRY(m_text)->text_area); + } } // the font will change for subsequent text insertiongs @@ -1128,12 +1424,14 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if (m_windowStyle & wxTE_MULTILINE) { +#ifndef __WXGTK20__ GdkWindow *window = GTK_TEXT(m_text)->text_area; if (!window) return FALSE; m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); gdk_window_set_background( window, m_backgroundColour.GetColor() ); gdk_window_clear( window ); +#endif } // change active background color too @@ -1144,8 +1442,6 @@ 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 ) { if ( style.IsDefault() ) @@ -1153,6 +1449,43 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) // 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) ); @@ -1187,6 +1520,7 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) /* does not seem to help under GTK+ 1.2 !!! gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */ SetInsertionPoint( old_pos ); +#endif return TRUE; } else // singe line @@ -1266,6 +1600,7 @@ void wxTextCtrl::OnInternalIdle() if (cursor.Ok()) { +#ifndef __WXGTK20__ GdkWindow *window = (GdkWindow*) NULL; if (HasFlag(wxTE_MULTILINE)) window = GTK_TEXT(m_text)->text_area; @@ -1281,6 +1616,7 @@ void wxTextCtrl::OnInternalIdle() window = m_widget->window; if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) gdk_window_set_cursor( window, cursor.GetCursor() ); +#endif } if (g_delayedFocus == this) @@ -1292,7 +1628,8 @@ void wxTextCtrl::OnInternalIdle() } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } wxSize wxTextCtrl::DoGetBestSize() const @@ -1308,20 +1645,24 @@ wxSize wxTextCtrl::DoGetBestSize() const void wxTextCtrl::Freeze() { +#ifndef __WXGTK20__ if ( HasFlag(wxTE_MULTILINE) ) { gtk_text_freeze(GTK_TEXT(m_text)); } +#endif } void wxTextCtrl::Thaw() { +#ifndef __WXGTK20__ if ( HasFlag(wxTE_MULTILINE) ) { GTK_TEXT(m_text)->vadj->value = 0.0; gtk_text_thaw(GTK_TEXT(m_text)); } +#endif } // ---------------------------------------------------------------------------- @@ -1330,11 +1671,16 @@ void wxTextCtrl::Thaw() GtkAdjustment *wxTextCtrl::GetVAdj() const { +#ifdef __WXGTK20__ + return NULL; +#else return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL; +#endif } bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff) { +#ifndef __WXGTK20__ float value = adj->value + diff; if ( value < 0 ) @@ -1355,11 +1701,15 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff) gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); +#endif return TRUE; } bool wxTextCtrl::ScrollLines(int lines) { +#ifdef __WXGTK20__ + return FALSE; +#else GtkAdjustment *adj = GetVAdj(); if ( !adj ) return FALSE; @@ -1368,14 +1718,19 @@ bool wxTextCtrl::ScrollLines(int lines) static const int KEY_SCROLL_PIXELS = 10; return DoScroll(adj, lines*KEY_SCROLL_PIXELS); +#endif } bool wxTextCtrl::ScrollPages(int pages) { +#ifdef __WXGTK20__ + return FALSE; +#else GtkAdjustment *adj = GetVAdj(); if ( !adj ) return FALSE; return DoScroll(adj, (int)ceil(pages*adj->page_increment)); +#endif }