X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a1597e9ef6f9e898b88c86299d6b0e0aa7896f7..b58dca4c0f83e156808ac6e23aaa83c0b0595ea9:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index a57c6320d9..50e178a6da 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -1,43 +1,41 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmlcell.cpp +// Name: src/html/htmlcell.cpp // Purpose: wxHtmlCell - basic element of HTML output // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "htmlcell.h" -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" - -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" #include "wx/brush.h" #include "wx/colour.h" #include "wx/dc.h" + #include "wx/settings.h" + #include "wx/module.h" + #include "wx/wxcrtvararg.h" #endif #include "wx/html/htmlcell.h" #include "wx/html/htmlwin.h" -#include "wx/settings.h" + #include //----------------------------------------------------------------------------- // Helper classes //----------------------------------------------------------------------------- -void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell, - const wxPoint& toPos, wxHtmlCell *toCell) +void wxHtmlSelection::Set(const wxPoint& fromPos, const wxHtmlCell *fromCell, + const wxPoint& toPos, const wxHtmlCell *toCell) { m_fromCell = fromCell; m_toCell = toCell; @@ -45,28 +43,47 @@ void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell, m_toPos = toPos; } -void wxHtmlSelection::Set(wxHtmlCell *fromCell, wxHtmlCell *toCell) +void wxHtmlSelection::Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell) { wxPoint p1 = fromCell ? fromCell->GetAbsPos() : wxDefaultPosition; wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition; if ( toCell ) { - p2.x += toCell->GetWidth()-1; - p2.y += toCell->GetHeight()-1; + p2.x += toCell->GetWidth(); + p2.y += toCell->GetHeight(); } Set(p1, fromCell, p2, toCell); } +wxColour +wxDefaultHtmlRenderingStyle:: +GetSelectedTextColour(const wxColour& WXUNUSED(clr)) +{ + return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); +} + +wxColour +wxDefaultHtmlRenderingStyle:: +GetSelectedTextBgColour(const wxColour& WXUNUSED(clr)) +{ + return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); +} + + //----------------------------------------------------------------------------- // wxHtmlCell //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlCell, wxObject) + wxHtmlCell::wxHtmlCell() : wxObject() { m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0; - m_CanLiveOnPagebreak = TRUE; + m_ScriptMode = wxHTML_SCRIPT_NORMAL; // or mode + m_ScriptBaseline = 0; // or baseline + m_CanLiveOnPagebreak = true; m_Link = NULL; } @@ -75,48 +92,157 @@ wxHtmlCell::~wxHtmlCell() delete m_Link; } +// Update the descent value when whe are in a or . +// prevbase is the parent base +void wxHtmlCell::SetScriptMode(wxHtmlScriptMode mode, long previousBase) +{ + m_ScriptMode = mode; + + if (mode == wxHTML_SCRIPT_SUP) + m_ScriptBaseline = previousBase - (m_Height + 1) / 2; + else if (mode == wxHTML_SCRIPT_SUB) + m_ScriptBaseline = previousBase + (m_Height + 1) / 6; + else + m_ScriptBaseline = 0; + + m_Descent += m_ScriptBaseline; +} + +#if WXWIN_COMPATIBILITY_2_6 + +struct wxHtmlCellOnMouseClickCompatHelper; + +static wxHtmlCellOnMouseClickCompatHelper *gs_helperOnMouseClick = NULL; + +// helper for routing calls to new ProcessMouseClick() method to deprecated +// OnMouseClick() method +struct wxHtmlCellOnMouseClickCompatHelper +{ + wxHtmlCellOnMouseClickCompatHelper(wxHtmlWindowInterface *window_, + const wxPoint& pos_, + const wxMouseEvent& event_) + : window(window_), pos(pos_), event(event_), retval(false) + { + } + + bool CallOnMouseClick(wxHtmlCell *cell) + { + wxHtmlCellOnMouseClickCompatHelper *oldHelper = gs_helperOnMouseClick; + gs_helperOnMouseClick = this; + cell->OnMouseClick + ( + window ? window->GetHTMLWindow() : NULL, + pos.x, pos.y, + event + ); + gs_helperOnMouseClick = oldHelper; + return retval; + } + + wxHtmlWindowInterface *window; + const wxPoint& pos; + const wxMouseEvent& event; + bool retval; +}; +#endif // WXWIN_COMPATIBILITY_2_6 + +bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window, + const wxPoint& pos, + const wxMouseEvent& event) +{ + wxCHECK_MSG( window, false, wxT("window interface must be provided") ); + +#if WXWIN_COMPATIBILITY_2_6 + // NB: this hack puts the body of ProcessMouseClick() into OnMouseClick() + // (for which it has to pass the arguments and return value via a + // helper variable because these two methods have different + // signatures), so that old code overriding OnMouseClick will continue + // to work + wxHtmlCellOnMouseClickCompatHelper compat(window, pos, event); + return compat.CallOnMouseClick(this); +} -void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, - const wxMouseEvent& event) +void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event) { - wxHtmlLinkInfo *lnk = GetLink(x, y); - if (lnk != NULL) + wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") ); + wxHtmlWindowInterface *window = gs_helperOnMouseClick->window; + const wxPoint& pos = gs_helperOnMouseClick->pos; +#endif // WXWIN_COMPATIBILITY_2_6 + + wxHtmlLinkInfo *lnk = GetLink(pos.x, pos.y); + bool retval = false; + + if (lnk) { wxHtmlLinkInfo lnk2(*lnk); lnk2.SetEvent(&event); lnk2.SetHtmlCell(this); - // note : this cast is legal because parent is *always* wxHtmlWindow - wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2); + window->OnHTMLLinkClicked(lnk2); + retval = true; } + +#if WXWIN_COMPATIBILITY_2_6 + gs_helperOnMouseClick->retval = retval; +#else + return retval; +#endif // WXWIN_COMPATIBILITY_2_6 } +#if WXWIN_COMPATIBILITY_2_6 +wxCursor wxHtmlCell::GetCursor() const +{ + return wxNullCursor; +} +#endif // WXWIN_COMPATIBILITY_2_6 + +wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const +{ +#if WXWIN_COMPATIBILITY_2_6 + // NB: Older versions of wx used GetCursor() virtual method in place of + // GetMouseCursor(interface). This code ensures that user code that + // overridden GetCursor() continues to work. The trick is that the base + // wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we + // know that GetCursor() was overridden iff it returns valid cursor. + wxCursor cur = GetCursor(); + if (cur.IsOk()) + return cur; +#endif // WXWIN_COMPATIBILITY_2_6 + + if ( GetLink() ) + { + return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Link); + } + else + { + return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Default); + } +} -bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const +bool wxHtmlCell::AdjustPagebreak(int *pagebreak, + wxArrayInt& WXUNUSED(known_pagebreaks)) const { if ((!m_CanLiveOnPagebreak) && m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) { *pagebreak = m_PosY; - return TRUE; + return true; } - return FALSE; + return false; } void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) { - if (m_Link) delete m_Link; - m_Link = NULL; + wxDELETE(m_Link); if (link.GetHref() != wxEmptyString) m_Link = new wxHtmlLinkInfo(link); } - void wxHtmlCell::Layout(int WXUNUSED(w)) { SetPos(0, 0); @@ -124,16 +250,6 @@ void wxHtmlCell::Layout(int WXUNUSED(w)) -void wxHtmlCell::GetHorizontalConstraints(int *left, int *right) const -{ - if (left) - *left = m_PosX; - if (right) - *right = m_PosX + m_Width; -} - - - const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const { return NULL; @@ -150,10 +266,10 @@ wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y, else { if ((flags & wxHTML_FIND_NEAREST_AFTER) && - (y < 0 || (y == 0 && x <= 0))) + (y < 0 || (y < 0+m_Height && x < 0+m_Width))) return wxConstCast(this, wxHtmlCell); else if ((flags & wxHTML_FIND_NEAREST_BEFORE) && - (y > m_Height-1 || (y == m_Height-1 && x >= m_Width))) + (y >= 0+m_Height || (y >= 0 && x >= 0))) return wxConstCast(this, wxHtmlCell); else return NULL; @@ -161,17 +277,26 @@ wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y, } -wxPoint wxHtmlCell::GetAbsPos() const +wxPoint wxHtmlCell::GetAbsPos(wxHtmlCell *rootCell) const { wxPoint p(m_PosX, m_PosY); - for (wxHtmlCell *parent = m_Parent; parent; parent = parent->m_Parent) + for (wxHtmlCell *parent = m_Parent; parent && parent != rootCell; + parent = parent->m_Parent) { p.x += parent->m_PosX; p.y += parent->m_PosY; } return p; } - + +wxHtmlCell *wxHtmlCell::GetRootCell() const +{ + wxHtmlCell *c = wxConstCast(this, wxHtmlCell); + while ( c->m_Parent ) + c = c->m_Parent; + return c; +} + unsigned wxHtmlCell::GetDepth() const { unsigned d = 0; @@ -179,7 +304,7 @@ unsigned wxHtmlCell::GetDepth() const d++; return d; } - + bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const { const wxHtmlCell *c1 = this; @@ -206,7 +331,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const if ( c1 == c2 ) return true; c1 = c1->GetNext(); - } + } return false; } else @@ -216,7 +341,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const } } - wxFAIL_MSG(_T("Cells are in different trees")); + wxFAIL_MSG(wxT("Cells are in different trees")); return false; } @@ -225,149 +350,369 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const // wxHtmlWordCell //----------------------------------------------------------------------------- -wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() +IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell) + +wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell() { m_Word = word; - dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); - SetCanLiveOnPagebreak(FALSE); + wxCoord w, h, d; + dc.GetTextExtent(m_Word, &w, &h, &d); + m_Width = w; + m_Height = h; + m_Descent = d; + SetCanLiveOnPagebreak(false); + m_allowLinebreak = true; } +void wxHtmlWordCell::SetPreviousWord(wxHtmlWordCell *cell) +{ + if ( cell && m_Parent == cell->m_Parent && + !wxIsspace(cell->m_Word.Last()) && !wxIsspace(m_Word[0u]) ) + { + m_allowLinebreak = false; + } +} // Splits m_Word into up to three parts according to selection, returns // substring before, in and after selection and the points (in relative coords) // where s2 and s3 start: -void wxHtmlWordCell::Split(wxDC& dc, +void wxHtmlWordCell::Split(const wxDC& dc, const wxPoint& selFrom, const wxPoint& selTo, - wxString& s1, wxString& s2, wxString& s3, - unsigned& pos1, unsigned& pos2) + unsigned& pos1, unsigned& pos2) const { wxPoint pt1 = (selFrom == wxDefaultPosition) ? wxDefaultPosition : selFrom - GetAbsPos(); wxPoint pt2 = (selTo == wxDefaultPosition) ? - wxPoint(m_Width, -1) : selTo - GetAbsPos(); + wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos(); + + // if the selection is entirely within this cell, make sure pt1 < pt2 in + // order to make the rest of this function simpler: + if ( selFrom != wxDefaultPosition && selTo != wxDefaultPosition && + selFrom.x > selTo.x ) + { + wxPoint tmp = pt1; + pt1 = pt2; + pt2 = tmp; + } - wxCoord charW, charH; unsigned len = m_Word.length(); unsigned i = 0; pos1 = 0; - s1 = s2 = s3 = wxEmptyString; + + // adjust for cases when the start/end position is completely + // outside the cell: + if ( pt1.y < 0 ) + pt1.x = 0; + if ( pt2.y >= m_Height ) + pt2.x = m_Width; // before selection: + // (include character under caret only if in first half of width) +#ifdef __WXMAC__ + // implementation using PartialExtents to support fractional widths + wxArrayInt widths ; + dc.GetPartialTextExtents(m_Word,widths) ; + while( i < len && pt1.x >= widths[i] ) + i++ ; + if ( i < len ) + { + int charW = (i > 0) ? widths[i] - widths[i-1] : widths[i]; + if ( widths[i] - pt1.x < charW/2 ) + i++; + } +#else // !__WXMAC__ + wxCoord charW, charH; while ( pt1.x > 0 && i < len ) { dc.GetTextExtent(m_Word[i], &charW, &charH); pt1.x -= charW; - if ( pt1.x >= 0 ) + if ( pt1.x >= -charW/2 ) { pos1 += charW; i++; } } +#endif // __WXMAC__/!__WXMAC__ // in selection: + // (include character under caret only if in first half of width) unsigned j = i; +#ifdef __WXMAC__ + while( j < len && pt2.x >= widths[j] ) + j++ ; + if ( j < len ) + { + int charW = (j > 0) ? widths[j] - widths[j-1] : widths[j]; + if ( widths[j] - pt2.x < charW/2 ) + j++; + } +#else // !__WXMAC__ pos2 = pos1; - pt2.x -= pos2; + pt2.x -= pos2; while ( pt2.x > 0 && j < len ) { dc.GetTextExtent(m_Word[j], &charW, &charH); pt2.x -= charW; - if ( pt2.x >= 0 ) + if ( pt2.x >= -charW/2 ) { pos2 += charW; j++; } } - - s1 = m_Word.Mid(0, i); - s2 = m_Word.Mid(i, j-i); - s3 = m_Word.Mid(j); -#if 0 // FIXME - printf(" '%s' %i '%s' %i '%s'\n", s1.mb_str(), pos1, - s2.mb_str(), pos2,s3.mb_str()); -#endif +#endif // __WXMAC__/!__WXMAC__ + + pos1 = i; + pos2 = j; + + wxASSERT( pos2 >= pos1 ); } +void wxHtmlWordCell::SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) const +{ + unsigned p1, p2; + + Split(dc, + this == s->GetFromCell() ? s->GetFromPos() : wxDefaultPosition, + this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition, + p1, p2); + + wxPoint p(0, m_Word.length()); + + if ( this == s->GetFromCell() ) + p.x = p1; // selection starts here + if ( this == s->GetToCell() ) + p.y = p2; // selection ends here -static void SwitchSelState(wxDC& dc, wxHtmlRenderingState& state, + if ( this == s->GetFromCell() ) + s->SetFromPrivPos(p); + if ( this == s->GetToCell() ) + s->SetToPrivPos(p); +} + + +static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info, bool toSelection) { + wxColour fg = info.GetState().GetFgColour(); + wxColour bg = info.GetState().GetBgColour(); + if ( toSelection ) { - dc.SetBackgroundMode(wxSOLID); - dc.SetTextBackground( - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); - dc.SetTextForeground( - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); + dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg)); + dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg)); + dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg), + wxBRUSHSTYLE_SOLID)); } else { - dc.SetBackgroundMode(wxTRANSPARENT); - dc.SetTextForeground(state.GetFgColour()); - dc.SetTextBackground(state.GetBgColour()); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + dc.SetTextForeground(fg); + dc.SetTextBackground(bg); + dc.SetBackground(wxBrush(bg, wxBRUSHSTYLE_SOLID)); } } void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingState& state) + wxHtmlRenderingInfo& info) { #if 0 // useful for debugging - dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height); + dc.SetPen(*wxBLACK_PEN); + dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width /* VZ: +1? */ ,m_Height); #endif - if ( state.GetSelectionState() == wxHTML_SEL_CHANGING ) + bool drawSelectionAfterCell = false; + + if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING ) { // Selection changing, we must draw the word piecewise: - - unsigned ofs1, ofs2; - wxString textBefore, textInside, textAfter; - wxHtmlSelection *s = state.GetSelection(); - - Split(dc, - this == s->GetFromCell() ? s->GetFromPos() : wxDefaultPosition, - this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition, - textBefore, textInside, textAfter, ofs1, ofs2); - dc.DrawText(textBefore, x + m_PosX, y + m_PosY); - int w1,w2,w3,h123; - dc.GetTextExtent(textBefore, &w1,&h123); - dc.GetTextExtent(textInside, &w2,&h123); - dc.GetTextExtent(textAfter, &w3,&h123); - if ( !textInside.empty() ) + wxHtmlSelection *s = info.GetSelection(); + wxString txt; + int w, h; + int ofs = 0; + + wxPoint priv = (this == s->GetFromCell()) ? + s->GetFromPrivPos() : s->GetToPrivPos(); + + // NB: this is quite a hack: in order to compute selection boundaries + // (in word's characters) we must know current font, which is only + // possible inside rendering code. Therefore we update the + // information here and store it in wxHtmlSelection so that + // ConvertToText can use it later: + if ( priv == wxDefaultPosition ) { - SwitchSelState(dc, state, true); - dc.DrawText(textInside, x + m_PosX + ofs1, y + m_PosY); + SetSelectionPrivPos(dc, s); + priv = (this == s->GetFromCell()) ? + s->GetFromPrivPos() : s->GetToPrivPos(); } - if ( !textAfter.empty() ) + + int part1 = priv.x; + int part2 = priv.y; + + if ( part1 > 0 ) { - SwitchSelState(dc, state, false); - dc.DrawText(textAfter, x + m_PosX + ofs2, y + m_PosY); + txt = m_Word.Mid(0, part1); + dc.DrawText(txt, x + m_PosX, y + m_PosY); + dc.GetTextExtent(txt, &w, &h); + ofs += w; } + + SwitchSelState(dc, info, true); + + txt = m_Word.Mid(part1, part2-part1); + dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY); + + if ( (size_t)part2 < m_Word.length() ) + { + dc.GetTextExtent(txt, &w, &h); + ofs += w; + SwitchSelState(dc, info, false); + txt = m_Word.Mid(part2); + dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY); + } + else + drawSelectionAfterCell = true; } else { + wxHtmlSelectionState selstate = info.GetState().GetSelectionState(); // Not changing selection state, draw the word in single mode: - - if ( state.GetSelectionState() != wxHTML_SEL_OUT && - dc.GetBackgroundMode() != wxSOLID ) + if ( selstate != wxHTML_SEL_OUT && + dc.GetBackgroundMode() != wxBRUSHSTYLE_SOLID ) { - SwitchSelState(dc, state, true); + SwitchSelState(dc, info, true); } - else if ( state.GetSelectionState() == wxHTML_SEL_OUT && - dc.GetBackgroundMode() == wxSOLID ) + else if ( selstate == wxHTML_SEL_OUT && + dc.GetBackgroundMode() == wxBRUSHSTYLE_SOLID ) { - SwitchSelState(dc, state, false); + SwitchSelState(dc, info, false); } dc.DrawText(m_Word, x + m_PosX, y + m_PosY); + drawSelectionAfterCell = (selstate != wxHTML_SEL_OUT); + } + + // NB: If the text is justified then there is usually some free space + // between adjacent cells and drawing the selection only onto cells + // would result in ugly unselected spaces. The code below detects + // this special case and renders the selection *outside* the sell, + // too. + if ( m_Parent->GetAlignHor() == wxHTML_ALIGN_JUSTIFY && + drawSelectionAfterCell ) + { + wxHtmlCell *nextCell = m_Next; + while ( nextCell && nextCell->IsFormattingCell() ) + nextCell = nextCell->GetNext(); + if ( nextCell ) + { + int nextX = nextCell->GetPosX(); + if ( m_PosX + m_Width < nextX ) + { + dc.SetBrush(dc.GetBackground()); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.DrawRectangle(x + m_PosX + m_Width, y + m_PosY, + nextX - m_PosX - m_Width, m_Height); + } + } + } +} + +wxCursor wxHtmlWordCell::GetMouseCursor(wxHtmlWindowInterface *window) const +{ + if ( !GetLink() ) + { + return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Text); + } + else + { + return wxHtmlCell::GetMouseCursor(window); + } +} + +wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const +{ + if ( s && (this == s->GetFromCell() || this == s->GetToCell()) ) + { + wxPoint priv = this == s->GetFromCell() ? s->GetFromPrivPos() + : s->GetToPrivPos(); + + // VZ: we may be called before we had a chance to re-render ourselves + // and in this case GetFrom/ToPrivPos() is not set yet -- assume + // that this only happens in case of a double/triple click (which + // seems to be the case now) and so it makes sense to select the + // entire contents of the cell in this case + // + // TODO: but this really needs to be fixed in some better way later... + if ( priv != wxDefaultPosition ) + { + const int part1 = priv.x; + const int part2 = priv.y; + if ( part1 == part2 ) + return wxEmptyString; + return GetPartAsText(part1, part2); + } + //else: return the whole word below } + + return GetAllAsText(); } - -wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *sel) const +wxString wxHtmlWordWithTabsCell::GetAllAsText() const { - // FIXME - use selection - return m_Word; + return m_wordOrig; +} + +wxString wxHtmlWordWithTabsCell::GetPartAsText(int begin, int end) const +{ + // NB: The 'begin' and 'end' positions are in the _displayed_ text + // (stored in m_Word) and not in the text with tabs that should + // be copied to clipboard (m_wordOrig). + // + // NB: Because selection is performed on displayed text, it's possible + // to select e.g. "half of TAB character" -- IOW, 'begin' and 'end' + // may be in the middle of TAB character expansion into ' 's. In this + // case, we copy the TAB character to clipboard once. + + wxASSERT( begin < end ); + + const unsigned SPACES_PER_TAB = 8; + + wxString sel; + + int pos = 0; + wxString::const_iterator i = m_wordOrig.begin(); + + // find the beginning of text to copy: + for ( ; pos < begin; ++i ) + { + if ( *i == '\t' ) + { + pos += 8 - (m_linepos + pos) % SPACES_PER_TAB; + if ( pos >= begin ) + { + sel += '\t'; + } + } + else + { + ++pos; + } + } + + // copy the content until we reach 'end': + for ( ; pos < end; ++i ) + { + const wxChar c = *i; + sel += c; + + if ( c == '\t' ) + pos += 8 - (m_linepos + pos) % SPACES_PER_TAB; + else + ++pos; + } + + return sel; } @@ -376,18 +721,20 @@ wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *sel) const // wxHtmlContainerCell //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell) wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCell() { m_Cells = m_LastCell = NULL; m_Parent = parent; + m_MaxTotalWidth = 0; if (m_Parent) m_Parent->InsertCell(this); m_AlignHor = wxHTML_ALIGN_LEFT; m_AlignVer = wxHTML_ALIGN_BOTTOM; m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0; m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; - m_UseBkColour = FALSE; - m_UseBorder = FALSE; + m_UseBkColour = false; + m_Border = 0; m_MinHeight = 0; m_MinHeightAlign = wxHTML_ALIGN_TOP; m_LastLayout = -1; @@ -432,7 +779,7 @@ int wxHtmlContainerCell::GetIndent(int ind) const int wxHtmlContainerCell::GetIndentUnits(int ind) const { - bool p = FALSE; + bool p = false; if (ind & wxHTML_INDENT_LEFT) p = m_IndentLeft < 0; else if (ind & wxHTML_INDENT_RIGHT) p = m_IndentRight < 0; else if (ind & wxHTML_INDENT_TOP) p = m_IndentTop < 0; @@ -442,37 +789,35 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const } - -bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks, int number_of_pages) const +bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, + wxArrayInt& known_pagebreaks) const { if (!m_CanLiveOnPagebreak) - return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, number_of_pages); + return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks); - else - { - wxHtmlCell *c = GetFirstChild(); - bool rt = FALSE; - int pbrk = *pagebreak - m_PosY; + wxHtmlCell *c = GetFirstChild(); + bool rt = false; + int pbrk = *pagebreak - m_PosY; - while (c) - { - if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages)) - rt = TRUE; - c = c->GetNext(); - } - if (rt) - *pagebreak = pbrk + m_PosY; - return rt; + while (c) + { + if (c->AdjustPagebreak(&pbrk, known_pagebreaks)) + rt = true; + c = c->GetNext(); } + if (rt) + *pagebreak = pbrk + m_PosY; + return rt; } - void wxHtmlContainerCell::Layout(int w) { wxHtmlCell::Layout(w); - if (m_LastLayout == w) return; + if (m_LastLayout == w) + return; + m_LastLayout = w; // VS: Any attempt to layout with negative or zero width leads to hell, // but we can't ignore such attempts completely, since it sometimes @@ -488,13 +833,14 @@ void wxHtmlContainerCell::Layout(int w) return; } - wxHtmlCell *cell = m_Cells, *line = m_Cells; + wxHtmlCell *nextCell; long xpos = 0, ypos = m_IndentTop; int xdelta = 0, ybasicpos = 0, ydiff; - int s_width, s_indent; + int s_width, nextWordWidth, s_indent; int ysizeup = 0, ysizedown = 0; int MaxLineWidth = 0; - int xcnt = 0; + int curLineWidth = 0; + m_MaxTotalWidth = 0; /* @@ -524,7 +870,7 @@ void wxHtmlContainerCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ @@ -532,7 +878,9 @@ void wxHtmlContainerCell::Layout(int w) s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); - // my own layouting: + // my own layout: + wxHtmlCell *cell = m_Cells, + *line = m_Cells; while (cell != NULL) { switch (m_AlignVer) @@ -546,13 +894,40 @@ void wxHtmlContainerCell::Layout(int w) if (cell->GetDescent() + ydiff > ysizedown) ysizedown = cell->GetDescent() + ydiff; if (ybasicpos + cell->GetDescent() < -ysizeup) ysizeup = - (ybasicpos + cell->GetDescent()); + // layout nonbreakable run of cells: cell->SetPos(xpos, ybasicpos + cell->GetDescent()); xpos += cell->GetWidth(); + if (!cell->IsTerminalCell()) + { + // Container cell indicates new line + if (curLineWidth > m_MaxTotalWidth) + m_MaxTotalWidth = curLineWidth; + + if (wxMax(cell->GetWidth(), cell->GetMaxTotalWidth()) > m_MaxTotalWidth) + m_MaxTotalWidth = cell->GetMaxTotalWidth(); + curLineWidth = 0; + } + else + // Normal cell, add maximum cell width to line width + curLineWidth += cell->GetMaxTotalWidth(); + cell = cell->GetNext(); - xcnt++; - // force new line if occured: - if ((cell == NULL) || (xpos + cell->GetWidth() > s_width)) + // compute length of the next word that would be added: + nextWordWidth = 0; + if (cell) + { + nextCell = cell; + do + { + nextWordWidth += nextCell->GetWidth(); + nextCell = nextCell->GetNext(); + } while (nextCell && !nextCell->IsLinebreakAllowed()); + } + + // force new line if occurred: + if ((cell == NULL) || + (xpos + nextWordWidth > s_width && cell->IsLinebreakAllowed())) { if (xpos > MaxLineWidth) MaxLineWidth = xpos; if (ysizeup < 0) ysizeup = 0; @@ -575,30 +950,99 @@ void wxHtmlContainerCell::Layout(int w) ypos += ysizeup; if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL) + { while (line != cell) { line->SetPos(line->GetPosX() + xdelta, ypos + line->GetPosY()); line = line->GetNext(); } - else + } + else // align == justify { - int counter = 0; - int step = (s_width - xpos); - if (step < 0) step = 0; - xcnt--; - if (xcnt > 0) while (line != cell) + // we have to distribute the extra horz space between the cells + // on this line + + // an added complication is that some cells have fixed size and + // shouldn't get any increment (it so happens that these cells + // also don't allow line break on them which provides with an + // easy way to test for this) -- and neither should the cells + // adjacent to them as this could result in a visible space + // between two cells separated by, e.g. font change, cell which + // is wrong + + int step = s_width - xpos; + if ( step > 0 ) { - line->SetPos(line->GetPosX() + s_indent + - (counter++ * step / xcnt), - ypos + line->GetPosY()); - line = line->GetNext(); + // first count the cells which will get extra space + int total = -1; + + const wxHtmlCell *c; + if ( line != cell ) + { + for ( c = line; c != cell; c = c->GetNext() ) + { + if ( c->IsLinebreakAllowed() ) + { + total++; + } + } + } + + // and now extra space to those cells which merit it + if ( total ) + { + // first visible cell on line is not moved: + while (line !=cell && !line->IsLinebreakAllowed()) + { + line->SetPos(line->GetPosX() + s_indent, + line->GetPosY() + ypos); + line = line->GetNext(); + } + + if (line != cell) + { + line->SetPos(line->GetPosX() + s_indent, + line->GetPosY() + ypos); + + line = line->GetNext(); + } + + for ( int n = 0; line != cell; line = line->GetNext() ) + { + if ( line->IsLinebreakAllowed() ) + { + // offset the next cell relative to this one + // thus increasing our size + n++; + } + + line->SetPos(line->GetPosX() + s_indent + + ((n * step) / total), + line->GetPosY() + ypos); + } + } + else + { + // this will cause the code to enter "else branch" below: + step = 0; + } + } + // else branch: + if ( step <= 0 ) // no extra space to distribute + { + // just set the indent properly + while (line != cell) + { + line->SetPos(line->GetPosX() + s_indent, + line->GetPosY() + ypos); + line = line->GetNext(); + } } - xcnt++; } ypos += ysizedown; - xpos = xcnt = 0; + xpos = 0; ysizeup = ysizedown = 0; line = cell; } @@ -623,100 +1067,164 @@ void wxHtmlContainerCell::Layout(int w) m_Height = m_MinHeight; } + if (curLineWidth > m_MaxTotalWidth) + m_MaxTotalWidth = curLineWidth; + + m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; - - m_LastLayout = w; } -void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingState& state, +void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info, wxHtmlCell *cell) const { - wxHtmlSelection *s = state.GetSelection(); + wxHtmlSelection *s = info.GetSelection(); if (!s) return; if (s->GetFromCell() == cell || s->GetToCell() == cell) { - state.SetSelectionState(wxHTML_SEL_CHANGING); + info.GetState().SetSelectionState(wxHTML_SEL_CHANGING); } } -void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingState& state, +void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingInfo& info, wxHtmlCell *cell) const { - wxHtmlSelection *s = state.GetSelection(); + wxHtmlSelection *s = info.GetSelection(); if (!s) return; if (s->GetToCell() == cell) - state.SetSelectionState(wxHTML_SEL_OUT); + info.GetState().SetSelectionState(wxHTML_SEL_OUT); else if (s->GetFromCell() == cell) - state.SetSelectionState(wxHTML_SEL_IN); + info.GetState().SetSelectionState(wxHTML_SEL_IN); } #define mMin(a, b) (((a) < (b)) ? (a) : (b)) #define mMax(a, b) (((a) < (b)) ? (b) : (a)) void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingState& state) + wxHtmlRenderingInfo& info) { - // container visible, draw it: - if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1)) +#if 0 // useful for debugging + dc.SetPen(*wxRED_PEN); + dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height); +#endif + + int xlocal = x + m_PosX; + int ylocal = y + m_PosY; + + if (m_UseBkColour) { - if (m_UseBkColour) - { - wxBrush myb = wxBrush(m_BkColour, wxSOLID); + wxBrush myb = wxBrush(m_BkColour, wxBRUSHSTYLE_SOLID); - int real_y1 = mMax(y + m_PosY, view_y1); - int real_y2 = mMin(y + m_PosY + m_Height - 1, view_y2); + int real_y1 = mMax(ylocal, view_y1); + int real_y2 = mMin(ylocal + m_Height - 1, view_y2); - dc.SetBrush(myb); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1); - } + dc.SetBrush(myb); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.DrawRectangle(xlocal, real_y1, m_Width, real_y2 - real_y1 + 1); + } - if (m_UseBorder) + if (m_Border == 1) + { + // draw thin border using lines + wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID); + wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID); + + dc.SetPen(mypen1); + dc.DrawLine(xlocal, ylocal, xlocal, ylocal + m_Height - 1); + dc.DrawLine(xlocal, ylocal, xlocal + m_Width, ylocal); + dc.SetPen(mypen2); + dc.DrawLine(xlocal + m_Width - 1, ylocal, xlocal + m_Width - 1, ylocal + m_Height - 1); + dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1); + } + else if (m_Border> 0) + { + wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID); + wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID); + + // draw upper left corner + // 0---------------5 + // | / + // | 3-----------4 + // | | + // | 2 + // |/ + // 1 + + wxPoint poly[6]; + poly[0].x =m_PosX; poly[0].y = m_PosY ; + poly[1].x =m_PosX; poly[1].y = m_PosY + m_Height; + poly[2].x =m_PosX + m_Border; poly[2].y = poly[1].y - m_Border; + poly[3].x =poly[2].x ; poly[3].y = m_PosY + m_Border; + poly[4].x =m_PosX + m_Width - m_Border; poly[4].y = poly[3].y; + poly[5].x =m_PosX + m_Width; poly[5].y = m_PosY; + + dc.SetBrush(mybrush1); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.DrawPolygon(6, poly, x, y); + + // draw lower right corner reusing point 1,2,4 and 5 + // 5 + // /| + // 4 | + // | | + // 2-----------3 | + // / | + // 1---------------0 + dc.SetBrush(mybrush2); + poly[0].x = poly[5].x; poly[0].y = poly[1].y; + poly[3].x = poly[4].x; poly[3].y = poly[2].y; + dc.DrawPolygon(6, poly, x, y); + + // smooth color transition like firefox + wxColour borderMediumColour( + (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 , + (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 , + (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2 + ); + wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID); + dc.SetPen(mypen3); + dc.DrawLines(2, &poly[1], x, y - 1); // between 1 and 2 + dc.DrawLines(2, &poly[4], x, y - 1); // between 4 and 5 + } + if (m_Cells) + { + // draw container's contents: + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) { - wxPen mypen1(m_BorderColour1, 1, wxSOLID); - wxPen mypen2(m_BorderColour2, 1, wxSOLID); - - dc.SetPen(mypen1); - dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX, y + m_PosY + m_Height - 1); - dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width, y + m_PosY); - dc.SetPen(mypen2); - dc.DrawLine(x + m_PosX + m_Width - 1, y + m_PosY, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1); - dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width, y + m_PosY + m_Height - 1); - } - if (m_Cells) - { - // draw container's contents: - for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + // optimize drawing: don't render off-screen content: + if ((ylocal + cell->GetPosY() <= view_y2) && + (ylocal + cell->GetPosY() + cell->GetHeight() > view_y1)) { - UpdateRenderingStatePre(state, cell); + // the cell is visible, draw it: + UpdateRenderingStatePre(info, cell); cell->Draw(dc, - x + m_PosX, y + m_PosY, view_y1, view_y2, - state); - UpdateRenderingStatePost(state, cell); + xlocal, ylocal, view_y1, view_y2, + info); + UpdateRenderingStatePost(info, cell); + } + else + { + // the cell is off-screen, proceed with font+color+etc. + // changes only: + cell->DrawInvisible(dc, xlocal, ylocal, info); } } } - // container invisible, just proceed font+color changing: - else - { - DrawInvisible(dc, x, y, state); - } } void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingState& state) + wxHtmlRenderingInfo& info) { if (m_Cells) { for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) { - UpdateRenderingStatePre(state, cell); - cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, state); - UpdateRenderingStatePost(state, cell); + UpdateRenderingStatePre(info, cell); + cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, info); + UpdateRenderingStatePost(info, cell); } } } @@ -786,7 +1294,7 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale int wdi; wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == wxT('%')) + if (wd[wd.length()-1] == wxT('%')) { wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); SetWidthFloat(wdi, wxHTML_UNITS_PERCENT); @@ -806,11 +1314,9 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co { if (m_Cells) { - const wxHtmlCell *r = NULL; - for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) { - r = cell->Find(condition, param); + const wxHtmlCell *r = cell->Find(condition, param); if (r) return r; } } @@ -838,14 +1344,16 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y, else if ( flags & wxHTML_FIND_NEAREST_AFTER ) { wxHtmlCell *c; - int y2; for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) { - y2 = cell->GetPosY() + cell->GetHeight() - 1; - if (y2 < y || (y2 == y && cell->GetPosX()+cell->GetWidth()-1 < x)) + if ( cell->IsFormattingCell() ) continue; - c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(), - flags); + int cellY = cell->GetPosY(); + if (!( y < cellY || (y < cellY + cell->GetHeight() && + x < cell->GetPosX() + cell->GetWidth()) )) + continue; + + c = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags); if (c) return c; } } @@ -854,11 +1362,13 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y, wxHtmlCell *c2, *c = NULL; for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) { - if (cell->GetPosY() > y || - (cell->GetPosY() == y && cell->GetPosX() > x)) + if ( cell->IsFormattingCell() ) + continue; + int cellY = cell->GetPosY(); + if (!( cellY + cell->GetHeight() <= y || + (y >= cellY && x >= cell->GetPosX()) )) break; - c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(), - flags); + c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags); if (c2) c = c2; } @@ -869,39 +1379,36 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y, } -void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) +bool wxHtmlContainerCell::ProcessMouseClick(wxHtmlWindowInterface *window, + const wxPoint& pos, + const wxMouseEvent& event) { - wxHtmlCell *cell = FindCellByPos(x, y); - if ( cell ) - cell->OnMouseClick(parent, x, y, event); +#if WXWIN_COMPATIBILITY_2_6 + wxHtmlCellOnMouseClickCompatHelper compat(window, pos, event); + return compat.CallOnMouseClick(this); } - - -void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const +void wxHtmlContainerCell::OnMouseClick(wxWindow*, + int, int, const wxMouseEvent& event) { - int cleft = m_PosX + m_Width, cright = m_PosX; // worst case - int l, r; - - for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) - { - cell->GetHorizontalConstraints(&l, &r); - if (l < cleft) - cleft = l; - if (r > cright) - cright = r; - } + wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") ); + wxHtmlWindowInterface *window = gs_helperOnMouseClick->window; + const wxPoint& pos = gs_helperOnMouseClick->pos; +#endif // WXWIN_COMPATIBILITY_2_6 - cleft -= (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; - cright += (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight; + bool retval = false; + wxHtmlCell *cell = FindCellByPos(pos.x, pos.y); + if ( cell ) + retval = cell->ProcessMouseClick(window, pos, event); - if (left) - *left = cleft; - if (right) - *right = cright; +#if WXWIN_COMPATIBILITY_2_6 + gs_helperOnMouseClick->retval = retval; +#else + return retval; +#endif // WXWIN_COMPATIBILITY_2_6 } - + wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const { if ( m_Cells ) @@ -926,9 +1433,14 @@ wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const if ( c ) return c; + wxHtmlCell *ctmp; wxHtmlCell *c2 = NULL; for (c = m_Cells; c; c = c->GetNext()) - c2 = c->GetLastTerminal(); + { + ctmp = c->GetLastTerminal(); + if ( ctmp ) + c2 = ctmp; + } return c2; } else @@ -936,36 +1448,129 @@ wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const } +static bool IsEmptyContainer(wxHtmlContainerCell *cell) +{ + for ( wxHtmlCell *c = cell->GetFirstChild(); c; c = c->GetNext() ) + { + if ( !c->IsTerminalCell() || !c->IsFormattingCell() ) + return false; + } + return true; +} + +void wxHtmlContainerCell::RemoveExtraSpacing(bool top, bool bottom) +{ + if ( top ) + SetIndent(0, wxHTML_INDENT_TOP); + if ( bottom ) + SetIndent(0, wxHTML_INDENT_BOTTOM); + + if ( m_Cells ) + { + wxHtmlCell *c; + wxHtmlContainerCell *cont; + if ( top ) + { + for ( c = m_Cells; c; c = c->GetNext() ) + { + if ( c->IsTerminalCell() ) + { + if ( !c->IsFormattingCell() ) + break; + } + else + { + cont = (wxHtmlContainerCell*)c; + if ( IsEmptyContainer(cont) ) + { + cont->SetIndent(0, wxHTML_INDENT_VERTICAL); + } + else + { + cont->RemoveExtraSpacing(true, false); + break; + } + } + } + } + + if ( bottom ) + { + wxArrayPtrVoid arr; + for ( c = m_Cells; c; c = c->GetNext() ) + arr.Add((void*)c); + + for ( int i = arr.GetCount() - 1; i >= 0; i--) + { + c = (wxHtmlCell*)arr[i]; + if ( c->IsTerminalCell() ) + { + if ( !c->IsFormattingCell() ) + break; + } + else + { + cont = (wxHtmlContainerCell*)c; + if ( IsEmptyContainer(cont) ) + { + cont->SetIndent(0, wxHTML_INDENT_VERTICAL); + } + else + { + cont->RemoveExtraSpacing(false, true); + break; + } + } + } + } + } +} + + // -------------------------------------------------------------------------- // wxHtmlColourCell // -------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlColourCell, wxHtmlCell) + void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingState& state) + wxHtmlRenderingInfo& info) { - DrawInvisible(dc, x, y, state); + DrawInvisible(dc, x, y, info); } void wxHtmlColourCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), - wxHtmlRenderingState& state) + wxHtmlRenderingInfo& info) { + wxHtmlRenderingState& state = info.GetState(); if (m_Flags & wxHTML_CLR_FOREGROUND) { state.SetFgColour(m_Colour); if (state.GetSelectionState() != wxHTML_SEL_IN) - dc.SetTextForeground(m_Colour); + dc.SetTextForeground(m_Colour); + else + dc.SetTextForeground( + info.GetStyle().GetSelectedTextColour(m_Colour)); } if (m_Flags & wxHTML_CLR_BACKGROUND) { state.SetBgColour(m_Colour); if (state.GetSelectionState() != wxHTML_SEL_IN) + { dc.SetTextBackground(m_Colour); - dc.SetBackground(wxBrush(m_Colour, wxSOLID)); + dc.SetBackground(wxBrush(m_Colour, wxBRUSHSTYLE_SOLID)); + } + else + { + wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour); + dc.SetTextBackground(c); + dc.SetBackground(wxBrush(c, wxBRUSHSTYLE_SOLID)); + } } } @@ -976,16 +1581,18 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, // wxHtmlFontCell // --------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell) + void wxHtmlFontCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingState& WXUNUSED(state)) + wxHtmlRenderingInfo& WXUNUSED(info)) { dc.SetFont(m_Font); } void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), - wxHtmlRenderingState& WXUNUSED(state)) + wxHtmlRenderingInfo& WXUNUSED(info)) { dc.SetFont(m_Font); } @@ -1001,6 +1608,8 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), // wxHtmlWidgetCell // --------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell) + wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w) { int sx, sy; @@ -1014,7 +1623,7 @@ wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w) void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingState& WXUNUSED(state)) + wxHtmlRenderingInfo& WXUNUSED(info)) { int absx = 0, absy = 0, stx, sty; wxHtmlCell *c = this; @@ -1026,15 +1635,22 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), c = c->GetParent(); } - ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty); - m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height); + wxScrolledWindow *scrolwin = + wxDynamicCast(m_Wnd->GetParent(), wxScrolledWindow); + wxCHECK_RET( scrolwin, + wxT("widget cells can only be placed in wxHtmlWindow") ); + + scrolwin->GetViewStart(&stx, &sty); + m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, + absy - wxHTML_SCROLL_STEP * sty, + m_Width, m_Height); } void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), - wxHtmlRenderingState& WXUNUSED(state)) + wxHtmlRenderingInfo& WXUNUSED(info)) { int absx = 0, absy = 0, stx, sty; wxHtmlCell *c = this; @@ -1099,7 +1715,7 @@ const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++() while ( m_pos->GetFirstChild() != NULL ) m_pos = m_pos->GetFirstChild(); } while ( !m_pos->IsTerminalCell() ); - + return m_pos; }