X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a28882ab8bb5b47b4089d3c894b41ad4afcadcc6:/include/wx/html/winpars.h
diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 24ed74b270..f634481287 100644
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: winpars.h
+// Name: wx/html/winpars.h
// Purpose: wxHtmlWinParser class (parser to be used with wxHtmlWindow)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -7,14 +7,9 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef _WX_WINPARS_H_
#define _WX_WINPARS_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "winpars.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_HTML
@@ -24,10 +19,12 @@
#include "wx/html/htmlcell.h"
#include "wx/encconv.h"
-class WXDLLIMPEXP_HTML wxHtmlWindow;
-class WXDLLIMPEXP_HTML wxHtmlWinParser;
-class WXDLLIMPEXP_HTML wxHtmlWinTagHandler;
-class WXDLLIMPEXP_HTML wxHtmlTagsModule;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler;
+class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
+
//--------------------------------------------------------------------------------
// wxHtmlWinParser
@@ -42,8 +39,9 @@ class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser
friend class wxHtmlWindow;
public:
- wxHtmlWinParser(wxHtmlWindow *wnd = NULL);
- ~wxHtmlWinParser();
+ wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL);
+
+ virtual ~wxHtmlWinParser();
virtual void InitParser(const wxString& source);
virtual void DoneParser();
@@ -54,7 +52,8 @@ public:
// Set's the DC used for parsing. If SetDC() is not called,
// parsing won't proceed
virtual void SetDC(wxDC *dc, double pixel_scale = 1.0)
- { m_DC = dc; m_PixelScale = pixel_scale; }
+ { SetDC(dc, pixel_scale, pixel_scale); }
+ void SetDC(wxDC *dc, double pixel_scale, double font_scale);
wxDC *GetDC() {return m_DC;}
double GetPixelScale() {return m_PixelScale;}
@@ -66,11 +65,21 @@ public:
// for this DC. If you want actual values, call
// GetDC()->GetChar...()
- // returns associated wxWindow
- wxHtmlWindow *GetWindow() {return m_Window;}
+ // returns interface to the rendering window
+ wxHtmlWindowInterface *GetWindowInterface() {return m_windowInterface;}
+#if WXWIN_COMPATIBILITY_2_6
+ // deprecated, use GetWindowInterface()->GetHTMLWindow() instead
+ wxDEPRECATED( wxHtmlWindow *GetWindow() );
+#endif
// Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
- void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL);
+ void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);
+
+ // Sets font sizes to be relative to the given size or the system
+ // default size; use either specified or default font
+ void SetStandardFonts(int size = -1,
+ const wxString& normal_face = wxEmptyString,
+ const wxString& fixed_face = wxEmptyString);
// Adds tags module. see wxHtmlTagsModule for details.
static void AddModule(wxHtmlTagsModule *module);
@@ -98,6 +107,8 @@ public:
int GetFontSize() const {return m_FontSize;}
void SetFontSize(int s);
+ // Try to map a font size in points to the HTML 1-7 font size range.
+ void SetFontPointSize(int pt);
int GetFontBold() const {return m_FontBold;}
void SetFontBold(int x) {m_FontBold = x;}
int GetFontItalic() const {return m_FontItalic;}
@@ -111,13 +122,31 @@ public:
int GetAlign() const {return m_Align;}
void SetAlign(int a) {m_Align = a;}
+
+ wxHtmlScriptMode GetScriptMode() const { return m_ScriptMode; }
+ void SetScriptMode(wxHtmlScriptMode mode) { m_ScriptMode = mode; }
+ long GetScriptBaseline() const { return m_ScriptBaseline; }
+ void SetScriptBaseline(long base) { m_ScriptBaseline = base; }
+
const wxColour& GetLinkColor() const { return m_LinkColor; }
void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; }
const wxColour& GetActualColor() const { return m_ActualColor; }
void SetActualColor(const wxColour& clr) { m_ActualColor = clr ;}
+ const wxColour& GetActualBackgroundColor() const { return m_ActualBackgroundColor; }
+ void SetActualBackgroundColor(const wxColour& clr) { m_ActualBackgroundColor = clr;}
+ int GetActualBackgroundMode() const { return m_ActualBackgroundMode; }
+ void SetActualBackgroundMode(int mode) { m_ActualBackgroundMode = mode;}
const wxHtmlLinkInfo& GetLink() const { return m_Link; }
void SetLink(const wxHtmlLinkInfo& link);
+ // applies current parser state (link, sub/supscript, ...) to given cell
+ void ApplyStateToCell(wxHtmlCell *cell);
+
+ // Needs to be called after inserting a cell that interrupts the flow of
+ // the text like e.g. ![]()
and tells us to not consider any of the
+ // following space as being part of the same space run as before.
+ void StopCollapsingSpaces() { m_tmpLastWasSpace = false; }
+
#if !wxUSE_UNICODE
void SetInputEncoding(wxFontEncoding enc);
wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
@@ -128,17 +157,33 @@ public:
// creates font depending on m_Font* members.
virtual wxFont* CreateCurrentFont();
+ enum WhitespaceMode
+ {
+ Whitespace_Normal, // normal mode, collapse whitespace
+ Whitespace_Pre // inside , keep whitespace as-is
+ };
+
+ // change the current whitespace handling mode
+ void SetWhitespaceMode(WhitespaceMode mode) { m_whitespaceMode = mode; }
+ WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; }
+
protected:
- virtual void AddText(const wxChar* txt);
+ virtual void AddText(const wxString& txt);
private:
+ void FlushWordBuf(wxChar *temp, int& len);
+ void AddWord(wxHtmlWordCell *word);
+ void AddWord(const wxString& word)
+ { AddWord(new wxHtmlWordCell(word, *(GetDC()))); }
+ void AddPreBlock(const wxString& text);
+
bool m_tmpLastWasSpace;
wxChar *m_tmpStrBuf;
size_t m_tmpStrBufSize;
// temporary variables used by AddText
- wxHtmlWindow *m_Window;
+ wxHtmlWindowInterface *m_windowInterface;
// window we're parsing for
- double m_PixelScale;
+ double m_PixelScale, m_FontScale;
wxDC *m_DC;
// Device Context we're parsing for
static wxList m_Modules;
@@ -148,19 +193,25 @@ private:
wxHtmlContainerCell *m_Container;
// current container. See Open/CloseContainer for details.
- int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not TRUE,FALSE but 1,0, we need it for indexing
- int m_FontSize; /* -2 to +4, 0 is default */
+ int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not true,false but 1,0, we need it for indexing
+ int m_FontSize; // From 1 (smallest) to 7, default is 3.
wxColour m_LinkColor;
wxColour m_ActualColor;
+ wxColour m_ActualBackgroundColor;
+ int m_ActualBackgroundMode;
// basic font parameters.
wxHtmlLinkInfo m_Link;
// actual hypertext link or empty string
bool m_UseLink;
- // TRUE if m_Link is not empty
+ // true if m_Link is not empty
long m_CharHeight, m_CharWidth;
// average height of normal-sized text
int m_Align;
// actual alignment
+ wxHtmlScriptMode m_ScriptMode;
+ // current script mode (sub/sup/normal)
+ long m_ScriptBaseline;
+ // current sub/supscript base
wxFont* m_FontsTable[2][2][2][2][7];
wxString m_FontsFacesTable[2][2][2][2][7];
@@ -178,14 +229,22 @@ private:
// html font sizes and faces of fixed and proportional fonts
#if !wxUSE_UNICODE
+ wxChar m_nbsp;
wxFontEncoding m_InputEnc, m_OutputEnc;
// I/O font encodings
wxEncodingConverter *m_EncConv;
#endif
+ // current whitespace handling mode
+ WhitespaceMode m_whitespaceMode;
+
wxHtmlWordCell *m_lastWordCell;
-
- DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
+
+ // current position on line, in num. of characters; used to properly
+ // expand TABs; only updated while inside
+ int m_posColumn;
+
+ wxDECLARE_NO_COPY_CLASS(wxHtmlWinParser);
};
@@ -200,19 +259,23 @@ private:
// the wxHtmlWinParser object
//-----------------------------------------------------------------------------
+class WXDLLIMPEXP_HTML wxHtmlStyleParams;
+
class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
{
DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
public:
- wxHtmlWinTagHandler() : wxHtmlTagHandler() {};
+ wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
- virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;};
+ virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
protected:
wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
- DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler)
+ void ApplyStyle(const wxHtmlStyleParams &styleParams);
+
+ wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);
};
@@ -233,7 +296,7 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
public:
- wxHtmlTagsModule() : wxModule() {};
+ wxHtmlTagsModule() : wxModule() {}
virtual bool OnInit();
virtual void OnExit();