X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3379ed3789e405f874d9db757d95346f1d378795..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 65f7951813..e852530107 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -7,24 +7,29 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "textctrl.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/textctrl.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/settings.h" #include "wx/panel.h" +#include "wx/strconv.h" +#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include #include +#include "wx/math.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkkeysyms.h" +#include "wx/gtk/private.h" +#include //----------------------------------------------------------------------------- // idle system @@ -37,154 +42,476 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; +extern wxWindowGTK *g_delayedFocus; + +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +#ifdef __WXGTK20__ +extern "C" { +static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter *start, + GtkTextIter *end, + gpointer user_data) +{ + gchar *name; + g_object_get (tag, "name", &name, NULL); -//----------------------------------------------------------------------------- -// "changed" -//----------------------------------------------------------------------------- + if (!name || strncmp(name, "WX", 2)) // anonymous tag or not starting with "WX" + g_signal_stop_emission_by_name(buffer, "remove_tag"); -static void -gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) + g_free(name); +} +} + +extern "C" { +static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, + const wxTextAttr& attr, + GtkTextIter *start, + GtkTextIter *end) { - if (!win->m_hasVMT) return; + static gchar buf[1024]; + GtkTextTag *tag; - if (g_isIdle) - wxapp_install_idle_handler(); + gulong remove_handler_id = g_signal_connect( text_buffer, "remove_tag", + G_CALLBACK(wxGtkOnRemoveTag), NULL); + gtk_text_buffer_remove_all_tags(text_buffer, start, end); + g_signal_handler_disconnect( text_buffer, remove_handler_id ); - win->SetModified(); - win->UpdateFontIfNeeded(); + 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); + 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, + "font-desc", font_description, + NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + g_free (font_string); + } - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); - event.SetString( win->GetValue() ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + if (attr.HasTextColour()) + { + 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 ), + buf ); + if (!tag) + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "foreground-gdk", colFg, NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + } + + if (attr.HasBackgroundColour()) + { + 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 ), + buf ); + if (!tag) + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "background-gdk", colBg, NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, start, end); + } +} } -//----------------------------------------------------------------------------- -// "changed" from vertical scrollbar -//----------------------------------------------------------------------------- +extern "C" { +static void wxGtkTextInsert(GtkWidget *text, + GtkTextBuffer *text_buffer, + const wxTextAttr& attr, + wxCharBuffer buffer) -static void -gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { - if (!win->m_hasVMT) return; + gint start_offset; + GtkTextIter iter, start; + + gtk_text_buffer_get_iter_at_mark( text_buffer, &iter, + gtk_text_buffer_get_insert (text_buffer) ); + start_offset = gtk_text_iter_get_offset (&iter); + gtk_text_buffer_insert( text_buffer, &iter, buffer, strlen(buffer) ); + + gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset); + + wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); +} +} +#else +extern "C" { +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 +// ---------------------------------------------------------------------------- + +extern "C" { +static void +gtk_insert_text_callback(GtkEditable *editable, + const gchar *new_text, + gint new_text_length, + gint *position, + wxTextCtrl *win) +{ if (g_isIdle) wxapp_install_idle_handler(); - win->CalculateScrollbar(); + // we should only be called if we have a max len limit at all + GtkEntry *entry = GTK_ENTRY (editable); + + wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") ); + + // check that we don't overflow the max length limit + // + // FIXME: this doesn't work when we paste a string which is going to be + // truncated + if ( entry->text_length == entry->text_max_length ) + { + // we don't need to run the base class version at all + gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text"); + + // remember that the next changed signal is to be ignored to avoid + // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event + win->IgnoreNextTextUpdate(); + + // and generate the correct one ourselves + wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId()); + event.SetEventObject(win); + event.SetString(win->GetValue()); + win->GetEventHandler()->ProcessEvent( event ); + } +} +} + +#ifdef __WXGTK20__ +// Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp, + +extern "C" { +static void +au_apply_tag_callback(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter *start, + GtkTextIter *end, + 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"); +} } //----------------------------------------------------------------------------- -// "focus_in_event" +// GtkTextCharPredicates for gtk_text_iter_*_find_char //----------------------------------------------------------------------------- -extern wxWindow *g_focusWindow; -extern bool g_blockEventsOnDrag; -// extern bool g_isIdle; +extern "C" { +static gboolean +pred_whitespace (gunichar ch, gpointer user_data) +{ + return g_unichar_isspace(ch); +} +} -static gint gtk_text_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) +extern "C" { +static gboolean +pred_non_whitespace (gunichar ch, gpointer user_data) { - // Necessary? -#if 0 - if (g_isIdle) - wxapp_install_idle_handler(); -#endif - if (!win->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) return FALSE; + return !g_unichar_isspace(ch); +} +} - g_focusWindow = win; +extern "C" { +static gboolean +pred_nonpunct (gunichar ch, gpointer user_data) +{ + return !g_unichar_ispunct(ch); +} +} - wxPanel *panel = wxDynamicCast(win->GetParent(), wxPanel); - if (panel) +extern "C" { +static gboolean +pred_nonpunct_or_slash (gunichar ch, gpointer 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 +au_check_word( GtkTextIter *s, GtkTextIter *e ) +{ + static const char *URIPrefixes[] = { - panel->SetLastFocus(win); + "http://", + "ftp://", + "www.", + "ftp.", + "mailto://", + "https://", + "file://", + "nntp://", + "news://", + "telnet://", + "mms://", + "gopher://", + "prospero://", + "wais://", + }; + + 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"); + + // 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); + + gchar* 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 ) + { + prefix_len = strlen(URIPrefixes[n]); + if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len)) + break; } -#ifdef HAVE_XIM - if (win->m_ic) - gdk_im_begin(win->m_ic, win->m_wxwindow->window); -#endif - -#if 0 -#ifdef wxUSE_CARET - // caret needs to be informed about focus change - wxCaret *caret = win->GetCaret(); - if ( caret ) + if(n < WXSIZEOF(URIPrefixes)) { - caret->OnSetFocus(); + 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); + gtk_text_buffer_apply_tag(buffer, tag, &start, &end); + g_signal_handler_unblock(buffer, signal_id); } -#endif // wxUSE_CARET -#endif +} +} - wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); - event.SetEventObject( win ); +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 (win->GetEventHandler()->ProcessEvent( event )) + 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)) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" ); - return TRUE; + 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); } +} +} - return FALSE; +//----------------------------------------------------------------------------- +// "insert-text" for GtkTextBuffer +//----------------------------------------------------------------------------- + +extern "C" { +static void +au_insert_text_callback(GtkTextBuffer *buffer, + GtkTextIter *end, + gchar *text, + gint len, + wxTextCtrl *win) +{ + if (!len || !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) ) + return; + + GtkTextIter start = *end; + gtk_text_iter_backward_chars(&start, g_utf8_strlen(text, len)); + + GtkTextIter line_start = start; + GtkTextIter line_end = *end; + GtkTextIter words_start = start; + GtkTextIter words_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(&words_start, pred_whitespace, NULL, &line_start); + gtk_text_iter_forward_find_char(&words_end, pred_whitespace, NULL, &line_end); + + au_check_range(&words_start, &words_end); +} } //----------------------------------------------------------------------------- -// "focus_out_event" +// "delete-range" for GtkTextBuffer //----------------------------------------------------------------------------- -static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) +extern "C" { +static void +au_delete_range_callback(GtkTextBuffer *buffer, + GtkTextIter *start, + GtkTextIter *end, + wxTextCtrl *win) { -#if 0 + 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" +//----------------------------------------------------------------------------- + +extern "C" { +static void +gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + if ( win->IgnoreTextUpdate() ) + return; + + if (!win->m_hasVMT) return; + if (g_isIdle) wxapp_install_idle_handler(); -#endif - if (!win->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) return FALSE; + win->SetModified(); +#ifndef __WXGTK20__ + win->UpdateFontIfNeeded(); +#endif // !__WXGTK20__ + + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); +} +} + +//----------------------------------------------------------------------------- +// "expose_event" from scrolled window and textview +//----------------------------------------------------------------------------- -#if 0 - // if the focus goes out of our app alltogether, OnIdle() will send - // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset - // g_sendActivateEvent to -1 - g_sendActivateEvent = 0; +#ifdef __WXGTK20__ +extern "C" { +static gboolean +gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) +{ + return TRUE; +} +} #endif - wxWindow *winFocus = wxFindFocusedChild(win); - if ( winFocus ) - win = winFocus; +//----------------------------------------------------------------------------- +// "changed" from vertical scrollbar +//----------------------------------------------------------------------------- - g_focusWindow = (wxWindow *)NULL; +#ifndef __WXGTK20__ +extern "C" { +static void +gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +{ + if (!win->m_hasVMT) return; -#ifdef HAVE_XIM - if (win->m_ic) - gdk_im_end(); -#endif + if (g_isIdle) + wxapp_install_idle_handler(); -#if 0 -#ifdef wxUSE_CARET - // caret needs to be informed about focus change - wxCaret *caret = win->GetCaret(); - if ( caret ) - { - caret->OnKillFocus(); - } -#endif // wxUSE_CARET + win->CalculateScrollbar(); +} +} #endif - wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); - event.SetEventObject( win ); +// ---------------------------------------------------------------------------- +// 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; - if (win->GetEventHandler()->ProcessEvent( event )) +extern "C" { + typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect); +} + +static GtkDrawCallback gs_gtk_text_draw = NULL; + +extern "C" { +static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect) +{ + if ( !wxIsInsideYield ) { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" ); - return TRUE; - } + wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw, + _T("infinite recursion in wxgtk_text_draw aborted") ); - return FALSE; + gs_gtk_text_draw(widget, rect); + } +} } +#endif // __WXGTK20__ + //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- @@ -205,14 +532,42 @@ 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) + +#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) + 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) +#endif END_EVENT_TABLE() void wxTextCtrl::Init() { - m_modified = FALSE; - m_updateFont = FALSE; + m_ignoreNextUpdate = + m_modified = false; + SetUpdateFont(false); m_text = m_vScrollbar = (GtkWidget *)NULL; +#ifdef __WXGTK20__ + m_frozenness = 0; + 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, @@ -238,34 +593,72 @@ bool wxTextCtrl::Create( wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + 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; + m_vScrollbarVisible = false; bool multi_line = (style & wxTE_MULTILINE) != 0; + if (multi_line) { -#if (GTK_MINOR_VERSION > 2) - /* a multi-line edit control: create a vertical scrollbar by default and - horizontal if requested */ - bool bHasHScrollbar = (style & wxHSCROLL) != 0; -#else - bool bHasHScrollbar = FALSE; +#ifdef __WXGTK20__ + // Create view + m_text = gtk_text_view_new(); + + m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + + // create scrolled window + m_widget = gtk_scrolled_window_new( NULL, NULL ); + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + + // Insert view into scrolled window + gtk_container_add( GTK_CONTAINER(m_widget), m_text ); + + // translate wx wrapping style to GTK+ + GtkWrapMode wrap; + if ( HasFlag( wxTE_DONTWRAP ) ) + wrap = GTK_WRAP_NONE; + else if ( HasFlag( wxTE_CHARWRAP ) ) + wrap = GTK_WRAP_CHAR; + else if ( HasFlag( wxTE_WORDWRAP ) ) + wrap = GTK_WRAP_WORD; + else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0 + { + // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4 +#ifdef __WXGTK24__ + if ( !gtk_check_version(2,4,0) ) + { + wrap = GTK_WRAP_WORD_CHAR; + } + else #endif + wrap = GTK_WRAP_WORD; + } + + gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); + + if (!HasFlag(wxNO_BORDER)) + gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); + + gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); - /* create our control ... */ + 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 */ + // ... 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, @@ -273,102 +666,86 @@ bool wxTextCtrl::Create( wxWindow *parent, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK), 0, 0); - /* always wrap words */ + // always wrap words gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE ); -#if (GTK_MINOR_VERSION > 2) - /* put the horizontal scrollbar in the lower left hand corner */ - if (bHasHScrollbar) - { - GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); - GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS ); - gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), - GTK_FILL, - 0, 0); - gtk_widget_show(hscrollbar); - - /* don't wrap lines, otherwise we wouldn't need the scrollbar */ - gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE ); - } -#endif - - /* finally, put the vertical scrollbar in the upper right corner */ + // finally, put the vertical scrollbar in the upper right corner m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj ); GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS ); gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1, GTK_FILL, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), 0, 0); +#endif // GTK+ 2/1 } else { - /* a single-line text control: no need for scrollbars */ + // a single-line text control: no need for scrollbars m_widget = - m_text = gtk_entry_new(); + m_text = gtk_entry_new(); + +#ifdef __WXGTK20__ + if (style & wxNO_BORDER) + g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL ); +#endif } m_parent->DoAddChild( this ); - PostCreation(); + m_focusWidget = m_text; - SetFont( parent->GetFont() ); - - wxSize size_best( DoGetBestSize() ); - wxSize new_size( size ); - if (new_size.x == -1) - new_size.x = size_best.x; - if (new_size.y == -1) - new_size.y = size_best.y; - if ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); + PostCreation(size); if (multi_line) gtk_widget_show(m_text); +#ifndef __WXGTK20__ if (multi_line) { gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this ); - gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_text_focus_in_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; - gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this ); - } - else - { - gtk_signal_connect( GTK_OBJECT(m_text), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this ); + gs_gtk_text_draw = draw; - gtk_signal_connect( GTK_OBJECT(m_text), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this ); + draw = wxgtk_text_draw; + } } +#endif // GTK+ 1.x - if (!value.IsEmpty()) + if (!value.empty()) { - gint tmp = 0; +#ifdef __WXGTK20__ + SetValue( value ); +#else -#if GTK_MINOR_VERSION == 0 +#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 // !Unicode +#else gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); -#endif // Unicode/!Unicode +#endif if (multi_line) { - /* bring editable's cursor uptodate. bug in GTK. */ - - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + // 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) @@ -381,39 +758,105 @@ bool wxTextCtrl::Create( wxWindow *parent, { if (!multi_line) gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); +#ifdef __WXGTK20__ + else + gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE); +#else } else { if (multi_line) gtk_text_set_editable( GTK_TEXT(m_text), 1 ); +#endif + } + +#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__ - /* we want to be notified about text changes */ - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + // 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); - /* we don't set a valid background colour, because the window - manager should use a default one */ - m_backgroundColour = wxColour(); + // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style + if (style & wxTE_AUTO_URL) + { + GtkTextIter start, end; + m_gdkHandCursor = gdk_cursor_new(GDK_HAND2); + m_gdkXTermCursor = gdk_cursor_new(GDK_XTERM); + + // We create our wxUrl tag here for slight efficiency gain - we + // don't have to check for the tag existance 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( 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); + + // 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( G_OBJECT(m_buffer), "apply_tag", + GTK_SIGNAL_FUNC(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); + } + } + else +#endif - wxColour colFg = parent->GetForegroundColour(); - SetForegroundColour( colFg ); + { + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + } m_cursor = wxCursor( wxCURSOR_IBEAM ); - // FIXME: is the bg colour correct here? - wxTextAttr attrDef( colFg, - wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW), - parent->GetFont() ); + wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont()); SetDefaultStyle( attrDef ); - Show( TRUE ); - - return TRUE; + return true; } + void wxTextCtrl::CalculateScrollbar() { +#ifndef __WXGTK20__ if ((m_windowStyle & wxTE_MULTILINE) == 0) return; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; @@ -423,7 +866,7 @@ void wxTextCtrl::CalculateScrollbar() if (m_vScrollbarVisible) { gtk_widget_hide( m_vScrollbar ); - m_vScrollbarVisible = FALSE; + m_vScrollbarVisible = false; } } else @@ -431,27 +874,47 @@ void wxTextCtrl::CalculateScrollbar() if (!m_vScrollbarVisible) { gtk_widget_show( m_vScrollbar ); - m_vScrollbarVisible = TRUE; + m_vScrollbarVisible = true; } } +#endif } 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) { +#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; + + g_free( text ); +#else gint len = gtk_text_get_length( GTK_TEXT(m_text) ); char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - tmp = wxString(text,*wxConvCurrent); + tmp = text; g_free( text ); +#endif } else { - tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent); + tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) ); } + return tmp; } @@ -461,27 +924,42 @@ void wxTextCtrl::SetValue( const wxString &value ) if (m_windowStyle & wxTE_MULTILINE) { +#ifdef __WXGTK20__ + +#if wxUSE_UNICODE + wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) ); +#else + wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) ); +#endif + if (gtk_text_buffer_get_char_count(m_buffer) != 0) + IgnoreNextTextUpdate(); + + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } + + 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; -#if wxUSE_UNICODE - wxWX2MBbuf tmpbuf = value.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len ); -#else gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); #endif } else { - gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) ); } // GRG, Jun/2000: Changed this after a lot of discussion in - // the lists. wxWindows 2.2 will have a set of flags to + // the lists. wxWidgets 2.2 will have a set of flags to // customize this behaviour. SetInsertionPoint(0); - m_modified = FALSE; + m_modified = false; } void wxTextCtrl::WriteText( const wxString &text ) @@ -491,140 +969,141 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( text.empty() ) return; -#if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - const char *txt = buf; - size_t txtlen = strlen(buf); -#else - const char *txt = text; - size_t txtlen = text.length(); -#endif + // gtk_text_changed_callback() will set m_modified to true but m_modified + // shouldn't be changed by the program writing to the text control itself, + // so save the old value and restore when we're done + bool oldModified = m_modified; if ( m_windowStyle & wxTE_MULTILINE ) { - /* this moves the cursor pos to behind the inserted text */ - gint len = GTK_EDITABLE(m_text)->current_pos; +#ifdef __WXGTK20__ - // if we have any special style, use it - if ( !m_defaultStyle.IsDefault() ) +#if wxUSE_UNICODE + wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); +#else + wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); +#endif + if ( !buffer ) { - GdkFont *font = m_defaultStyle.HasFont() - ? m_defaultStyle.GetFont().GetInternalFont() - : NULL; - - GdkColor *colFg = m_defaultStyle.HasTextColour() - ? m_defaultStyle.GetTextColour().GetColor() - : NULL; + // what else can we do? at least don't crash... + return; + } - GdkColor *colBg = m_defaultStyle.HasBackgroundColour() - ? m_defaultStyle.GetBackgroundColour().GetColor() - : NULL; + // TODO: Call whatever is needed to delete the selection. + wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer ); - gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + 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 // no style +#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() ) { - gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); + SetUpdateFont(false); } - /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + // 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 { - /* this moves the cursor pos to behind the inserted text */ - gint len = GTK_EDITABLE(m_text)->current_pos; - gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); + // First remove the selection if there is one + gtk_editable_delete_selection( GTK_EDITABLE(m_text) ); - /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos += text.Len(); + // This moves the cursor pos to behind the inserted text. + gint len = GET_EDITABLE_POS(m_text); - /* bring entry's cursor uptodate. bug in GTK. */ - gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); - } -} - -void wxTextCtrl::AppendText( const wxString &text ) -{ - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - - if ( text.empty() ) - return; +#ifdef __WXGTK20__ #if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - const char *txt = buf; - size_t txtlen = strlen(buf); + wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) ); #else - const char *txt = text; - size_t txtlen = text.length(); + wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); #endif - - if (m_windowStyle & wxTE_MULTILINE) - { - if ( !m_defaultStyle.IsDefault() ) + if ( !buffer ) { - GdkFont *font = m_defaultStyle.HasFont() - ? m_defaultStyle.GetFont().GetInternalFont() - : NULL; - - GdkColor *colFg = m_defaultStyle.HasTextColour() - ? m_defaultStyle.GetTextColour().GetColor() - : NULL; + // what else can we do? at least don't crash... + return; + } - GdkColor *colBg = m_defaultStyle.HasBackgroundColour() - ? m_defaultStyle.GetBackgroundColour().GetColor() - : NULL; + gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); - gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); - } - else // no style - { - /* we'll insert at the last position */ - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); - } +#else + gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len ); +#endif - /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); - } - else // single line - { - gtk_entry_append_text( GTK_ENTRY(m_text), txt ); + // Bring entry's cursor uptodate. + gtk_entry_set_position( GTK_ENTRY(m_text), len ); } + + m_modified = oldModified; } -wxString wxTextCtrl::GetLineText( long lineNo ) const +void wxTextCtrl::AppendText( const wxString &text ) { - if (m_windowStyle & wxTE_MULTILINE) - { - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); + SetInsertionPointEnd(); + WriteText( text ); +} - if (text) +wxString wxTextCtrl::GetLineText( long lineNo ) const +{ + if (m_windowStyle & wxTE_MULTILINE) { - wxString buf(wxT("")); - long i; - int currentLine = 0; - for (i = 0; currentLine != lineNo && text[i]; i++ ) - if (text[i] == '\n') +#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; + 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]; + // Now get the text + int j; + for (j = 0; text[i] && text[i] != '\n'; i++, j++ ) + buf += text[i]; - g_free( text ); - return buf; + 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 } else - return wxEmptyString; - } - else - { - if (lineNo == 0) return GetValue(); - return wxEmptyString; - } + { + if (lineNo == 0) return GetValue(); + return wxEmptyString; + } } void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) @@ -642,7 +1121,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const // cast to prevent warning. But pos really should've been unsigned. if( (unsigned long)pos > text.Len() ) - return FALSE; + return false; *x=0; // First Col *y=0; // First Line @@ -669,11 +1148,11 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const else { // index out of bounds - return FALSE; + return false; } } - return TRUE; + return true; } long wxTextCtrl::XYToPosition(long x, long y ) const @@ -697,6 +1176,9 @@ int wxTextCtrl::GetNumberOfLines() const { if (m_windowStyle & wxTE_MULTILINE) { +#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 ); @@ -717,6 +1199,7 @@ int wxTextCtrl::GetNumberOfLines() const { return 0; } +#endif } else { @@ -728,16 +1211,23 @@ void wxTextCtrl::SetInsertionPoint( long pos ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { - /* seems to be broken in GTK 1.0.X: - gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */ - +#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 thos non-sense, we + isn't supposed to get to know about this non-sense, we disconnect so that no events are sent to the user program. */ gint tmp = (gint)pos; @@ -747,17 +1237,16 @@ void wxTextCtrl::SetInsertionPoint( long pos ) gtk_signal_connect( GTK_OBJECT(m_text), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - /* bring editable's cursor uptodate. another bug in GTK. */ - - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + // 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 } else { gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos ); - /* bring editable's cursor uptodate. bug in GTK. */ - - GTK_EDITABLE(m_text)->current_pos = (guint32)pos; + // Bring editable's cursor uptodate. Bug in GTK. + SET_EDITABLE_POS(m_text, (guint32)pos); } } @@ -766,9 +1255,19 @@ 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 ); + } } void wxTextCtrl::SetEditable( bool editable ) @@ -776,9 +1275,17 @@ void wxTextCtrl::SetEditable( bool editable ) wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); if (m_windowStyle & wxTE_MULTILINE) + { +#ifdef __WXGTK20__ + gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable ); +#else gtk_text_set_editable( GTK_TEXT(m_text), editable ); +#endif + } else + { gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); + } } bool wxTextCtrl::Enable( bool enable ) @@ -786,20 +1293,24 @@ bool wxTextCtrl::Enable( bool enable ) if (!wxWindowBase::Enable(enable)) { // nothing to do - return FALSE; + 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 TRUE; + return true; } // wxGTK-specific: called recursively by Enable, @@ -822,15 +1333,82 @@ void wxTextCtrl::OnParentEnable( bool enable ) } } +void wxTextCtrl::MarkDirty() +{ + m_modified = true; +} + void wxTextCtrl::DiscardEdits() { - m_modified = FALSE; + m_modified = false; +} + +// ---------------------------------------------------------------------------- +// max text length support +// ---------------------------------------------------------------------------- + +void wxTextCtrl::IgnoreNextTextUpdate() +{ + m_ignoreNextUpdate = true; +} + +bool wxTextCtrl::IgnoreTextUpdate() +{ + if ( m_ignoreNextUpdate ) + { + m_ignoreNextUpdate = false; + + return true; + } + + return false; +} + +void wxTextCtrl::SetMaxLength(unsigned long len) +{ + if ( !HasFlag(wxTE_MULTILINE) ) + { + gtk_entry_set_max_length(GTK_ENTRY(m_text), len); + + // 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 + ); + } + } } 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 ) { @@ -838,31 +1416,125 @@ void wxTextCtrl::SetSelection( long from, long to ) wxLogDebug(_T("Can't call SetSelection() before realizing the control")); return; } +#endif + + 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 + } + else + { + gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + } +} - gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); +void wxTextCtrl::ShowPosition( long pos ) +{ + if (m_windowStyle & wxTE_MULTILINE) + { +#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 + } } -void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) +#ifdef __WXGTK20__ + +wxTextCtrlHitTestResult +wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const { -// SetInsertionPoint( pos ); + if ( !IsMultiLine() ) + { + // not supported + return wxTE_HT_UNKNOWN; + } + + int x, y; + gtk_text_view_window_to_buffer_coords + ( + GTK_TEXT_VIEW(m_text), + GTK_TEXT_WINDOW_TEXT, + pt.x, pt.y, + &x, &y + ); + + GtkTextIter iter; + gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &iter, x, y); + if ( pos ) + *pos = gtk_text_iter_get_offset(&iter); + + return wxTE_HT_ON_TEXT; } +#endif // __WXGTK20__ + long wxTextCtrl::GetInsertionPoint() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); - return (long) GTK_EDITABLE(m_text)->current_pos; +#ifdef __WXGTK20__ + if (m_windowStyle & wxTE_MULTILINE) + { + // There is no direct accessor for the cursor, but + // internally, the cursor is the "mark" called + // "insert" in the text view's btree structure. + + GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer ); + GtkTextIter cursor; + gtk_text_buffer_get_iter_at_mark( m_buffer, &cursor, mark ); + + return gtk_text_iter_get_offset( &cursor ); + } + else +#endif + { + return (long) GET_EDITABLE_POS(m_text); + } } -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) + { +#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 + { pos = GTK_ENTRY(m_text)->text_length; + } return (long)pos; } @@ -871,6 +1543,17 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); +#ifdef __WXGTK20__ + if (m_windowStyle & wxTE_MULTILINE) + { + 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_delete( m_buffer, &fromi, &toi ); + } + else // single line +#endif gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } @@ -878,17 +1561,22 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); + Remove( from, to ); - if (!value.IsEmpty()) + 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 +#endif // wxUSE_UNICODE +#endif // GTK 1.x/2.x } } @@ -896,33 +1584,36 @@ void wxTextCtrl::Cut() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#if (GTK_MINOR_VERSION > 0) - gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); -#else - gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); +#ifdef __WXGTK20__ + if (m_windowStyle & wxTE_MULTILINE) + g_signal_emit_by_name(m_text, "cut-clipboard"); + else #endif + gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); } void wxTextCtrl::Copy() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#if (GTK_MINOR_VERSION > 0) - gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); -#else - gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); +#ifdef __WXGTK20__ + if (m_windowStyle & wxTE_MULTILINE) + g_signal_emit_by_name(m_text, "copy-clipboard"); + else #endif + gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); } void wxTextCtrl::Paste() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); -#if (GTK_MINOR_VERSION > 0) - gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); -#else - gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); +#ifdef __WXGTK20__ + if (m_windowStyle & wxTE_MULTILINE) + g_signal_emit_by_name(m_text, "paste-clipboard"); + else #endif + gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG); } // Undo/redo @@ -941,15 +1632,15 @@ void wxTextCtrl::Redo() bool wxTextCtrl::CanUndo() const { // TODO - wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); - return FALSE; + //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") ); + return false; } bool wxTextCtrl::CanRedo() const { // TODO - wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); - return FALSE; + //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") ); + return false; } // If the return values from and to are the same, there is no @@ -958,25 +1649,48 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - long from, to; - if ( !(GTK_EDITABLE(m_text)->has_selection) ) - { - from = - to = GetInsertionPoint(); - } - else // got selection - { - from = (long) GTK_EDITABLE(m_text)->selection_start_pos; - to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + 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 ( from > to ) - { - // exchange them to be compatible with wxMSW - long tmp = from; - from = to; - to = tmp; - } - } + if (! haveSelection ) + from = to = GetInsertionPoint(); + + if ( from > to ) + { + // exchange them to be compatible with wxMSW + gint tmp = from; + from = to; + to = tmp; + } if ( fromOut ) *fromOut = from; @@ -984,11 +1698,23 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const *toOut = to; } + 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) + { + return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)); + } + else + { + return gtk_editable_get_editable(GTK_EDITABLE(m_text)); + } +#else return GTK_EDITABLE(m_text)->editable; +#endif } bool wxTextCtrl::IsModified() const @@ -998,14 +1724,14 @@ 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.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) + if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject(this); @@ -1013,17 +1739,24 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) if (GetEventHandler()->ProcessEvent(event)) return; } - if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) + if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) { + // This will invoke the dialog default action, such + // as the clicking the default button. + wxWindow *top_frame = m_parent; while (top_frame->GetParent() && !(top_frame->IsTopLevel())) top_frame = top_frame->GetParent(); - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); - 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; + } } } @@ -1038,117 +1771,154 @@ GtkWidget* wxTextCtrl::GetConnectWidget() bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) { if (m_windowStyle & wxTE_MULTILINE) + { +#ifdef __WXGTK20__ + return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork +#else return (window == GTK_TEXT(m_text)->text_area); +#endif + } else + { return (window == GTK_ENTRY(m_text)->text_area); + } } // the font will change for subsequent text insertiongs 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 ( !wxWindowBase::SetFont(font) ) + if ( !wxTextCtrlBase::SetFont(font) ) { // font didn't change, nothing to do - return FALSE; + return false; } if ( m_windowStyle & wxTE_MULTILINE ) { - m_updateFont = TRUE; + SetUpdateFont(true); + + m_defaultStyle.SetFont(font); ChangeFontGlobally(); } - return TRUE; + return true; } void wxTextCtrl::ChangeFontGlobally() { // this method is very inefficient and hence should be called as rarely as // 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 wxString value = GetValue(); - if ( !value.IsEmpty() ) + if ( !value.empty() ) { + SetUpdateFont(false); + Clear(); AppendText(value); - - m_updateFont = FALSE; } } +#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") ); - wxControl::SetBackgroundColour( colour ); + if ( !wxControl::SetBackgroundColour( colour ) ) + return false; +#ifndef __WXGTK20__ if (!m_widget->window) - return FALSE; - - wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); - if (sysbg.Red() == colour.Red() && - sysbg.Green() == colour.Green() && - sysbg.Blue() == colour.Blue()) - { - return FALSE; // FIXME or TRUE? - } + return false; +#endif if (!m_backgroundColour.Ok()) - return FALSE; + return false; if (m_windowStyle & wxTE_MULTILINE) { +#ifndef __WXGTK20__ GdkWindow *window = GTK_TEXT(m_text)->text_area; if (!window) - return FALSE; + 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 ); - return TRUE; + return true; } -bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr &style ) +bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) { - /* VERY dirty way to do that - removes the required text and re-adds it - with styling (FIXME) */ if ( m_windowStyle & wxTE_MULTILINE ) { if ( style.IsDefault() ) { // 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") ); + + 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_buffer, attr, &starti, &endi ); +#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, + wxCHECK_MSG( start >= 0 && end <= l, false, _T("invalid range in wxTextCtrl::SetStyle") ); gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) ); @@ -1159,52 +1929,39 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr &style ) gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end ); gtk_editable_set_position( GTK_EDITABLE(m_text), start ); -#if wxUSE_UNICODE + #if wxUSE_UNICODE wxWX2MBbuf buf = tmp.mbc_str(); const char *txt = buf; size_t txtlen = strlen(buf); -#else + #else const char *txt = tmp; size_t txtlen = tmp.length(); -#endif - - GdkFont *font = style.HasFont() - ? style.GetFont().GetInternalFont() - : NULL; + #endif - GdkColor *colFg = style.HasTextColour() - ? style.GetTextColour().GetColor() - : NULL; - - GdkColor *colBg = style.HasBackgroundColour() - ? style.GetBackgroundColour().GetColor() - : NULL; - - gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + // 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 ); - return TRUE; - } - else // singe line - { - // cannot do this for GTK+'s Entry widget - return FALSE; +#endif + + return true; } + + // else single line + // cannot do this for GTK+'s Entry widget + return false; } -void wxTextCtrl::ApplyWidgetStyle() +void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_windowStyle & wxTE_MULTILINE) - { - // how ? - } - else - { - SetWidgetStyle(); - gtk_widget_set_style( m_text, m_widgetStyle ); - } + gtk_widget_modify_style(m_text, style); } void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event)) @@ -1264,6 +2021,7 @@ void wxTextCtrl::OnInternalIdle() if (cursor.Ok()) { +#ifndef __WXGTK20__ GdkWindow *window = (GdkWindow*) NULL; if (HasFlag(wxTE_MULTILINE)) window = GTK_TEXT(m_text)->text_area; @@ -1279,14 +2037,211 @@ void wxTextCtrl::OnInternalIdle() window = m_widget->window; if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) gdk_window_set_cursor( window, cursor.GetCursor() ); +#endif + } + + if (g_delayedFocus == this) + { + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_grab_focus( m_widget ); + g_delayedFocus = NULL; + } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } wxSize wxTextCtrl::DoGetBestSize() const { // FIXME should be different for multi-line controls... wxSize ret( wxControl::DoGetBestSize() ); - return wxSize(80, ret.y); + wxSize best(80, ret.y); + CacheBestSize(best); + return best; +} + +// ---------------------------------------------------------------------------- +// freeze/thaw +// ---------------------------------------------------------------------------- + +void wxTextCtrl::Freeze() +{ + if ( HasFlag(wxTE_MULTILINE) ) + { +#ifdef __WXGTK20__ + if ( !m_frozenness++ ) + { + // 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 + } +} + +void wxTextCtrl::Thaw() +{ + if ( HasFlag(wxTE_MULTILINE) ) + { +#ifdef __WXGTK20__ + wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); + + if ( !--m_frozenness ) + { + // 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); + } +#else + GTK_TEXT(m_text)->vadj->value = 0.0; + + gtk_text_thaw(GTK_TEXT(m_text)); +#endif + } +} + +// ---------------------------------------------------------------------------- +// 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)) + return; + + gint x, y; + GtkTextIter start, end; + GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(m_buffer), + "wxUrl"); + + gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(m_text), GTK_TEXT_WINDOW_WIDGET, + event.GetX(), event.GetY(), &x, &y); + + gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y); + if (!gtk_text_iter_has_tag(&end, tag)) + { + gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), + GTK_TEXT_WINDOW_TEXT), m_gdkXTermCursor); + return; + } + + gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), + GTK_TEXT_WINDOW_TEXT), m_gdkHandCursor); + + 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); + + // Native context menu is probably not desired on an URL. + // Consider making this dependant on ProcessEvent(wxTextUrlEvent) return value + if(event.GetEventType() == wxEVT_RIGHT_DOWN) + event.Skip(false); + + wxTextUrlEvent url_event(m_windowId, event, + gtk_text_iter_get_offset(&start), + gtk_text_iter_get_offset(&end)); + + InitCommandEvent(url_event); + // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag) + //event.Skip(!GetEventHandler()->ProcessEvent(url_event)); + GetEventHandler()->ProcessEvent(url_event); +} +#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) +{ + 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 + + 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); +} + +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); }