X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ddb394878d390c3eb065f393d9a5664010d9ada..fbda518cb73c410f88838b8f9df3e525720106a6:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 08fd4c335c..9517877940 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1,57 +1,78 @@ ///////////////////////////////////////////////////////////////////////////// -// 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/strconv.h" #include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include #include -#include "wx/math.h" #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; // ---------------------------------------------------------------------------- // helpers // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ -static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, +extern "C" { +static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter *start, + GtkTextIter *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 +82,11 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, if (attr.HasFont()) { - char *font_string; + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end); + 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); + 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 +94,26 @@ 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()) + { + 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 (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 +126,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 +138,150 @@ 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()) + { + default: + align = GTK_JUSTIFY_LEFT; + break; + case wxTEXT_ALIGNMENT_RIGHT: + align = GTK_JUSTIFY_RIGHT; + break; + case wxTEXT_ALIGNMENT_CENTER: + align = GTK_JUSTIFY_CENTER; + break; +// 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); + 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; +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) / + gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10; + else +#endif + factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 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 buf = tagname.mb_str(wxConvUTF8); + + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buf ); + if (!tag) + { + // Factor to convert from 1/10th of a mm into pixels + float factor; +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) / + gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10; + else +#endif + factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 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, buf, + "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,27 +294,8 @@ 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) -{ - GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont() - : NULL; - - GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() - : NULL; - - GdkColor *colBg = attr.HasBackgroundColour() - ? attr.GetBackgroundColour().GetColor() - : NULL; - - gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); -} -#endif // GTK 1.x // ---------------------------------------------------------------------------- // "insert_text" for GtkEntry @@ -152,9 +309,6 @@ gtk_insert_text_callback(GtkEditable *editable, 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); @@ -167,7 +321,7 @@ gtk_insert_text_callback(GtkEditable *editable, if ( entry->text_length == entry->text_max_length ) { // we don't need to run the base class version at all - gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text"); + 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 @@ -182,7 +336,6 @@ gtk_insert_text_callback(GtkEditable *editable, } } -#ifdef __WXGTK20__ // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp, extern "C" { @@ -194,7 +347,7 @@ au_apply_tag_callback(GtkTextBuffer *buffer, gpointer 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"); + g_signal_stop_emission_by_name (buffer, "apply_tag"); } } @@ -264,7 +417,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) GtkTextIter start = *s, end = *e; GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s); - + // Get our special link tag GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"); @@ -277,7 +430,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; @@ -290,14 +443,14 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) 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); + gulong signal_id = g_signal_handler_find (buffer, + (GSignalMatchType) (G_SIGNAL_MATCH_FUNC), + 0, 0, NULL, + (gpointer)au_apply_tag_callback, NULL); - g_signal_handler_block(buffer, signal_id); + g_signal_handler_block (buffer, signal_id); gtk_text_buffer_apply_tag(buffer, tag, &start, &end); - g_signal_handler_unblock(buffer, signal_id); + g_signal_handler_unblock (buffer, signal_id); } } } @@ -389,8 +542,6 @@ au_delete_range_callback(GtkTextBuffer *buffer, } -#endif - //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- @@ -404,94 +555,75 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) if (!win->m_hasVMT) return; - if (g_isIdle) - wxapp_install_idle_handler(); - - win->SetModified(); -#ifndef __WXGTK20__ - win->UpdateFontIfNeeded(); -#endif // !__WXGTK20__ + if ( win->MarkDirtyOnChange() ) + win->MarkDirty(); - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + win->SendTextUpdatedEvent(); } } //----------------------------------------------------------------------------- -// "expose_event" from scrolled window and textview +// clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard" //----------------------------------------------------------------------------- -#ifdef __WXGTK20__ -extern "C" { -static gboolean -gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) +// common part of the event handlers below +static void +handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win, + wxEventType eventType, const gchar * signal_name) { - return TRUE; -} + wxClipboardTextEvent event( eventType, win->GetId() ); + event.SetEventObject( win ); + if ( win->GetEventHandler()->ProcessEvent( 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); + } } -#endif - -//----------------------------------------------------------------------------- -// "changed" from vertical scrollbar -//----------------------------------------------------------------------------- -#ifndef __WXGTK20__ extern "C" { static void -gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) { - if (!win->m_hasVMT) return; - - if (g_isIdle) - wxapp_install_idle_handler(); - - win->CalculateScrollbar(); -} + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" ); } -#endif - -// ---------------------------------------------------------------------------- -// redraw callback for multiline text -// ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ - -// 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 bool wxIsInsideYield; +static void +gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" ); +} -extern "C" { - typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect); +static void +gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" ); +} } -static GtkDrawCallback gs_gtk_text_draw = NULL; +//----------------------------------------------------------------------------- +// "expose_event" from scrolled window and textview +//----------------------------------------------------------------------------- extern "C" { -static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect) +static gboolean +gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) { - 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); - } + return TRUE; } } -#endif // __WXGTK20__ //----------------------------------------------------------------------------- // 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) @@ -506,7 +638,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) -#ifdef __WXGTK20__ // wxTE_AUTO_URL wxTextUrl support. Currently only creates // wxTextUrlEvent in the same cases as wxMSW, more can be added here. EVT_MOTION (wxTextCtrl::OnUrlMouseEvent) @@ -516,31 +647,30 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_RIGHT_DOWN (wxTextCtrl::OnUrlMouseEvent) EVT_RIGHT_UP (wxTextCtrl::OnUrlMouseEvent) EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent) -#endif END_EVENT_TABLE() void wxTextCtrl::Init() { - m_ignoreNextUpdate = + m_dontMarkDirty = m_modified = false; + + m_countUpdatesToIgnore = 0; + SetUpdateFont(false); - m_text = - m_vScrollbar = (GtkWidget *)NULL; -#ifdef __WXGTK20__ - m_frozenness = 0; + + m_text = NULL; + m_freezeCount = 0; + m_showPositionOnThaw = NULL; m_gdkHandCursor = NULL; m_gdkXTermCursor = NULL; -#endif } wxTextCtrl::~wxTextCtrl() { -#ifdef __WXGTK20__ if(m_gdkHandCursor) gdk_cursor_unref(m_gdkHandCursor); if(m_gdkXTermCursor) gdk_cursor_unref(m_gdkXTermCursor); -#endif } wxTextCtrl::wxTextCtrl( wxWindow *parent, @@ -566,9 +696,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 )) { @@ -576,68 +703,40 @@ bool wxTextCtrl::Create( wxWindow *parent, return false; } - - m_vScrollbarVisible = false; - bool multi_line = (style & wxTE_MULTILINE) != 0; if (multi_line) { -#ifdef __WXGTK20__ // Create view m_text = gtk_text_view_new(); 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_LINEWRAP ) ) - wrap = GTK_WRAP_CHAR; - else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0 - wrap = GTK_WRAP_WORD; + GTKSetWrapMode(); - gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); - - if (!HasFlag(wxNO_BORDER)) - gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); + GtkScrolledWindowSetBorder(m_widget, style); gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); -#else // GTK+ 1 - // 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 // GTK+ 2/1 } else { @@ -645,10 +744,8 @@ bool wxTextCtrl::Create( wxWindow *parent, m_widget = m_text = gtk_entry_new(); -#ifdef __WXGTK20__ if (style & wxNO_BORDER) - g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL ); -#endif + g_object_set (m_text, "has-frame", FALSE, NULL); } m_parent->DoAddChild( this ); @@ -658,111 +755,40 @@ 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); + } + else + { + g_signal_connect (m_text, "changed", + G_CALLBACK (gtk_text_changed_callback), this); } -#endif // GTK+ 1.x if (!value.empty()) { -#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 - - if (multi_line) - { - // Bring editable's cursor uptodate. Bug in GTK. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); - } - -#endif } if (style & wxTE_PASSWORD) - { - 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(); -#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)) - { - 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 - } -#endif // __WXGTK20__ + // left justification (alignment) is the default anyhow + if ( style & (wxTE_RIGHT | wxTE_CENTRE) ) + GTKSetJustification(); - // 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); - - // .. 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; @@ -778,10 +804,10 @@ bool wxTextCtrl::Create( wxWindow *parent, NULL); // Check for URLs after each text change - g_signal_connect_after( G_OBJECT(m_buffer), "insert_text", - GTK_SIGNAL_FUNC(au_insert_text_callback), (gpointer)this); - g_signal_connect_after( G_OBJECT(m_buffer), "delete_range", - GTK_SIGNAL_FUNC(au_delete_range_callback), (gpointer)this); + 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 @@ -789,8 +815,8 @@ bool wxTextCtrl::Create( wxWindow *parent, // 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( G_OBJECT(m_buffer), "apply_tag", - GTK_SIGNAL_FUNC(au_apply_tag_callback), NULL); + 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); @@ -798,123 +824,231 @@ bool wxTextCtrl::Create( wxWindow *parent, au_check_range(&start, &end); } } - else -#endif - - { - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - } + + 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 ); - wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont()); - SetDefaultStyle( attrDef ); - return true; } +// ---------------------------------------------------------------------------- +// flags handling +// ---------------------------------------------------------------------------- -void wxTextCtrl::CalculateScrollbar() +void wxTextCtrl::GTKSetEditable() { -#ifndef __WXGTK20__ - if ((m_windowStyle & wxTE_MULTILINE) == 0) return; + 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); +} - GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; +void wxTextCtrl::GTKSetVisibility() +{ + // VZ: shouldn't we assert if wxTE_PASSWORD is set for multiline control? + if ( IsSingleLine() ) + gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD)); +} - if (adj->upper - adj->page_size < 0.8) - { - if (m_vScrollbarVisible) +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 + { + // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4 +#ifdef __WXGTK24__ + if ( !gtk_check_version(2,4,0) ) { - gtk_widget_hide( m_vScrollbar ); - m_vScrollbarVisible = false; + wrap = GTK_WRAP_WORD_CHAR; } + else +#endif // __WXGTK24__ + wrap = GTK_WRAP_WORD; } - else + + gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); +} + +void wxTextCtrl::GTKSetJustification() +{ + if ( IsMultiLine() ) { - if (!m_vScrollbarVisible) + 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 + { +#ifdef __WXGTK24__ + // gtk_entry_set_alignment was introduced in gtk+-2.3.5 + if (!gtk_check_version(2,4,0)) { - gtk_widget_show( m_vScrollbar ); - m_vScrollbarVisible = true; + 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 // __WXGTK24__ } -#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(); + + 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 ); + wxGtkString 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; - - 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 { - tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) ); + const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) ); + return wxGTK_CONV_BACK(text); } return tmp; } -void wxTextCtrl::SetValue( const wxString &value ) +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.HasFont() ? style.GetFont().GetEncoding() + : wxFONTENCODING_SYSTEM; + + // fall back to the controls font if no style + if ( enc == wxFONTENCODING_SYSTEM && m_hasFont ) + enc = GetFont().GetEncoding(); + + return enc; +} + +bool wxTextCtrl::IsEmpty() const +{ + if ( IsMultiLine() ) + return gtk_text_buffer_get_char_count(m_buffer) == 0; + + return wxTextCtrlBase::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; + + 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 ) { -#ifdef __WXGTK20__ + // see comment in WriteText() as to why we must warn the user about + // this + wxLogWarning(_("Failed to set text in the text control.")); + return; + } -#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(); + if ( !(flags & SetValue_SendEvent) ) + { + g_signal_handlers_block_by_func(GetTextObject(), + (gpointer)gtk_text_changed_callback, this); + } + if ( IsMultiLine() ) + { gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); - -#else - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); - len = 0; - gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); -#endif + + 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 + else // single line { - gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) ); + gtk_entry_set_text( GTK_ENTRY(m_text), buffer ); } - // 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. + if ( !(flags & SetValue_SendEvent) ) + { + g_signal_handlers_unblock_by_func(GetTextObject(), + (gpointer)gtk_text_changed_callback, this); + } + + // This was added after discussion on the list SetInsertionPoint(0); - - m_modified = false; } void wxTextCtrl::WriteText( const wxString &text ) @@ -924,56 +1058,50 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( text.empty() ) 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; + // check if we have a specific style for the current position + wxFontEncoding enc = wxFONTENCODING_SYSTEM; + wxTextAttr style; + if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() ) + { + enc = style.GetFont().GetEncoding(); + } + + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); - if ( m_windowStyle & wxTE_MULTILINE ) + const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc)); + if ( !buffer ) { -#ifdef __WXGTK20__ + // 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; + } -#if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); -#else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } + // we're changing the text programmatically + DontMarkDirtyOnNextChange(); + + if ( IsMultiLine() ) + { + // 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); - // TODO: Call whatever is needed to delete the selection. + // Insert the text wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) ); // Scroll to cursor, but only if scrollbar thumb is at the very bottom - if ( adj->value == adj->upper - adj->page_size ) + // 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 ); } -#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); - } - - // Bring editable's cursor back uptodate. - SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) )); -#endif // GTK 1.x/2.0 } else // single line { @@ -981,26 +1109,13 @@ void wxTextCtrl::WriteText( const wxString &text ) gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); // This moves the cursor pos to behind the inserted text. - gint len = GET_EDITABLE_POS(m_text); - -#ifdef __WXGTK20__ + gint len = gtk_editable_get_position(GTK_EDITABLE(m_text)); -#if wxUSE_UNICODE - wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); -#else - wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); -#endif gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len ); -#endif - // Bring entry's cursor uptodate. - gtk_entry_set_position( GTK_ENTRY(m_text), len ); + gtk_editable_set_position( GTK_EDITABLE(m_text), len ); } - - m_modified = oldModified; } void wxTextCtrl::AppendText( const wxString &text ) @@ -1011,48 +1126,26 @@ void wxTextCtrl::AppendText( const wxString &text ) 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) ) @@ -1064,35 +1157,28 @@ 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() ) + 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 ) { - *y = 0; - *x = pos; + if ( y ) + *y = 0; + if ( x ) + *x = pos; } else { @@ -1106,51 +1192,47 @@ 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; - long pos=0; - for( int i=0; i= gtk_text_buffer_get_line_count (m_buffer)) + return -1; + + gtk_text_buffer_get_iter_at_line(m_buffer, &iter, y); + if (x >= gtk_text_iter_get_chars_in_line (&iter)) + return -1; - pos += x; - return pos; + return gtk_text_iter_get_offset(&iter) + x; } int wxTextCtrl::GetLineLength(long lineNo) const { - wxString str = GetLineText (lineNo); - return (int) str.Length(); + if ( IsMultiLine() ) + { + int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1; + if (lineNo > last_line) + return -1; + + 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 + { + wxString str = GetLineText (lineNo); + return (int) str.length(); + } } int wxTextCtrl::GetNumberOfLines() 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 ); - - // currentLine is 0 based, add 1 to get number of lines - return currentLine + 1; - } - else - { - return 0; - } -#endif } - else + else // single line { return 1; } @@ -1162,78 +1244,39 @@ void wxTextCtrl::SetInsertionPoint( long pos ) 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 + 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 { - 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); + // 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) - { -#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 - } - else - { - gtk_entry_set_position( GTK_ENTRY(m_text), -1 ); - } + SetInsertionPoint(-1); } 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 { - gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); + gtk_editable_set_editable( GTK_EDITABLE(m_text), editable ); } } @@ -1245,27 +1288,15 @@ bool wxTextCtrl::Enable( bool enable ) 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 ); - } + 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 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 @@ -1296,16 +1327,11 @@ void wxTextCtrl::DiscardEdits() // max text length support // ---------------------------------------------------------------------------- -void wxTextCtrl::IgnoreNextTextUpdate() -{ - m_ignoreNextUpdate = true; -} - bool wxTextCtrl::IgnoreTextUpdate() { - if ( m_ignoreNextUpdate ) + if ( m_countUpdatesToIgnore > 0 ) { - m_ignoreNextUpdate = false; + m_countUpdatesToIgnore--; return true; } @@ -1313,6 +1339,18 @@ bool wxTextCtrl::IgnoreTextUpdate() return false; } +bool wxTextCtrl::MarkDirtyOnChange() +{ + if ( m_dontMarkDirty ) + { + m_dontMarkDirty = false; + + return false; + } + + return true; +} + void wxTextCtrl::SetMaxLength(unsigned long len) { if ( !HasFlag(wxTE_MULTILINE) ) @@ -1330,19 +1368,13 @@ void wxTextCtrl::SetMaxLength(unsigned long len) // 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); + g_signal_connect (m_text, "insert_text", + G_CALLBACK (gtk_insert_text_callback), this); } else // no checking { - gtk_signal_disconnect_by_func - ( - GTK_OBJECT(m_text), - GTK_SIGNAL_FUNC(gtk_insert_text_callback), - (gpointer)this - ); + g_signal_handlers_disconnect_by_func (m_text, + (gpointer) gtk_insert_text_callback, this); } } } @@ -1354,31 +1386,17 @@ void wxTextCtrl::SetSelection( long from, long to ) if (from == -1 && to == -1) { from = 0; - to = GetValue().Length(); + to = GetValue().length(); } -#ifndef __WXGTK20__ - if ( (m_windowStyle & wxTE_MULTILINE) && - !GTK_TEXT(m_text)->line_start_cache ) - { - // tell the programmer that it didn't work - wxLogDebug(_T("Can't call SetSelection() before realizing the control")); - return; - } -#endif - - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { -#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 } else { @@ -1388,29 +1406,20 @@ void wxTextCtrl::SetSelection( long from, long 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 { @@ -1437,14 +1446,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 @@ -1457,9 +1463,8 @@ long wxTextCtrl::GetInsertionPoint() const return gtk_text_iter_get_offset( &cursor ); } else -#endif { - return (long) GET_EDITABLE_POS(m_text); + return (long) gtk_editable_get_position(GTK_EDITABLE(m_text)); } } @@ -1469,16 +1474,12 @@ wxTextPos wxTextCtrl::GetLastPosition() const 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 { @@ -1492,8 +1493,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 ); @@ -1502,8 +1502,7 @@ 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 ); + gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } void wxTextCtrl::Replace( long from, long to, const wxString &value ) @@ -1514,18 +1513,8 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value ) if (!value.empty()) { -#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 } } @@ -1533,36 +1522,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); + gtk_editable_cut_clipboard(GTK_EDITABLE(m_text)); } 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); + gtk_editable_copy_clipboard(GTK_EDITABLE(m_text)); } 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); + gtk_editable_paste_clipboard(GTK_EDITABLE(m_text)); } // Undo/redo @@ -1602,8 +1585,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const gint to = -1; bool haveSelection = false; -#ifdef __WXGTK20__ - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter ifrom, ito; if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) ) @@ -1621,14 +1603,6 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const 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 (! haveSelection ) from = to = GetInsertionPoint(); @@ -1652,8 +1626,7 @@ bool wxTextCtrl::IsEditable() const { 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)); } @@ -1661,9 +1634,6 @@ bool wxTextCtrl::IsEditable() const { return gtk_editable_get_editable(GTK_EDITABLE(m_text)); } -#else - return GTK_EDITABLE(m_text)->editable; -#endif } bool wxTextCtrl::IsModified() const @@ -1673,38 +1643,44 @@ bool wxTextCtrl::IsModified() const void wxTextCtrl::Clear() { - SetValue( wxT("") ); + 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 & 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 ( HasFlag(wxTE_PROCESS_ENTER) ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + event.SetEventObject(this); + event.SetString(GetValue()); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + } - if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) + // FIXME: this is not the right place to do it, wxDialog::OnCharHook() + // probably is + if ( IsSingleLine() ) { - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + // 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 (window->default_widget) + if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) { - gtk_widget_activate (window->default_widget); - return; + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } } } } @@ -1717,19 +1693,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() ) { -#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); + return GTK_ENTRY(m_text)->text_area; } } @@ -1744,7 +1717,7 @@ bool wxTextCtrl::SetFont( const wxFont &font ) return false; } - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { SetUpdateFont(true); @@ -1762,14 +1735,8 @@ 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), + wxASSERT_MSG( IsMultiLine(), _T("shouldn't be called for single line controls") ); -#endif wxString value = GetValue(); if ( !value.empty() ) @@ -1781,16 +1748,6 @@ void wxTextCtrl::ChangeFontGlobally() } } -#ifndef __WXGTK20__ - -void wxTextCtrl::UpdateFontIfNeeded() -{ - if ( m_updateFont ) - ChangeFontGlobally(); -} - -#endif // GTK+ 1.x - bool wxTextCtrl::SetForegroundColour(const wxColour& colour) { if ( !wxControl::SetForegroundColour(colour) ) @@ -1809,26 +1766,9 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) if ( !wxControl::SetBackgroundColour( colour ) ) return false; -#ifndef __WXGTK20__ - if (!m_widget->window) - return false; -#endif - 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 - } - // change active background color too m_defaultStyle.SetBackgroundColour( colour ); @@ -1837,14 +1777,14 @@ 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() ) { // nothing to do return true; } -#ifdef __WXGTK20__ + gint l = gtk_text_buffer_get_char_count( m_buffer ); wxCHECK_MSG( start >= 0 && end <= l, false, @@ -1854,59 +1794,13 @@ 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 - // VERY dirty way to do that - removes the required text and re-adds it - // with styling (FIXME) - - gint l = gtk_text_get_length( GTK_TEXT(m_text) ); - - wxCHECK_MSG( start >= 0 && end <= l, false, - _T("invalid range in wxTextCtrl::SetStyle") ); - - 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 ); - - gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end ); - gtk_editable_set_position( GTK_EDITABLE(m_text), start ); - -#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 - - // 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; - } - else // singe line - { - // cannot do this for GTK+'s Entry widget - return false; } + //else: single line text controls don't support styles + + return false; } void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style) @@ -1964,45 +1858,6 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } -void wxTextCtrl::OnInternalIdle() -{ - 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; - - if (window) - gdk_window_set_cursor( window, cursor.GetCursor() ); - - if (!g_globalCursor.Ok()) - cursor = *wxSTANDARD_CURSOR; - - window = m_widget->window; - if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) - gdk_window_set_cursor( window, cursor.GetCursor() ); -#endif - } - - 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... @@ -2018,23 +1873,31 @@ wxSize wxTextCtrl::DoGetBestSize() const void wxTextCtrl::Freeze() { + wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl")); + if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ - if ( !m_frozenness++ ) + if (m_freezeCount++ == 0) { // 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); + g_signal_connect (m_text, "expose_event", + G_CALLBACK (gtk_text_exposed_callback), this); + g_signal_connect (m_widget, "expose_event", + 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)); - } -#else - gtk_text_freeze(GTK_TEXT(m_text)); -#endif + 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); + } } } @@ -2042,23 +1905,25 @@ void wxTextCtrl::Thaw() { if ( HasFlag(wxTE_MULTILINE) ) { -#ifdef __WXGTK20__ - 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); 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); + 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); + if (m_showPositionOnThaw != NULL) + { + 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 } } @@ -2066,15 +1931,13 @@ void wxTextCtrl::Thaw() // wxTextUrlEvent passing if style & wxTE_AUTO_URL // ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ - // 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) { event.Skip(); - if(!(m_windowStyle & wxTE_AUTO_URL)) + if( !HasFlag(wxTE_AUTO_URL) ) return; gint x, y; @@ -2116,82 +1979,24 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) //event.Skip(!GetEventHandler()->ProcessEvent(url_event)); GetEventHandler()->ProcessEvent(url_event); } -#endif // gtk2 - -// ---------------------------------------------------------------------------- -// scrolling -// ---------------------------------------------------------------------------- - -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) +bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const { - float value = adj->value + diff; - - if ( value < 0 ) - value = 0; - - float upper = adj->upper - adj->page_size; - if ( value > upper ) - value = upper; - - // did we noticeably change the scroll position? - if ( fabs(adj->value - value) < 0.2 ) - { - // well, this is what Robert does in wxScrollBar, so it must be good... - return false; - } - - adj->value = value; - -#ifdef __WXGTK20__ - gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj)); -#else - gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); -#endif + bool rc = wxTextCtrlBase::GTKProcessEvent(event); - return true; -} - -bool wxTextCtrl::ScrollLines(int lines) -{ - GtkAdjustment *adj = GetVAdj(); - if ( !adj ) - return 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 - - return DoScroll(adj, diff); + // 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); } -bool wxTextCtrl::ScrollPages(int pages) -{ - GtkAdjustment *adj = GetVAdj(); - if ( !adj ) - return false; - - return DoScroll(adj, (int)ceil(pages*adj->page_increment)); -} - - // static wxVisualAttributes wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } + +#endif // wxUSE_TEXTCTRL