X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77f706726cf5c5c4ccda8355cd9592216bb722fd..0d53638f7147c18153f63fdfc096b17be6e22a27:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index d91d2bf5f1..bce644abf4 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1,57 +1,80 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textctrl.cpp +// Name: src/gtk/textctrl.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin +// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "textctrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_TEXTCTRL + #include "wx/textctrl.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/settings.h" -#include "wx/panel.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/scopeguard.h" #include "wx/strconv.h" #include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include #include -#include // for fabs +#include #include "wx/gtk/private.h" -#include - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; +#include "wx/gtk/private/gtk2-compat.h" // ---------------------------------------------------------------------------- // helpers // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ -static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, +extern "C" { +static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter * WXUNUSED(start), + GtkTextIter * WXUNUSED(end), + char *prefix) +{ + gchar *name; + g_object_get (tag, "name", &name, NULL); + + if (!name || strncmp(name, prefix, strlen(prefix))) + // anonymous tag or not starting with prefix - don't remove + g_signal_stop_emission_by_name (buffer, "remove_tag"); + + g_free(name); +} +} + +// 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) @@ -61,10 +84,13 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, 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) @@ -72,12 +98,38 @@ 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 (font.GetUnderlined()) + { + g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE"); + 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, + "underline-set", TRUE, + "underline", PANGO_UNDERLINE_SINGLE, + NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + } + if ( font.GetStrikethrough() ) + { + g_snprintf(buf, sizeof(buf), "WXFONTSTRIKETHROUGH"); + 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, + "strikethrough-set", TRUE, + "strikethrough", TRUE, + NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + } } 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 ), @@ -90,7 +142,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 ), @@ -100,12 +154,144 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, "background-gdk", colBg, NULL ); gtk_text_buffer_apply_tag (text_buffer, tag, start, end); } + + if (attr.HasAlignment()) + { + 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, "WXALIGNMENT", ¶_start, ¶_end); + + GtkJustification align; + switch (attr.GetAlignment()) + { + case wxTEXT_ALIGNMENT_RIGHT: + align = GTK_JUSTIFY_RIGHT; + break; + case wxTEXT_ALIGNMENT_CENTER: + align = GTK_JUSTIFY_CENTER; + break; + case wxTEXT_ALIGNMENT_JUSTIFIED: +#ifdef __WXGTK3__ + align = GTK_JUSTIFY_FILL; + break; +#elif GTK_CHECK_VERSION(2,11,0) +// 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)) + { + align = GTK_JUSTIFY_FILL; + break; + } + // fallthrough +#endif + default: + align = GTK_JUSTIFY_LEFT; + break; + } + + g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align); + 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, + "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 = wxT("WXTABS"); + g_snprintf(buf, sizeof(buf), "WXTABS"); + for (size_t i = 0; i < tabs.GetCount(); i++) + tagname += wxString::Format(wxT(" %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); + } } static void wxGtkTextInsert(GtkWidget *text, GtkTextBuffer *text_buffer, const wxTextAttr& attr, - wxCharBuffer buffer) + const wxCharBuffer& buffer) { gint start_offset; @@ -118,163 +304,290 @@ static void wxGtkTextInsert(GtkWidget *text, gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset); - wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); + wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter); } -#else -static void wxGtkTextInsert(GtkWidget *text, - const wxTextAttr& attr, - const char *txt, - size_t len) + +// Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp, + +extern "C" { +static void +au_apply_tag_callback(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter * WXUNUSED(start), + GtkTextIter * WXUNUSED(end), + gpointer WXUNUSED(textctrl)) { - GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont() - : NULL; + if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl")) + g_signal_stop_emission_by_name (buffer, "apply_tag"); +} +} - GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() - : NULL; +//----------------------------------------------------------------------------- +// GtkTextCharPredicates for gtk_text_iter_*_find_char +//----------------------------------------------------------------------------- - GdkColor *colBg = attr.HasBackgroundColour() - ? attr.GetBackgroundColour().GetColor() - : NULL; +extern "C" { +static gboolean +pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data)) +{ + return g_unichar_isspace(ch); +} +} - gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); +extern "C" { +static gboolean +pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data)) +{ + return !g_unichar_isspace(ch); +} } -#endif // GTK 1.x -// ---------------------------------------------------------------------------- -// "insert_text" for GtkEntry -// ---------------------------------------------------------------------------- +extern "C" { +static gboolean +pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data)) +{ + return !g_unichar_ispunct(ch); +} +} + +extern "C" { +static gboolean +pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(user_data)) +{ + return !g_unichar_ispunct(ch) || ch == '/'; +} +} +//----------------------------------------------------------------------------- +// Check for links between s and e and correct tags as necessary +//----------------------------------------------------------------------------- + +// This function should be made match better while being efficient at one point. +// Most probably with a row of regular expressions. +extern "C" { static void -gtk_insert_text_callback(GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position, - wxTextCtrl *win) +au_check_word( GtkTextIter *s, GtkTextIter *e ) { - if (g_isIdle) - wxapp_install_idle_handler(); + static const char *const URIPrefixes[] = + { + "http://", + "ftp://", + "www.", + "ftp.", + "mailto://", + "https://", + "file://", + "nntp://", + "news://", + "telnet://", + "mms://", + "gopher://", + "prospero://", + "wais://", + }; - // we should only be called if we have a max len limit at all - GtkEntry *entry = GTK_ENTRY (editable); + GtkTextIter start = *s, end = *e; + GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s); - wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") ); + // Get our special link tag + GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"); - // 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 ) + // Get rid of punctuation from beginning and end. + // Might want to move this to au_check_range if an improved link checking doesn't + // use some intelligent punctuation checking itself (beware of undesired iter modifications). + if(g_unichar_ispunct( gtk_text_iter_get_char( &start ) ) ) + gtk_text_iter_forward_find_char( &start, pred_nonpunct, NULL, e ); + + gtk_text_iter_backward_find_char( &end, pred_nonpunct_or_slash, NULL, &start ); + gtk_text_iter_forward_char(&end); + + wxGtkString text(gtk_text_iter_get_text( &start, &end )); + size_t len = strlen(text), prefix_len; + size_t n; + + for( n = 0; n < WXSIZEOF(URIPrefixes); ++n ) { - // we don't need to run the base class version at all - gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text"); + prefix_len = strlen(URIPrefixes[n]); + if((len > prefix_len) && !wxStrnicmp(text, URIPrefixes[n], prefix_len)) + break; + } - // remember that the next changed signal is to be ignored to avoid - // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event - win->IgnoreNextTextUpdate(); + if(n < WXSIZEOF(URIPrefixes)) + { + gulong signal_id = g_signal_handler_find (buffer, + (GSignalMatchType) (G_SIGNAL_MATCH_FUNC), + 0, 0, NULL, + (gpointer)au_apply_tag_callback, NULL); - // 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 ); + g_signal_handler_block (buffer, signal_id); + gtk_text_buffer_apply_tag(buffer, tag, &start, &end); + g_signal_handler_unblock (buffer, signal_id); } } +} + +extern "C" { +static void +au_check_range(GtkTextIter *s, + GtkTextIter *range_end) +{ + GtkTextIter range_start = *s; + GtkTextIter word_end; + GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s); + GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"); + + gtk_text_buffer_remove_tag(buffer, tag, s, range_end); + + if(g_unichar_isspace(gtk_text_iter_get_char(&range_start))) + gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end); + + while(!gtk_text_iter_equal(&range_start, range_end)) + { + word_end = range_start; + gtk_text_iter_forward_find_char(&word_end, pred_whitespace, NULL, range_end); + + // Now we should have a word delimited by range_start and word_end, correct link tags + au_check_word(&range_start, &word_end); + + range_start = word_end; + gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end); + } +} +} //----------------------------------------------------------------------------- -// "changed" +// "insert-text" for GtkTextBuffer //----------------------------------------------------------------------------- +extern "C" { + +// Normal version used for detecting IME input and generating appropriate +// events for it. +void +wx_insert_text_callback(GtkTextBuffer* buffer, + GtkTextIter* WXUNUSED(end), + gchar *text, + gint WXUNUSED(len), + wxTextCtrl *win) +{ + if ( win->GTKOnInsertText(text) ) + { + // If we already handled the new text insertion, don't do it again. + g_signal_stop_emission_by_name (buffer, "insert_text"); + } +} + + +// And an "after" version used for detecting URLs in the text. static void -gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) +au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer), + GtkTextIter *end, + gchar *text, + gint len, + wxTextCtrl *win) { - if ( win->IgnoreTextUpdate() ) + if (!len || !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) ) return; - if (!win->m_hasVMT) return; + GtkTextIter start = *end; + gtk_text_iter_backward_chars(&start, g_utf8_strlen(text, len)); - if (g_isIdle) - wxapp_install_idle_handler(); + GtkTextIter line_start = start; + GtkTextIter line_end = *end; + GtkTextIter words_start = start; + GtkTextIter words_end = *end; - win->SetModified(); -#ifndef __WXGTK20__ - win->UpdateFontIfNeeded(); -#endif // !__WXGTK20__ + gtk_text_iter_set_line(&line_start, gtk_text_iter_get_line(&start)); + gtk_text_iter_forward_to_line_end(&line_end); + gtk_text_iter_backward_find_char(&words_start, pred_whitespace, NULL, &line_start); + gtk_text_iter_forward_find_char(&words_end, pred_whitespace, NULL, &line_end); - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); - event.SetEventObject( win ); - event.SetString( win->GetValue() ); - win->GetEventHandler()->ProcessEvent( event ); + au_check_range(&words_start, &words_end); +} } //----------------------------------------------------------------------------- -// "expose_event" from scrolled window and textview +// "delete-range" for GtkTextBuffer //----------------------------------------------------------------------------- -#ifdef __WXGTK20__ -static gboolean -gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) +extern "C" { +static void +au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer), + GtkTextIter *start, + GtkTextIter *end, + wxTextCtrl *win) { - return TRUE; + if( !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) ) + return; + + GtkTextIter line_start = *start, line_end = *end; + + gtk_text_iter_set_line(&line_start, gtk_text_iter_get_line(start)); + gtk_text_iter_forward_to_line_end(&line_end); + gtk_text_iter_backward_find_char(start, pred_whitespace, NULL, &line_start); + gtk_text_iter_forward_find_char(end, pred_whitespace, NULL, &line_end); + + au_check_range(start, end); +} } -#endif //----------------------------------------------------------------------------- -// "changed" from vertical scrollbar +// "populate_popup" from text control and "unmap" from its poup menu //----------------------------------------------------------------------------- -#ifndef __WXGTK20__ +extern "C" { static void -gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +gtk_textctrl_popup_unmap( GtkMenu *WXUNUSED(menu), wxTextCtrl* win ) { - if (!win->m_hasVMT) return; + win->GTKEnableFocusOutEvent(); +} +} - if (g_isIdle) - wxapp_install_idle_handler(); +extern "C" { +static void +gtk_textctrl_populate_popup( GtkEntry *WXUNUSED(entry), GtkMenu *menu, wxTextCtrl *win ) +{ + win->GTKDisableFocusOutEvent(); - win->CalculateScrollbar(); + g_signal_connect (menu, "unmap", G_CALLBACK (gtk_textctrl_popup_unmap), win ); +} } -#endif - -// ---------------------------------------------------------------------------- -// redraw callback for multiline text -// ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ +//----------------------------------------------------------------------------- +// "changed" +//----------------------------------------------------------------------------- -// redrawing a GtkText from inside a wxYield() call results in crashes (the -// text sample shows it in its "Add lines" command which shows wxProgressDialog -// which implicitly calls wxYield()) so we override GtkText::draw() and simply -// don't do anything if we're inside wxYield() +extern "C" { +static void +gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +{ + if ( win->IgnoreTextUpdate() ) + return; -extern bool wxIsInsideYield; + if ( win->MarkDirtyOnChange() ) + win->MarkDirty(); -extern "C" { - typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect); + win->SendTextUpdatedEvent(); +} } -static GtkDrawCallback gs_gtk_text_draw = NULL; +//----------------------------------------------------------------------------- +// "mark_set" +//----------------------------------------------------------------------------- -extern "C" -void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect) +extern "C" { +static void mark_set(GtkTextBuffer*, GtkTextIter*, GtkTextMark* mark, GSList** markList) { - if ( !wxIsInsideYield ) - { - wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw, - _T("infinite recursion in wxgtk_text_draw aborted") ); - - gs_gtk_text_draw(widget, rect); - } + if (gtk_text_mark_get_name(mark) == NULL) + *markList = g_slist_prepend(*markList, mark); +} } - -#endif // __WXGTK20__ //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) - -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) @@ -288,18 +601,47 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste) EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) + + // wxTE_AUTO_URL wxTextUrl support. Currently only creates + // wxTextUrlEvent in the same cases as wxMSW, more can be added here. + EVT_MOTION (wxTextCtrl::OnUrlMouseEvent) + EVT_LEFT_DOWN (wxTextCtrl::OnUrlMouseEvent) + EVT_LEFT_UP (wxTextCtrl::OnUrlMouseEvent) + EVT_LEFT_DCLICK (wxTextCtrl::OnUrlMouseEvent) + EVT_RIGHT_DOWN (wxTextCtrl::OnUrlMouseEvent) + EVT_RIGHT_UP (wxTextCtrl::OnUrlMouseEvent) + EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent) END_EVENT_TABLE() void wxTextCtrl::Init() { - m_ignoreNextUpdate = - m_modified = FALSE; - SetUpdateFont(FALSE); - m_text = - m_vScrollbar = (GtkWidget *)NULL; -#ifdef __WXGTK20__ - m_frozenness = 0; -#endif + m_dontMarkDirty = + m_modified = false; + + m_countUpdatesToIgnore = 0; + + SetUpdateFont(false); + + m_text = NULL; + m_buffer = NULL; + m_showPositionOnThaw = NULL; + m_anonymousMarkList = NULL; +} + +wxTextCtrl::~wxTextCtrl() +{ + if (m_text) + GTKDisconnect(m_text); + if (m_buffer) + GTKDisconnect(m_buffer); + + // this is also done by wxWindowGTK dtor, but has to be done here so our + // DoThaw() override is called + while (IsFrozen()) + Thaw(); + + if (m_anonymousMarkList) + g_slist_free(m_anonymousMarkList); } wxTextCtrl::wxTextCtrl( wxWindow *parent, @@ -325,78 +667,65 @@ 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 )) { wxFAIL_MSG( wxT("wxTextCtrl creation failed") ); - return FALSE; + return false; } - - m_vScrollbarVisible = FALSE; - bool multi_line = (style & wxTE_MULTILINE) != 0; if (multi_line) { -#ifdef __WXGTK20__ + m_buffer = gtk_text_buffer_new(NULL); + gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList); // Create view - m_text = gtk_text_view_new(); + m_text = gtk_text_view_new_with_buffer(m_buffer); + // gtk_text_view_set_buffer adds its own reference + g_object_unref(m_buffer); + g_signal_handler_disconnect(m_buffer, sig_id); - 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] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(m_widget))); // 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 ) || HasFlag( wxTE_DONTWRAP )) - 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 ); + GTKSetWrapMode(); - if (!HasFlag(wxNO_BORDER)) - gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); - - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); -#else - // create our control ... - m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); - - // ... 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, - (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), - (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), - 0, 0); - - // always wrap words - gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE ); - - // 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 + GTKScrolledWindowSetBorder(m_widget, style); + + gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); + + gtk_widget_set_can_focus(m_widget, FALSE); } else { // a single-line text control: no need for scrollbars m_widget = m_text = gtk_entry_new(); + // work around probable bug in GTK+ 2.18 when calling WriteText on a + // new, empty control, see http://trac.wxwidgets.org/ticket/11409 + gtk_entry_get_text((GtkEntry*)m_text); + + if (style & wxNO_BORDER) + g_object_set (m_text, "has-frame", FALSE, NULL); + } + g_object_ref(m_widget); m_parent->DoAddChild( this ); @@ -405,365 +734,435 @@ bool wxTextCtrl::Create( wxWindow *parent, PostCreation(size); if (multi_line) + { gtk_widget_show(m_text); + } -#ifndef __WXGTK20__ + // We want to be notified about text changes. if (multi_line) { - gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", - (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this ); - - // 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 ) - { - GtkDrawCallback& - draw = GTK_WIDGET_CLASS(GTK_OBJECT(m_text)->klass)->draw; - - gs_gtk_text_draw = draw; - - draw = wxgtk_text_draw; - } + g_signal_connect (m_buffer, "changed", + G_CALLBACK (gtk_text_changed_callback), this); } -#endif // GTK+ 1.x - - if (!value.IsEmpty()) + else { -#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 - // gtk_editable_insert_text() - 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 - gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); -#endif + g_signal_connect (m_text, "changed", + G_CALLBACK (gtk_text_changed_callback), this); + } - if (multi_line) - { - // Bring editable's cursor uptodate. Bug in GTK. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); - } + // Catch to disable focus out handling + g_signal_connect (m_text, "populate_popup", + G_CALLBACK (gtk_textctrl_populate_popup), + this); -#endif + if (!value.empty()) + { + SetValue( value ); } 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_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 - } + GTKSetEditable(); + + // left justification (alignment) is the default anyhow + if ( style & (wxTE_RIGHT | wxTE_CENTRE) ) + GTKSetJustification(); -#ifdef __WXGTK20__ 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)) + // Handle URLs on multi-line controls with wxTE_AUTO_URL style + if (style & wxTE_AUTO_URL) { - 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 ); + GtkTextIter start, end; + + // We create our wxUrl tag here for slight efficiency gain - we + // don't have to check for the tag existence in callbacks, + // hereby it's guaranteed to exist. + gtk_text_buffer_create_tag(m_buffer, "wxUrl", + "foreground", "blue", + "underline", PANGO_UNDERLINE_SINGLE, + NULL); + + // Check for URLs after each text change + g_signal_connect_after (m_buffer, "insert_text", + G_CALLBACK (au_insert_text_callback), this); + g_signal_connect_after (m_buffer, "delete_range", + G_CALLBACK (au_delete_range_callback), this); + + // Block all wxUrl tag applying unless we do it ourselves, in which case we + // block this callback temporarily. This takes care of gtk+ internal + // gtk_text_buffer_insert_range* calls that would copy our URL tag otherwise, + // which is undesired because only a part of the URL might be copied. + // The insert-text signal emitted inside it will take care of newly formed + // or wholly copied URLs. + g_signal_connect (m_buffer, "apply_tag", + G_CALLBACK (au_apply_tag_callback), NULL); + + // Check for URLs in the initial string passed to Create + gtk_text_buffer_get_start_iter(m_buffer, &start); + gtk_text_buffer_get_end_iter(m_buffer, &end); + au_check_range(&start, &end); } -#endif - } -#endif // __WXGTK20__ - - // We want to be notified about text changes. -#ifdef __WXGTK20__ - if (multi_line) - { - g_signal_connect( G_OBJECT(m_buffer), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + + // Also connect a normal (not "after") signal handler for checking for + // the IME-generated input. + g_signal_connect(m_buffer, "insert_text", + G_CALLBACK(wx_insert_text_callback), this); } - else -#endif - + else // single line { - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + // do the right thing with Enter presses depending on whether we have + // wxTE_PROCESS_ENTER or not + GTKSetActivatesDefault(); + + GTKConnectInsertTextSignal(GTK_ENTRY(m_text)); } - m_cursor = wxCursor( wxCURSOR_IBEAM ); - wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont()); - SetDefaultStyle( attrDef ); + GTKConnectClipboardSignals(m_text); - return TRUE; -} + m_cursor = wxCursor( wxCURSOR_IBEAM ); + return true; +} -void wxTextCtrl::CalculateScrollbar() +GtkEditable *wxTextCtrl::GetEditable() const { -#ifndef __WXGTK20__ - if ((m_windowStyle & wxTE_MULTILINE) == 0) return; + wxCHECK_MSG( IsSingleLine(), NULL, "shouldn't be called for multiline" ); - GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; + return GTK_EDITABLE(m_text); +} + +GtkEntry *wxTextCtrl::GetEntry() const +{ + return GTK_ENTRY(m_text); +} - if (adj->upper - adj->page_size < 0.8) +int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const +{ +#if GTK_CHECK_VERSION(2, 22, 0) + if ( gtk_check_version(2, 12, 0) == 0 ) { - if (m_vScrollbarVisible) + if ( IsSingleLine() ) + { + return wxTextEntry::GTKIMFilterKeypress(event); + } + else { - gtk_widget_hide( m_vScrollbar ); - m_vScrollbarVisible = FALSE; + return gtk_text_view_im_context_filter_keypress( + GTK_TEXT_VIEW(m_text), + event + ); } } +#else // GTK+ < 2.22 + wxUnusedVar(event); +#endif // GTK+ 2.22+ + + return FALSE; +} + +// ---------------------------------------------------------------------------- +// 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() ) { - if (!m_vScrollbarVisible) - { - gtk_widget_show( m_vScrollbar ); - m_vScrollbarVisible = TRUE; - } + 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); } -#endif } +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, wxT(""), wxT("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") ); - wxString tmp; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { -#ifdef __WXGTK20__ 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 ); - -#if wxUSE_UNICODE - wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) ); -#else - wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) ); -#endif - if ( buffer ) - tmp = buffer; + wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true)); - 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 = text; - g_free( text ); -#endif + return wxGTK_CONV_BACK(text); } - else + else // single line { - tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) ); + return wxTextEntry::GetValue(); } - - return tmp; } -void wxTextCtrl::SetValue( const wxString &value ) +wxFontEncoding wxTextCtrl::GetTextEncoding() const { - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + // GTK+ uses UTF-8 internally, we need to convert to it but from which + // encoding? - if (m_windowStyle & wxTE_MULTILINE) - { -#ifdef __WXGTK20__ - -#if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) ); -#else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) ); -#endif - if (gtk_text_buffer_get_char_count(m_buffer) != 0) - IgnoreNextTextUpdate(); + // 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; - gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + // fall back to the controls font if no style + if ( enc == wxFONTENCODING_SYSTEM && m_hasFont ) + enc = GetFont().GetEncoding(); -#else - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); - len = 0; - gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); -#endif - } - else - { - gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) ); - } + return enc; +} - // 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. - SetInsertionPoint(0); +bool wxTextCtrl::IsEmpty() const +{ + if ( IsMultiLine() ) + return gtk_text_buffer_get_char_count(m_buffer) == 0; - m_modified = FALSE; + return wxTextEntry::IsEmpty(); } -void wxTextCtrl::WriteText( const wxString &text ) +void wxTextCtrl::DoSetValue( const wxString &value, int flags ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ( text.empty() ) - return; + m_modified = false; - // 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 ( !IsMultiLine() ) + { + wxTextEntry::DoSetValue(value, flags); + return; + } - if ( m_windowStyle & wxTE_MULTILINE ) + if (value.IsEmpty()) { -#ifdef __WXGTK20__ + if ( !(flags & SetValue_SendEvent) ) + EnableTextChangedEvents(false); + + gtk_text_buffer_set_text( m_buffer, "", 0 ); + + if ( !(flags & SetValue_SendEvent) ) + EnableTextChangedEvents(true); + + return; + } #if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); + const wxCharBuffer buffer(value.utf8_str()); #else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); + wxFontEncoding enc = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetEncoding() + : wxFONTENCODING_SYSTEM; + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); + + 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; + } #endif - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } - // TODO: Call whatever is needed to delete the selection. - wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); + if ( !(flags & SetValue_SendEvent) ) + { + EnableTextChangedEvents(false); + } - 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( m_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() ) - { - SetUpdateFont(FALSE); - } + gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); - // 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 + if ( !m_defaultStyle.IsDefault() ) + { + GtkTextIter start, end; + gtk_text_buffer_get_bounds( m_buffer, &start, &end ); + wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle, + &start, &end); } - else // single line + + if ( !(flags & SetValue_SendEvent) ) { - // First remove the selection if there is one - gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); + EnableTextChangedEvents(true); + } +} - // This moves the cursor pos to behind the inserted text. - gint len = GET_EDITABLE_POS(m_text); +void wxTextCtrl::WriteText( const wxString &text ) +{ + wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ + // we're changing the text programmatically + DontMarkDirtyOnNextChange(); + + if ( !IsMultiLine() ) + { + wxTextEntry::WriteText(text); + return; + } #if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); + const wxCharBuffer buffer(text.utf8_str()); #else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif - gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); + // check if we have a specific style for the current position + wxFontEncoding enc = wxFONTENCODING_SYSTEM; + wxTextAttr style; + if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() ) + { + enc = style.GetFontEncoding(); + } -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len ); -#endif + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); - // Bring entry's cursor uptodate. - gtk_entry_set_position( GTK_ENTRY(m_text), len ); + const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc)); + if ( !buffer ) + { + // 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; } +#endif - m_modified = oldModified; -} + // First remove the selection if there is one + gtk_text_buffer_delete_selection(m_buffer, false, true); -void wxTextCtrl::AppendText( const wxString &text ) -{ - SetInsertionPointEnd(); - WriteText( text ); + // Insert the text + wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); + + // 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()) + { + GtkAdjustment* adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget)); + const double value = gtk_adjustment_get_value(adj); + const double upper = gtk_adjustment_get_upper(adj); + const double page_size = gtk_adjustment_get_page_size(adj); + if (wxIsSameDouble(value, upper - page_size)) + { + gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(m_text), + gtk_text_buffer_get_insert(m_buffer), 0, false, 0, 1); + } + } } wxString wxTextCtrl::GetLineText( long lineNo ) const { - if (m_windowStyle & wxTE_MULTILINE) + wxString result; + if ( IsMultiLine() ) { -#ifndef __WXGTK20__ - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - - if (text) - { - wxString buf(wxT("")); - long i; - int currentLine = 0; - for (i = 0; currentLine != lineNo && text[i]; i++ ) - if (text[i] == '\n') - currentLine++; - // Now get the text - int j; - for (j = 0; text[i] && text[i] != '\n'; i++, j++ ) - buf += text[i]; - - g_free( text ); - return buf; - } - else - { - return wxEmptyString; - } -#else GtkTextIter line; gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); - GtkTextIter end; - gtk_text_buffer_get_end_iter(m_buffer,&end ); - gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE); - wxString result(wxGTK_CONV_BACK(text)); - g_free(text); - return result.BeforeFirst(wxT('\n')); -#endif + + GtkTextIter end = line; + // 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) ) @@ -775,158 +1174,137 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { - wxString text = GetValue(); + GtkTextIter iter; - // cast to prevent warning. But pos really should've been unsigned. - if( (unsigned long)pos > text.Len() ) - return FALSE; + if (pos > GetLastPosition()) + return false; - *x=0; // First Col - *y=0; // First Line + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); - const wxChar* stop = text.c_str() + pos; - for ( const wxChar *p = text.c_str(); p < stop; p++ ) - { - if (*p == wxT('\n')) - { - (*y)++; - *x=0; - } - else - (*x)++; - } + 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 ) + if (pos <= gtk_entry_get_text_length(GTK_ENTRY(m_text))) { - *y = 0; - *x = pos; + if ( y ) + *y = 0; + if ( x ) + *x = pos; } else { // index out of bounds - return FALSE; + return false; } } - return TRUE; + return true; } long wxTextCtrl::XYToPosition(long x, long y ) const { - if (!(m_windowStyle & wxTE_MULTILINE)) return 0; + if ( IsSingleLine() ) + return 0; - long pos=0; - for( int i=0; i= gtk_text_buffer_get_line_count (m_buffer)) + return -1; - pos += x; - return pos; -} + gtk_text_buffer_get_iter_at_line(m_buffer, &iter, y); + if (x >= gtk_text_iter_get_chars_in_line (&iter)) + return -1; -int wxTextCtrl::GetLineLength(long lineNo) const -{ - wxString str = GetLineText (lineNo); - return (int) str.Length(); + return gtk_text_iter_get_offset(&iter) + x; } -int wxTextCtrl::GetNumberOfLines() const +int wxTextCtrl::GetLineLength(long lineNo) const { - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { -#ifdef __WXGTK20__ - return gtk_text_buffer_get_line_count( m_buffer ); -#else - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - - if (text) - { - int currentLine = 0; - for (int i = 0; i < len; i++ ) - { - if (text[i] == '\n') - currentLine++; - } - g_free( text ); + int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1; + if (lineNo > last_line) + return -1; - // currentLine is 0 based, add 1 to get number of lines - return currentLine + 1; - } - else - { - return 0; - } -#endif + GtkTextIter iter; + gtk_text_buffer_get_iter_at_line(m_buffer, &iter, lineNo); + // get_chars_in_line return includes paragraph delimiters, so need to subtract 1 IF it is not the last line + return gtk_text_iter_get_chars_in_line(&iter) - ((lineNo == last_line) ? 0 : 1); } else { - return 1; + wxString str = GetLineText (lineNo); + return (int) str.length(); } } -void wxTextCtrl::SetInsertionPoint( long pos ) +wxPoint wxTextCtrl::DoPositionToCoords(long pos) const { - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + if ( !IsMultiLine() ) + { + // Single line text entry (GtkTextEntry) doesn't have support for + // getting the coordinates for the given offset. Perhaps we could + // find them ourselves by using GetTextExtent() but for now just leave + // it unimplemented, this function is more useful for multiline + // controls anyhow. + return wxDefaultPosition; + } + + // Window coordinates for the given position is calculated by getting + // the buffer coordinates and converting them to window coordinates. + GtkTextView *textview = GTK_TEXT_VIEW(m_text); + + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); + + GdkRectangle bufferCoords; + gtk_text_view_get_iter_location(textview, &iter, &bufferCoords); + + gint winCoordX = 0, + winCoordY = 0; + gtk_text_view_buffer_to_window_coords(textview, GTK_TEXT_WINDOW_WIDGET, + bufferCoords.x, bufferCoords.y, + &winCoordX, &winCoordY); + + return wxPoint(winCoordX, winCoordY); +} +int wxTextCtrl::GetNumberOfLines() const +{ if ( IsMultiLine() ) { -#ifdef __WXGTK20__ - 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 // GTK+ 1.x - 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 this non-sense, we - disconnect so that no events are sent to the user program. */ - - gint tmp = (gint)pos; - gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp ); - - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - - // bring editable's cursor uptodate. Bug in GTK. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); -#endif // GTK+ 2/1 + return gtk_text_buffer_get_line_count( m_buffer ); } - else + else // single line { - gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos ); - - // Bring editable's cursor uptodate. Bug in GTK. - SET_EDITABLE_POS(m_text, (guint32)pos); + return 1; } } -void wxTextCtrl::SetInsertionPointEnd() +void wxTextCtrl::SetInsertionPoint( long pos ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { -#ifdef __WXGTK20__ - GtkTextIter end; - gtk_text_buffer_get_end_iter( m_buffer, &end ); - gtk_text_buffer_place_cursor( m_buffer, &end ); -#else - SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); -#endif + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos ); + gtk_text_buffer_place_cursor( m_buffer, &iter ); + 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_entry_set_position( GTK_ENTRY(m_text), -1 ); + wxTextEntry::SetInsertionPoint(pos); } } @@ -934,17 +1312,13 @@ void wxTextCtrl::SetEditable( bool editable ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { -#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 + else // single line { - gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); + wxTextEntry::SetEditable(editable); } } @@ -953,175 +1327,107 @@ bool wxTextCtrl::Enable( bool enable ) if (!wxWindowBase::Enable(enable)) { // nothing to do - return FALSE; - } - - if (m_windowStyle & wxTE_MULTILINE) - { -#ifdef __WXGTK20__ - SetEditable( enable ); -#else - gtk_text_set_editable( GTK_TEXT(m_text), enable ); - OnParentEnable(enable); -#endif - } - else - { - gtk_widget_set_sensitive( m_text, enable ); + return false; } - return TRUE; -} + gtk_widget_set_sensitive( m_text, enable ); + SetCursor(enable ? wxCursor(wxCURSOR_IBEAM) : wxCursor()); -// wxGTK-specific: called recursively by Enable, -// to give widgets an oppprtunity to correct their colours after they -// have been changed by Enable -void wxTextCtrl::OnParentEnable( bool 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 - // text. - wxColour oldColour = GetBackgroundColour(); - if (oldColour.Ok()) - { - // Need to set twice or it'll optimize the useful stuff out - if (oldColour == * wxWHITE) - SetBackgroundColour(*wxBLACK); - else - SetBackgroundColour(*wxWHITE); - SetBackgroundColour(oldColour); - } + return true; } void wxTextCtrl::MarkDirty() { - m_modified = TRUE; + m_modified = true; } void wxTextCtrl::DiscardEdits() { - m_modified = FALSE; + m_modified = false; } // ---------------------------------------------------------------------------- -// 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; + return true; } - return FALSE; + 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 ) - { - gtk_signal_connect( GTK_OBJECT(m_text), - "insert_text", - GTK_SIGNAL_FUNC(gtk_insert_text_callback), - (gpointer)this); - } - else // no checking - { - gtk_signal_disconnect_by_func - ( - GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_insert_text_callback), - (gpointer)this - ); - } + return false; } + + return true; } 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 ) + if ( IsMultiLine() ) { - // tell the programmer that it didn't work - wxLogDebug(_T("Can't call SetSelection() before realizing the control")); - return; - } -#endif + if (from == -1 && to == -1) + { + from = 0; + to = GetValue().length(); + } - if (m_windowStyle & wxTE_MULTILINE) - { -#ifdef __WXGTK20__ GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to ); - gtk_text_buffer_place_cursor( m_buffer, &toi ); - gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi ); -#else - gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); -#endif + gtk_text_buffer_select_range( m_buffer, &fromi, &toi ); } - 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()) { -#ifdef __WXGTK20__ 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 ); -#else // GTK 1.x - GtkAdjustment *vp = GTK_TEXT(m_text)->vadj; - float totalLines = (float) GetNumberOfLines(); - long posX; - long posY; - PositionToXY(pos, &posX, &posY); - 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 + 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); } } -#ifdef __WXGTK20__ - wxTextCtrlHitTestResult wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const { @@ -1148,14 +1454,11 @@ wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const return wxTE_HT_ON_TEXT; } -#endif // __WXGTK20__ - long wxTextCtrl::GetInsertionPoint() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { // There is no direct accessor for the cursor, but // internally, the cursor is the "mark" called @@ -1168,32 +1471,27 @@ long wxTextCtrl::GetInsertionPoint() const return gtk_text_iter_get_offset( &cursor ); } else -#endif { - return (long) GET_EDITABLE_POS(m_text); + return wxTextEntry::GetInsertionPoint(); } } -long wxTextCtrl::GetLastPosition() const +wxTextPos wxTextCtrl::GetLastPosition() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); int pos = 0; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { -#ifdef __WXGTK20__ GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); pos = gtk_text_iter_get_offset( &end ); -#else - pos = gtk_text_get_length( GTK_TEXT(m_text) ); -#endif } - else + else // single line { - pos = GTK_ENTRY(m_text)->text_length; + pos = wxTextEntry::GetLastPosition(); } return (long)pos; @@ -1203,8 +1501,7 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); @@ -1213,30 +1510,8 @@ void wxTextCtrl::Remove( long from, long to ) gtk_text_buffer_delete( m_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") ); - - 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 // wxUSE_UNICODE -#endif // GTK 1.x/2.x + wxTextEntry::Remove(from, to); } } @@ -1244,63 +1519,30 @@ void wxTextCtrl::Cut() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) - g_signal_emit_by_name(m_text, "cut-clipboard"); + if ( IsMultiLine() ) + g_signal_emit_by_name (m_text, "cut-clipboard"); else -#endif - gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + wxTextEntry::Cut(); } void wxTextCtrl::Copy() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) - g_signal_emit_by_name(m_text, "copy-clipboard"); + if ( IsMultiLine() ) + g_signal_emit_by_name (m_text, "copy-clipboard"); else -#endif - gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); + wxTextEntry::Copy(); } void wxTextCtrl::Paste() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) - g_signal_emit_by_name(m_text, "paste-clipboard"); + if ( IsMultiLine() ) + g_signal_emit_by_name (m_text, "paste-clipboard"); else -#endif - gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); -} - -// 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 @@ -1309,48 +1551,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; - -#ifdef __WXGTK20__ - 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; - } - } -#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 ( !IsMultiLine() ) + { + wxTextEntry::GetSelection(fromOut, toOut); + return; + } + + gint from, to; - if (! haveSelection ) - from = to = GetInsertionPoint(); + 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; - } + 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; @@ -1361,20 +1588,16 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const bool wxTextCtrl::IsEditable() const { - wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { - return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)); + return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)) != 0; } else { - return gtk_editable_get_editable(GTK_EDITABLE(m_text)); + return wxTextEntry::IsEditable(); } -#else - return GTK_EDITABLE(m_text)->editable; -#endif } bool wxTextCtrl::IsModified() const @@ -1382,41 +1605,19 @@ bool wxTextCtrl::IsModified() const return m_modified; } -void wxTextCtrl::Clear() -{ - SetValue( wxT("") ); -} - void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) - { - 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)) + if ( key_event.GetKeyCode() == WXK_RETURN ) { - // 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_TEXT_ENTER, m_windowId); + event.SetEventObject(this); + event.SetString(GetValue()); + if ( HandleWindowEvent(event) ) return; - } } } @@ -1428,43 +1629,45 @@ 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() ) { -#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 + return gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), + GTK_TEXT_WINDOW_TEXT ); } else { - return (window == GTK_ENTRY(m_text)->text_area); +#ifdef __WXGTK3__ + // no access to internal GdkWindows + return NULL; +#else + return gtk_entry_get_text_window(GTK_ENTRY(m_text)); +#endif } } // the font will change for subsequent text insertiongs bool wxTextCtrl::SetFont( const wxFont &font ) { - wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); if ( !wxTextCtrlBase::SetFont(font) ) { // font didn't change, nothing to do - return FALSE; + return false; } - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { - SetUpdateFont(TRUE); + SetUpdateFont(true); m_defaultStyle.SetFont(font); ChangeFontGlobally(); } - return TRUE; + return true; } void wxTextCtrl::ChangeFontGlobally() @@ -1473,156 +1676,121 @@ void wxTextCtrl::ChangeFontGlobally() // possible! // // TODO: it can be implemented much more efficiently for GTK2 -#ifndef __WXGTK20__ - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, - - _T("shouldn't be called for single line controls") ); -#else - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE), - _T("shouldn't be called for single line controls") ); -#endif + wxASSERT_MSG( IsMultiLine(), + wxT("shouldn't be called for single line controls") ); wxString value = GetValue(); - if ( !value.IsEmpty() ) + if ( !value.empty() ) { - SetUpdateFont(FALSE); + SetUpdateFont(false); Clear(); AppendText(value); } } -#ifndef __WXGTK20__ - -void wxTextCtrl::UpdateFontIfNeeded() -{ - if ( m_updateFont ) - ChangeFontGlobally(); -} - -#endif // GTK+ 1.x - bool wxTextCtrl::SetForegroundColour(const wxColour& colour) { if ( !wxControl::SetForegroundColour(colour) ) - return FALSE; + return false; // update default fg colour too m_defaultStyle.SetTextColour(colour); - return TRUE; + return true; } bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) { - wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); if ( !wxControl::SetBackgroundColour( colour ) ) - return FALSE; - -#ifndef __WXGTK20__ - if (!m_widget->window) - return FALSE; -#endif + return false; - if (!m_backgroundColour.Ok()) - return FALSE; - - 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 - } + if (!m_backgroundColour.IsOk()) + return false; // change active background color too m_defaultStyle.SetBackgroundColour( colour ); - return TRUE; + return true; } bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { if ( style.IsDefault() ) { // nothing to do - return TRUE; + return true; } -#ifdef __WXGTK20__ + gint l = gtk_text_buffer_get_char_count( m_buffer ); - wxCHECK_MSG( start >= 0 && end <= l, FALSE, - _T("invalid range in wxTextCtrl::SetStyle") ); + wxCHECK_MSG( start >= 0 && end <= l, false, + wxT("invalid range in wxTextCtrl::SetStyle") ); GtkTextIter starti, endi; 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_widget, m_buffer, style, &starti, &endi ); - wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi ); + return true; + } + //else: single line text controls don't support styles - return TRUE; -#else - // VERY dirty way to do that - removes the required text and re-adds it - // with styling (FIXME) + return false; +} - gint l = gtk_text_get_length( GTK_TEXT(m_text) ); +bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) +{ + if ( !IsMultiLine() ) + { + // no styles for GtkEntry + return false; + } - wxCHECK_MSG( start >= 0 && end <= l, FALSE, - _T("invalid range in wxTextCtrl::SetStyle") ); + gint l = gtk_text_buffer_get_char_count( m_buffer ); - gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end ); - wxString tmp(text,*wxConvCurrent); - g_free( text ); + wxCHECK_MSG( position >= 0 && position <= l, false, + wxT("invalid range in wxTextCtrl::GetStyle") ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end ); - gtk_editable_set_position( GTK_EDITABLE(m_text), start ); + GtkTextIter positioni; + gtk_text_buffer_get_iter_at_offset(m_buffer, &positioni, position); -#if wxUSE_UNICODE - wxWX2MBbuf buf = tmp.mbc_str(); - const char *txt = buf; - size_t txtlen = strlen(buf); -#else - const char *txt = tmp; - size_t txtlen = tmp.length(); -#endif + // Obtain a copy of the default attributes + GtkTextAttributes * const + pattr = gtk_text_view_get_default_attributes(GTK_TEXT_VIEW(m_text)); + wxON_BLOCK_EXIT1(gtk_text_attributes_unref, pattr); - // 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 - wxGtkTextInsert(m_text, - wxTextAttr::Combine(style, m_defaultStyle, this), - txt, - txtlen); - - /* 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; + // And query GTK for the attributes at the given position using it as base + if ( !gtk_text_iter_get_attributes(&positioni, pattr) ) + { + style = m_defaultStyle; } - else // singe line + else // have custom attributes { - // cannot do this for GTK+'s Entry widget - return FALSE; + style.SetBackgroundColour(pattr->appearance.bg_color); + style.SetTextColour(pattr->appearance.fg_color); + + const wxGtkString + pangoFontString(pango_font_description_to_string(pattr->font)); + + wxFont font; + if ( font.SetNativeFontInfo(wxString(pangoFontString)) ) + style.SetFont(font); + + // TODO: set alignment, tabs and indents } + + return true; } void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style) { - gtk_widget_modify_style(m_text, style); + GTKApplyStyle(m_text, style); } void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event)) @@ -1675,178 +1843,198 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } -void wxTextCtrl::OnInternalIdle() +wxSize wxTextCtrl::DoGetBestSize() const { - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - if (cursor.Ok()) - { -#ifndef __WXGTK20__ - GdkWindow *window = (GdkWindow*) NULL; - if (HasFlag(wxTE_MULTILINE)) - window = GTK_TEXT(m_text)->text_area; - else - window = GTK_ENTRY(m_text)->text_area; + return DoGetSizeFromTextSize(80); +} - if (window) - gdk_window_set_cursor( window, cursor.GetCursor() ); +wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const +{ + wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") ); - if (!g_globalCursor.Ok()) - cursor = *wxSTANDARD_CURSOR; + wxSize tsize(xlen, 0); + int cHeight = GetCharHeight(); - window = m_widget->window; - if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) - gdk_window_set_cursor( window, cursor.GetCursor() ); -#endif + if ( IsSingleLine() ) + { + if ( HasFlag(wxBORDER_NONE) ) + { + tsize.y = cHeight; +#ifdef __WXGTK3__ + tsize.IncBy(9, 0); +#else + tsize.IncBy(4, 0); +#endif // GTK3 + } + else + { + // default height + tsize.y = GTKGetPreferredSize(m_widget).y; + // Add the margins we have previously set, but only the horizontal border + // as vertical one has been taken account at GTKGetPreferredSize(). + // Also get other GTK+ margins. + tsize.IncBy( GTKGetEntryMargins(GetEntry()).x, 0); + } } - if (g_delayedFocus == this) + //multiline + else { - if (GTK_WIDGET_REALIZED(m_widget)) + // add space for vertical scrollbar + if ( m_scrollBar[1] && !(m_windowStyle & wxTE_NO_VSCROLL) ) + tsize.IncBy(GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[1])).x + 3, 0); + + // height + tsize.y = cHeight; + if ( ylen <= 0 ) + { + tsize.y = 1 + cHeight * wxMax(wxMin(GetNumberOfLines(), 10), 2); + // add space for horizontal scrollbar + if ( m_scrollBar[0] && (m_windowStyle & wxHSCROLL) ) + tsize.IncBy(0, GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[0])).y + 3); + } + + if ( !HasFlag(wxBORDER_NONE) ) { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; + // hardcode borders, margins, etc + tsize.IncBy(5, 4); } } - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} + // Perhaps the user wants something different from CharHeight, or ylen + // is used as the height of a multiline text. + if ( ylen > 0 ) + tsize.IncBy(0, ylen - cHeight); -wxSize wxTextCtrl::DoGetBestSize() const -{ - // FIXME should be different for multi-line controls... - wxSize ret( wxControl::DoGetBestSize() ); - wxSize best(80, ret.y); - CacheBestSize(best); - return best; + return tsize; } + // ---------------------------------------------------------------------------- // freeze/thaw // ---------------------------------------------------------------------------- -void wxTextCtrl::Freeze() +void wxTextCtrl::DoFreeze() { + wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl")); + + GTKFreezeWidget(m_text); + if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ - if ( !m_frozenness++ ) + // removing buffer dramatically speeds up insertion: + g_object_ref(m_buffer); + GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL); + 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); + // These marks should be deleted when the buffer is changed, + // but they are not (in GTK+ up to at least 3.0.1). + // Otherwise these anonymous marks start to build up in the buffer, + // and Freeze takes longer and longer each time it is called. + if (m_anonymousMarkList) { - // freeze textview updates and remove buffer - g_signal_connect( G_OBJECT(m_text), "expose_event", - GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this); - g_signal_connect( G_OBJECT(m_widget), "expose_event", - GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)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)); - } -#else - gtk_text_freeze(GTK_TEXT(m_text)); -#endif + for (GSList* item = m_anonymousMarkList; item; item = item->next) + { + GtkTextMark* mark = static_cast(item->data); + if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark)) + gtk_text_buffer_delete_mark(m_buffer, mark); + } + g_slist_free(m_anonymousMarkList); + m_anonymousMarkList = NULL; + } } } -void wxTextCtrl::Thaw() +void wxTextCtrl::DoThaw() { if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ - wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); + // reattach buffer: + gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList); + gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer); + g_object_unref(m_buffer); + g_signal_handler_disconnect(m_buffer, sig_id); - if ( !--m_frozenness ) + if (m_showPositionOnThaw != NULL) { - // Reattach buffer and thaw textview updates - gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer); - g_object_unref(m_buffer); - gtk_widget_set_sensitive(m_widget, true); - g_signal_handlers_disconnect_by_func(m_widget, (gpointer)gtk_text_exposed_callback, this); - g_signal_handlers_disconnect_by_func(m_text, (gpointer)gtk_text_exposed_callback, this); + gtk_text_view_scroll_mark_onscreen( + GTK_TEXT_VIEW(m_text), m_showPositionOnThaw); + m_showPositionOnThaw = NULL; } -#else - GTK_TEXT(m_text)->vadj->value = 0.0; - - gtk_text_thaw(GTK_TEXT(m_text)); -#endif } + + GTKThawWidget(m_text); } // ---------------------------------------------------------------------------- -// scrolling +// wxTextUrlEvent passing if style & wxTE_AUTO_URL // ---------------------------------------------------------------------------- -GtkAdjustment *wxTextCtrl::GetVAdj() const -{ - if ( !IsMultiLine() ) - return NULL; - -#ifdef __WXGTK20__ - return gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget)); -#else - return GTK_TEXT(m_text)->vadj; -#endif -} - -bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff) +// FIXME: when dragging on a link the sample gets an "Unknown event". +// This might be an excessive event from us or a buggy wxMouseEvent::Moving() or +// a buggy sample, or something else +void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) { - float value = adj->value + diff; + event.Skip(); + if( !HasFlag(wxTE_AUTO_URL) ) + return; - if ( value < 0 ) - value = 0; + gint x, y; + GtkTextIter start, end; + GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(m_buffer), + "wxUrl"); - float upper = adj->upper - adj->page_size; - if ( value > upper ) - value = upper; + gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(m_text), GTK_TEXT_WINDOW_WIDGET, + event.GetX(), event.GetY(), &x, &y); - // did we noticeably change the scroll position? - if ( fabs(adj->value - value) < 0.2 ) + gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y); + if (!gtk_text_iter_has_tag(&end, tag)) { - // well, this is what Robert does in wxScrollBar, so it must be good... - return FALSE; + SetCursor(wxCursor(wxCURSOR_IBEAM)); + return; } - adj->value = value; - -#ifdef __WXGTK20__ - gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj)); -#else - gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); -#endif + SetCursor(wxCursor(wxCURSOR_HAND)); - return TRUE; -} + start = end; + if(!gtk_text_iter_begins_tag(&start, tag)) + gtk_text_iter_backward_to_tag_toggle(&start, tag); + if(!gtk_text_iter_ends_tag(&end, tag)) + gtk_text_iter_forward_to_tag_toggle(&end, tag); -bool wxTextCtrl::ScrollLines(int lines) -{ - GtkAdjustment *adj = GetVAdj(); - if ( !adj ) - return FALSE; + // Native context menu is probably not desired on an URL. + // Consider making this dependent on ProcessEvent(wxTextUrlEvent) return value + if(event.GetEventType() == wxEVT_RIGHT_DOWN) + event.Skip(false); -#ifdef __WXGTK20__ - int diff = (int)ceil(lines*adj->step_increment); -#else - // this is hardcoded to 10 in GTK+ 1.2 (great idea) - int diff = 10*lines; -#endif + wxTextUrlEvent url_event(m_windowId, event, + gtk_text_iter_get_offset(&start), + gtk_text_iter_get_offset(&end)); - return DoScroll(adj, diff); + InitCommandEvent(url_event); + // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag) + //event.Skip(!HandleWindowEvent(url_event)); + HandleWindowEvent(url_event); } -bool wxTextCtrl::ScrollPages(int pages) +bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const { - GtkAdjustment *adj = GetVAdj(); - if ( !adj ) - return FALSE; + bool rc = wxTextCtrlBase::GTKProcessEvent(event); - return DoScroll(adj, (int)ceil(pages*adj->page_increment)); + // 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 wxVisualAttributes wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); + return GetDefaultAttributesFromGTKWidget(gtk_entry_new(), true); } + +#endif // wxUSE_TEXTCTRL