X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..e22c13fe7ed64b4a7cb68ef42b338b6805f9fc64:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 1d41116d87..2cb16ddea1 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -21,6 +21,7 @@ #include #include #include +#include // for fabs #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -40,13 +41,56 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; +// ---------------------------------------------------------------------------- +// "insert_text" for GtkEntry +// ---------------------------------------------------------------------------- + +static void +gtk_insert_text_callback(GtkEditable *editable, + const gchar *new_text, + gint new_text_length, + gint *position, + wxTextCtrl *win) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + // we should only be called if we have a max len limit at all + GtkEntry *entry = GTK_ENTRY (editable); + + wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") ); + + // check that we don't overflow the max length limit + // + // FIXME: this doesn't work when we paste a string which is going to be + // truncated + if ( entry->text_length == entry->text_max_length ) + { + // we don't need to run the base class version at all + 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 ); + } +} + //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- static void -gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) { + if ( win->IgnoreTextUpdate() ) + return; + if (!win->m_hasVMT) return; if (g_isIdle) @@ -56,8 +100,8 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) win->UpdateFontIfNeeded(); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); - event.SetString( win->GetValue() ); event.SetEventObject( win ); + event.SetString( win->GetValue() ); win->GetEventHandler()->ProcessEvent( event ); } @@ -76,116 +120,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) win->CalculateScrollbar(); } -//----------------------------------------------------------------------------- -// "focus_in_event" -//----------------------------------------------------------------------------- - -wxWindow *FindFocusedChild(wxWindow *win); -extern wxWindow *g_focusWindow; -extern bool g_blockEventsOnDrag; -// extern bool g_isIdle; - -static gint gtk_text_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) -{ - // Necessary? -#if 0 - if (g_isIdle) - wxapp_install_idle_handler(); -#endif - if (!win->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) return FALSE; - - g_focusWindow = win; - - wxPanel *panel = wxDynamicCast(win->GetParent(), wxPanel); - if (panel) - { - panel->SetLastFocus(win); - } - -#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 ) - { - caret->OnSetFocus(); - } -#endif // wxUSE_CARET -#endif - - wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); - event.SetEventObject( win ); - - if (win->GetEventHandler()->ProcessEvent( event )) - { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" ); - return TRUE; - } - - return FALSE; -} - -//----------------------------------------------------------------------------- -// "focus_out_event" -//----------------------------------------------------------------------------- - -static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) -{ -#if 0 - if (g_isIdle) - wxapp_install_idle_handler(); -#endif - - if (!win->m_hasVMT) return FALSE; - if (g_blockEventsOnDrag) return FALSE; - -#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; -#endif - - wxWindow *winFocus = FindFocusedChild(win); - if ( winFocus ) - win = winFocus; - - g_focusWindow = (wxWindow *)NULL; - -#ifdef HAVE_XIM - if (win->m_ic) - gdk_im_end(); -#endif - -#if 0 -#ifdef wxUSE_CARET - // caret needs to be informed about focus change - wxCaret *caret = win->GetCaret(); - if ( caret ) - { - caret->OnKillFocus(); - } -#endif // wxUSE_CARET -#endif - - wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); - event.SetEventObject( win ); - - if (win->GetEventHandler()->ProcessEvent( event )) - { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" ); - return TRUE; - } - - return FALSE; -} - //----------------------------------------------------------------------------- // wxTextCtrl //----------------------------------------------------------------------------- @@ -210,6 +144,7 @@ END_EVENT_TABLE() void wxTextCtrl::Init() { + m_ignoreNextUpdate = m_modified = FALSE; m_updateFont = FALSE; m_text = @@ -310,6 +245,8 @@ bool wxTextCtrl::Create( wxWindow *parent, } m_parent->DoAddChild( this ); + + m_focusWidget = m_text; PostCreation(); @@ -331,20 +268,6 @@ bool wxTextCtrl::Create( wxWindow *parent, { 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 ); - - 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 ); - - gtk_signal_connect( GTK_OBJECT(m_text), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this ); } if (!value.IsEmpty()) @@ -402,10 +325,7 @@ bool wxTextCtrl::Create( wxWindow *parent, m_cursor = wxCursor( wxCURSOR_IBEAM ); - // FIXME: is the bg colour correct here? - wxTextAttr attrDef( colFg, - wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW), - parent->GetFont() ); + wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() ); SetDefaultStyle( attrDef ); Show( TRUE ); @@ -503,9 +423,9 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( m_windowStyle & wxTE_MULTILINE ) { - /* this moves the cursor pos to behind the inserted text */ - gint len = GTK_EDITABLE(m_text)->current_pos; - + // After cursor movements, gtk_text_get_point() is wrong by one. + gtk_text_set_point( GTK_TEXT(m_text), GTK_EDITABLE(m_text)->current_pos ); + // if we have any special style, use it if ( !m_defaultStyle.IsDefault() ) { @@ -521,111 +441,73 @@ void wxTextCtrl::WriteText( const wxString &text ) ? m_defaultStyle.GetBackgroundColour().GetColor() : NULL; - gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + GetInsertionPoint(); + gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, -1 ); } else // no style { + gint len = GTK_EDITABLE(m_text)->current_pos; gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); } - - /* bring editable's cursor uptodate. bug in GTK. */ + + // Bring editable's cursor back uptodate. GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } else // single line { - /* this moves the cursor pos to behind the inserted text */ + // 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 ); - /* bring editable's cursor uptodate. bug in GTK. */ + // Bring editable's cursor uptodate. GTK_EDITABLE(m_text)->current_pos += text.Len(); - /* bring entry's cursor uptodate. bug in GTK. */ + // Bring entry's cursor uptodate. gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); } + + m_modified = TRUE; } void wxTextCtrl::AppendText( const wxString &text ) { - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - - 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 + SetInsertionPointEnd(); + WriteText( text ); +} +wxString wxTextCtrl::GetLineText( long lineNo ) const +{ if (m_windowStyle & wxTE_MULTILINE) { - if ( !m_defaultStyle.IsDefault() ) - { - GdkFont *font = m_defaultStyle.HasFont() - ? m_defaultStyle.GetFont().GetInternalFont() - : NULL; - - GdkColor *colFg = m_defaultStyle.HasTextColour() - ? m_defaultStyle.GetTextColour().GetColor() - : NULL; + gint len = gtk_text_get_length( GTK_TEXT(m_text) ); + char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - GdkColor *colBg = m_defaultStyle.HasBackgroundColour() - ? m_defaultStyle.GetBackgroundColour().GetColor() - : NULL; + 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]; - gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + g_free( text ); + return buf; } - else // no style + else { - /* 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 ); + return wxEmptyString; } - - /* 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 ); } -} - -wxString wxTextCtrl::GetLineText( long lineNo ) const -{ - 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 ); - - if (text) + else { - 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; + if (lineNo == 0) return GetValue(); + return wxEmptyString; } - else - return wxEmptyString; - } - else - { - if (lineNo == 0) return GetValue(); - return wxEmptyString; - } } void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) @@ -828,6 +710,61 @@ void wxTextCtrl::DiscardEdits() 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") ); @@ -1059,6 +996,8 @@ bool wxTextCtrl::SetFont( const wxFont &font ) { m_updateFont = TRUE; + m_defaultStyle.SetFont(font); + ChangeFontGlobally(); } @@ -1075,10 +1014,10 @@ void wxTextCtrl::ChangeFontGlobally() wxString value = GetValue(); if ( !value.IsEmpty() ) { + m_updateFont = FALSE; + Clear(); AppendText(value); - - m_updateFont = FALSE; } } @@ -1103,7 +1042,8 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) { wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); - wxControl::SetBackgroundColour( colour ); + if ( !wxControl::SetBackgroundColour( colour ) ) + return FALSE; if (!m_widget->window) return FALSE; @@ -1291,3 +1231,81 @@ wxSize wxTextCtrl::DoGetBestSize() const wxSize ret( wxControl::DoGetBestSize() ); return wxSize(80, ret.y); } + +// ---------------------------------------------------------------------------- +// freeze/thaw +// ---------------------------------------------------------------------------- + +void wxTextCtrl::Freeze() +{ + if ( HasFlag(wxTE_MULTILINE) ) + { + gtk_text_freeze(GTK_TEXT(m_text)); + } +} + +void wxTextCtrl::Thaw() +{ + if ( HasFlag(wxTE_MULTILINE) ) + { + GTK_TEXT(m_text)->vadj->value = 0.0; + + gtk_text_thaw(GTK_TEXT(m_text)); + } +} + +// ---------------------------------------------------------------------------- +// scrolling +// ---------------------------------------------------------------------------- + +GtkAdjustment *wxTextCtrl::GetVAdj() const +{ + return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL; +} + +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; + + gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); + + return TRUE; +} + +bool wxTextCtrl::ScrollLines(int lines) +{ + GtkAdjustment *adj = GetVAdj(); + if ( !adj ) + return FALSE; + + // this is hardcoded to 10 in GTK+ 1.2 (great idea) + static const int KEY_SCROLL_PIXELS = 10; + + return DoScroll(adj, lines*KEY_SCROLL_PIXELS); +} + +bool wxTextCtrl::ScrollPages(int pages) +{ + GtkAdjustment *adj = GetVAdj(); + if ( !adj ) + return FALSE; + + return DoScroll(adj, (int)ceil(pages*adj->page_increment)); +} +