X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a7a4e10ed18f81a576dcd866cfbf02bf404c00..fac7f644e2c46168555cfeda70feb9cfe46a179e:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 7705302842..8fc7205172 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -10,34 +10,26 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_TEXTCTRL + #include "wx/textctrl.h" #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/math.h" #endif -#include "wx/utils.h" -#include "wx/log.h" -#include "wx/math.h" -#include "wx/settings.h" -#include "wx/panel.h" #include "wx/strconv.h" #include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include #include -#include "wx/math.h" #include "wx/gtk/private.h" -#include - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; // ---------------------------------------------------------------------------- // helpers @@ -46,8 +38,8 @@ extern wxWindowGTK *g_delayedFocus; extern "C" { static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, GtkTextTag *tag, - GtkTextIter *start, - GtkTextIter *end, + GtkTextIter * WXUNUSED(start), + GtkTextIter * WXUNUSED(end), char *prefix) { gchar *name; @@ -61,8 +53,26 @@ static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, } } -extern "C" { -static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, +// remove all tags starting with the given prefix from the start..end range +static void +wxGtkTextRemoveTagsWithPrefix(GtkTextBuffer *text_buffer, + const char *prefix, + GtkTextIter *start, + GtkTextIter *end) +{ + gulong remove_handler_id = g_signal_connect + ( + text_buffer, + "remove_tag", + G_CALLBACK(wxGtkOnRemoveTag), + gpointer(prefix) + ); + gtk_text_buffer_remove_all_tags(text_buffer, start, end); + g_signal_handler_disconnect(text_buffer, remove_handler_id); +} + +static void wxGtkTextApplyTagsFromAttr(GtkWidget *text, + GtkTextBuffer *text_buffer, const wxTextAttr& attr, GtkTextIter *start, GtkTextIter *end) @@ -70,17 +80,15 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, static gchar buf[1024]; GtkTextTag *tag; - gulong remove_handler_id = g_signal_connect (text_buffer, "remove_tag", - G_CALLBACK (wxGtkOnRemoveTag), gpointer("WX")); - gtk_text_buffer_remove_all_tags(text_buffer, start, end); - g_signal_handler_disconnect (text_buffer, remove_handler_id); - if (attr.HasFont()) { - char *font_string; - PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description; - font_string = pango_font_description_to_string(font_description); - g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end); + + wxFont font(attr.GetFont()); + + PangoFontDescription *font_description = font.GetNativeFontInfo()->description; + wxGtkString font_string(pango_font_description_to_string(font_description)); + g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str()); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), buf ); if (!tag) @@ -88,9 +96,8 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, "font-desc", font_description, NULL ); gtk_text_buffer_apply_tag (text_buffer, tag, start, end); - g_free (font_string); - if (attr.GetFont().GetUnderlined()) + if (font.GetUnderlined()) { g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE"); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), @@ -106,7 +113,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, if (attr.HasTextColour()) { - GdkColor *colFg = attr.GetTextColour().GetColor(); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end); + + const GdkColor *colFg = attr.GetTextColour().GetColor(); g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d", colFg->red, colFg->green, colFg->blue); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), @@ -119,7 +128,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, if (attr.HasBackgroundColour()) { - GdkColor *colBg = attr.GetBackgroundColour().GetColor(); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end); + + const GdkColor *colBg = attr.GetBackgroundColour().GetColor(); g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d", colBg->red, colBg->green, colBg->blue); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), @@ -138,11 +149,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, gtk_text_iter_get_line(start) ); gtk_text_iter_forward_line(¶_end); - remove_handler_id = g_signal_connect (text_buffer, "remove_tag", - G_CALLBACK(wxGtkOnRemoveTag), - gpointer("WXALIGNMENT")); - gtk_text_buffer_remove_all_tags( text_buffer, ¶_start, ¶_end ); - g_signal_handler_disconnect (text_buffer, remove_handler_id); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end); GtkJustification align; switch (attr.GetAlignment()) @@ -156,7 +163,16 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, case wxTEXT_ALIGNMENT_CENTER: align = GTK_JUSTIFY_CENTER; break; - // gtk+ doesn't support justify as of gtk+-2.7.4 +// gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available +// (but if new enough pango isn't available it's a mere gtk warning) +#if GTK_CHECK_VERSION(2,11,0) + case wxTEXT_ALIGNMENT_JUSTIFIED: + if (!gtk_check_version(2,11,0)) + align = GTK_JUSTIFY_FILL; + else + align = GTK_JUSTIFY_LEFT; + break; +#endif } g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align); @@ -167,10 +183,93 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, "justification", align, NULL ); gtk_text_buffer_apply_tag( text_buffer, tag, ¶_start, ¶_end ); } -} + + if (attr.HasLeftIndent()) + { + // Indentation attribute + + // Clear old indentation tags + GtkTextIter para_start, para_end = *end; + gtk_text_buffer_get_iter_at_line( text_buffer, + ¶_start, + gtk_text_iter_get_line(start) ); + gtk_text_iter_forward_line(¶_end); + + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end); + + // Convert indent from 1/10th of a mm into pixels + float factor = + (float)gdk_screen_get_width(gtk_widget_get_screen(text)) / + gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10; + + const int indent = (int)(factor * attr.GetLeftIndent()); + const int subIndent = (int)(factor * attr.GetLeftSubIndent()); + + gint gindent; + gint gsubindent; + + if (subIndent >= 0) + { + gindent = indent; + gsubindent = -subIndent; + } + else + { + gindent = -subIndent; + gsubindent = indent; + } + + g_snprintf(buf, sizeof(buf), "WXINDENT %d %d", gindent, gsubindent); + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buf ); + if (!tag) + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "left-margin", gindent, "indent", gsubindent, NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, ¶_start, ¶_end); + } + + if (attr.HasTabs()) + { + // Set tab stops + + // Clear old tabs + GtkTextIter para_start, para_end = *end; + gtk_text_buffer_get_iter_at_line( text_buffer, + ¶_start, + gtk_text_iter_get_line(start) ); + gtk_text_iter_forward_line(¶_end); + + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end); + + const wxArrayInt& tabs = attr.GetTabs(); + + wxString tagname = _T("WXTABS"); + g_snprintf(buf, sizeof(buf), "WXTABS"); + for (size_t i = 0; i < tabs.GetCount(); i++) + tagname += wxString::Format(_T(" %d"), tabs[i]); + + const wxWX2MBbuf buftag = tagname.utf8_str(); + + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buftag ); + if (!tag) + { + // Factor to convert from 1/10th of a mm into pixels + float factor = + (float)gdk_screen_get_width(gtk_widget_get_screen(text)) / + gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10; + + PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE); + for (size_t i = 0; i < tabs.GetCount(); i++) + pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor)); + tag = gtk_text_buffer_create_tag( text_buffer, buftag, + "tabs", tabArray, NULL ); + pango_tab_array_free(tabArray); + } + gtk_text_buffer_apply_tag (text_buffer, tag, ¶_start, ¶_end); + } } -extern "C" { static void wxGtkTextInsert(GtkWidget *text, GtkTextBuffer *text_buffer, const wxTextAttr& attr, @@ -187,50 +286,7 @@ static void wxGtkTextInsert(GtkWidget *text, gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset); - wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); -} -} - -// ---------------------------------------------------------------------------- -// "insert_text" for GtkEntry -// ---------------------------------------------------------------------------- - -extern "C" { -static void -gtk_insert_text_callback(GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position, - wxTextCtrl *win) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // we should only be called if we have a max len limit at all - GtkEntry *entry = GTK_ENTRY (editable); - - wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") ); - - // check that we don't overflow the max length limit - // - // FIXME: this doesn't work when we paste a string which is going to be - // truncated - if ( entry->text_length == entry->text_max_length ) - { - // we don't need to run the base class version at all - g_signal_stop_emission_by_name (editable, "insert_text"); - - // remember that the next changed signal is to be ignored to avoid - // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event - win->IgnoreNextTextUpdate(); - - // and generate the correct one ourselves - wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId()); - event.SetEventObject(win); - event.SetString(win->GetValue()); - win->GetEventHandler()->ProcessEvent( event ); - } -} + wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter); } // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp, @@ -239,9 +295,9 @@ extern "C" { static void au_apply_tag_callback(GtkTextBuffer *buffer, GtkTextTag *tag, - GtkTextIter *start, - GtkTextIter *end, - gpointer textctrl) + GtkTextIter * WXUNUSED(start), + GtkTextIter * WXUNUSED(end), + gpointer WXUNUSED(textctrl)) { if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl")) g_signal_stop_emission_by_name (buffer, "apply_tag"); @@ -254,7 +310,7 @@ au_apply_tag_callback(GtkTextBuffer *buffer, extern "C" { static gboolean -pred_whitespace (gunichar ch, gpointer user_data) +pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data)) { return g_unichar_isspace(ch); } @@ -262,7 +318,7 @@ pred_whitespace (gunichar ch, gpointer user_data) extern "C" { static gboolean -pred_non_whitespace (gunichar ch, gpointer user_data) +pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data)) { return !g_unichar_isspace(ch); } @@ -270,7 +326,7 @@ pred_non_whitespace (gunichar ch, gpointer user_data) extern "C" { static gboolean -pred_nonpunct (gunichar ch, gpointer user_data) +pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data)) { return !g_unichar_ispunct(ch); } @@ -278,7 +334,7 @@ pred_nonpunct (gunichar ch, gpointer user_data) extern "C" { static gboolean -pred_nonpunct_or_slash (gunichar ch, gpointer user_data) +pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(user_data)) { return !g_unichar_ispunct(ch) || ch == '/'; } @@ -327,7 +383,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) gtk_text_iter_backward_find_char( &end, pred_nonpunct_or_slash, NULL, &start ); gtk_text_iter_forward_char(&end); - gchar* text = gtk_text_iter_get_text( &start, &end ); + wxGtkString text(gtk_text_iter_get_text( &start, &end )); size_t len = strlen(text), prefix_len; size_t n; @@ -387,7 +443,7 @@ au_check_range(GtkTextIter *s, extern "C" { static void -au_insert_text_callback(GtkTextBuffer *buffer, +au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer), GtkTextIter *end, gchar *text, gint len, @@ -419,7 +475,7 @@ au_insert_text_callback(GtkTextBuffer *buffer, extern "C" { static void -au_delete_range_callback(GtkTextBuffer *buffer, +au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer), GtkTextIter *start, GtkTextIter *end, wxTextCtrl *win) @@ -445,21 +501,59 @@ au_delete_range_callback(GtkTextBuffer *buffer, extern "C" { static void -gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) +gtk_text_changed_callback( GtkWidget * WXUNUSED(widget), wxTextCtrl *win ) { if ( win->IgnoreTextUpdate() ) return; if (!win->m_hasVMT) return; - if (g_isIdle) - wxapp_install_idle_handler(); + if ( win->MarkDirtyOnChange() ) + win->MarkDirty(); - win->SetModified(); + win->SendTextUpdatedEvent(); +} +} - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); +//----------------------------------------------------------------------------- +// clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard" +//----------------------------------------------------------------------------- + +// common part of the event handlers below +static void +handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win, + wxEventType eventType, const gchar * signal_name) +{ + wxClipboardTextEvent event( eventType, win->GetId() ); event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + if ( win->HandleWindowEvent( event ) ) + { + // don't let the default processing to take place if we did something + // ourselves in the event handler + g_signal_stop_emission_by_name (widget, signal_name); + } +} + +extern "C" { +static void +gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" ); +} + +static void +gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" ); +} + +static void +gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" ); } } @@ -469,7 +563,9 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) extern "C" { static gboolean -gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) +gtk_text_exposed_callback( GtkWidget * WXUNUSED(widget), + GdkEventExpose * WXUNUSED(event), + wxTextCtrl * WXUNUSED(win) ) { return TRUE; } @@ -480,9 +576,9 @@ gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl // wxTextCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) @@ -510,12 +606,16 @@ END_EVENT_TABLE() void wxTextCtrl::Init() { - m_ignoreNextUpdate = + m_dontMarkDirty = m_modified = false; + + m_countUpdatesToIgnore = 0; + SetUpdateFont(false); - m_text = - m_vScrollbar = (GtkWidget *)NULL; - m_frozenness = 0; + + m_text = NULL; + m_freezeCount = 0; + m_showPositionOnThaw = NULL; m_gdkHandCursor = NULL; m_gdkXTermCursor = NULL; } @@ -551,9 +651,6 @@ bool wxTextCtrl::Create( wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_needParent = true; - m_acceptsFocus = true; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { @@ -561,9 +658,6 @@ bool wxTextCtrl::Create( wxWindow *parent, return false; } - - m_vScrollbarVisible = false; - bool multi_line = (style & wxTE_MULTILINE) != 0; if (multi_line) @@ -573,36 +667,25 @@ bool wxTextCtrl::Create( wxWindow *parent, m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + // create "ShowPosition" marker + GtkTextIter iter; + gtk_text_buffer_get_start_iter(m_buffer, &iter); + gtk_text_buffer_create_mark(m_buffer, "ShowPosition", &iter, true); + // 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 ); + GTK_POLICY_AUTOMATIC, + style & wxTE_NO_VSCROLL + ? GTK_POLICY_NEVER + : GTK_POLICY_AUTOMATIC ); + // for ScrollLines/Pages + m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar; // Insert view into scrolled window gtk_container_add( GTK_CONTAINER(m_widget), m_text ); - // translate wx wrapping style to GTK+ - GtkWrapMode wrap; - if ( HasFlag( wxTE_DONTWRAP ) ) - wrap = GTK_WRAP_NONE; - else if ( HasFlag( wxTE_CHARWRAP ) ) - wrap = GTK_WRAP_CHAR; - else if ( HasFlag( wxTE_WORDWRAP ) ) - wrap = GTK_WRAP_WORD; - else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0 - { - // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4 -#ifdef __WXGTK24__ - if ( !gtk_check_version(2,4,0) ) - { - wrap = GTK_WRAP_WORD_CHAR; - } - else -#endif - wrap = GTK_WRAP_WORD; - } - - gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); + GTKSetWrapMode(); GtkScrolledWindowSetBorder(m_widget, style); @@ -617,7 +700,8 @@ bool wxTextCtrl::Create( wxWindow *parent, m_text = gtk_entry_new(); if (style & wxNO_BORDER) - g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL ); + g_object_set (m_text, "has-frame", FALSE, NULL); + } m_parent->DoAddChild( this ); @@ -629,7 +713,18 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) { gtk_widget_show(m_text); - SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget)); + } + + // We want to be notified about text changes. + if (multi_line) + { + g_signal_connect (m_buffer, "changed", + G_CALLBACK (gtk_text_changed_callback), this); + } + else + { + g_signal_connect (m_text, "changed", + G_CALLBACK (gtk_text_changed_callback), this); } if (!value.empty()) @@ -638,48 +733,18 @@ bool wxTextCtrl::Create( wxWindow *parent, } if (style & wxTE_PASSWORD) - { - if (!multi_line) - gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE ); - } + GTKSetVisibility(); if (style & wxTE_READONLY) - { - if (!multi_line) - gtk_editable_set_editable( GTK_EDITABLE(m_text), FALSE ); - else - gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE); - } + GTKSetEditable(); - if (multi_line) - { - if (style & wxTE_RIGHT) - gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_RIGHT ); - else if (style & wxTE_CENTRE) - gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER ); - // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT - } - else - { -#ifdef __WXGTK24__ - // gtk_entry_set_alignment was introduced in gtk+-2.3.5 - if (!gtk_check_version(2,4,0)) - { - if (style & wxTE_RIGHT) - gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 ); - else if (style & wxTE_CENTRE) - gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 ); - } -#endif - } + // left justification (alignment) is the default anyhow + if ( style & (wxTE_RIGHT | wxTE_CENTRE) ) + GTKSetJustification(); - // We want to be notified about text changes. if (multi_line) { - g_signal_connect (m_buffer, "changed", - G_CALLBACK (gtk_text_changed_callback), this); - - // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style + // Handle URLs on multi-line controls with wxTE_AUTO_URL style if (style & wxTE_AUTO_URL) { GtkTextIter start, end; @@ -715,171 +780,312 @@ bool wxTextCtrl::Create( wxWindow *parent, au_check_range(&start, &end); } } - else + else // single line { - g_signal_connect (m_text, "changed", - G_CALLBACK (gtk_text_changed_callback), this); + // do the right thing with Enter presses depending on whether we have + // wxTE_PROCESS_ENTER or not + GTKSetActivatesDefault(); } - m_cursor = wxCursor( wxCURSOR_IBEAM ); - wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont()); - SetDefaultStyle( attrDef ); + g_signal_connect (m_text, "copy-clipboard", + G_CALLBACK (gtk_copy_clipboard_callback), this); + g_signal_connect (m_text, "cut-clipboard", + G_CALLBACK (gtk_cut_clipboard_callback), this); + g_signal_connect (m_text, "paste-clipboard", + G_CALLBACK (gtk_paste_clipboard_callback), this); + + m_cursor = wxCursor( wxCURSOR_IBEAM ); return true; } +GtkEditable *wxTextCtrl::GetEditable() const +{ + wxCHECK_MSG( IsSingleLine(), NULL, "shouldn't be called for multiline" ); + + return GTK_EDITABLE(m_text); +} + +// ---------------------------------------------------------------------------- +// flags handling +// ---------------------------------------------------------------------------- + +void wxTextCtrl::GTKSetEditable() +{ + gboolean editable = !HasFlag(wxTE_READONLY); + if ( IsSingleLine() ) + gtk_editable_set_editable(GTK_EDITABLE(m_text), editable); + else + gtk_text_view_set_editable(GTK_TEXT_VIEW(m_text), editable); +} + +void wxTextCtrl::GTKSetVisibility() +{ + wxCHECK_RET( IsSingleLine(), + "wxTE_PASSWORD is for single line text controls only" ); + + gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD)); +} + +void wxTextCtrl::GTKSetActivatesDefault() +{ + wxCHECK_RET( IsSingleLine(), + "wxTE_PROCESS_ENTER is for single line text controls only" ); + + gtk_entry_set_activates_default(GTK_ENTRY(m_text), + !HasFlag(wxTE_PROCESS_ENTER)); +} + +void wxTextCtrl::GTKSetWrapMode() +{ + // no wrapping in single line controls + if ( !IsMultiLine() ) + return; + + // translate wx wrapping style to GTK+ + GtkWrapMode wrap; + if ( HasFlag( wxTE_DONTWRAP ) ) + wrap = GTK_WRAP_NONE; + else if ( HasFlag( wxTE_CHARWRAP ) ) + wrap = GTK_WRAP_CHAR; + else if ( HasFlag( wxTE_WORDWRAP ) ) + wrap = GTK_WRAP_WORD; + else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0 + wrap = GTK_WRAP_WORD_CHAR; + + gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); +} + +void wxTextCtrl::GTKSetJustification() +{ + if ( IsMultiLine() ) + { + GtkJustification just; + if ( HasFlag(wxTE_RIGHT) ) + just = GTK_JUSTIFY_RIGHT; + else if ( HasFlag(wxTE_CENTRE) ) + just = GTK_JUSTIFY_CENTER; + else // wxTE_LEFT == 0 + just = GTK_JUSTIFY_LEFT; + + gtk_text_view_set_justification(GTK_TEXT_VIEW(m_text), just); + } + else // single line + { + gfloat align; + if ( HasFlag(wxTE_RIGHT) ) + align = 1.0; + else if ( HasFlag(wxTE_CENTRE) ) + align = 0.5; + else // single line + align = 0.0; + + gtk_entry_set_alignment(GTK_ENTRY(m_text), align); + } +} -void wxTextCtrl::CalculateScrollbar() +void wxTextCtrl::SetWindowStyleFlag(long style) { + long styleOld = GetWindowStyleFlag(); + + wxTextCtrlBase::SetWindowStyleFlag(style); + + if ( (style & wxTE_READONLY) != (styleOld & wxTE_READONLY) ) + GTKSetEditable(); + + if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) ) + GTKSetVisibility(); + + if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) ) + GTKSetActivatesDefault(); + + static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP; + if ( (style & flagsWrap) != (styleOld & flagsWrap) ) + GTKSetWrapMode(); + + static const long flagsAlign = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT; + if ( (style & flagsAlign) != (styleOld & flagsAlign) ) + GTKSetJustification(); } +// ---------------------------------------------------------------------------- +// control value +// ---------------------------------------------------------------------------- + wxString wxTextCtrl::GetValue() const { wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") ); - wxString tmp; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter start; gtk_text_buffer_get_start_iter( m_buffer, &start ); GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); - gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE ); - - const wxWxCharBuffer buf = wxGTK_CONV_BACK(text); - if ( buf ) - tmp = buf; + wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true)); - g_free( text ); + return wxGTK_CONV_BACK(text); } - else + else // single line { - const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) ); - const wxWxCharBuffer buf = wxGTK_CONV_BACK( text ); - if ( buf ) - tmp = buf; + return wxTextEntry::GetValue(); } +} + +wxFontEncoding wxTextCtrl::GetTextEncoding() const +{ + // GTK+ uses UTF-8 internally, we need to convert to it but from which + // encoding? + + // first check the default text style (we intentionally don't check the + // style for the current position as it doesn't make sense for SetValue()) + const wxTextAttr& style = GetDefaultStyle(); + wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding() + : wxFONTENCODING_SYSTEM; + + // fall back to the controls font if no style + if ( enc == wxFONTENCODING_SYSTEM && m_hasFont ) + enc = GetFont().GetEncoding(); - return tmp; + return enc; } -void wxTextCtrl::SetValue( const wxString &value ) +bool wxTextCtrl::IsEmpty() const +{ + if ( IsMultiLine() ) + return gtk_text_buffer_get_char_count(m_buffer) == 0; + + return wxTextEntry::IsEmpty(); +} + +void wxTextCtrl::DoSetValue( const wxString &value, int flags ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + m_modified = false; + + if ( !IsMultiLine() ) { - const wxCharBuffer buffer(wxGTK_CONV(value)); - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } + wxTextEntry::DoSetValue(value, flags); + return; + } - if (gtk_text_buffer_get_char_count(m_buffer) != 0) - IgnoreNextTextUpdate(); + wxFontEncoding enc = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetEncoding() + : wxFONTENCODING_SYSTEM; + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); - gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc)); + if ( !buffer ) + { + // see comment in WriteText() as to why we must warn the user about + // this + wxLogWarning(_("Failed to set text in the text control.")); + return; } - else // single line + + if ( !(flags & SetValue_SendEvent) ) + { + EnableTextChangedEvents(false); + } + + gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + + if ( !m_defaultStyle.IsDefault() ) { - // gtk_entry_set_text() emits two "changed" signals because internally - // it calls gtk_editable_delete_text() and gtk_editable_insert_text() - // but we want to have only one event - IgnoreNextTextUpdate(); + GtkTextIter start, end; + gtk_text_buffer_get_bounds( m_buffer, &start, &end ); + wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle, + &start, &end); + } - gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV(value) ); + if ( !(flags & SetValue_SendEvent) ) + { + EnableTextChangedEvents(true); } - // GRG, Jun/2000: Changed this after a lot of discussion in - // the lists. wxWidgets 2.2 will have a set of flags to - // customize this behaviour. + // This was added after discussion on the list SetInsertionPoint(0); - - m_modified = false; } void wxTextCtrl::WriteText( const wxString &text ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ( text.empty() ) - return; + // we're changing the text programmatically + DontMarkDirtyOnNextChange(); - const wxCharBuffer buffer(wxGTK_CONV(text)); - if ( !buffer ) + if ( !IsMultiLine() ) { - // what else can we do? at least don't crash... + wxTextEntry::WriteText(text); return; } - // gtk_text_changed_callback() will set m_modified to true but m_modified - // shouldn't be changed by the program writing to the text control itself, - // so save the old value and restore when we're done - bool oldModified = m_modified; - - if ( m_windowStyle & wxTE_MULTILINE ) + // check if we have a specific style for the current position + wxFontEncoding enc = wxFONTENCODING_SYSTEM; + wxTextAttr style; + if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() ) { - // First remove the selection if there is one - // TODO: Is there an easier GTK specific way to do this? - long from, to; - GetSelection(&from, &to); - if (from != to) - Remove(from, to); + enc = style.GetFontEncoding(); + } - // Insert the text - wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); - 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 ( wxIsSameDouble(adj->value, adj->upper - adj->page_size) ) - { - gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), - gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 ); - } - } - else // single line + const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc)); + if ( !buffer ) { - // First remove the selection if there is one - gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); + // we must log an error here as losing the text like this can be a + // serious problem (e.g. imagine the document edited by user being + // empty instead of containing the correct text) + wxLogWarning(_("Failed to insert text in the control.")); + return; + } - // This moves the cursor pos to behind the inserted text. - gint len = gtk_editable_get_position(GTK_EDITABLE(m_text)); + // First remove the selection if there is one + // TODO: Is there an easier GTK specific way to do this? + long from, to; + GetSelection(&from, &to); + if (from != to) + Remove(from, to); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); + // Insert the text + wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); - // Bring entry's cursor uptodate. - gtk_editable_set_position( GTK_EDITABLE(m_text), len ); + 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 + // won't work when frozen, text view is not using m_buffer then + if (!IsFrozen() && wxIsSameDouble(adj->value, adj->upper - adj->page_size)) + { + gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), + gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 ); } - - m_modified = oldModified; -} - -void wxTextCtrl::AppendText( const wxString &text ) -{ - SetInsertionPointEnd(); - WriteText( text ); } wxString wxTextCtrl::GetLineText( long lineNo ) const { - if (m_windowStyle & wxTE_MULTILINE) + wxString result; + if ( IsMultiLine() ) { GtkTextIter line; gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); + GtkTextIter end = line; - gtk_text_iter_forward_to_line_end(&end); - gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE); - wxString result(wxGTK_CONV_BACK(text)); - g_free(text); - return result; + // avoid skipping to the next line end if this one is empty + if ( !gtk_text_iter_ends_line(&line) ) + gtk_text_iter_forward_to_line_end(&end); + + wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true)); + result = wxGTK_CONV_BACK(text); } else { - if (lineNo == 0) return GetValue(); - return wxEmptyString; + if (lineNo == 0) + result = GetValue(); } + return result; } void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) @@ -891,22 +1097,28 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { GtkTextIter iter; - gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); - if (gtk_text_iter_is_end(&iter)) + + if (pos > GetLastPosition()) return false; - *y = gtk_text_iter_get_line(&iter); - *x = gtk_text_iter_get_line_offset(&iter); + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); + + if ( y ) + *y = gtk_text_iter_get_line(&iter); + if ( x ) + *x = gtk_text_iter_get_line_offset(&iter); } else // single line control { if ( pos <= GTK_ENTRY(m_text)->text_length ) { - *y = 0; - *x = pos; + if ( y ) + *y = 0; + if ( x ) + *x = pos; } else { @@ -920,7 +1132,8 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const long wxTextCtrl::XYToPosition(long x, long y ) const { - if (!(m_windowStyle & wxTE_MULTILINE)) return 0; + if ( IsSingleLine() ) + return 0; GtkTextIter iter; if (y >= gtk_text_buffer_get_line_count (m_buffer)) @@ -935,7 +1148,7 @@ long wxTextCtrl::XYToPosition(long x, long y ) const int wxTextCtrl::GetLineLength(long lineNo) const { - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1; if (lineNo > last_line) @@ -955,33 +1168,9 @@ int wxTextCtrl::GetLineLength(long lineNo) const int wxTextCtrl::GetNumberOfLines() const { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { - GtkTextIter iter; - gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 ); - - // move forward by one display line until the end is reached - int lineCount = 1; - while ( gtk_text_view_forward_display_line(GTK_TEXT_VIEW(m_text), &iter) ) - { - lineCount++; - } - - // If the last character in the text buffer is a newline, - // gtk_text_view_forward_display_line() will return false without that - // line being counted. Must add one manually in that case. - GtkTextIter lastCharIter; - gtk_text_buffer_get_iter_at_offset - ( - m_buffer, - &lastCharIter, - gtk_text_buffer_get_char_count(m_buffer) - 1 - ); - gchar lastChar = gtk_text_iter_get_char( &lastCharIter ); - if ( lastChar == wxT('\n') ) - lineCount++; - - return lineCount; + return gtk_text_buffer_get_line_count( m_buffer ); } else // single line { @@ -998,32 +1187,16 @@ void wxTextCtrl::SetInsertionPoint( long pos ) GtkTextIter iter; gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos ); gtk_text_buffer_place_cursor( m_buffer, &iter ); - gtk_text_view_scroll_mark_onscreen - ( - GTK_TEXT_VIEW(m_text), - gtk_text_buffer_get_insert( m_buffer ) - ); - } - else - { - // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2? - gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos)); - } -} - -void wxTextCtrl::SetInsertionPointEnd() -{ - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - - if (m_windowStyle & wxTE_MULTILINE) - { - GtkTextIter end; - gtk_text_buffer_get_end_iter( m_buffer, &end ); - gtk_text_buffer_place_cursor( m_buffer, &end ); + GtkTextMark* mark = gtk_text_buffer_get_insert(m_buffer); + if (IsFrozen()) + // defer until Thaw, text view is not using m_buffer now + m_showPositionOnThaw = mark; + else + gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark); } - else + else // single line { - gtk_editable_set_position( GTK_EDITABLE(m_text), -1 ); + wxTextEntry::SetInsertionPoint(pos); } } @@ -1031,13 +1204,13 @@ void wxTextCtrl::SetEditable( bool editable ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable ); } - else + else // single line { - gtk_editable_set_editable( GTK_EDITABLE(m_text), editable ); + wxTextEntry::SetEditable(editable); } } @@ -1049,22 +1222,15 @@ bool wxTextCtrl::Enable( bool enable ) return false; } - if (m_windowStyle & wxTE_MULTILINE) - { - SetEditable( enable ); - } - else - { - gtk_widget_set_sensitive( m_text, enable ); - } + gtk_widget_set_sensitive( m_text, enable ); return true; } // wxGTK-specific: called recursively by Enable, -// to give widgets an oppprtunity to correct their colours after they +// to give widgets an opportunity to correct their colours after they // have been changed by Enable -void wxTextCtrl::OnParentEnable( bool enable ) +void wxTextCtrl::OnEnabled(bool WXUNUSED(enable)) { // If we have a custom background colour, we use this colour in both // disabled and enabled mode, or we end up with a different colour under the @@ -1092,19 +1258,28 @@ void wxTextCtrl::DiscardEdits() } // ---------------------------------------------------------------------------- -// max text length support +// event handling // ---------------------------------------------------------------------------- -void wxTextCtrl::IgnoreNextTextUpdate() +void wxTextCtrl::EnableTextChangedEvents(bool enable) { - m_ignoreNextUpdate = true; + if ( enable ) + { + g_signal_handlers_unblock_by_func(GetTextObject(), + (gpointer)gtk_text_changed_callback, this); + } + else // disable events + { + g_signal_handlers_block_by_func(GetTextObject(), + (gpointer)gtk_text_changed_callback, this); + } } bool wxTextCtrl::IgnoreTextUpdate() { - if ( m_ignoreNextUpdate ) + if ( m_countUpdatesToIgnore > 0 ) { - m_ignoreNextUpdate = false; + m_countUpdatesToIgnore--; return true; } @@ -1112,32 +1287,16 @@ bool wxTextCtrl::IgnoreTextUpdate() return false; } -void wxTextCtrl::SetMaxLength(unsigned long len) +bool wxTextCtrl::MarkDirtyOnChange() { - if ( !HasFlag(wxTE_MULTILINE) ) + if ( m_dontMarkDirty ) { - gtk_entry_set_max_length(GTK_ENTRY(m_text), len); + m_dontMarkDirty = false; - // there is a bug in GTK+ 1.2.x: "changed" signal is emitted even if - // we had tried to enter more text than allowed by max text length and - // the text wasn't really changed - // - // to detect this and generate TEXT_MAXLEN event instead of - // TEXT_CHANGED one in this case we also catch "insert_text" signal - // - // when max len is set to 0 we disconnect our handler as it means that - // we shouldn't check anything any more - if ( len ) - { - g_signal_connect (m_text, "insert_text", - G_CALLBACK (gtk_insert_text_callback), this); - } - else // no checking - { - g_signal_handlers_disconnect_by_func (m_text, - (gpointer) gtk_insert_text_callback, this); - } + return false; } + + return true; } void wxTextCtrl::SetSelection( long from, long to ) @@ -1150,7 +1309,7 @@ void wxTextCtrl::SetSelection( long from, long to ) to = GetValue().length(); } - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); @@ -1159,21 +1318,25 @@ void wxTextCtrl::SetSelection( long from, long to ) gtk_text_buffer_place_cursor( m_buffer, &toi ); gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi ); } - else + else // single line { - gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + wxTextEntry::SetSelection(from, to); } } void wxTextCtrl::ShowPosition( long pos ) { - if (m_windowStyle & wxTE_MULTILINE) + if (IsMultiLine()) { GtkTextIter iter; - gtk_text_buffer_get_start_iter( m_buffer, &iter ); - gtk_text_iter_set_offset( &iter, pos ); - GtkTextMark *mark = gtk_text_buffer_create_mark( m_buffer, NULL, &iter, TRUE ); - gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 ); + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, int(pos)); + GtkTextMark* mark = gtk_text_buffer_get_mark(m_buffer, "ShowPosition"); + gtk_text_buffer_move_mark(m_buffer, mark, &iter); + if (IsFrozen()) + // defer until Thaw, text view is not using m_buffer now + m_showPositionOnThaw = mark; + else + gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark); } } @@ -1207,7 +1370,7 @@ long wxTextCtrl::GetInsertionPoint() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { // There is no direct accessor for the cursor, but // internally, the cursor is the "mark" called @@ -1221,7 +1384,7 @@ long wxTextCtrl::GetInsertionPoint() const } else { - return (long) gtk_editable_get_position(GTK_EDITABLE(m_text)); + return wxTextEntry::GetInsertionPoint(); } } @@ -1231,16 +1394,16 @@ wxTextPos wxTextCtrl::GetLastPosition() const int pos = 0; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); pos = gtk_text_iter_get_offset( &end ); } - else + else // single line { - pos = GTK_ENTRY(m_text)->text_length; + pos = wxTextEntry::GetLastPosition(); } return (long)pos; @@ -1250,7 +1413,7 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); @@ -1259,19 +1422,8 @@ void wxTextCtrl::Remove( long from, long to ) gtk_text_buffer_delete( m_buffer, &fromi, &toi ); } else // single line - 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") ); - - Remove( from, to ); - - if (!value.empty()) { - SetInsertionPoint( from ); - WriteText( value ); + wxTextEntry::Remove(from, to); } } @@ -1279,57 +1431,30 @@ void wxTextCtrl::Cut() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) g_signal_emit_by_name (m_text, "cut-clipboard"); else - gtk_editable_cut_clipboard(GTK_EDITABLE(m_text)); + wxTextEntry::Cut(); } void wxTextCtrl::Copy() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) g_signal_emit_by_name (m_text, "copy-clipboard"); else - gtk_editable_copy_clipboard(GTK_EDITABLE(m_text)); + wxTextEntry::Copy(); } void wxTextCtrl::Paste() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) g_signal_emit_by_name (m_text, "paste-clipboard"); else - gtk_editable_paste_clipboard(GTK_EDITABLE(m_text)); -} - -// Undo/redo -void wxTextCtrl::Undo() -{ - // TODO - wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") ); -} - -void wxTextCtrl::Redo() -{ - // TODO - wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") ); -} - -bool wxTextCtrl::CanUndo() const -{ - // TODO - //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); - return false; -} - -bool wxTextCtrl::CanRedo() const -{ - // TODO - //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); - return false; + wxTextEntry::Paste(); } // If the return values from and to are the same, there is no @@ -1338,39 +1463,33 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - gint from = -1; - gint to = -1; - bool haveSelection = false; - - if (m_windowStyle & wxTE_MULTILINE) - { - GtkTextIter ifrom, ito; - if ( gtk_text_buffer_get_selection_bounds(m_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; - } - } - - if (! haveSelection ) - from = to = GetInsertionPoint(); - - if ( from > to ) - { - // exchange them to be compatible with wxMSW - gint tmp = from; - from = to; - to = tmp; - } + if ( !IsMultiLine() ) + { + wxTextEntry::GetSelection(fromOut, toOut); + return; + } + + gint from, to; + + GtkTextIter ifrom, ito; + if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) ) + { + from = gtk_text_iter_get_offset(&ifrom); + to = gtk_text_iter_get_offset(&ito); + + if ( from > to ) + { + // exchange them to be compatible with wxMSW + gint tmp = from; + from = to; + to = tmp; + } + } + else // no selection + { + from = + to = GetInsertionPoint(); + } if ( fromOut ) *fromOut = from; @@ -1383,13 +1502,13 @@ bool wxTextCtrl::IsEditable() const { wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)); } else { - return gtk_editable_get_editable(GTK_EDITABLE(m_text)); + return wxTextEntry::IsEditable(); } } @@ -1398,41 +1517,19 @@ bool wxTextCtrl::IsModified() const return m_modified; } -void wxTextCtrl::Clear() -{ - SetValue( wxEmptyString ); -} - void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER)) + if ( key_event.GetKeyCode() == WXK_RETURN ) { - wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); - event.SetEventObject(this); - event.SetString(GetValue()); - if (GetEventHandler()->ProcessEvent(event)) return; - } - - 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)) + if ( HasFlag(wxTE_PROCESS_ENTER) ) { - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); - - if (window->default_widget) - { - gtk_widget_activate (window->default_widget); + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + event.SetEventObject(this); + event.SetString(GetValue()); + if ( HandleWindowEvent(event) ) return; - } } } @@ -1444,15 +1541,16 @@ GtkWidget* wxTextCtrl::GetConnectWidget() return GTK_WIDGET(m_text); } -bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { - return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork + return gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), + GTK_TEXT_WINDOW_TEXT ); } else { - return (window == GTK_ENTRY(m_text)->text_area); + return GTK_ENTRY(m_text)->text_area; } } @@ -1467,7 +1565,7 @@ bool wxTextCtrl::SetFont( const wxFont &font ) return false; } - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { SetUpdateFont(true); @@ -1485,7 +1583,7 @@ void wxTextCtrl::ChangeFontGlobally() // possible! // // TODO: it can be implemented much more efficiently for GTK2 - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE), + wxASSERT_MSG( IsMultiLine(), _T("shouldn't be called for single line controls") ); wxString value = GetValue(); @@ -1527,7 +1625,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { if ( style.IsDefault() ) { @@ -1544,18 +1642,12 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start ); gtk_text_buffer_get_iter_at_offset( m_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); - - wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi ); + wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi ); return true; } + //else: single line text controls don't support styles - // else single line - // cannot do this for GTK+'s Entry widget return false; } @@ -1614,24 +1706,6 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } -void wxTextCtrl::OnInternalIdle() -{ - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; - } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} - wxSize wxTextCtrl::DoGetBestSize() const { // FIXME should be different for multi-line controls... @@ -1647,9 +1721,11 @@ wxSize wxTextCtrl::DoGetBestSize() const void wxTextCtrl::Freeze() { + wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl")); + if ( HasFlag(wxTE_MULTILINE) ) { - if ( !m_frozenness++ ) + if (m_freezeCount++ == 0) { // freeze textview updates and remove buffer g_signal_connect (m_text, "expose_event", @@ -1658,7 +1734,17 @@ void wxTextCtrl::Freeze() G_CALLBACK (gtk_text_exposed_callback), this); gtk_widget_set_sensitive(m_widget, false); g_object_ref(m_buffer); - gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL)); + GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL); + GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark; + gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new); + // gtk_text_view_set_buffer adds its own reference + g_object_unref(buf_new); + // This mark should be deleted when the buffer is changed, + // but it's not (in GTK+ up to at least 2.10.6). + // Otherwise these anonymous marks start to build up in the buffer, + // and Freeze takes longer and longer each time it is called. + if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark)) + gtk_text_buffer_delete_mark(m_buffer, mark); } } } @@ -1667,9 +1753,9 @@ void wxTextCtrl::Thaw() { if ( HasFlag(wxTE_MULTILINE) ) { - wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); + wxCHECK_RET(m_freezeCount != 0, _T("Thaw() without matching Freeze()")); - if ( !--m_frozenness ) + if (--m_freezeCount == 0) { // Reattach buffer and thaw textview updates gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer); @@ -1679,6 +1765,12 @@ void wxTextCtrl::Thaw() (gpointer) gtk_text_exposed_callback, this); g_signal_handlers_disconnect_by_func (m_text, (gpointer) gtk_text_exposed_callback, this); + if (m_showPositionOnThaw != NULL) + { + gtk_text_view_scroll_mark_onscreen( + GTK_TEXT_VIEW(m_text), m_showPositionOnThaw); + m_showPositionOnThaw = NULL; + } } } } @@ -1693,7 +1785,7 @@ void wxTextCtrl::Thaw() void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) { event.Skip(); - if(!(m_windowStyle & wxTE_AUTO_URL)) + if( !HasFlag(wxTE_AUTO_URL) ) return; gint x, y; @@ -1732,8 +1824,20 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) InitCommandEvent(url_event); // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag) - //event.Skip(!GetEventHandler()->ProcessEvent(url_event)); - GetEventHandler()->ProcessEvent(url_event); + //event.Skip(!HandleWindowEvent(url_event)); + HandleWindowEvent(url_event); +} + +bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const +{ + bool rc = wxTextCtrlBase::GTKProcessEvent(event); + + // GtkTextView starts a drag operation when left mouse button is pressed + // and ends it when it is released and if it doesn't get the release event + // the next click on a control results in an assertion failure inside + // gtk_text_view_start_selection_drag() which simply *kills* the program + // without anything we can do about it, so always let GTK+ have this event + return rc && (IsSingleLine() || event.GetEventType() != wxEVT_LEFT_UP); } // static @@ -1742,3 +1846,5 @@ wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } + +#endif // wxUSE_TEXTCTRL