X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9297b0eead20a0bfee71df18e0d8f0cbc402fb..8b0975a38e83e3a5a3874c4526bc0cee279305be:/src/html/m_pre.cpp diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index 2cf0d2142c..9d84e28fa5 100644 --- a/src/html/m_pre.cpp +++ b/src/html/m_pre.cpp @@ -4,10 +4,10 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -15,15 +15,13 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -33,88 +31,57 @@ FORCE_LINK_ME(m_pre) - -//----------------------------------------------------------------------------- -// wxHtmlCodeCell -//----------------------------------------------------------------------------- - -class wxHtmlPRECell : public wxHtmlCell -{ - private: - wxString** m_Text; - // list of wxString objects. - int m_LinesCnt; - // number of lines - int m_LineHeight; - // height of single line of text - - public: - wxHtmlPRECell(const wxString& s, wxDC& dc); - ~wxHtmlPRECell(); - void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); -}; - - -wxHtmlPRECell::wxHtmlPRECell(const wxString& s, wxDC& dc) : wxHtmlCell() +// replaces '\t', ' ' and '\n' with HTML markup: +static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str) { - wxStringTokenizer tokenizer(s, "\n"); - wxString tmp; - long int x, z; - int i; - - m_LineHeight = dc.GetCharHeight(); - m_LinesCnt = 0; - m_Text = NULL; - m_Width = m_Height = 0; - - i = 0; - while (tokenizer.HasMoreTokens()) + wxString out; + size_t len = str.Len(); + size_t linepos = 0; + for (size_t i = 0; i < len; i++) { - if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10)); - tmp = tokenizer.NextToken(); - tmp.Replace(wxT("©"), wxT("(c)"), TRUE); - tmp.Replace(wxT(" "), wxT(" "), TRUE); - tmp.Replace(wxT("""), wxT("\""), TRUE); - tmp.Replace(wxT("<"), wxT("<"), TRUE); - tmp.Replace(wxT(">"), wxT(">"), TRUE); - tmp.Replace(wxT("&"), wxT("&"), TRUE); - tmp.Replace(wxT("\t"), wxT(" "), TRUE); - tmp.Replace(wxT("\r"), wxT(""), TRUE); - m_Text[i++] = new wxString(tmp); - - dc.GetTextExtent(tmp, &x, &z, &z); - if (x > m_Width) m_Width = x; - m_Height += m_LineHeight; - m_LinesCnt++; + switch (str[i]) + { + case wxT('<'): + while (i < len && str[i] != wxT('>')) + { + out << str[i++]; + linepos++; + } + out << wxT('>'); + linepos++; + break; + case wxT(' '): + out << wxT(" "); + linepos++; + break; + case wxT('\n'): + out << wxT("
"); + linepos = 0; + break; + case wxT('\t'): + { + for (size_t j = 8 - linepos % 8; j > 0; j--) + out << wxT(" "); + linepos += 8 - linepos % 8; + } + break; + default: + out << str[i]; + linepos++; + break; + } } + return out; } - -wxHtmlPRECell::~wxHtmlPRECell() -{ - for (int i = 0; i < m_LinesCnt; i++) delete m_Text[i]; - free(m_Text); -} - - -void wxHtmlPRECell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) -{ - for (int i = 0; i < m_LinesCnt; i++) - dc.DrawText(*(m_Text[i]), x + m_PosX, y + m_PosY + m_LineHeight * i); - - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); -} - - - - //----------------------------------------------------------------------------- // The list handler: //----------------------------------------------------------------------------- TAG_HANDLER_BEGIN(PRE, "PRE") + TAG_HANDLER_CONSTR(PRE) { } TAG_HANDLER_PROC(tag) { @@ -126,30 +93,33 @@ TAG_HANDLER_BEGIN(PRE, "PRE") bold = m_WParser->GetFontBold(), fsize = m_WParser->GetFontSize(); + c = m_WParser->GetContainer(); + m_WParser->SetFontUnderlined(false); + m_WParser->SetFontBold(false); + m_WParser->SetFontItalic(false); + m_WParser->SetFontFixed(true); + m_WParser->SetFontSize(3); + c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->CloseContainer(); c = m_WParser->OpenContainer(); + c->SetWidthFloat(tag); + c = m_WParser->OpenContainer(); c->SetAlignHor(wxHTML_ALIGN_LEFT); - c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_VERTICAL); + c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); - m_WParser->SetFontUnderlined(FALSE); - m_WParser->SetFontBold(FALSE); - m_WParser->SetFontItalic(FALSE); - m_WParser->SetFontFixed(TRUE); - m_WParser->SetFontSize(3); - c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + wxString srcMid = + m_WParser->GetSource()->Mid(tag.GetBeginPos(), + tag.GetEndPos1() - tag.GetBeginPos()); + // It is safe to temporarily change the source being parsed, + // provided we restore the state back after parsing + m_Parser->SetSourceAndSaveState(HtmlizeWhitespaces(srcMid)); + m_Parser->DoParsing(); + m_Parser->RestoreState(); - { - wxString cit; - wxEncodingConverter *encconv = m_WParser->GetEncodingConverter(); - cit = m_WParser->GetSource()->Mid(tag.GetBeginPos(), - tag.GetEndPos1() - tag.GetBeginPos()); - if (encconv) - c->InsertCell(new wxHtmlPRECell(encconv->Convert(cit), - *(m_WParser->GetDC()))); - else - c->InsertCell(new wxHtmlPRECell(cit, - *(m_WParser->GetDC()))); - } + m_WParser->CloseContainer(); + m_WParser->CloseContainer(); + c = m_WParser->OpenContainer(); m_WParser->SetFontUnderlined(underlined); m_WParser->SetFontBold(bold); @@ -158,9 +128,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE") m_WParser->SetFontSize(fsize); c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - m_WParser->CloseContainer(); - m_WParser->OpenContainer(); - return TRUE; + return true; } TAG_HANDLER_END(PRE)