X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5363f57fb8beb6638932cb2b02a69262ee60f82..abe0903cd4a16c6d8f50a3263d601fc718038c6d:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 9a01d9e656..8caec2e8ca 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtext/richtexthtml.cpp +// Name: src/richtext/richtexthtml.cpp // Purpose: HTML I/O for wxRichTextCtrl // Author: Julian Smart // Modified by: @@ -13,28 +13,47 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_RICHTEXT #include "wx/richtext/richtexthtml.h" +#include "wx/richtext/richtextstyles.h" #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wx/filename.h" #include "wx/wfstream.h" #include "wx/txtstrm.h" +#if wxUSE_FILESYSTEM +#include "wx/filesys.h" +#include "wx/fs_mem.h" +#endif + IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler) +int wxRichTextHTMLHandler::sm_fileCounter = 1; + +wxRichTextHTMLHandler::wxRichTextHTMLHandler(const wxString& name, const wxString& ext, int type) + : wxRichTextFileHandler(name, ext, type), m_buffer(NULL), m_font(false), m_inTable(false) +{ + m_fontSizeMapping.Add(8); + m_fontSizeMapping.Add(10); + m_fontSizeMapping.Add(13); + m_fontSizeMapping.Add(17); + m_fontSizeMapping.Add(22); + m_fontSizeMapping.Add(30); + m_fontSizeMapping.Add(100); +} + /// Can we handle this filename (if using files)? By default, checks the extension. bool wxRichTextHTMLHandler::CanHandle(const wxString& filename) const { wxString path, file, ext; - wxSplitPath(filename, & path, & file, & ext); + wxFileName::SplitPath(filename, & path, & file, & ext); return (ext.Lower() == wxT("html") || ext.Lower() == wxT("htm")); } @@ -52,416 +71,417 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) { + m_buffer = buffer; + + ClearTemporaryImageLocations(); + buffer->Defragment(); - - wxTextOutputStream str(stream); - - wxTextAttrEx currentParaStyle = buffer->GetAttributes(); - wxTextAttrEx currentCharStyle = buffer->GetAttributes(); - - str << wxT("
\n"); - - /* - wxRichText may be support paper formats like a1/a2/a3/a4 - when this widget grown enough, i should turn back and support its new features - but not yet - - str << wxT(""); - - wxString left_indent = SymbolicIndent(currentParaStyle.GetLeftIndent()); - wxString right_indent = SymbolicIndent(currentParaStyle.GetRightIndent()); - - str << wxString::Format(wxT("%s | %s | |
");
- */
-
- str << wxT("
|
after every paragraph - if(!m_list) + if (thisStyle.HasURL()) + stream << wxT(""); + + if (thisStyle.GetFontUnderlined()) + stream << wxT(""); + if (thisStyle.GetFontStyle() == wxITALIC) + stream << wxT(""); + if (thisStyle.GetFontWeight() == wxBOLD) + stream << wxT(""); + + if (thisStyle.HasTextEffects()) { - wxTextOutputStream str(stream); - wxString align = GetAlignment( thisStyle ); - str << wxString::Format(wxT("
"), align.c_str()); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH) + stream << wxT("
before a list when using
...
in previous paragraphs. + // TODO: pass a flag that indicates we're using wxHTML. + str << wxT("\n"); + + str << tag; + } + + str << wxT("
0.0))
+ {
+ styleStr += wxString::Format(wxT("margin-left: %.2fmm; "), indentLeftMM);
+ }
+ float indentRightMM = thisStyle.GetRightIndent()/10.0;
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && thisStyle.HasRightIndent() && (indentRightMM > 0.0))
+ {
+ styleStr += wxString::Format(wxT("margin-right: %.2fmm; "), indentRightMM);
+ }
+ // First line indentation
+ float firstLineIndentMM = - thisStyle.GetLeftSubIndent() / 10.0;
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) && (firstLineIndentMM > 0.0))
+ {
+ styleStr += wxString::Format(wxT("text-indent: %.2fmm; "), firstLineIndentMM);
+ }
+
+ if (!styleStr.IsEmpty())
+ str << wxT(" style=\"") << styleStr << wxT("\"");
+
+ str << wxT(">");
+
+ // TODO: convert to pixels
+ int indentPixels = static_cast ");
}
+ OutputFont(thisStyle, str);
}
-void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str )
+
+/// End paragraph formatting
+void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& stream)
{
- //As a five year experienced web developer i assure you there is no way to indent an item
- //in html way, but we can use tables.
-
-
-
- //Item -> "Hello world"
- //Its Left Indentation -> 100
- //Its Left Sub-Indentation ->40
- //A typical indentation-table for the item will be construct as the following
-
- //3 x nbsp = 60
- //2 x nbsp = 40
- //LSI = Left Sub Indent
- //LI = Left Indent - LSI
- //
- //-------------------------------------------
- //| nbsp;|nbsp;nbsp;Hello World |
- //| | | | |
- //| V | V |
- //| --LI-- | --LSI-- |
- //-------------------------------------------
-
- str << wxT(""), indentPixels);
+ m_inTable = true;
+ }
+
+ if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0))
+ {
+ str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
+ }
+ }
+ }
+ else
+ {
+ CloseLists(-1, str);
+
+ wxString align = GetAlignment(thisStyle);
+ str << wxString::Format(wxT("
\n");
+ m_inTable = false;
}
+ else if (!thisStyle.HasBulletStyle())
+ stream << wxT("\n");
}
-void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str )
+/// Closes lists to level (-1 means close all)
+void wxRichTextHTMLHandler::CloseLists(int level, wxTextOutputStream& str)
{
- //Code:
- //r.BeginNumberedBullet(1, 200, 60);
- //r.Newline();
- //r.WriteText(wxT("first item"));
- //r.EndNumberedBullet();
- //r.BeginNumberedBullet(2, 200, 60);
- //r.Newline();
- //r.WriteText(wxT("second item."));
- //r.EndNumberedBullet();
- //
- //A typical indentation-table for the item will be construct as the following
-
- //1 x nbsp = 20 point
- //ULI -> 100pt (UL/OL tag indents its sub element by 100 point)
- //<--------- 100 pt ---------->|
- //------------------------------------------------------
- //| nbsp; nbsp;|");
-
- wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent );
- str << wxString::Format( wxT(" %s "), symbolic_indent.c_str() );
- str << wxT("");
-
- if( thisStyle.GetLeftSubIndent() < 0 )
+ if (thisStyle.HasFont())
+ stream << wxT("");
+
+ if (m_inTable)
{
- str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
+ stream << wxT(" |
- //| |<-ULI->
|
- //------------------------------------------------------
- // |<-100->|
-
-
- str << wxT("");
-
- wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100);
- str << wxString::Format( wxT(" %s "), symbolic_indent.c_str() );
- str << wxT("");
+ // Close levels high than this
+ int i = m_indents.GetCount()-1;
+ while (i >= 0)
+ {
+ int l = m_indents[i];
+ if (l > level)
+ {
+ if (m_listTypes[i] == 0)
+ str << wxT("");
+ else
+ str << wxT("");
+ m_indents.RemoveAt(i);
+ m_listTypes.RemoveAt(i);
+ }
+ else
+ break;
+ i --;
+ }
+}
+
+/// Output font tag
+void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream)
+{
+ if (style.HasFont())
+ {
+ stream << wxString::Format(wxT("");
+ }
}
-void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag )
+int wxRichTextHTMLHandler::TypeOfList( const wxRichTextAttr& thisStyle, wxString& tag )
{
- //We can use number attribute of li tag but not all the browsers support it.
- //also wxHtmlWindow doesn't support type attribute.
-
- m_is_ul = false;
- if( thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
+ // We can use number attribute of li tag but not all the browsers support it.
+ // also wxHtmlWindow doesn't support type attribute.
+
+ bool m_is_ul = false;
+ if (thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
tag = wxT(" ");
- else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER )
+ else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER)
tag = wxT("
");
- else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER )
+ else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER)
tag = wxT("
");
- else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER )
+ else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER)
tag = wxT("
");
- else if( thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER )
+ else if (thisStyle.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER)
tag = wxT("
");
else
{
tag = wxT("
");
m_is_ul = true;
}
+
+ if (m_is_ul)
+ return 1;
+ else
+ return 0;
}
-wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
+wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle )
{
switch( thisStyle.GetAlignment() )
{
@@ -478,36 +498,100 @@ wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
}
}
-void wxRichTextHTMLHandler::Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream)
+void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& stream)
{
wxTextOutputStream str(stream);
-
+
str << wxT("GetImageBlock().GetImageType());
- str << wxT(";base64,");
-
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
- image->MakeBlock();
-
- wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
- str << data;
-
- delete[] data;
-
+
+#if wxUSE_FILESYSTEM
+ if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
+ {
+#if 0
+ if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())
+ image->LoadFromBlock();
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
+ image->MakeBlock();
+#endif
+
+ if (image->GetImageBlock().IsOk())
+ {
+ wxImage img;
+ image->GetImageBlock().Load(img);
+ if (img.IsOk())
+ {
+ wxString ext(image->GetImageBlock().GetExtension());
+ wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
+ wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
+
+ m_imageLocations.Add(tempFilename);
+
+ str << wxT("memory:") << tempFilename;
+ }
+ }
+ else
+ str << wxT("memory:?");
+
+ sm_fileCounter ++;
+ }
+ else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
+ {
+#if 0
+ if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())
+ image->LoadFromBlock();
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
+ image->MakeBlock();
+#endif
+
+ if (image->GetImageBlock().IsOk())
+ {
+ wxString tempDir(GetTempDir());
+ if (tempDir.IsEmpty())
+ tempDir = wxFileName::GetTempDir();
+
+ wxString ext(image->GetImageBlock().GetExtension());
+ wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext));
+ image->GetImageBlock().Write(tempFilename);
+
+ m_imageLocations.Add(tempFilename);
+
+ str << wxFileSystem::FileNameToURL(tempFilename);
+ }
+ else
+ str << wxT("file:?");
+
+ sm_fileCounter ++;
+ }
+ else // if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_BASE64) // this is implied
+#endif
+ {
+ str << wxT("data:");
+ str << GetMimeType(image->GetImageBlock().GetImageType());
+ str << wxT(";base64,");
+#if 0
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
+ image->MakeBlock();
+#endif
+ if (image->GetImageBlock().IsOk())
+ {
+ wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
+ str << data;
+
+ delete[] data;
+ }
+ }
+
str << wxT("\" />");
}
-long wxRichTextHTMLHandler::Pt_To_Size(long size)
+long wxRichTextHTMLHandler::PtToSize(long size)
{
- //return most approximate size
- if(size < 9 ) return 1;
- else if( size < 11 ) return 2;
- else if( size < 14 ) return 3;
- else if( size < 18 ) return 4;
- else if( size < 23 ) return 5;
- else if( size < 30 ) return 6;
- else return 7;
+ int i;
+ int len = m_fontSizeMapping.GetCount();
+ for (i = 0; i < len; i++)
+ if (size <= m_fontSizeMapping[i])
+ return i+1;
+ return 7;
}
wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
@@ -524,7 +608,7 @@ const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
{
case wxBITMAP_TYPE_BMP:
return wxT("image/bmp");
- case wxBITMAP_TYPE_TIF:
+ case wxBITMAP_TYPE_TIFF:
return wxT("image/tiff");
case wxBITMAP_TYPE_GIF:
return wxT("image/gif");
@@ -537,57 +621,88 @@ const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
}
}
-//exim-style base64 encoder
+// exim-style base64 encoder
wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
{
- //elements of enc64 array must be 8 bit values
- //otherwise encoder will fail
- //hmmm.. Does wxT macro define a char as 16 bit value
- //when compiling with UNICODE option?
+ // elements of enc64 array must be 8 bit values
+ // otherwise encoder will fail
+ // hmmm.. Does wxT macro define a char as 16 bit value
+ // when compiling with UNICODE option?
static const wxChar enc64[] = wxT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
wxChar* output = new wxChar[4*((in_len+2)/3)+1];
wxChar* p = output;
-
+
while( in_len-- > 0 )
{
register wxChar a, b;
-
+
a = *input++;
-
+
*p++ = enc64[ (a >> 2) & 0x3f ];
-
- if( in_len-- <= 0 )
+
+ if( in_len-- == 0 )
{
*p++ = enc64[ (a << 4 ) & 0x30 ];
*p++ = '=';
*p++ = '=';
break;
}
-
+
b = *input++;
-
+
*p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f];
-
- if( in_len-- <= 0 )
+
+ if( in_len-- == 0 )
{
*p++ = enc64[ (b << 2) & 0x3f ];
*p++ = '=';
break;
}
-
+
a = *input++;
-
+
*p++ = enc64[ ((( b << 2 ) & 0x3f ) | ((a >> 6)& 0x3)) & 0x3f ];
-
+
*p++ = enc64[ a & 0x3f ];
}
*p = 0;
-
+
return output;
}
#endif
// wxUSE_STREAMS
+/// Delete the in-memory or temporary files generated by the last operation
+bool wxRichTextHTMLHandler::DeleteTemporaryImages()
+{
+ return DeleteTemporaryImages(GetFlags(), m_imageLocations);
+}
+
+/// Delete the in-memory or temporary files generated by the last operation
+bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString& imageLocations)
+{
+ size_t i;
+ for (i = 0; i < imageLocations.GetCount(); i++)
+ {
+ wxString location = imageLocations[i];
+
+ if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
+ {
+#if wxUSE_FILESYSTEM
+ wxMemoryFSHandler::RemoveFile(location);
+#endif
+ }
+ else if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
+ {
+ if (wxFileExists(location))
+ wxRemoveFile(location);
+ }
+ }
+
+ return true;
+}
+
+
#endif
// wxUSE_RICHTEXT