X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52cac90cda8f499169a247e7f23c985b16a70e6..399b60a0ad232265cd74ce8bf6a53a1f2cc57ff2:/src/html/htmlcell.cpp?ds=inline diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index eab1485438..0ca4bb2524 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -33,23 +33,40 @@ // wxHtmlCell //----------------------------------------------------------------------------- +wxHtmlCell::wxHtmlCell() : wxObject() +{ + m_Next = NULL; + m_Parent = NULL; + m_Width = m_Height = m_Descent = 0; + m_CanLiveOnPagebreak = TRUE; + m_Link = NULL; +} + +wxHtmlCell::~wxHtmlCell() +{ + if (m_Link) delete m_Link; + if (m_Next) delete m_Next; +} + -void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, - bool WXUNUSED(left), - bool WXUNUSED(middle), - bool WXUNUSED(right)) +void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, + const wxMouseEvent& event) { - wxString lnk = GetLink(x, y); - if (lnk != wxEmptyString) - ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk); + wxHtmlLinkInfo *lnk = GetLink(x, y); + if (lnk != NULL) + { + wxHtmlLinkInfo lnk2(*lnk); + lnk2.SetEvent(&event); + lnk2.SetHtmlCell(this); + ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk2); // note : this overcasting is legal because parent is *always* wxHtmlWindow + } } -bool wxHtmlCell::AdjustPagebreak(int *pagebreak) +bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const { - if ((!m_CanLiveOnPagebreak) && m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) { *pagebreak = m_PosY; @@ -65,6 +82,44 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak) +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 w) +{ + SetPos(0, 0); + if (m_Next) m_Next -> Layout(w); +} + + +void wxHtmlCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +{ + if (m_Next) m_Next -> Draw(dc, x, y, view_y1, view_y2); +} + + + +void wxHtmlCell::DrawInvisible(wxDC& dc, int x, int y) +{ + if (m_Next) m_Next -> DrawInvisible(dc, x, y); +} + + + +const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const +{ + if (m_Next) return m_Next -> Find(condition, param); + else return NULL; +} + + //----------------------------------------------------------------------------- // wxHtmlWordCell @@ -73,20 +128,119 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak) wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() { m_Word = word; + + if (m_Word.Find(wxT('&')) != -1) + { +#define ESCSEQ(escape, subst) \ + { wxT("&"escape";"), wxT("&"escape" "), wxT(subst) } + static wxChar* substitutions[][3] = + { + ESCSEQ("quot", "\""), + ESCSEQ("lt", "<"), + ESCSEQ("gt", ">"), + + ESCSEQ("nbsp", " "), + ESCSEQ("iexcl", "!"), + ESCSEQ("cent", "¢"), + + ESCSEQ("yen", " "), + ESCSEQ("brkbar", " "), + ESCSEQ("sect", " "), + ESCSEQ("uml", " "), + + ESCSEQ("copy", "(c)"), + ESCSEQ("ordf", " "), + ESCSEQ("laquo", " "), + ESCSEQ("not", " "), + + ESCSEQ("reg", "(r)"), + + ESCSEQ("deg", " "), + ESCSEQ("plusm", " "), + + ESCSEQ("acute", " "), + ESCSEQ("micro", " "), + ESCSEQ("para", " "), + + ESCSEQ("ordm", " "), + ESCSEQ("raquo", " "), + + ESCSEQ("iquest", " "), + ESCSEQ("Agrave", "À"), + + ESCSEQ("Acirc", "Â"), + ESCSEQ("Atilde", "Ã"), + ESCSEQ("Auml", "Ä"), + ESCSEQ("Aring", " "), + ESCSEQ("AElig", " "), + ESCSEQ("Ccedil", "ç"), + ESCSEQ("Egrave", "È"), + ESCSEQ("Eacute", "É"), + ESCSEQ("Ecirc", "Ê"), + ESCSEQ("Euml", "Ë"), + ESCSEQ("Igrave", "Ì"), + + ESCSEQ("Icirc", "Î"), + ESCSEQ("Iuml", "Ï"), + + ESCSEQ("Ntilde", "Ñ"), + ESCSEQ("Ograve", "Ò"), + + ESCSEQ("Ocirc", "Ô"), + ESCSEQ("Otilde", "Õ"), + ESCSEQ("Ouml", "Ö"), + + ESCSEQ("Oslash", " "), + ESCSEQ("Ugrave", "Ù"), + + ESCSEQ("Ucirc", " "), + ESCSEQ("Uuml", "Ü"), + + ESCSEQ("szlig", "§"), + ESCSEQ("agrave;","à"), + ESCSEQ("aacute", "á"), + ESCSEQ("acirc", "â"), + ESCSEQ("atilde", "ã"), + ESCSEQ("auml", "ä"), + ESCSEQ("aring", "a"), + ESCSEQ("aelig", "ae"), + ESCSEQ("ccedil", "ç"), + ESCSEQ("egrave", "è"), + ESCSEQ("eacute", "é"), + ESCSEQ("ecirc", "ê"), + ESCSEQ("euml", "ë"), + ESCSEQ("igrave", "ì"), + ESCSEQ("iacute", "í"), + ESCSEQ("icirc", " "), + ESCSEQ("iuml", "ï"), + ESCSEQ("eth", " "), + ESCSEQ("ntilde", "ñ"), + ESCSEQ("ograve", "ò"), + ESCSEQ("oacute", "ó"), + ESCSEQ("ocirc", "ô"), + ESCSEQ("otilde", "õ"), + ESCSEQ("ouml", "ö"), + ESCSEQ("divide", " "), + ESCSEQ("oslash", " "), + ESCSEQ("ugrave", "ù"), + ESCSEQ("uacute", "ú"), + ESCSEQ("ucirc", "û"), + ESCSEQ("uuml", "ü"), + + ESCSEQ("yuml", ""), - m_Word.Replace(wxT(" "), wxT(" "), TRUE); - m_Word.Replace(wxT("©"), wxT("(c)"), TRUE); - m_Word.Replace(wxT("""), wxT("\""), TRUE); - m_Word.Replace(wxT("<"), wxT("<"), TRUE); - m_Word.Replace(wxT(">"), wxT(">"), TRUE); - m_Word.Replace(wxT("&"), wxT("&"), TRUE); + /* this one should ALWAYS stay the last one!!! */ + ESCSEQ("amp", "&"), - m_Word.Replace(wxT("  "), wxT(" "), TRUE); - m_Word.Replace(wxT("© "), wxT("(c)"), TRUE); - m_Word.Replace(wxT("" "), wxT("\""), TRUE); - m_Word.Replace(wxT("< "), wxT("<"), TRUE); - m_Word.Replace(wxT("> "), wxT(">"), TRUE); - m_Word.Replace(wxT("& "), wxT("&"), TRUE); + { NULL, NULL, NULL } + }; + + for (int i = 0; substitutions[i][0] != NULL; i++) + { + m_Word.Replace(substitutions[i][0], substitutions[i][2], TRUE); + m_Word.Replace(substitutions[i][1], substitutions[i][2], TRUE); + } + } dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); SetCanLiveOnPagebreak(FALSE); @@ -118,8 +272,14 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; m_UseBkColour = FALSE; m_UseBorder = FALSE; - m_MinHeight = m_MaxLineWidth = 0; + m_MinHeight = 0; m_MinHeightAlign = wxHTML_ALIGN_TOP; + m_LastLayout = -1; +} + +wxHtmlContainerCell::~wxHtmlContainerCell() +{ + if (m_Cells) delete m_Cells; } @@ -131,6 +291,7 @@ void wxHtmlContainerCell::SetIndent(int i, int what, int units) 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; } @@ -160,7 +321,7 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const -bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) +bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const { if (!m_CanLiveOnPagebreak) return wxHtmlCell::AdjustPagebreak(pagebreak); @@ -183,11 +344,19 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) void wxHtmlContainerCell::Layout(int w) { + if (m_LastLayout == w) { + wxHtmlCell::Layout(w); + return; + } + wxHtmlCell *cell = m_Cells, *line = m_Cells; long xpos = 0, ypos = m_IndentTop; int xdelta = 0, ybasicpos = 0, ydiff; int s_width, s_indent; int ysizeup = 0, ysizedown = 0; + int MaxLineWidth = 0; + int xcnt = 0; + /* @@ -220,8 +389,6 @@ 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); - m_MaxLineWidth = 0; - // my own layouting: while (cell != NULL) { switch (m_AlignVer) { @@ -237,28 +404,53 @@ void wxHtmlContainerCell::Layout(int w) cell -> SetPos(xpos, ybasicpos + cell -> GetDescent()); xpos += cell -> GetWidth(); cell = cell -> GetNext(); + xcnt++; // force new line if occured: if ((cell == NULL) || (xpos + cell -> GetWidth() > s_width)) { - if (xpos > m_MaxLineWidth) m_MaxLineWidth = xpos; + if (xpos > MaxLineWidth) MaxLineWidth = xpos; if (ysizeup < 0) ysizeup = 0; if (ysizedown < 0) ysizedown = 0; switch (m_AlignHor) { - case wxHTML_ALIGN_LEFT : xdelta = 0; break; - case wxHTML_ALIGN_RIGHT : xdelta = 0 + (s_width - xpos); break; - case wxHTML_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(); + } + xcnt++; } ypos += ysizedown; - xpos = 0; + xpos = xcnt = 0; ysizeup = ysizedown = 0; line = cell; } @@ -280,8 +472,10 @@ void wxHtmlContainerCell::Layout(int w) 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; + MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); + if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; + + m_LastLayout = w; wxHtmlCell::Layout(w); } @@ -338,7 +532,7 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y) -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; @@ -350,7 +544,7 @@ wxString wxHtmlContainerCell::GetLink(int x, int y) const return c -> GetLink(x - cx, y - cy); c = c -> GetNext(); } - return wxEmptyString; + return NULL; } @@ -364,40 +558,45 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f) if (m_LastCell) while (m_LastCell -> GetNext()) m_LastCell = m_LastCell -> GetNext(); } 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") + if (alg == wxT("CENTER")) SetAlignHor(wxHTML_ALIGN_CENTER); - else if (alg == "LEFT") + else if (alg == wxT("LEFT")) SetAlignHor(wxHTML_ALIGN_LEFT); - else if (alg == "RIGHT") + 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] == '%') { + if (wd[wd.Length()-1] == wxT('%')) { wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); SetWidthFloat(wdi, wxHTML_UNITS_PERCENT); } else { wxSscanf(wd.c_str(), wxT("%i"), &wdi); - SetWidthFloat(wdi, wxHTML_UNITS_PIXELS); + SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS); } + m_LastLayout = -1; } } @@ -417,7 +616,7 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co -void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right) +void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) { if (m_Cells) { wxHtmlCell *c = m_Cells; @@ -426,7 +625,7 @@ void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, bool left (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); + c -> OnMouseClick(parent, x - c -> GetPosX(), y - c -> GetPosY(), event); break; } c = c -> GetNext(); @@ -473,13 +672,13 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y) void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) { - dc.SetFont(*m_Font); + dc.SetFont(m_Font); wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); } void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y) { - dc.SetFont(*m_Font); + dc.SetFont(m_Font); wxHtmlCell::DrawInvisible(dc, x, y); }