X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed673c6a48b3479beac60a93ff8f44611e44415f..bcbd69875f4e9149eb22d922f94d99e307fdd280:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index eb8f940064..3bd6c6c2c3 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -7,109 +7,572 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "htmlcell.h" #endif #include "wx/wxprec.h" -#if wxUSE_HTML +#include "wx/defs.h" -#ifdef __BORDLANDC__ +#if wxUSE_HTML && wxUSE_STREAMS + +#ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include "wx/wx.h" + #include "wx/brush.h" + #include "wx/colour.h" + #include "wx/dc.h" #endif #include "wx/html/htmlcell.h" #include "wx/html/htmlwin.h" +#include "wx/settings.h" +#include "wx/module.h" +#include "wx/dynarray.h" + #include +//----------------------------------------------------------------------------- +// Global variables +//----------------------------------------------------------------------------- + +static wxCursor *gs_cursorLink = NULL; +static wxCursor *gs_cursorText = NULL; + + +//----------------------------------------------------------------------------- +// Helper classes +//----------------------------------------------------------------------------- + +void wxHtmlSelection::Set(const wxPoint& fromPos, const wxHtmlCell *fromCell, + const wxPoint& toPos, const wxHtmlCell *toCell) +{ + m_fromCell = fromCell; + m_toCell = toCell; + m_fromPos = fromPos; + m_toPos = toPos; +} + +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(); + 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_Link = NULL; +} + +wxHtmlCell::~wxHtmlCell() +{ + delete m_Link; +} + void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, - bool WXUNUSED(left), - bool WXUNUSED(middle), - bool WXUNUSED(right)) + const wxMouseEvent& event) +{ + wxHtmlLinkInfo *lnk = GetLink(x, y); + if (lnk != NULL) + { + wxHtmlLinkInfo lnk2(*lnk); + lnk2.SetEvent(&event); + lnk2.SetHtmlCell(this); + + // note : this cast is legal because parent is *always* wxHtmlWindow + wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2); + } +} + + +wxCursor wxHtmlCell::GetCursor() const +{ + if ( GetLink() ) + { + if ( !gs_cursorLink ) + gs_cursorLink = new wxCursor(wxCURSOR_HAND); + return *gs_cursorLink; + } + else + return *wxSTANDARD_CURSOR; +} + + +bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const +{ + if ((!m_CanLiveOnPagebreak) && + m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) + { + *pagebreak = m_PosY; + return TRUE; + } + + return FALSE; +} + + + +void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) +{ + if (m_Link) delete m_Link; + m_Link = NULL; + if (link.GetHref() != wxEmptyString) + m_Link = new wxHtmlLinkInfo(link); +} + + +void wxHtmlCell::Layout(int WXUNUSED(w)) +{ + SetPos(0, 0); +} + + + +const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const +{ + return NULL; +} + + +wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y, + unsigned flags) const +{ + if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height ) + { + return wxConstCast(this, wxHtmlCell); + } + else + { + if ((flags & wxHTML_FIND_NEAREST_AFTER) && + (y < 0 || (y < 0+m_Height && x < 0+m_Width))) + return wxConstCast(this, wxHtmlCell); + else if ((flags & wxHTML_FIND_NEAREST_BEFORE) && + (y >= 0+m_Height || (y >= 0 && x >= 0))) + return wxConstCast(this, wxHtmlCell); + else + return NULL; + } +} + + +wxPoint wxHtmlCell::GetAbsPos() const +{ + wxPoint p(m_PosX, m_PosY); + for (wxHtmlCell *parent = m_Parent; parent; parent = parent->m_Parent) + { + p.x += parent->m_PosX; + p.y += parent->m_PosY; + } + return p; +} + +unsigned wxHtmlCell::GetDepth() const { - wxString lnk = GetLink(x, y); - if (lnk != wxEmptyString) - ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk); - // note : this overcasting is legal because parent is *always* wxHtmlWindow + unsigned d = 0; + for (wxHtmlCell *p = m_Parent; p; p = p->m_Parent) + d++; + return d; } +bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const +{ + const wxHtmlCell *c1 = this; + const wxHtmlCell *c2 = cell; + unsigned d1 = GetDepth(); + unsigned d2 = cell->GetDepth(); + + if ( d1 > d2 ) + for (; d1 != d2; d1-- ) + c1 = c1->m_Parent; + else if ( d1 < d2 ) + for (; d1 != d2; d2-- ) + c2 = c2->m_Parent; + + if ( cell == this ) + return true; + + while ( c1 && c2 ) + { + if ( c1->m_Parent == c2->m_Parent ) + { + while ( c1 ) + { + if ( c1 == c2 ) + return true; + c1 = c1->GetNext(); + } + return false; + } + else + { + c1 = c1->m_Parent; + c2 = c2->m_Parent; + } + } + + wxFAIL_MSG(_T("Cells are in different trees")); + return false; +} //----------------------------------------------------------------------------- // wxHtmlWordCell //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell) + wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() { m_Word = word; - m_Word.Replace(" ", " ", TRUE); - m_Word.Replace(""", "\"", TRUE); - m_Word.Replace("<", "<", TRUE); - m_Word.Replace(">", ">", TRUE); - m_Word.Replace("&", "&", TRUE); dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); + 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, + const wxPoint& selFrom, const wxPoint& selTo, + unsigned& pos1, unsigned& pos2) const +{ + wxPoint pt1 = (selFrom == wxDefaultPosition) ? + wxDefaultPosition : selFrom - GetAbsPos(); + wxPoint pt2 = (selTo == wxDefaultPosition) ? + wxPoint(m_Width, -1) : selTo - GetAbsPos(); + + wxCoord charW, charH; + unsigned len = m_Word.length(); + unsigned i = 0; + pos1 = 0; + + // 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: + while ( pt1.x > 0 && i < len ) + { + dc.GetTextExtent(m_Word[i], &charW, &charH); + pt1.x -= charW; + if ( pt1.x >= 0 ) + { + pos1 += charW; + i++; + } + } + + // in selection: + unsigned j = i; + pos2 = pos1; + pt2.x -= pos2; + while ( pt2.x > 0 && j < len ) + { + dc.GetTextExtent(m_Word[j], &charW, &charH); + pt2.x -= charW; + if ( pt2.x >= 0 ) + { + pos2 += charW; + j++; + } + } + pos1 = i; + pos2 = j; +} -void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const { - dc.DrawText(m_Word, x + m_PosX, y + m_PosY); - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); + 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 + + 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.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg)); + dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg)); + dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg), + wxSOLID)); + } + else + { + dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetTextForeground(fg); + dc.SetTextBackground(bg); + dc.SetBackground(wxBrush(bg, wxSOLID)); + } +} + + +void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& info) +{ +#if 0 // useful for debugging + dc.SetPen(*wxBLACK_PEN); + dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height); +#endif + + bool drawSelectionAfterCell = false; + + if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING ) + { + // Selection changing, we must draw the word piecewise: + 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 ) + { + SetSelectionPrivPos(dc, s); + priv = (this == s->GetFromCell()) ? + s->GetFromPrivPos() : s->GetToPrivPos(); + } + + int part1 = priv.x; + int part2 = priv.y; + + if ( part1 > 0 ) + { + 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 ( selstate != wxHTML_SEL_OUT && + dc.GetBackgroundMode() != wxSOLID ) + { + SwitchSelState(dc, info, true); + } + else if ( selstate == wxHTML_SEL_OUT && + dc.GetBackgroundMode() == wxSOLID ) + { + 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); + } + } + } +} + + +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 ) + { + int part1 = priv.x; + int part2 = priv.y; + return m_Word.Mid(part1, part2-part1); + } + //else: return the whole word below + } + + return m_Word; +} + +wxCursor wxHtmlWordCell::GetCursor() const +{ + if ( !GetLink() ) + { + if ( !gs_cursorText ) + gs_cursorText = new wxCursor(wxCURSOR_IBEAM); + return *gs_cursorText; + } + else + return wxHtmlCell::GetCursor(); +} + //----------------------------------------------------------------------------- // wxHtmlContainerCell //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell) wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCell() { m_Cells = m_LastCell = NULL; m_Parent = parent; - if (m_Parent) m_Parent -> InsertCell(this); - m_AlignHor = HTML_ALIGN_LEFT; - m_AlignVer = HTML_ALIGN_BOTTOM; + 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 = HTML_UNITS_PERCENT; + m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; m_UseBkColour = FALSE; m_UseBorder = FALSE; - m_MinHeight = m_MaxLineWidth = 0; - m_MinHeightAlign = HTML_ALIGN_TOP; + m_MinHeight = 0; + m_MinHeightAlign = wxHTML_ALIGN_TOP; + m_LastLayout = -1; +} + +wxHtmlContainerCell::~wxHtmlContainerCell() +{ + wxHtmlCell *cell = m_Cells; + while ( cell ) + { + wxHtmlCell *cellNext = cell->GetNext(); + delete cell; + cell = cellNext; + } } void wxHtmlContainerCell::SetIndent(int i, int what, int units) { - int val = (units == HTML_UNITS_PIXELS) ? i : -i; - if (what & HTML_INDENT_LEFT) m_IndentLeft = val; - if (what & HTML_INDENT_RIGHT) m_IndentRight = val; - if (what & HTML_INDENT_TOP) m_IndentTop = val; - if (what & HTML_INDENT_BOTTOM) m_IndentBottom = val; + int val = (units == wxHTML_UNITS_PIXELS) ? i : -i; + if (what & wxHTML_INDENT_LEFT) m_IndentLeft = val; + if (what & wxHTML_INDENT_RIGHT) m_IndentRight = val; + if (what & wxHTML_INDENT_TOP) m_IndentTop = val; + if (what & wxHTML_INDENT_BOTTOM) m_IndentBottom = val; + m_LastLayout = -1; } int wxHtmlContainerCell::GetIndent(int ind) const { - if (ind & HTML_INDENT_LEFT) return m_IndentLeft; - else if (ind & HTML_INDENT_RIGHT) return m_IndentRight; - else if (ind & HTML_INDENT_TOP) return m_IndentTop; - else if (ind & HTML_INDENT_BOTTOM) return m_IndentBottom; + if (ind & wxHTML_INDENT_LEFT) return m_IndentLeft; + else if (ind & wxHTML_INDENT_RIGHT) return m_IndentRight; + else if (ind & wxHTML_INDENT_TOP) return m_IndentTop; + else if (ind & wxHTML_INDENT_BOTTOM) return m_IndentBottom; else return -1; /* BUG! Should not be called... */ } @@ -119,94 +582,202 @@ int wxHtmlContainerCell::GetIndent(int ind) const int wxHtmlContainerCell::GetIndentUnits(int ind) const { bool p = FALSE; - if (ind & HTML_INDENT_LEFT) p = m_IndentLeft < 0; - else if (ind & HTML_INDENT_RIGHT) p = m_IndentRight < 0; - else if (ind & HTML_INDENT_TOP) p = m_IndentTop < 0; - else if (ind & HTML_INDENT_BOTTOM) p = m_IndentBottom < 0; - if (p) return HTML_UNITS_PERCENT; - else return HTML_UNITS_PIXELS; + 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; + else if (ind & wxHTML_INDENT_BOTTOM) p = m_IndentBottom < 0; + if (p) return wxHTML_UNITS_PERCENT; + else return wxHTML_UNITS_PIXELS; +} + + + +bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks, int number_of_pages) const +{ + if (!m_CanLiveOnPagebreak) + return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, number_of_pages); + + else + { + 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; + } } void wxHtmlContainerCell::Layout(int w) { + wxHtmlCell::Layout(w); + + if (m_LastLayout == w) return; + + // VS: Any attempt to layout with negative or zero width leads to hell, + // but we can't ignore such attempts completely, since it sometimes + // happen (e.g. when trying how small a table can be). The best thing we + // can do is to set the width of child cells to zero + if (w < 1) + { + m_Width = 0; + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + cell->Layout(0); + // this does two things: it recursively calls this code on all + // child contrainers and resets children's position to (0,0) + 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; + /* - + WIDTH ADJUSTING : - + */ - if (m_WidthFloatUnits == HTML_UNITS_PERCENT) { + if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) + { if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100; else m_Width = m_WidthFloat * w / 100; } - else { + else + { if (m_WidthFloat < 0) m_Width = w + m_WidthFloat; else m_Width = m_WidthFloat; } - if (m_Cells) { + if (m_Cells) + { int l = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; int r = (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight; - m_Cells -> Layout(m_Width - (l + r)); + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + cell->Layout(m_Width - (l + r)); } /* LAYOUTING : - + */ // adjust indentation: 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); - m_MaxLineWidth = 0; - // my own layouting: - while (cell != NULL) { - switch (m_AlignVer) { - case HTML_ALIGN_TOP : ybasicpos = 0; break; - case HTML_ALIGN_BOTTOM : ybasicpos = - cell -> GetHeight(); break; - case HTML_ALIGN_CENTER : ybasicpos = - cell -> GetHeight() / 2; break; + while (cell != NULL) + { + switch (m_AlignVer) + { + case wxHTML_ALIGN_TOP : ybasicpos = 0; break; + case wxHTML_ALIGN_BOTTOM : ybasicpos = - cell->GetHeight(); break; + case wxHTML_ALIGN_CENTER : ybasicpos = - cell->GetHeight() / 2; break; } - ydiff = cell -> GetHeight() + ybasicpos; - - if (cell -> GetDescent() + ydiff > ysizedown) ysizedown = cell -> GetDescent() + ydiff; - if (ybasicpos + cell -> GetDescent() < -ysizeup) ysizeup = - (ybasicpos + cell -> GetDescent()); - - cell -> SetPos(xpos, ybasicpos + cell -> GetDescent()); - xpos += cell -> GetWidth(); - cell = cell -> GetNext(); - + ydiff = cell->GetHeight() + ybasicpos; + + 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++; + + // 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 occured: - if ((cell == NULL) || (xpos + cell -> GetWidth() > s_width)) { - if (xpos > m_MaxLineWidth) m_MaxLineWidth = xpos; + if ((cell == NULL) || + (xpos + nextWordWidth > s_width && cell->IsLinebreakAllowed())) + { + if (xpos > MaxLineWidth) MaxLineWidth = xpos; if (ysizeup < 0) ysizeup = 0; if (ysizedown < 0) ysizedown = 0; switch (m_AlignHor) { - case HTML_ALIGN_LEFT : xdelta = 0; break; - case HTML_ALIGN_RIGHT : xdelta = 0 + (s_width - xpos); break; - case HTML_ALIGN_CENTER : xdelta = 0 + (s_width - xpos) / 2; break; + case wxHTML_ALIGN_LEFT : + case wxHTML_ALIGN_JUSTIFY : + xdelta = 0; + break; + case wxHTML_ALIGN_RIGHT : + xdelta = 0 + (s_width - xpos); + break; + case wxHTML_ALIGN_CENTER : + xdelta = 0 + (s_width - xpos) / 2; + break; } if (xdelta < 0) xdelta = 0; xdelta += s_indent; ypos += ysizeup; - while (line != cell) { - line -> SetPos(line -> GetPosX() + xdelta, ypos + line -> GetPosY()); - line = line -> GetNext(); + + if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL) + while (line != cell) + { + line->SetPos(line->GetPosX() + xdelta, + ypos + line->GetPosY()); + line = line->GetNext(); + } + else + { + int counter = 0; + int step = (s_width - xpos); + if (step < 0) step = 0; + xcnt--; + if (xcnt > 0) while (line != cell) + { + line->SetPos(line->GetPosX() + s_indent + + (counter++ * step / xcnt), + ypos + line->GetPosY()); + line = line->GetNext(); + } } ypos += ysizedown; - xpos = 0; + xpos = xcnt = 0; ysizeup = ysizedown = 0; line = cell; } @@ -215,35 +786,69 @@ void wxHtmlContainerCell::Layout(int w) // setup height & width, depending on container layout: m_Height = ypos + (ysizedown + ysizeup) + m_IndentBottom; - if (m_Height < m_MinHeight) { - if (m_MinHeightAlign != HTML_ALIGN_TOP) { + if (m_Height < m_MinHeight) + { + if (m_MinHeightAlign != wxHTML_ALIGN_TOP) + { int diff = m_MinHeight - m_Height; - if (m_MinHeightAlign == HTML_ALIGN_CENTER) diff /= 2; + if (m_MinHeightAlign == wxHTML_ALIGN_CENTER) diff /= 2; cell = m_Cells; - while (cell) { - cell -> SetPos(cell -> GetPosX(), cell -> GetPosY() + diff); - cell = cell -> GetNext(); + while (cell) + { + cell->SetPos(cell->GetPosX(), cell->GetPosY() + diff); + cell = cell->GetNext(); } } m_Height = m_MinHeight; } - m_MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); - if (m_Width < m_MaxLineWidth) m_Width = m_MaxLineWidth; + 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; - wxHtmlCell::Layout(w); + m_LastLayout = w; +} + +void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info, + wxHtmlCell *cell) const +{ + wxHtmlSelection *s = info.GetSelection(); + if (!s) return; + if (s->GetFromCell() == cell || s->GetToCell() == cell) + { + info.GetState().SetSelectionState(wxHTML_SEL_CHANGING); + } } +void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingInfo& info, + wxHtmlCell *cell) const +{ + wxHtmlSelection *s = info.GetSelection(); + if (!s) return; + if (s->GetToCell() == cell) + info.GetState().SetSelectionState(wxHTML_SEL_OUT); + else if (s->GetFromCell() == cell) + 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) +void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, + wxHtmlRenderingInfo& info) { +#if 0 // useful for debugging + dc.SetPen(*wxRED_PEN); + dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height); +#endif // container visible, draw it: - if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1)) { - - if (m_UseBkColour) { + if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1)) + { + if (m_UseBkColour) + { wxBrush myb = wxBrush(m_BkColour, wxSOLID); int real_y1 = mMax(y + m_PosY, view_y1); @@ -254,51 +859,74 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1); } - if (m_UseBorder) { + if (m_UseBorder) + { 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 - 1, y + m_PosY); + 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 - 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) m_Cells -> Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2); + if (m_Cells) + { + // draw container's contents: + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + { + UpdateRenderingStatePre(info, cell); + cell->Draw(dc, + x + m_PosX, y + m_PosY, view_y1, view_y2, + info); + UpdateRenderingStatePost(info, cell); + } + } } // container invisible, just proceed font+color changing: - else { - if (m_Cells) m_Cells -> DrawInvisible(dc, x + m_PosX, y + m_PosY); + else + { + DrawInvisible(dc, x, y, info); } - - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); } -void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y, + wxHtmlRenderingInfo& info) { - if (m_Cells) m_Cells -> DrawInvisible(dc, x + m_PosX, y + m_PosY); - wxHtmlCell::DrawInvisible(dc, x, y); + if (m_Cells) + { + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + { + UpdateRenderingStatePre(info, cell); + cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, info); + UpdateRenderingStatePost(info, cell); + } + } +} + + +wxColour wxHtmlContainerCell::GetBackgroundColour() +{ + if (m_UseBkColour) + return m_BkColour; + else + return wxNullColour; } -wxString wxHtmlContainerCell::GetLink(int x, int y) const +wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const { - wxHtmlCell *c = m_Cells; - int cx, cy, cw, ch; + wxHtmlCell *cell = FindCellByPos(x, y); - while (c) { - cx = c -> GetPosX(), cy = c -> GetPosY(); - cw = c -> GetWidth(), ch = c -> GetHeight(); - if ((x >= cx) && (x < cx + cw) && (y >= cy) && (y < cy + ch)) - return c -> GetLink(x - cx, y - cy); - c = c -> GetNext(); - } - return wxEmptyString; + // VZ: I don't know if we should pass absolute or relative coords to + // wxHtmlCell::GetLink()? As the base class version just ignores them + // anyhow, it hardly matters right now but should still be clarified + return cell ? cell->GetLink(x, y) : NULL; } @@ -306,46 +934,56 @@ wxString wxHtmlContainerCell::GetLink(int x, int y) const void wxHtmlContainerCell::InsertCell(wxHtmlCell *f) { if (!m_Cells) m_Cells = m_LastCell = f; - else { - m_LastCell -> SetNext(f); + else + { + m_LastCell->SetNext(f); m_LastCell = f; - if (m_LastCell) while (m_LastCell -> GetNext()) m_LastCell = m_LastCell -> GetNext(); + if (m_LastCell) while (m_LastCell->GetNext()) m_LastCell = m_LastCell->GetNext(); } - f -> SetParent(this); + f->SetParent(this); + m_LastLayout = -1; } void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag) { - if (tag.HasParam("ALIGN")) { - wxString alg = tag.GetParam("ALIGN"); + if (tag.HasParam(wxT("ALIGN"))) + { + wxString alg = tag.GetParam(wxT("ALIGN")); alg.MakeUpper(); - if (alg == "CENTER") - SetAlignHor(HTML_ALIGN_CENTER); - else if (alg == "LEFT") - SetAlignHor(HTML_ALIGN_LEFT); - else if (alg == "RIGHT") - SetAlignHor(HTML_ALIGN_RIGHT); + if (alg == wxT("CENTER")) + SetAlignHor(wxHTML_ALIGN_CENTER); + else if (alg == wxT("LEFT")) + SetAlignHor(wxHTML_ALIGN_LEFT); + else if (alg == wxT("JUSTIFY")) + SetAlignHor(wxHTML_ALIGN_JUSTIFY); + else if (alg == wxT("RIGHT")) + SetAlignHor(wxHTML_ALIGN_RIGHT); + m_LastLayout = -1; } } -void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag) +void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale) { - if (tag.HasParam("WIDTH")) { + if (tag.HasParam(wxT("WIDTH"))) + { int wdi; - wxString wd = tag.GetParam("WIDTH"); + wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == '%') { - sscanf(wd.c_str(), "%i%%", &wdi); - SetWidthFloat(wdi, HTML_UNITS_PERCENT); + if (wd[wd.Length()-1] == wxT('%')) + { + wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); + SetWidthFloat(wdi, wxHTML_UNITS_PERCENT); } - else { - sscanf(wd.c_str(), "%i", &wdi); - SetWidthFloat(wdi, HTML_UNITS_PIXELS); + else + { + wxSscanf(wd.c_str(), wxT("%i"), &wdi); + SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS); } + m_LastLayout = -1; } } @@ -353,82 +991,267 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag) const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) const { - const wxHtmlCell *r = NULL; - - if (m_Cells) { - r = m_Cells -> Find(condition, param); - if (r) return r; + if (m_Cells) + { + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + { + const wxHtmlCell *r = cell->Find(condition, param); + if (r) return r; + } } + return NULL; +} + - return wxHtmlCell::Find(condition, param); +wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y, + unsigned flags) const +{ + if ( flags & wxHTML_FIND_EXACT ) + { + for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) + { + int cx = cell->GetPosX(), + cy = cell->GetPosY(); + + if ( (cx <= x) && (cx + cell->GetWidth() > x) && + (cy <= y) && (cy + cell->GetHeight() > y) ) + { + return cell->FindCellByPos(x - cx, y - cy, flags); + } + } + } + else if ( flags & wxHTML_FIND_NEAREST_AFTER ) + { + wxHtmlCell *c; + for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) + { + if ( cell->IsFormattingCell() ) + continue; + 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; + } + } + else if ( flags & wxHTML_FIND_NEAREST_BEFORE ) + { + wxHtmlCell *c2, *c = NULL; + for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) + { + 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 - cellY, flags); + if (c2) + c = c2; + } + if (c) return c; + } + + return NULL; +} + + +void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) +{ + wxHtmlCell *cell = FindCellByPos(x, y); + if ( cell ) + cell->OnMouseClick(parent, x, y, event); } -void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right) +wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const { - if (m_Cells) { - wxHtmlCell *c = m_Cells; - while (c) { - if ( (c -> GetPosX() <= x) && - (c -> GetPosY() <= y) && - (c -> GetPosX() + c -> GetWidth() > x) && - (c -> GetPosY() + c -> GetHeight() > y)) { - c -> OnMouseClick(parent, x - c -> GetPosX(), y - c -> GetPosY(), left, middle, right); - break; - } - c = c -> GetNext(); + if ( m_Cells ) + { + wxHtmlCell *c2; + for (wxHtmlCell *c = m_Cells; c; c = c->GetNext()) + { + c2 = c->GetFirstTerminal(); + if ( c2 ) + return c2; } } + return NULL; } +wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const +{ + if ( m_Cells ) + { + // most common case first: + wxHtmlCell *c = m_LastCell->GetLastTerminal(); + if ( c ) + return c; + + wxHtmlCell *ctmp; + wxHtmlCell *c2 = NULL; + for (c = m_Cells; c; c = c->GetNext()) + { + ctmp = c->GetLastTerminal(); + if ( ctmp ) + c2 = ctmp; + } + return c2; + } + else + return NULL; +} +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 view_y1, int view_y2) +void wxHtmlColourCell::Draw(wxDC& dc, + int x, int y, + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& info) { - if (m_Flags & HTML_CLR_FOREGROUND) - dc.SetTextForeground(m_Colour); - if (m_Flags & HTML_CLR_BACKGROUND) { - dc.SetBackground(wxBrush(m_Colour, wxSOLID)); - dc.SetTextBackground(m_Colour); - } - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); + DrawInvisible(dc, x, y, info); } -void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlColourCell::DrawInvisible(wxDC& dc, + int WXUNUSED(x), int WXUNUSED(y), + wxHtmlRenderingInfo& info) { - if (m_Flags & HTML_CLR_FOREGROUND) - dc.SetTextForeground(m_Colour); - if (m_Flags & HTML_CLR_BACKGROUND) { - dc.SetBackground(wxBrush(m_Colour, wxSOLID)); - dc.SetTextBackground(m_Colour); + wxHtmlRenderingState& state = info.GetState(); + if (m_Flags & wxHTML_CLR_FOREGROUND) + { + state.SetFgColour(m_Colour); + if (state.GetSelectionState() != wxHTML_SEL_IN) + 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)); + } + else + { + wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour); + dc.SetTextBackground(c); + dc.SetBackground(wxBrush(c, wxSOLID)); + } } - wxHtmlCell::DrawInvisible(dc, x, y); } -//-------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- // wxHtmlFontCell -//-------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell) -void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlFontCell::Draw(wxDC& dc, + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) { - dc.SetFont(*m_Font); - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); + dc.SetFont(m_Font); } -void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), + wxHtmlRenderingInfo& WXUNUSED(info)) { - dc.SetFont(*m_Font); - wxHtmlCell::DrawInvisible(dc, x, y); + dc.SetFont(m_Font); } @@ -438,74 +1261,137 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y) -//-------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- // wxHtmlWidgetCell -//-------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell) wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w) { int sx, sy; m_Wnd = wnd; - m_Wnd -> GetSize(&sx, &sy); + m_Wnd->GetSize(&sx, &sy); m_Width = sx, m_Height = sy; m_WidthFloat = w; } -void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) { int absx = 0, absy = 0, stx, sty; wxHtmlCell *c = this; - while (c) { - absx += c -> GetPosX(); - absy += c -> GetPosY(); - c = c -> GetParent(); + while (c) + { + absx += c->GetPosX(); + absy += c->GetPosY(); + c = c->GetParent(); } -/* - ((wxScrolledWindow*)(m_Wnd -> GetParent())) -> ViewStart(&stx, &sty); - m_Wnd -> SetSize(absx - HTML_SCROLL_STEP * stx, absy - HTML_SCROLL_STEP * sty, m_Width, m_Height); -*/ - - m_Wnd -> SetSize(absx, absy, m_Width, m_Height); - - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); + ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty); + m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height); } -void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + wxHtmlRenderingInfo& WXUNUSED(info)) { int absx = 0, absy = 0, stx, sty; wxHtmlCell *c = this; - while (c) { - absx += c -> GetPosX(); - absy += c -> GetPosY(); - c = c -> GetParent(); + while (c) + { + absx += c->GetPosX(); + absy += c->GetPosY(); + c = c->GetParent(); } - -/* - ((wxScrolledWindow*)(m_Wnd -> GetParent())) -> ViewStart(&stx, &sty); - m_Wnd -> SetSize(absx - HTML_SCROLL_STEP * stx, absy - HTML_SCROLL_STEP * sty, m_Width, m_Height); -*/ - m_Wnd -> SetSize(absx, absy, m_Width, m_Height); - - wxHtmlCell::DrawInvisible(dc, x, y); + ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty); + m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height); } void wxHtmlWidgetCell::Layout(int w) { - if (m_WidthFloat != 0) { + if (m_WidthFloat != 0) + { m_Width = (w * m_WidthFloat) / 100; - m_Wnd -> SetSize(m_Width, m_Height); + m_Wnd->SetSize(m_Width, m_Height); } wxHtmlCell::Layout(w); } + + +// ---------------------------------------------------------------------------- +// wxHtmlTerminalCellsInterator +// ---------------------------------------------------------------------------- + +const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++() +{ + if ( !m_pos ) + return NULL; + + do + { + if ( m_pos == m_to ) + { + m_pos = NULL; + return NULL; + } + + if ( m_pos->GetNext() ) + m_pos = m_pos->GetNext(); + else + { + // we must go up the hierarchy until we reach container where this + // is not the last child, and then go down to first terminal cell: + while ( m_pos->GetNext() == NULL ) + { + m_pos = m_pos->GetParent(); + if ( !m_pos ) + return NULL; + } + m_pos = m_pos->GetNext(); + } + while ( m_pos->GetFirstChild() != NULL ) + m_pos = m_pos->GetFirstChild(); + } while ( !m_pos->IsTerminalCell() ); + + return m_pos; +} + + + + + + + +//----------------------------------------------------------------------------- +// Cleanup +//----------------------------------------------------------------------------- + +class wxHtmlCellModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxHtmlCellModule) +public: + wxHtmlCellModule() : wxModule() {} + bool OnInit() { return true; } + void OnExit() + { + wxDELETE(gs_cursorLink); + wxDELETE(gs_cursorText); + } +}; + +IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellModule, wxModule) + #endif