X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77611ad4da9df336a0805508276a81b8f4437107..4b5e178a4c22caac92952131632641c63821fc0c:/src/html/htmlfilt.cpp diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 95f90552d1..28c3de9e68 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -1,33 +1,38 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmlfilt.cpp +// Name: src/html/htmlfilt.cpp // Purpose: wxHtmlFilter - input filter for translating into HTML format // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" -#if wxUSE_HTML - -#ifdef __BORDLANDC__ -#pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#ifndef WXPRECOMP -#include "wx/wx.h" +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/intl.h" #endif +#include "wx/strconv.h" +#include "wx/sstream.h" #include "wx/html/htmlfilt.h" #include "wx/html/htmlwin.h" +// utility function: read entire contents of an wxInputStream into a wxString +// +// TODO: error handling? +static void ReadString(wxString& str, wxInputStream* s, wxMBConv& conv) +{ + wxStringOutputStream out(&str, conv); + s->Read(out); +} /* @@ -46,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter) bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const { - return TRUE; + return true; } @@ -54,19 +59,15 @@ bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const { wxInputStream *s = file.GetStream(); - char *src; wxString doc, doc2; if (s == NULL) return wxEmptyString; - src = new char[s -> GetSize()+1]; - src[s -> GetSize()] = 0; - s -> Read(src, s -> GetSize()); - doc = src; - delete [] src; - - doc.Replace(wxT("<"), wxT("<"), TRUE); - doc.Replace(wxT(">"), wxT(">"), TRUE); - doc2 = "
\n" + doc + "\n
"; + ReadString(doc, s, wxConvISO8859_1); + + doc.Replace(wxT("&"), wxT("&"), true); + doc.Replace(wxT("<"), wxT("<"), true); + doc.Replace(wxT(">"), wxT(">"), true); + doc2 = wxT("
\n") + doc + wxT("\n
"); return doc2; } @@ -101,26 +102,18 @@ bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const { - return (""); + wxString res = wxT(""); + return res; } //-------------------------------------------------------------------------------- -// wxHtmlFilterPlainText -// filter for text/plain or uknown +// wxHtmlFilterHTML +// filter for text/html //-------------------------------------------------------------------------------- -class wxHtmlFilterHTML : public wxHtmlFilter -{ - DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML) - - public: - virtual bool CanRead(const wxFSFile& file) const; - virtual wxString ReadFile(const wxFSFile& file) const; -}; - IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter) @@ -138,29 +131,52 @@ bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const { wxInputStream *s = file.GetStream(); - char *src; wxString doc; - if (s == NULL) + if (s == NULL) { - wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().mb_str()); + wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().c_str()); return wxEmptyString; } - src = new char[s -> GetSize() + 1]; - src[s -> GetSize()] = 0; - s -> Read(src, s -> GetSize()); - doc = src; - delete[] src; - - // add meta tag if we obtained this through http: - if (file.GetMimeType().Find(_T("; charset=")) == 0) + + // NB: We convert input file to wchar_t here in Unicode mode, based on + // either Content-Type header or tags. In ANSI mode, we don't + // do it as it is done by wxHtmlParser (for this reason, we add + // tag if we used Content-Type header). +#if wxUSE_UNICODE + int charsetPos; + if ((charsetPos = file.GetMimeType().Find(_T("; charset="))) != wxNOT_FOUND) + { + wxString charset = file.GetMimeType().Mid(charsetPos + 10); + wxCSConv conv(charset); + ReadString(doc, s, conv); + } + else + { + wxString tmpdoc; + ReadString(tmpdoc, s, wxConvISO8859_1); + wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc); + if (charset.empty()) + doc = tmpdoc; + else + { + wxCSConv conv(charset); + doc = wxString(tmpdoc.mb_str(wxConvISO8859_1), conv); + } + } +#else // !wxUSE_UNICODE + ReadString(doc, s, wxConvLibc); + // add meta tag if we obtained this through http: + if (!file.GetMimeType().empty()) { - wxString s(_T(""); - return s; + wxString hdr; + wxString mime = file.GetMimeType(); + hdr.Printf(_T(""), mime.c_str()); + return hdr+doc; } +#endif - else return doc; + return doc; } @@ -177,7 +193,7 @@ class wxHtmlFilterModule : public wxModule { wxHtmlWindow::AddFilter(new wxHtmlFilterHTML); wxHtmlWindow::AddFilter(new wxHtmlFilterImage); - return TRUE; + return true; } virtual void OnExit() {} };