X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..82c126e50158efee5a1f46e1200be380c5199f8d:/src/generic/caret.cpp diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp index 3371a270cd..5cad74d086 100644 --- a/src/generic/caret.cpp +++ b/src/generic/caret.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 25.05.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "caret.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,9 +24,12 @@ #pragma hdrstop #endif +#if wxUSE_CARET + #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/dcclient.h" + #include "wx/dcmemory.h" #endif //WX_PRECOMP #include "wx/caret.h" @@ -50,14 +49,14 @@ static int gs_blinkTime = 500; // in milliseconds // timer stuff // ---------------------------------------------------------------------------- -wxCaretTimer::wxCaretTimer(wxCaret *caret) -{ - m_caret = caret; +wxCaretTimer::wxCaretTimer(wxCaret *caret) +{ + m_caret = caret; } -void wxCaretTimer::Notify() -{ - m_caret->OnTimer(); +void wxCaretTimer::Notify() +{ + m_caret->OnTimer(); } void wxCaret::OnTimer() @@ -87,8 +86,13 @@ void wxCaretBase::SetBlinkTime(int milliseconds) void wxCaret::InitGeneric() { - m_hasFocus = TRUE; - m_blinkedOut = FALSE; + m_hasFocus = true; + m_blinkedOut = true; +#ifndef wxHAS_CARET_USING_OVERLAYS + m_xOld = + m_yOld = -1; + m_bmpUnderCaret.Create(m_width, m_height); +#endif } wxCaret::~wxCaret() @@ -96,7 +100,8 @@ wxCaret::~wxCaret() if ( IsVisible() ) { // stop blinking - m_timer.Stop(); + if ( m_timer.IsRunning() ) + m_timer.Stop(); } } @@ -106,10 +111,12 @@ wxCaret::~wxCaret() void wxCaret::DoShow() { - m_timer.Start(GetBlinkTime()); + int blinkTime = GetBlinkTime(); + if ( blinkTime ) + m_timer.Start(blinkTime); - m_blinkedOut = TRUE; - Blink(); + if ( m_blinkedOut ) + Blink(); } void wxCaret::DoHide() @@ -124,11 +131,44 @@ void wxCaret::DoHide() void wxCaret::DoMove() { - if ( IsVisible() && !m_blinkedOut ) +#ifdef wxHAS_CARET_USING_OVERLAYS + m_overlay.Reset(); +#endif + if ( IsVisible() ) { - Blink(); + if ( !m_blinkedOut ) + { + // hide it right now and it will be shown the next time it blinks + Blink(); + + // but if the caret is not blinking, we should blink it back into + // visibility manually + if ( !m_timer.IsRunning() ) + Blink(); + } + } + //else: will be shown at the correct location when it is shown +} + +void wxCaret::DoSize() +{ + int countVisible = m_countVisible; + if (countVisible > 0) + { + m_countVisible = 0; + DoHide(); + } +#ifdef wxHAS_CARET_USING_OVERLAYS + m_overlay.Reset(); +#else + // Change bitmap size + m_bmpUnderCaret = wxBitmap(m_width, m_height); +#endif + if (countVisible > 0) + { + m_countVisible = countVisible; + DoShow(); } - //else: will be shown at the correct location next time it blinks } // ---------------------------------------------------------------------------- @@ -137,24 +177,29 @@ void wxCaret::DoMove() void wxCaret::OnSetFocus() { - m_hasFocus = TRUE; + m_hasFocus = true; - Refresh(); + if ( IsVisible() ) + Refresh(); } void wxCaret::OnKillFocus() { - m_hasFocus = FALSE; + m_hasFocus = false; if ( IsVisible() ) { // the caret must be shown - otherwise, if it is hidden now, it will // stay so until the focus doesn't return because it won't blink any // more - m_blinkedOut = FALSE; - } - Refresh(); + // hide it first if it isn't hidden ... + if ( !m_blinkedOut ) + Blink(); + + // .. and show it in the new style + Blink(); + } } // ---------------------------------------------------------------------------- @@ -170,38 +215,69 @@ void wxCaret::Blink() void wxCaret::Refresh() { - if ( !m_blinkedOut ) + wxClientDC dcWin(GetWindow()); +// this is the new code, switch to 0 if this gives problems +#ifdef wxHAS_CARET_USING_OVERLAYS + wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height ); + if ( m_blinkedOut ) { - wxClientDC dc(GetWindow()); - DoDraw(&dc); + dcOverlay.Clear(); } else { - // FIXME can't be less efficient than this... we probably should use - // backing store for the caret instead of leaving all the burden - // of correct refresh logic handling to the user code - - // NB: +1 is needed! - wxRect rect(m_x, m_y, m_width + 1, m_height + 1); - GetWindow()->Refresh(FALSE, &rect); + DoDraw( &dcWin ); + } +#else + wxMemoryDC dcMem; + dcMem.SelectObject(m_bmpUnderCaret); + if ( m_blinkedOut ) + { + // restore the old image + dcWin.Blit(m_xOld, m_yOld, m_width, m_height, + &dcMem, 0, 0); + m_xOld = + m_yOld = -1; } + else + { + if ( m_xOld == -1 && m_yOld == -1 ) + { + // save the part we're going to overdraw + + int x = m_x, + y = m_y; +#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__) + wxPoint pt = dcWin.GetDeviceOrigin(); + x += pt.x; + y += pt.y; +#endif // broken wxGTK wxDC::Blit + dcMem.Blit(0, 0, m_width, m_height, + &dcWin, x, y); + + m_xOld = m_x; + m_yOld = m_y; + } + //else: we already saved the image below the caret, don't do it any + // more + + // and draw the caret there + DoDraw(&dcWin); + } +#endif } void wxCaret::DoDraw(wxDC *dc) { dc->SetPen( *wxBLACK_PEN ); - // VZ: Robert's code for I-shaped caret - this is nice but doesn't look - // at all the same as the MSW version and I don't know how to indicate - // that the window has focus or not with such caret -#if 0 - dc->DrawLine( m_x, m_y, m_x+m_width, m_y ); - dc->DrawLine( m_x, m_y+m_height, m_x+m_width, m_y+m_height ); - dc->DrawLine( m_x+(m_width/2), m_y, m_x+(m_width/2), m_y+m_height ); -// dc->DrawLine( m_x+(m_width/2)+1, m_y, m_x+(m_width/2)+1, m_y+m_height ); -#else // 1 - if ( m_hasFocus ) - dc->SetBrush( *wxBLACK_BRUSH ); - dc->DrawRectangle( m_x, m_y, m_width, m_height ); -#endif // 0/1 + dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH)); + dc->SetPen(*wxBLACK_PEN); + + // VZ: unfortunately, the rectangle comes out a pixel smaller when this is + // done under wxGTK - no idea why + //dc->SetLogicalFunction(wxINVERT); + + dc->DrawRectangle(m_x, m_y, m_width, m_height); } + +#endif // wxUSE_CARET