X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/html/m_tables.cpp diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index ea4491ac59..07f7b61658 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_tables.cpp +// Name: src/html/m_tables.cpp // Purpose: wxHtml module for tables // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -9,13 +9,15 @@ #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/wxcrtvararg.h" + #include "wx/brush.h" #endif #include "wx/html/forcelnk.h" @@ -42,7 +44,7 @@ struct colStruct // ('width' is the number, 'units' determines its meaning) int minWidth, maxWidth; // minimal/maximal column width. This is needed by HTML 4.0 - // layouting algorithm and can be determined by trying to + // layout algorithm and can be determined by trying to // layout table cells with width=1 and width=infinity int leftpos, pixwidth, maxrealwidth; // temporary (depends on actual width of table) @@ -70,8 +72,6 @@ class wxHtmlTableCell : public wxHtmlContainerCell protected: /* These are real attributes: */ - // should we draw borders or not? - bool m_HasBorders; // number of columns; rows int m_NumCols, m_NumRows; // array of column information @@ -98,12 +98,17 @@ private: public: wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); - ~wxHtmlTableCell(); + virtual ~wxHtmlTableCell(); + + virtual void RemoveExtraSpacing(bool top, bool bottom); + virtual void Layout(int w); void AddRow(const wxHtmlTag& tag); void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag); + const wxColour& GetRowDefaultBackgroundColour() const { return m_rBkg; } + private: // Reallocates memory to given number of cols/rows // and changes m_NumCols/m_NumRows value to reflect this change @@ -115,7 +120,7 @@ private: // only once, before first Layout(). void ComputeMinMaxWidths(); - DECLARE_NO_COPY_CLASS(wxHtmlTableCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell); }; @@ -124,8 +129,6 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t : wxHtmlContainerCell(parent) { m_PixelScale = pixel_scale; - m_HasBorders = - (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0")); m_ColsInfo = NULL; m_NumCols = m_NumRows = 0; m_CellInfo = NULL; @@ -133,7 +136,11 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t /* scan params: */ if (tag.HasParam(wxT("BGCOLOR"))) + { tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg); + if (m_tBkg.IsOk()) + SetBackgroundColour(m_tBkg); + } if (tag.HasParam(wxT("VALIGN"))) m_tValign = tag.GetParam(wxT("VALIGN")); else @@ -145,8 +152,20 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t m_Spacing = (int)(m_PixelScale * (double)m_Spacing); m_Padding = (int)(m_PixelScale * (double)m_Padding); - if (m_HasBorders) - SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2); + if(tag.HasParam(wxT("BORDER"))) + { + if(tag.GetParam("BORDER").IsEmpty()) + m_Border = 1; + else + tag.GetParamAsInt(wxT("BORDER"), &m_Border); + } + if (m_Border == 1) + SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2, m_Border); // special case see wxHtmlContainerCell::Draw + else if (m_Border> 0) + SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2, (int)(m_PixelScale * (double)m_Border)); + else + m_Border = 0; + } @@ -163,6 +182,15 @@ wxHtmlTableCell::~wxHtmlTableCell() } +void wxHtmlTableCell::RemoveExtraSpacing(bool WXUNUSED(top), + bool WXUNUSED(bottom)) +{ + // Don't remove any spacing in the table -- it's always desirable, + // because it's part of table's definition. + // (If wxHtmlContainerCell::RemoveExtraSpacing() was applied to tables, + // then upper left cell of a table would be positioned above other cells + // if the table was the first element on the page.) +} void wxHtmlTableCell::ReallocCols(int cols) { @@ -263,16 +291,21 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) { wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == wxT('%')) + if (!wd.empty() && wd[wd.length()-1] == wxT('%')) { - wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width); - m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; + if ( wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width) == 1 ) + { + m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; + } } else { - wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width); - m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width); - m_ColsInfo[c].units = wxHTML_UNITS_PIXELS; + long width; + if ( wd.ToLong(&width) ) + { + m_ColsInfo[c].width = (int)(m_PixelScale * (double)width); + m_ColsInfo[c].units = wxHTML_UNITS_PIXELS; + } } } } @@ -314,10 +347,10 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) wxColour bk = m_rBkg; if (tag.HasParam(wxT("BGCOLOR"))) tag.GetParamAsColour(wxT("BGCOLOR"), &bk); - if (bk.Ok()) + if (bk.IsOk()) cell->SetBackgroundColour(bk); } - if (m_HasBorders) + if (m_Border > 0) cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1); // vertical alignment: @@ -391,7 +424,7 @@ void wxHtmlTableCell::ComputeMinMaxWidths() else m_MaxTotalWidth = m_MaxTotalWidth * 100 / (100 - percentage); - m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing; + m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing + 2 * m_Border; } void wxHtmlTableCell::Layout(int w) @@ -430,7 +463,7 @@ void wxHtmlTableCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ @@ -439,7 +472,7 @@ void wxHtmlTableCell::Layout(int w) The algorithm tries to keep the table size less than w if possible. */ { - int wpix = m_Width - (m_NumCols + 1) * m_Spacing; + int wpix = m_Width - (m_NumCols + 1) * m_Spacing - 2 * m_Border; // Available space for cell content int i, j; // 1a. setup fixed-width columns: @@ -478,7 +511,7 @@ void wxHtmlTableCell::Layout(int w) else newWidth = newWidth * 100 / (100 - percentage); - newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing); + newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing - 2 * m_Border); wpix -= m_Width - newWidth; m_Width = newWidth; } @@ -492,7 +525,7 @@ void wxHtmlTableCell::Layout(int w) m_ColsInfo[i].pixwidth = wxMin(m_ColsInfo[i].width, 100) * wpix / 100; // Make sure to leave enough space for the other columns - int minRequired = 0; + int minRequired = m_Border; for (j = 0; j < m_NumCols; j++) { if ((m_ColsInfo[j].units == wxHTML_UNITS_PERCENT && j > i) || @@ -503,7 +536,7 @@ void wxHtmlTableCell::Layout(int w) wtemp -= m_ColsInfo[i].pixwidth; } - wpix = wtemp; + wpix = wtemp; // minimum cells width // 1d. setup default columns (no width specification supplied): // The algorithm assigns calculates the maximum possible width if line @@ -514,8 +547,8 @@ void wxHtmlTableCell::Layout(int w) for (i = j = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) j++; - if (wpix < 0) - wpix = 0; + if (wpix < m_Border) + wpix = m_Border; // Assign widths for (i = 0; i < m_NumCols; i++) @@ -553,12 +586,16 @@ void wxHtmlTableCell::Layout(int w) /* 2. compute positions of columns: */ { - int wpos = m_Spacing; + int wpos = m_Spacing + m_Border; for (int i = 0; i < m_NumCols; i++) { m_ColsInfo[i].leftpos = wpos; wpos += m_ColsInfo[i].pixwidth + m_Spacing; } + + // add the remaining space to the last column + if (m_NumCols > 0 && wpos < m_Width - m_Border) + m_ColsInfo[m_NumCols-1].pixwidth += m_Width - wpos - m_Border; } /* 3. sub-layout all cells: */ @@ -569,7 +606,7 @@ void wxHtmlTableCell::Layout(int w) int fullwid; wxHtmlContainerCell *actcell; - ypos[0] = m_Spacing; + ypos[0] = m_Spacing + m_Border; for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1; for (actrow = 0; actrow < m_NumRows; actrow++) { @@ -611,7 +648,7 @@ void wxHtmlTableCell::Layout(int w) actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); } } - m_Height = ypos[m_NumRows]; + m_Height = ypos[m_NumRows] + m_Border; delete[] ypos; } @@ -619,7 +656,7 @@ void wxHtmlTableCell::Layout(int w) if (m_NumCols > 0) { int twidth = m_ColsInfo[m_NumCols-1].leftpos + - m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing; + m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing + m_Border; if (twidth > m_Width) m_Width = twidth; } @@ -640,10 +677,43 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") TAG_HANDLER_VARS wxHtmlTableCell* m_Table; wxString m_tAlign, m_rAlign; + wxHtmlContainerCell *m_enclosingContainer; + + // Call ParseInner() preserving background colour and mode after any + // changes done by it. + void CallParseInnerWithBg(const wxHtmlTag& tag, const wxColour& colBg) + { + const wxColour oldbackclr = m_WParser->GetActualBackgroundColor(); + const int oldbackmode = m_WParser->GetActualBackgroundMode(); + if ( colBg.IsOk() ) + { + m_WParser->SetActualBackgroundColor(colBg); + m_WParser->SetActualBackgroundMode(wxBRUSHSTYLE_SOLID); + m_WParser->GetContainer()->InsertCell( + new wxHtmlColourCell(colBg, wxHTML_CLR_BACKGROUND) + ); + } + + ParseInner(tag); + + if ( oldbackmode != m_WParser->GetActualBackgroundMode() || + oldbackclr != m_WParser->GetActualBackgroundColor() ) + { + m_WParser->SetActualBackgroundMode(oldbackmode); + m_WParser->SetActualBackgroundColor(oldbackclr); + m_WParser->GetContainer()->InsertCell( + new wxHtmlColourCell(oldbackclr, + oldbackmode == wxBRUSHSTYLE_TRANSPARENT + ? wxHTML_CLR_TRANSPARENT_BACKGROUND + : wxHTML_CLR_BACKGROUND) + ); + } + } TAG_HANDLER_CONSTR(TABLE) { m_Table = NULL; + m_enclosingContainer = NULL; m_tAlign = m_rAlign = wxEmptyString; } @@ -656,29 +726,28 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") if (tag.GetName() == wxT("TABLE")) { wxHtmlTableCell *oldt = m_Table; - wxHtmlContainerCell *oldcont; - oldcont = c = m_WParser->OpenContainer(); + wxHtmlContainerCell *oldEnclosing = m_enclosingContainer; + m_enclosingContainer = c = m_WParser->OpenContainer(); - m_Table = new wxHtmlTableCell(c, tag); + m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale()); // width: { if (tag.HasParam(wxT("WIDTH"))) { - wxString wd = tag.GetParam(wxT("WIDTH")); - - if (wd[wd.Length()-1] == wxT('%')) - { - int width = 0; - wxSscanf(wd.c_str(), wxT("%i%%"), &width); - m_Table->SetWidthFloat(width, wxHTML_UNITS_PERCENT); - } - else + int width = 0; + bool wpercent = false; + if (tag.GetParamAsIntOrPercent(wxT("WIDTH"), &width, wpercent)) { - int width = 0; - wxSscanf(wd.c_str(), wxT("%i"), &width); - m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS); + if (wpercent) + { + m_Table->SetWidthFloat(width, wxHTML_UNITS_PERCENT); + } + else + { + m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS); + } } } else @@ -689,14 +758,16 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") if (tag.HasParam(wxT("ALIGN"))) m_tAlign = tag.GetParam(wxT("ALIGN")); - ParseInner(tag); + CallParseInnerWithBg(tag, m_Table->GetBackgroundColour()); m_WParser->SetAlign(oldAlign); - m_WParser->SetContainer(oldcont); + m_WParser->SetContainer(m_enclosingContainer); m_WParser->CloseContainer(); m_Table = oldt; - return true; + m_enclosingContainer = oldEnclosing; + + return true; // ParseInner() called } @@ -719,27 +790,60 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") m_WParser->OpenContainer(); - if (tag.GetName() == wxT("TH")) /*header style*/ - m_WParser->SetAlign(wxHTML_ALIGN_CENTER); - else - m_WParser->SetAlign(wxHTML_ALIGN_LEFT); + const bool isHeader = tag.GetName() == wxT("TH"); wxString als; - - als = m_rAlign; if (tag.HasParam(wxT("ALIGN"))) als = tag.GetParam(wxT("ALIGN")); + else + als = m_rAlign; als.MakeUpper(); + if (als == wxT("RIGHT")) m_WParser->SetAlign(wxHTML_ALIGN_RIGHT); else if (als == wxT("LEFT")) m_WParser->SetAlign(wxHTML_ALIGN_LEFT); else if (als == wxT("CENTER")) m_WParser->SetAlign(wxHTML_ALIGN_CENTER); + else // use default alignment + m_WParser->SetAlign(isHeader ? wxHTML_ALIGN_CENTER + : wxHTML_ALIGN_LEFT); m_WParser->OpenContainer(); + + // the header should be rendered in bold by default + int boldOld = 0; + if ( isHeader ) + { + boldOld = m_WParser->GetFontBold(); + m_WParser->SetFontBold(true); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + } + + wxColour bgCol; + if ( !tag.GetParamAsColour(wxT("BGCOLOR"), &bgCol) ) + bgCol = m_Table->GetRowDefaultBackgroundColour(); + + CallParseInnerWithBg(tag, bgCol); + + if ( isHeader ) + { + m_WParser->SetFontBold(boldOld); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + } + + // set the current container back to the enclosing one so that + // text outside of and isn't included in any cell + // (this happens often enough in practice because it's common + // to use whitespace between and the next ): + m_WParser->SetContainer(m_enclosingContainer); + + return true; // ParseInner() called } } + return false; }