X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/src/html/m_tables.cpp diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index a93a089c9a..3e47cb4ff9 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -1,41 +1,30 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mod_tables.cpp +// Name: src/html/m_tables.cpp // Purpose: wxHtml module for tables // Author: Vaclav Slavik -// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - -#include +#include "wx/wxprec.h" -#if wxUSE_HTML -#ifdef __BORDLANDC__ -#pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#ifndef WXPRECOMP -#include -#endif - - -/* -REMARKS: - 1. This version of mod_tables doesn't support auto-layout algorithm. - This means that all columns are of same width unless explicitly specified. -*/ +#if wxUSE_HTML && wxUSE_STREAMS +#ifndef WX_PRECOMP + #include "wx/wxcrtvararg.h" + #include "wx/brush.h" +#endif #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" #include "wx/html/htmlcell.h" -FORCE_LINK_ME(mod_tables) +FORCE_LINK_ME(m_tables) #define TABLE_BORDER_CLR_1 wxColour(0xC5, 0xC2, 0xC5) @@ -47,87 +36,135 @@ FORCE_LINK_ME(mod_tables) //----------------------------------------------------------------------------- -typedef struct { - int width, units; // universal - int leftpos, pixwidth, maxrealwidth; // temporary (depends on width of table) - } colStruct; +struct colStruct +{ + int width, units; + // width of the column either in pixels or percents + // ('width' is the number, 'units' determines its meaning) + int minWidth, maxWidth; + // minimal/maximal column width. This is needed by HTML 4.0 + // 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) +}; -typedef enum { - cellSpan, - cellUsed, - cellFree - } cellState; +enum cellState +{ + cellSpan, + cellUsed, + cellFree +}; -typedef struct { - wxHtmlContainerCell *cont; - int colspan, rowspan; - int minheight, valign; - cellState flag; - } cellStruct; +struct cellStruct +{ + wxHtmlContainerCell *cont; + int colspan, rowspan; + int minheight, valign; + cellState flag; + bool nowrap; +}; class wxHtmlTableCell : public wxHtmlContainerCell { - protected: - /* These are real attributes: */ - bool m_HasBorders; - // should we draw borders or not? - int m_NumCols, m_NumRows; - // number of columns; rows - colStruct *m_ColsInfo; - // array of column information - cellStruct **m_CellInfo; - // 2D array of all cells in the table : m_CellInfo[row][column] - int m_Spacing; - // spaces between cells - int m_Padding; - // cells internal indentation - - private: - /* ...and these are valid only during parsing of table: */ - int m_ActualCol, m_ActualRow; - // number of actual column (ranging from 0..m_NumCols) - - // default values (for table and row): - int m_tBkg, m_rBkg; - wxString m_tValign, m_rValign; - - - public: - wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag); - ~wxHtmlTableCell(); - virtual void Layout(int w); - - void AddRow(const wxHtmlTag& tag); - void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag); - private: - void ReallocCols(int cols); - void ReallocRows(int rows); - // reallocates memory to given number of cols/rows - // and changes m_NumCols/m_NumRows value to reflect this change - // NOTE! You CAN'T change m_NumCols/m_NumRows before calling this!! +protected: + /* These are real attributes: */ + + // number of columns; rows + int m_NumCols, m_NumRows; + // array of column information + colStruct *m_ColsInfo; + // 2D array of all cells in the table : m_CellInfo[row][column] + cellStruct **m_CellInfo; + // spaces between cells + int m_Spacing; + // cells internal indentation + int m_Padding; + +private: + /* ...and these are valid only when parsing the table: */ + + // number of actual column (ranging from 0..m_NumCols) + int m_ActualCol, m_ActualRow; + + // default values (for table and row): + wxColour m_tBkg, m_rBkg; + wxString m_tValign, m_rValign; + + double m_PixelScale; + + +public: + wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); + 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 + // NOTE! You CAN'T change m_NumCols/m_NumRows before calling this!! + void ReallocCols(int cols); + void ReallocRows(int rows); + + // Computes minimal and maximal widths of columns. Needs to be called + // only once, before first Layout(). + void ComputeMinMaxWidths(); + + wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell); }; -wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag) +wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale) : wxHtmlContainerCell(parent) { - m_HasBorders = tag.HasParam("BORDER"); + m_PixelScale = pixel_scale; m_ColsInfo = NULL; m_NumCols = m_NumRows = 0; m_CellInfo = NULL; m_ActualCol = m_ActualRow = -1; /* scan params: */ - m_tBkg = m_rBkg = -1; - if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &m_tBkg); - if (tag.HasParam("VALIGN")) m_tValign = tag.GetParam("VALIGN"); else m_tValign = wxEmptyString; - if (tag.HasParam("CELLSPACING") && tag.ScanParam("CELLSPACING", "%i", &m_Spacing) == 1) {} else m_Spacing = 2; - if (tag.HasParam("CELLPADDING") && tag.ScanParam("CELLPADDING", "%i", &m_Padding) == 1) {} else m_Padding = 3; - - if (m_HasBorders) - SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2); + 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 + m_tValign = wxEmptyString; + if (!tag.GetParamAsInt(wxT("CELLSPACING"), &m_Spacing)) + m_Spacing = 2; + if (!tag.GetParamAsInt(wxT("CELLPADDING"), &m_Padding)) + m_Padding = 3; + m_Spacing = (int)(m_PixelScale * (double)m_Spacing); + m_Padding = (int)(m_PixelScale * (double)m_Padding); + + 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; + } @@ -135,7 +172,8 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t wxHtmlTableCell::~wxHtmlTableCell() { if (m_ColsInfo) free(m_ColsInfo); - if (m_CellInfo) { + if (m_CellInfo) + { for (int i = 0; i < m_NumRows; i++) free(m_CellInfo[i]); free(m_CellInfo); @@ -143,21 +181,33 @@ 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) { int i,j; - for (i = 0; i < m_NumRows; i++) { + for (i = 0; i < m_NumRows; i++) + { m_CellInfo[i] = (cellStruct*) realloc(m_CellInfo[i], sizeof(cellStruct) * cols); for (j = m_NumCols; j < cols; j++) m_CellInfo[i][j].flag = cellFree; } m_ColsInfo = (colStruct*) realloc(m_ColsInfo, sizeof(colStruct) * cols); - for (j = m_NumCols; j < cols; j++) { + for (j = m_NumCols; j < cols; j++) + { m_ColsInfo[j].width = 0; - m_ColsInfo[j].units = HTML_UNITS_PERCENT; + m_ColsInfo[j].units = wxHTML_UNITS_PERCENT; + m_ColsInfo[j].minWidth = m_ColsInfo[j].maxWidth = -1; } m_NumCols = cols; @@ -168,39 +218,58 @@ void wxHtmlTableCell::ReallocCols(int cols) void wxHtmlTableCell::ReallocRows(int rows) { m_CellInfo = (cellStruct**) realloc(m_CellInfo, sizeof(cellStruct*) * rows); - if (m_NumCols != 0) { - int x = rows - 1; - m_CellInfo[x] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols); - for (int i = 0; i < m_NumCols; i++) - m_CellInfo[x][i].flag = cellFree; + for (int row = m_NumRows; row < rows ; row++) + { + if (m_NumCols == 0) + m_CellInfo[row] = NULL; + else + { + m_CellInfo[row] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols); + for (int col = 0; col < m_NumCols; col++) + m_CellInfo[row][col].flag = cellFree; + } } - else - m_CellInfo[rows - 1] = NULL; m_NumRows = rows; } - void wxHtmlTableCell::AddRow(const wxHtmlTag& tag) { - if (m_ActualRow + 1 > m_NumRows - 1) - ReallocRows(m_ActualRow + 2); - m_ActualRow++; m_ActualCol = -1; + // VS: real allocation of row entry is done in AddCell in order + // to correctly handle empty rows (i.e. "") + // m_ActualCol == -1 indicates that AddCell has to allocate new row. - /* scan params: */ + // scan params: m_rBkg = m_tBkg; - if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &m_rBkg); - if (tag.HasParam("VALIGN")) m_rValign = tag.GetParam("VALIGN"); else m_rValign = m_tValign; + if (tag.HasParam(wxT("BGCOLOR"))) + tag.GetParamAsColour(wxT("BGCOLOR"), &m_rBkg); + if (tag.HasParam(wxT("VALIGN"))) + m_rValign = tag.GetParam(wxT("VALIGN")); + else + m_rValign = m_tValign; } void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) { - do { + // Is this cell in new row? + // VS: we can't do it in AddRow, see my comment there + if (m_ActualCol == -1) + { + if (m_ActualRow + 1 > m_NumRows - 1) + ReallocRows(m_ActualRow + 2); + m_ActualRow++; + } + + // cells & columns: + do + { m_ActualCol++; - } while ((m_ActualCol < m_NumCols) && (m_CellInfo[m_ActualRow][m_ActualCol].flag != cellFree)); + } while ((m_ActualCol < m_NumCols) && + (m_CellInfo[m_ActualRow][m_ActualCol].flag != cellFree)); + if (m_ActualCol > m_NumCols - 1) ReallocCols(m_ActualCol + 1); @@ -211,22 +280,31 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) m_CellInfo[r][c].rowspan = 1; m_CellInfo[r][c].flag = cellUsed; m_CellInfo[r][c].minheight = 0; - m_CellInfo[r][c].valign = HTML_ALIGN_TOP; + m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP; /* scan for parameters: */ // width: { - if (tag.HasParam("WIDTH")) { - wxString wd = tag.GetParam("WIDTH"); + if (tag.HasParam(wxT("WIDTH"))) + { + wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == '%') { - sscanf(wd.c_str(), "%i%%", &m_ColsInfo[c].width); - m_ColsInfo[c].units = HTML_UNITS_PERCENT; + if (!wd.empty() && wd[wd.length()-1] == wxT('%')) + { + if ( wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width) == 1 ) + { + m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; + } } - else { - sscanf(wd.c_str(), "%i", &m_ColsInfo[c].width); - m_ColsInfo[c].units = HTML_UNITS_PIXELS; + else + { + long width; + if ( wd.ToLong(&width) ) + { + m_ColsInfo[c].width = (int)(m_PixelScale * (double)width); + m_ColsInfo[c].units = wxHTML_UNITS_PIXELS; + } } } } @@ -234,13 +312,28 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) // spanning: { - if (tag.HasParam("COLSPAN")) tag.ScanParam("COLSPAN", "%i", &m_CellInfo[r][c].colspan); - if (tag.HasParam("ROWSPAN")) tag.ScanParam("ROWSPAN", "%i", &m_CellInfo[r][c].rowspan); - if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1)) { + tag.GetParamAsInt(wxT("COLSPAN"), &m_CellInfo[r][c].colspan); + tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan); + + // VS: the standard says this about col/rowspan: + // "This attribute specifies the number of rows spanned by the + // current cell. The default value of this attribute is one ("1"). + // The value zero ("0") means that the cell spans all rows from the + // current row to the last row of the table." All mainstream + // browsers act as if 0==1, though, and so does wxHTML. + if (m_CellInfo[r][c].colspan < 1) + m_CellInfo[r][c].colspan = 1; + if (m_CellInfo[r][c].rowspan < 1) + m_CellInfo[r][c].rowspan = 1; + + if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1)) + { int i, j; - if (r + m_CellInfo[r][c].rowspan > m_NumRows) ReallocRows(r + m_CellInfo[r][c].rowspan); - if (c + m_CellInfo[r][c].colspan > m_NumCols) ReallocCols(c + m_CellInfo[r][c].colspan); + if (r + m_CellInfo[r][c].rowspan > m_NumRows) + ReallocRows(r + m_CellInfo[r][c].rowspan); + if (c + m_CellInfo[r][c].colspan > m_NumCols) + ReallocCols(c + m_CellInfo[r][c].colspan); for (i = r; i < r + m_CellInfo[r][c].rowspan; i++) for (j = c; j < c + m_CellInfo[r][c].colspan; j++) m_CellInfo[i][j].flag = cellSpan; @@ -250,46 +343,118 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) //background color: { - int bk = m_rBkg; - if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &bk); - if (bk != -1) { - wxColour clr = wxColour((bk & 0xFF0000) >> 16 , (bk & 0x00FF00) >> 8, (bk & 0x0000FF)); - cell -> SetBackgroundColour(clr); - } + wxColour bk = m_rBkg; + if (tag.HasParam(wxT("BGCOLOR"))) + tag.GetParamAsColour(wxT("BGCOLOR"), &bk); + if (bk.IsOk()) + cell->SetBackgroundColour(bk); } - if (m_HasBorders) - cell -> SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1); + if (m_Border > 0) + cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1); // vertical alignment: { wxString valign; - if (tag.HasParam("VALIGN")) valign = tag.GetParam("VALIGN"); else valign = m_tValign; + if (tag.HasParam(wxT("VALIGN"))) + valign = tag.GetParam(wxT("VALIGN")); + else + valign = m_tValign; valign.MakeUpper(); - if (valign == "TOP") m_CellInfo[r][c].valign = HTML_ALIGN_TOP; - else if (valign == "BOTTOM") m_CellInfo[r][c].valign = HTML_ALIGN_BOTTOM; - else m_CellInfo[r][c].valign = HTML_ALIGN_CENTER; + if (valign == wxT("TOP")) + m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP; + else if (valign == wxT("BOTTOM")) + m_CellInfo[r][c].valign = wxHTML_ALIGN_BOTTOM; + else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER; } - cell -> SetIndent(m_Padding, HTML_INDENT_ALL, HTML_UNITS_PIXELS); + // nowrap + if (tag.HasParam(wxT("NOWRAP"))) + m_CellInfo[r][c].nowrap = true; + else + m_CellInfo[r][c].nowrap = false; + + cell->SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); } +void wxHtmlTableCell::ComputeMinMaxWidths() +{ + if (m_NumCols == 0 || m_ColsInfo[0].minWidth != wxDefaultCoord) return; + m_MaxTotalWidth = 0; + int percentage = 0; + for (int c = 0; c < m_NumCols; c++) + { + for (int r = 0; r < m_NumRows; r++) + { + cellStruct& cell = m_CellInfo[r][c]; + if (cell.flag == cellUsed) + { + cell.cont->Layout(2*m_Padding + 1); + int maxWidth = cell.cont->GetMaxTotalWidth(); + int width = cell.nowrap?maxWidth:cell.cont->GetWidth(); + width -= (cell.colspan-1) * m_Spacing; + maxWidth -= (cell.colspan-1) * m_Spacing; + // HTML 4.0 says it is acceptable to distribute min/max + width /= cell.colspan; + maxWidth /= cell.colspan; + for (int j = 0; j < cell.colspan; j++) { + if (width > m_ColsInfo[c+j].minWidth) + m_ColsInfo[c+j].minWidth = width; + if (maxWidth > m_ColsInfo[c+j].maxWidth) + m_ColsInfo[c+j].maxWidth = maxWidth; + } + } + } + // Calculate maximum table width, required for nested tables + if (m_ColsInfo[c].units == wxHTML_UNITS_PIXELS) + m_MaxTotalWidth += wxMax(m_ColsInfo[c].width, m_ColsInfo[c].minWidth); + else if ((m_ColsInfo[c].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[c].width != 0)) + percentage += m_ColsInfo[c].width; + else + m_MaxTotalWidth += m_ColsInfo[c].maxWidth; + } + if (percentage >= 100) + { + // Table would have infinite length + // Make it ridiculous large + m_MaxTotalWidth = 0xFFFFFF; + } + else + m_MaxTotalWidth = m_MaxTotalWidth * 100 / (100 - percentage); + m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing + 2 * m_Border; +} void wxHtmlTableCell::Layout(int w) { + ComputeMinMaxWidths(); + + wxHtmlCell::Layout(w); + /* WIDTH ADJUSTING : */ - if (m_WidthFloatUnits == HTML_UNITS_PERCENT) { - if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100; - else m_Width = m_WidthFloat * w / 100; + if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) + { + if (m_WidthFloat < 0) + { + if (m_WidthFloat < -100) + m_WidthFloat = -100; + m_Width = (100 + m_WidthFloat) * w / 100; + } + else + { + if (m_WidthFloat > 100) + m_WidthFloat = 100; + m_Width = m_WidthFloat * w / 100; + } } - else { + else + { if (m_WidthFloat < 0) m_Width = w + m_WidthFloat; else m_Width = m_WidthFloat; } @@ -297,44 +462,139 @@ void wxHtmlTableCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ - /* 1. setup columns widths: */ + /* 1. setup columns widths: + + 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; - int wtemp = 0; // 1a. setup fixed-width columns: for (i = 0; i < m_NumCols; i++) - if (m_ColsInfo[i].units == HTML_UNITS_PIXELS) - wpix -= (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width); + if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS) + { + m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width, + m_ColsInfo[i].minWidth); + wpix -= m_ColsInfo[i].pixwidth; + } - // 1b. setup floating-width columns: + // 1b. Calculate maximum possible width if line wrapping would be disabled + // Recalculate total width if m_WidthFloat is zero to keep tables as small + // as possible. + int maxWidth = 0; for (i = 0; i < m_NumCols; i++) - if ((m_ColsInfo[i].units == HTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) - wtemp += (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width * wpix / 100); - wpix -= wtemp; + if (m_ColsInfo[i].width == 0) + { + maxWidth += m_ColsInfo[i].maxWidth; + } + + if (!m_WidthFloat) + { + // Recalculate table width since no table width was initially given + int newWidth = m_Width - wpix + maxWidth; + + // Make sure that floating-width columns will have the right size. + // Calculate sum of all floating-width columns + int percentage = 0; + for (i = 0; i < m_NumCols; i++) + if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) + percentage += m_ColsInfo[i].width; + + if (percentage >= 100) + newWidth = w; + else + newWidth = newWidth * 100 / (100 - percentage); + + newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing - 2 * m_Border); + wpix -= m_Width - newWidth; + m_Width = newWidth; + } + + + // 1c. setup floating-width columns: + int wtemp = wpix; + for (i = 0; i < m_NumCols; i++) + if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) + { + m_ColsInfo[i].pixwidth = wxMin(m_ColsInfo[i].width, 100) * wpix / 100; + + // Make sure to leave enough space for the other columns + int minRequired = m_Border; + for (j = 0; j < m_NumCols; j++) + { + if ((m_ColsInfo[j].units == wxHTML_UNITS_PERCENT && j > i) || + !m_ColsInfo[j].width) + minRequired += m_ColsInfo[j].minWidth; + } + m_ColsInfo[i].pixwidth = wxMax(wxMin(wtemp - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth); + + wtemp -= m_ColsInfo[i].pixwidth; + } + wpix = wtemp; // minimum cells width + + // 1d. setup default columns (no width specification supplied): + // The algorithm assigns calculates the maximum possible width if line + // wrapping would be disabled and assigns column width as a fraction + // based upon the maximum width of a column + // FIXME: I'm not sure if this algorithm is conform to HTML standard, + // though it seems to be much better than the old one - // 1c. setup defalut columns (no width specification supplied): - // NOTE! This algorithm doesn't conform to HTML standard : it assigns equal widths - // instead of optimal for (i = j = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) j++; + if (wpix < m_Border) + wpix = m_Border; + + // Assign widths for (i = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) - m_ColsInfo[i].pixwidth = wpix / j; + { + // Assign with, make sure not to drop below minWidth + if (maxWidth) + m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5); + else + m_ColsInfo[i].pixwidth = wpix / j; + + // Make sure to leave enough space for the other columns + int minRequired = 0; + int r; + for (r = i + 1; r < m_NumCols; r++) + { + if (!m_ColsInfo[r].width) + minRequired += m_ColsInfo[r].minWidth; + } + m_ColsInfo[i].pixwidth = wxMax(wxMin(wpix - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth); + + if (maxWidth) + { + if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5)) + { + int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5)); + maxWidth += diff - m_ColsInfo[i].maxWidth; + } + else + maxWidth -= m_ColsInfo[i].maxWidth; + } + wpix -= m_ColsInfo[i].pixwidth; + } } /* 2. compute positions of columns: */ { - int wpos = m_Spacing; - for (int i = 0; i < m_NumCols; i++) { + 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: */ @@ -345,10 +605,11 @@ void wxHtmlTableCell::Layout(int w) int fullwid; wxHtmlContainerCell *actcell; - for (actrow = 0; actrow <= m_NumRows; actrow++) ypos[actrow] = m_Spacing; - - for (actrow = 0; actrow < m_NumRows; actrow++) { - + ypos[0] = m_Spacing + m_Border; + for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1; + for (actrow = 0; actrow < m_NumRows; actrow++) + { + if (ypos[actrow] == -1) ypos[actrow] = ypos[actrow-1]; // 3a. sub-layout and detect max height: for (actcol = 0; actcol < m_NumCols; actcol++) { @@ -357,37 +618,47 @@ void wxHtmlTableCell::Layout(int w) fullwid = 0; for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++) fullwid += m_ColsInfo[i].pixwidth; - actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign); - actcell -> Layout(fullwid); + fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing; + actcell->SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign); + actcell->Layout(fullwid); - if (ypos[actrow] + actcell -> GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing > ypos[actrow + m_CellInfo[actrow][actcol].rowspan]) + if (ypos[actrow] + actcell->GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing > ypos[actrow + m_CellInfo[actrow][actcol].rowspan]) ypos[actrow + m_CellInfo[actrow][actcol].rowspan] = - ypos[actrow] + actcell -> GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing; + ypos[actrow] + actcell->GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing; } } - - for (actrow = 0; actrow < m_NumRows; actrow++) { - + for (actrow = 0; actrow < m_NumRows; actrow++) + { // 3b. place cells in row & let'em all have same height: - for (actcol = 0; actcol < m_NumCols; actcol++) { + for (actcol = 0; actcol < m_NumCols; actcol++) + { if (m_CellInfo[actrow][actcol].flag != cellUsed) continue; actcell = m_CellInfo[actrow][actcol].cont; - actcell -> SetMinHeight( - ypos[actrow + m_CellInfo[actrow][actcol].rowspan] - ypos[actrow] - m_CellInfo[actrow][actcol].rowspan * m_Spacing, + actcell->SetMinHeight( + ypos[actrow + m_CellInfo[actrow][actcol].rowspan] - ypos[actrow] - m_Spacing, m_CellInfo[actrow][actcol].valign); fullwid = 0; for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++) fullwid += m_ColsInfo[i].pixwidth; - actcell -> Layout(fullwid); - actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); + fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing; + actcell->Layout(fullwid); + actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); } - } - m_Height = ypos[m_NumRows]; + m_Height = ypos[m_NumRows] + m_Border; delete[] ypos; } + + /* 4. adjust table's width if it was too small: */ + if (m_NumCols > 0) + { + int twidth = m_ColsInfo[m_NumCols-1].leftpos + + m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing + m_Border; + if (twidth > m_Width) + m_Width = twidth; + } } @@ -405,13 +676,44 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") TAG_HANDLER_VARS wxHtmlTableCell* m_Table; wxString m_tAlign, m_rAlign; - int m_OldAlign; + 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_tAlign = m_rAlign = wxEmptyString; - m_OldAlign = HTML_ALIGN_LEFT; + m_enclosingContainer = NULL; + m_tAlign = m_rAlign = wxEmptyString; } @@ -420,62 +722,128 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") wxHtmlContainerCell *c; // new table started, backup upper-level table (if any) and create new: - if (tag.GetName() == "TABLE") { + if (tag.GetName() == wxT("TABLE")) + { wxHtmlTableCell *oldt = m_Table; - wxHtmlContainerCell *oldcont; - int m_OldAlign; - oldcont = c = m_WParser -> OpenContainer(); + wxHtmlContainerCell *oldEnclosing = m_enclosingContainer; + m_enclosingContainer = c = m_WParser->OpenContainer(); + + m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale()); - c -> SetWidthFloat(tag); - m_Table = new wxHtmlTableCell(c, tag); - m_OldAlign = m_WParser -> GetAlign(); + // width: + { + if (tag.HasParam(wxT("WIDTH"))) + { + int width = 0; + bool wpercent = false; + if (tag.GetParamAsIntOrPercent(wxT("WIDTH"), &width, wpercent)) + { + if (wpercent) + { + m_Table->SetWidthFloat(width, wxHTML_UNITS_PERCENT); + } + else + { + m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS); + } + } + } + else + m_Table->SetWidthFloat(0, wxHTML_UNITS_PIXELS); + } + int oldAlign = m_WParser->GetAlign(); m_tAlign = wxEmptyString; - if (tag.HasParam("ALIGN")) m_tAlign = tag.GetParam("ALIGN"); + 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(m_enclosingContainer); + m_WParser->CloseContainer(); - m_WParser -> SetAlign(m_OldAlign); - m_WParser -> SetContainer(oldcont); - m_WParser -> CloseContainer(); m_Table = oldt; - return TRUE; + m_enclosingContainer = oldEnclosing; + + return true; // ParseInner() called } - else if (m_Table && !tag.IsEnding()) { + else if (m_Table) + { // new row in table - if (tag.GetName() == "TR") { - m_Table -> AddRow(tag); + if (tag.GetName() == wxT("TR")) + { + m_Table->AddRow(tag); m_rAlign = m_tAlign; - if (tag.HasParam("ALIGN")) m_rAlign = tag.GetParam("ALIGN"); + if (tag.HasParam(wxT("ALIGN"))) + m_rAlign = tag.GetParam(wxT("ALIGN")); } // new cell - else { - m_WParser -> SetAlign(m_OldAlign); - c = m_WParser -> SetContainer(new wxHtmlContainerCell(m_Table)); - m_Table -> AddCell(c, tag); + else + { + c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table)); + m_Table->AddCell(c, tag); - m_WParser -> OpenContainer(); + m_WParser->OpenContainer(); - if (tag.GetName() == "TH") /*header style*/ { - m_WParser -> SetAlign(HTML_ALIGN_CENTER); - } + const bool isHeader = tag.GetName() == wxT("TH"); + wxString als; + 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 ) { - wxString als; + boldOld = m_WParser->GetFontBold(); + m_WParser->SetFontBold(true); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + } - als = m_rAlign; - if (tag.HasParam("ALIGN")) als = tag.GetParam("ALIGN"); - als.MakeUpper(); - if (als == "RIGHT") m_WParser -> SetAlign(HTML_ALIGN_RIGHT); - else if (als == "CENTER") m_WParser -> SetAlign(HTML_ALIGN_CENTER); + 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())); } - m_WParser -> OpenContainer(); + + // 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; + + return false; } TAG_HANDLER_END(TABLE)