X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8487f8874288a8e4fe40ead153c73dfc7777f41b..b142515e79888988bf22c532c8c0da175fb59aca:/src/gtk/textctrl.cpp?ds=sidebyside diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index ec0d15875c..65f7951813 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -14,7 +14,9 @@ #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 #include @@ -51,6 +53,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) wxapp_install_idle_handler(); win->SetModified(); + win->UpdateFontIfNeeded(); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetString( win->GetValue() ); @@ -73,6 +76,115 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) win->CalculateScrollbar(); } +//----------------------------------------------------------------------------- +// "focus_in_event" +//----------------------------------------------------------------------------- + +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 = wxFindFocusedChild(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 //----------------------------------------------------------------------------- @@ -95,22 +207,36 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -wxTextCtrl::wxTextCtrl() +void wxTextCtrl::Init() { m_modified = FALSE; + m_updateFont = FALSE; + m_text = + m_vScrollbar = (GtkWidget *)NULL; } -wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) +wxTextCtrl::wxTextCtrl( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { - m_modified = FALSE; + Init(); + Create( parent, id, value, pos, size, style, validator, name ); } -bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) +bool wxTextCtrl::Create( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { m_needParent = TRUE; m_acceptsFocus = TRUE; @@ -119,7 +245,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxTextCtrl creation failed") ); - return FALSE; + return FALSE; } @@ -182,26 +308,42 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, m_text = gtk_entry_new(); } - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 80; - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); - m_parent->DoAddChild( this ); PostCreation(); + 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 ); + if (multi_line) gtk_widget_show(m_text); - /* 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); - 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 ); + + 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()) @@ -246,11 +388,25 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, gtk_text_set_editable( GTK_TEXT(m_text), 1 ); } - SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); - SetForegroundColour( parent->GetForegroundColour() ); + /* 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 don't set a valid background colour, because the window + manager should use a default one */ + m_backgroundColour = wxColour(); + + wxColour colFg = parent->GetForegroundColour(); + SetForegroundColour( colFg ); m_cursor = wxCursor( wxCURSOR_IBEAM ); - + + // FIXME: is the bg colour correct here? + wxTextAttr attrDef( colFg, + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW), + parent->GetFont() ); + SetDefaultStyle( attrDef ); + Show( TRUE ); return TRUE; @@ -303,57 +459,82 @@ void wxTextCtrl::SetValue( const wxString &value ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - wxString tmp = wxT(""); - if (!value.IsNull()) tmp = value; if (m_windowStyle & wxTE_MULTILINE) { 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 = tmp.mbc_str(); + 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), tmp.mbc_str(), tmp.Length(), &len ); + gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); #endif } else { - gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() ); } + + // GRG, Jun/2000: Changed this after a lot of discussion in + // the lists. wxWindows 2.2 will have a set of flags to + // customize this behaviour. + SetInsertionPoint(0); + + m_modified = FALSE; } void wxTextCtrl::WriteText( const wxString &text ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (text.IsEmpty()) return; + if ( text.empty() ) + return; - if (m_windowStyle & wxTE_MULTILINE) +#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 + + if ( m_windowStyle & wxTE_MULTILINE ) { /* this moves the cursor pos to behind the inserted text */ gint len = GTK_EDITABLE(m_text)->current_pos; -#if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); -#endif + // if we have any special style, use it + if ( !m_defaultStyle.IsDefault() ) + { + GdkFont *font = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetInternalFont() + : NULL; + + GdkColor *colFg = m_defaultStyle.HasTextColour() + ? m_defaultStyle.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = m_defaultStyle.HasBackgroundColour() + ? m_defaultStyle.GetBackgroundColour().GetColor() + : NULL; + + gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); + } + else // no style + { + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); + } /* bring editable's cursor uptodate. bug in GTK. */ GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } - else + else // single line { /* this moves the cursor pos to behind the inserted text */ gint len = GTK_EDITABLE(m_text)->current_pos; -#if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); -#endif + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); /* bring editable's cursor uptodate. bug in GTK. */ GTK_EDITABLE(m_text)->current_pos += text.Len(); @@ -367,40 +548,49 @@ void wxTextCtrl::AppendText( const wxString &text ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (text.IsEmpty()) return; + 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 if (m_windowStyle & wxTE_MULTILINE) { - bool hasSpecialAttributes = m_font.Ok() || - m_foregroundColour.Ok() || - m_backgroundColour.Ok(); - if ( hasSpecialAttributes ) + if ( !m_defaultStyle.IsDefault() ) { - gtk_text_insert( GTK_TEXT(m_text), - m_font.GetInternalFont(), - m_foregroundColour.GetColor(), - m_backgroundColour.GetColor(), - text.mbc_str(), text.length()); + GdkFont *font = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetInternalFont() + : NULL; + + GdkColor *colFg = m_defaultStyle.HasTextColour() + ? m_defaultStyle.GetTextColour().GetColor() + : NULL; + GdkColor *colBg = m_defaultStyle.HasBackgroundColour() + ? m_defaultStyle.GetBackgroundColour().GetColor() + : NULL; + + gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen ); } - else + else // no style { /* we'll insert at the last position */ gint len = gtk_text_get_length( GTK_TEXT(m_text) ); -#if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); -#endif + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); } /* bring editable's cursor uptodate. bug in GTK. */ GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } - else + else // single line { - gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() ); + gtk_entry_append_text( GTK_ENTRY(m_text), txt ); } } @@ -591,6 +781,47 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); } +bool wxTextCtrl::Enable( bool enable ) +{ + if (!wxWindowBase::Enable(enable)) + { + // nothing to do + return FALSE; + } + + if (m_windowStyle & wxTE_MULTILINE) + { + gtk_text_set_editable( GTK_TEXT(m_text), enable ); + OnParentEnable(enable); + } + else + { + 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 +// have been changed by Enable +void wxTextCtrl::OnParentEnable( bool enable ) +{ + // If we have a custom background colour, we use this colour in both + // disabled and enabled mode, or we end up with a different colour under the + // text. + wxColour oldColour = GetBackgroundColour(); + if (oldColour.Ok()) + { + // Need to set twice or it'll optimize the useful stuff out + if (oldColour == * wxWHITE) + SetBackgroundColour(*wxBLACK); + else + SetBackgroundColour(*wxWHITE); + SetBackgroundColour(oldColour); + } +} + void wxTextCtrl::DiscardEdits() { m_modified = FALSE; @@ -600,6 +831,14 @@ void wxTextCtrl::SetSelection( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + 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; + } + gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } @@ -686,27 +925,6 @@ void wxTextCtrl::Paste() #endif } -bool wxTextCtrl::CanCopy() const -{ - // Can copy if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to) ; -} - -bool wxTextCtrl::CanCut() const -{ - // Can cut if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to) ; -} - -bool wxTextCtrl::CanPaste() const -{ - return IsEditable() ; -} - // Undo/redo void wxTextCtrl::Undo() { @@ -736,19 +954,34 @@ bool wxTextCtrl::CanRedo() const // If the return values from and to are the same, there is no // selection. -void wxTextCtrl::GetSelection(long* from, long* to) const +void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (!(GTK_EDITABLE(m_text)->has_selection)) + long from, to; + if ( !(GTK_EDITABLE(m_text)->has_selection) ) { - if (from) *from = 0; - if (to) *to = 0; - return; + from = + to = GetInsertionPoint(); } + else // got selection + { + from = (long) GTK_EDITABLE(m_text)->selection_start_pos; + to = (long) GTK_EDITABLE(m_text)->selection_end_pos; - if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos; - if (to) *to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + if ( from > to ) + { + // exchange them to be compatible with wxMSW + long tmp = from; + from = to; + to = tmp; + } + } + + if ( fromOut ) + *fromOut = from; + if ( toOut ) + *toOut = to; } bool wxTextCtrl::IsEditable() const @@ -776,6 +1009,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); event.SetEventObject(this); + event.SetString(GetValue()); if (GetEventHandler()->ProcessEvent(event)) return; } @@ -784,13 +1018,13 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) 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) + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + + if (window->default_widget) { gtk_widget_activate (window->default_widget); - return; - } + return; + } } key_event.Skip(); @@ -822,26 +1056,46 @@ bool wxTextCtrl::SetFont( const wxFont &font ) if ( m_windowStyle & wxTE_MULTILINE ) { - // for compatibility with other ports: the font is a global controls - // characteristic, so change the font globally - wxString value = GetValue(); - if ( !value.IsEmpty() ) - { - Clear(); + m_updateFont = TRUE; - AppendText(value); - } + ChangeFontGlobally(); } return TRUE; } -bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) +void wxTextCtrl::ChangeFontGlobally() { - wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + // this method is very inefficient and hence should be called as rarely as + // possible! + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, + _T("shouldn't be called for single line controls") ); - // doesn't work - return FALSE; + wxString value = GetValue(); + if ( !value.IsEmpty() ) + { + Clear(); + AppendText(value); + + m_updateFont = FALSE; + } +} + +void wxTextCtrl::UpdateFontIfNeeded() +{ + if ( m_updateFont ) + ChangeFontGlobally(); +} + +bool wxTextCtrl::SetForegroundColour(const wxColour& colour) +{ + if ( !wxControl::SetForegroundColour(colour) ) + return FALSE; + + // update default fg colour too + m_defaultStyle.SetTextColour(colour); + + return TRUE; } bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) @@ -874,9 +1128,72 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) gdk_window_clear( window ); } + // change active background color too + m_defaultStyle.SetBackgroundColour( colour ); + return TRUE; } +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; + } + + 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 + + GdkFont *font = style.HasFont() + ? style.GetFont().GetInternalFont() + : NULL; + + 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 ); + + /* 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; + } +} + void wxTextCtrl::ApplyWidgetStyle() { if (m_windowStyle & wxTE_MULTILINE) @@ -948,11 +1265,11 @@ void wxTextCtrl::OnInternalIdle() if (cursor.Ok()) { GdkWindow *window = (GdkWindow*) NULL; - if (HasFlag(wxTE_MULTILINE)) + 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() ); @@ -963,4 +1280,13 @@ void wxTextCtrl::OnInternalIdle() if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) gdk_window_set_cursor( window, cursor.GetCursor() ); } + + UpdateWindowUI(); +} + +wxSize wxTextCtrl::DoGetBestSize() const +{ + // FIXME should be different for multi-line controls... + wxSize ret( wxControl::DoGetBestSize() ); + return wxSize(80, ret.y); }