X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93cd80d63c45b754387edac7bdb89e7342c70e28..b63fce942f8d195c42863f28ad41af750273fb47:/contrib/src/xrc/xml.cpp diff --git a/contrib/src/xrc/xml.cpp b/contrib/src/xrc/xml.cpp index 5639d48a26..b8b8aabec8 100644 --- a/contrib/src/xrc/xml.cpp +++ b/contrib/src/xrc/xml.cpp @@ -10,7 +10,6 @@ #ifdef __GNUG__ #pragma implementation "xml.h" -#pragma implementation "xmlio.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -26,11 +25,15 @@ #include "wx/zstream.h" #include "wx/log.h" #include "wx/intl.h" +#include "wx/strconv.h" #include "wx/xrc/xml.h" -#include "wx/xrc/xmlio.h" +#include "xmlparse.h" // from Expat +//----------------------------------------------------------------------------- +// wxXmlNode +//----------------------------------------------------------------------------- wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, const wxString& name, const wxString& content, @@ -51,8 +54,6 @@ wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type, } } - - wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content) : m_type(type), m_name(name), m_content(content), @@ -60,8 +61,6 @@ wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name, m_children(NULL), m_next(NULL) {} - - wxXmlNode::wxXmlNode(const wxXmlNode& node) { m_next = NULL; @@ -69,8 +68,6 @@ wxXmlNode::wxXmlNode(const wxXmlNode& node) DoCopy(node); } - - wxXmlNode::~wxXmlNode() { wxXmlNode *c, *c2; @@ -88,18 +85,14 @@ wxXmlNode::~wxXmlNode() } } - - wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node) { - delete m_properties; - delete m_children; + wxDELETE(m_properties); + wxDELETE(m_children); DoCopy(node); return *this; } - - void wxXmlNode::DoCopy(const wxXmlNode& node) { m_type = node.m_type; @@ -123,7 +116,6 @@ void wxXmlNode::DoCopy(const wxXmlNode& node) } } - bool wxXmlNode::HasProp(const wxString& propName) const { wxXmlProperty *prop = GetProperties(); @@ -137,8 +129,6 @@ bool wxXmlNode::HasProp(const wxString& propName) const return FALSE; } - - bool wxXmlNode::GetPropVal(const wxString& propName, wxString *value) const { wxXmlProperty *prop = GetProperties(); @@ -156,8 +146,6 @@ bool wxXmlNode::GetPropVal(const wxString& propName, wxString *value) const return FALSE; } - - wxString wxXmlNode::GetPropVal(const wxString& propName, const wxString& defaultVal) const { wxString tmp; @@ -167,8 +155,6 @@ wxString wxXmlNode::GetPropVal(const wxString& propName, const wxString& default return defaultVal; } - - void wxXmlNode::AddChild(wxXmlNode *child) { if (m_children == NULL) @@ -183,8 +169,6 @@ void wxXmlNode::AddChild(wxXmlNode *child) child->m_parent = this; } - - void wxXmlNode::InsertChild(wxXmlNode *child, wxXmlNode *before_node) { wxASSERT_MSG(before_node->GetParent() == this, wxT("wxXmlNode::InsertChild - the node has incorrect parent")); @@ -202,8 +186,6 @@ void wxXmlNode::InsertChild(wxXmlNode *child, wxXmlNode *before_node) child->m_next = before_node; } - - bool wxXmlNode::RemoveChild(wxXmlNode *child) { if (m_children == NULL) @@ -233,8 +215,6 @@ bool wxXmlNode::RemoveChild(wxXmlNode *child) } } - - void wxXmlNode::AddProperty(const wxString& name, const wxString& value) { AddProperty(new wxXmlProperty(name, value, NULL)); @@ -252,16 +232,16 @@ void wxXmlNode::AddProperty(wxXmlProperty *prop) } } - - bool wxXmlNode::DeleteProperty(const wxString& name) { + wxXmlProperty *prop; + if (m_properties == NULL) return FALSE; else if (m_properties->GetName() == name) { - wxXmlProperty *prop = m_properties; + prop = m_properties; m_properties = prop->GetNext(); prop->SetNext(NULL); delete prop; @@ -275,7 +255,7 @@ bool wxXmlNode::DeleteProperty(const wxString& name) { if (p->GetNext()->GetName() == name) { - wxXmlProperty *prop = p->GetNext(); + prop = p->GetNext(); p->SetNext(prop->GetNext()); prop->SetNext(NULL); delete prop; @@ -289,172 +269,459 @@ bool wxXmlNode::DeleteProperty(const wxString& name) +//----------------------------------------------------------------------------- +// wxXmlDocument +//----------------------------------------------------------------------------- +wxXmlDocument::wxXmlDocument() + : m_version(wxT("1.0")), m_fileEncoding(wxT("utf-8")), m_root(NULL) +{ +#if !wxUSE_UNICODE + m_encoding = wxT("UTF-8"); +#endif +} - - - -wxList *wxXmlDocument::sm_handlers = NULL; - - - -wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type) +wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding) : wxObject(), m_root(NULL) { - if (!Load(filename, io_type)) + if ( !Load(filename, encoding) ) { - delete m_root; - m_root = NULL; + wxDELETE(m_root); } } - - -wxXmlDocument::wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type) +wxXmlDocument::wxXmlDocument(wxInputStream& stream, const wxString& encoding) : wxObject(), m_root(NULL) { - if (!Load(stream, io_type)) + if ( !Load(stream, encoding) ) { - delete m_root; - m_root = NULL; + wxDELETE(m_root); } } - - wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc) { DoCopy(doc); } - - wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc) { - delete m_root; + wxDELETE(m_root); DoCopy(doc); return *this; } - - void wxXmlDocument::DoCopy(const wxXmlDocument& doc) { m_version = doc.m_version; +#if !wxUSE_UNICODE m_encoding = doc.m_encoding; +#endif + m_fileEncoding = doc.m_fileEncoding; m_root = new wxXmlNode(*doc.m_root); } - - -bool wxXmlDocument::Load(const wxString& filename, wxXmlIOType io_type) +bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding) { wxFileInputStream stream(filename); - return Load(stream, io_type); + return Load(stream, encoding); } +bool wxXmlDocument::Save(const wxString& filename) const +{ + wxFileOutputStream stream(filename); + return Save(stream); +} -bool wxXmlDocument::Load(wxInputStream& stream, wxXmlIOType io_type) + +//----------------------------------------------------------------------------- +// wxXmlDocument loading routines +//----------------------------------------------------------------------------- + +/* + FIXME: + - process all elements, including CDATA + */ + +// converts Expat-produced string in UTF-8 into wxString. +inline static wxString CharToString(wxMBConv *conv, + const char *s, size_t len = wxSTRING_MAXLEN) { - wxNode *n = sm_handlers->GetFirst(); - while (n) +#if wxUSE_UNICODE + (void)conv; + return wxString(s, wxConvUTF8, len); +#else + if ( conv ) { - wxXmlIOHandler *h = (wxXmlIOHandler*) n->GetData(); + size_t nLen = (len != wxSTRING_MAXLEN) ? len : + nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0); + + wchar_t *buf = new wchar_t[nLen+1]; + wxConvUTF8.MB2WC(buf, s, nLen); + buf[nLen] = 0; + wxString str(buf, *conv, len); + delete[] buf; + return str; + } + else + return wxString(s, len); +#endif +} + +struct wxXmlParsingContext +{ + wxMBConv *conv; + wxXmlNode *root; + wxXmlNode *node; + wxXmlNode *lastAsText; + wxString encoding; + wxString version; +}; + +static void StartElementHnd(void *userData, const char *name, const char **atts) +{ + wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; + wxXmlNode *node = new wxXmlNode(wxXML_ELEMENT_NODE, CharToString(ctx->conv, name)); + const char **a = atts; + while (*a) + { + node->AddProperty(CharToString(ctx->conv, a[0]), CharToString(ctx->conv, a[1])); + a += 2; + } + if (ctx->root == NULL) + ctx->root = node; + else + ctx->node->AddChild(node); + ctx->node = node; + ctx->lastAsText = NULL; +} + +static void EndElementHnd(void *userData, const char* WXUNUSED(name)) +{ + wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; + + ctx->node = ctx->node->GetParent(); + ctx->lastAsText = NULL; +} - if ((io_type == wxXML_IO_AUTO || io_type == h->GetType()) && - h->CanLoad(stream)) +static void TextHnd(void *userData, const char *s, int len) +{ + wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; + char *buf = new char[len + 1]; + + buf[len] = '\0'; + memcpy(buf, s, (size_t)len); + + if (ctx->lastAsText) + { + ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + + CharToString(ctx->conv, buf)); + } + else + { + bool whiteOnly = TRUE; + for (char *c = buf; *c != '\0'; c++) + if (*c != ' ' && *c != '\t' && *c != '\n' && *c != '\r') + { + whiteOnly = FALSE; + break; + } + if (!whiteOnly) { - return h->Load(stream, *this); + ctx->lastAsText = new wxXmlNode(wxXML_TEXT_NODE, wxT("text"), + CharToString(ctx->conv, buf)); + ctx->node->AddChild(ctx->lastAsText); } - n = n->GetNext(); } - wxLogError(_("Cannot find XML I/O handler capable of loading this format.")); - return FALSE; + + delete[] buf; } +static void CommentHnd(void *userData, const char *data) +{ + wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; + if (ctx->node) + { + // VS: ctx->node == NULL happens if there is a comment before + // the root element (e.g. wxDesigner's output). We ignore such + // comments, no big deal... + ctx->node->AddChild(new wxXmlNode(wxXML_COMMENT_NODE, + wxT("comment"), CharToString(ctx->conv, data))); + } + ctx->lastAsText = NULL; +} -bool wxXmlDocument::Save(const wxString& filename, wxXmlIOType io_type) const +static void DefaultHnd(void *userData, const char *s, int len) { - wxFileOutputStream stream(filename); - return Save(stream, io_type); + // XML header: + if (len > 6 && memcmp(s, "conv, s, (size_t)len); + int pos; + pos = buf.Find(wxT("encoding=")); + if (pos != wxNOT_FOUND) + ctx->encoding = buf.Mid(pos + 10).BeforeFirst(buf[(size_t)pos+9]); + pos = buf.Find(wxT("version=")); + if (pos != wxNOT_FOUND) + ctx->version = buf.Mid(pos + 9).BeforeFirst(buf[(size_t)pos+8]); + } } +static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData), + const XML_Char *name, XML_Encoding *info) +{ + // We must build conversion table for expat. The easiest way to do so + // is to let wxCSConv convert as string containing all characters to + // wide character representation: + wxCSConv conv(wxString(name, wxConvLibc)); + char mbBuf[2]; + wchar_t wcBuf[10]; + size_t i; + + mbBuf[1] = 0; + info->map[0] = 0; + for (i = 0; i < 255; i++) + { + mbBuf[0] = (char)(i+1); + if (conv.MB2WC(wcBuf, mbBuf, 2) == (size_t)-1) + { + // invalid/undefined byte in the encoding: + info->map[i+1] = -1; + } + info->map[i+1] = (int)wcBuf[0]; + } + + info->data = NULL; + info->convert = NULL; + info->release = NULL; + return 1; +} -bool wxXmlDocument::Save(wxOutputStream& stream, wxXmlIOType io_type) const +bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding) { - wxNode *n = sm_handlers->GetFirst(); - while (n) +#if wxUSE_UNICODE + (void)encoding; +#else + m_encoding = encoding; +#endif + + const size_t BUFSIZE = 1024; + char buf[BUFSIZE]; + wxXmlParsingContext ctx; + bool done; + XML_Parser parser = XML_ParserCreate(NULL); + + ctx.root = ctx.node = NULL; + ctx.encoding = wxT("UTF-8"); // default in absence of encoding="" + ctx.conv = NULL; +#if !wxUSE_UNICODE + if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") ) + ctx.conv = new wxCSConv(encoding); +#endif + + XML_SetUserData(parser, (void*)&ctx); + XML_SetElementHandler(parser, StartElementHnd, EndElementHnd); + XML_SetCharacterDataHandler(parser, TextHnd); + XML_SetCommentHandler(parser, CommentHnd); + XML_SetDefaultHandler(parser, DefaultHnd); + XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL); + + bool ok = true; + do { - wxXmlIOHandler *h = (wxXmlIOHandler*) n->GetData(); - if (io_type == h->GetType() && h->CanSave()) + size_t len = stream.Read(buf, BUFSIZE).LastRead(); + done = (len < BUFSIZE); + if (!XML_Parse(parser, buf, len, done)) { - return h->Save(stream, *this); + wxLogError(_("XML parsing error: '%s' at line %d"), + XML_ErrorString(XML_GetErrorCode(parser)), + XML_GetCurrentLineNumber(parser)); + ok = false; + break; } - n = n->GetNext(); + } while (!done); + + if (ok) + { + SetVersion(ctx.version); + SetFileEncoding(ctx.encoding); + SetRoot(ctx.root); } - wxLogError(_("Cannot find XML I/O handler capable of saving in this format.")); - return FALSE; -} + XML_ParserFree(parser); +#if !wxUSE_UNICODE + if ( ctx.conv ) + delete ctx.conv; +#endif + return ok; +} -void wxXmlDocument::AddHandler(wxXmlIOHandler *handler) +//----------------------------------------------------------------------------- +// wxXmlDocument saving routines +//----------------------------------------------------------------------------- + +// write string to output: +inline static void OutputString(wxOutputStream& stream, const wxString& str, + wxMBConv *convMem, wxMBConv *convFile) { - if (sm_handlers == NULL) + if (str.IsEmpty()) return; +#if wxUSE_UNICODE + const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8)); + stream.Write((const char*)buf, strlen((const char*)buf)); +#else + if ( convFile == NULL ) + stream.Write(str.mb_str(), str.Len()); + else { - sm_handlers = new wxList; - sm_handlers->DeleteContents(TRUE); + wxString str2(str.wc_str(*convMem), *convFile); + stream.Write(str2.mb_str(), str2.Len()); } - sm_handlers->Append(handler); +#endif } - -void wxXmlDocument::CleanUpHandlers() +// Same as above, but create entities first. +// Translates '<' to "<", '>' to ">" and '&' to "&" +static void OutputStringEnt(wxOutputStream& stream, const wxString& str, + wxMBConv *convMem, wxMBConv *convFile) { - delete sm_handlers; - sm_handlers = NULL; -} + wxString buf; + size_t i, last, len; + wxChar c; + len = str.Len(); + last = 0; + for (i = 0; i < len; i++) + { + c = str.GetChar(i); + if (c == wxT('<') || c == wxT('>') || + (c == wxT('&') && str.Mid(i+1, 4) != wxT("amp;"))) + { + OutputString(stream, str.Mid(last, i - last), convMem, convFile); + switch (c) + { + case wxT('<'): + OutputString(stream, wxT("<"), NULL, NULL); + break; + case wxT('>'): + OutputString(stream, wxT(">"), NULL, NULL); + break; + case wxT('&'): + OutputString(stream, wxT("&"), NULL, NULL); + break; + default: break; + } + last = i + 1; + } + } + OutputString(stream, str.Mid(last, i - last), convMem, convFile); +} -void wxXmlDocument::InitStandardHandlers() +inline static void OutputIndentation(wxOutputStream& stream, int indent) { - AddHandler(new wxXmlIOHandlerBin); -#if wxUSE_ZLIB - AddHandler(new wxXmlIOHandlerBinZ); -#endif - AddHandler(new wxXmlIOHandlerExpat); - AddHandler(new wxXmlIOHandlerWriter); + wxString str = wxT("\n"); + for (int i = 0; i < indent; i++) + str << wxT(' ') << wxT(' '); + OutputString(stream, str, NULL, NULL); } +static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent, + wxMBConv *convMem, wxMBConv *convFile) +{ + wxXmlNode *n, *prev; + wxXmlProperty *prop; -#include "wx/module.h" + switch (node->GetType()) + { + case wxXML_TEXT_NODE: + OutputStringEnt(stream, node->GetContent(), convMem, convFile); + break; -class wxXmlModule: public wxModule + case wxXML_ELEMENT_NODE: + OutputString(stream, wxT("<"), NULL, NULL); + OutputString(stream, node->GetName(), NULL, NULL); + + prop = node->GetProperties(); + while (prop) + { + OutputString(stream, wxT(" ") + prop->GetName() + + wxT("=\"") + prop->GetValue() + wxT("\""), + NULL, NULL); + // FIXME - what if prop contains '"'? + prop = prop->GetNext(); + } + + if (node->GetChildren()) + { + OutputString(stream, wxT(">"), NULL, NULL); + prev = NULL; + n = node->GetChildren(); + while (n) + { + if (n && n->GetType() != wxXML_TEXT_NODE) + OutputIndentation(stream, indent + 1); + OutputNode(stream, n, indent + 1, convMem, convFile); + prev = n; + n = n->GetNext(); + } + if (prev && prev->GetType() != wxXML_TEXT_NODE) + OutputIndentation(stream, indent); + OutputString(stream, wxT("GetName(), NULL, NULL); + OutputString(stream, wxT(">"), NULL, NULL); + } + else + OutputString(stream, wxT("/>"), NULL, NULL); + break; + + case wxXML_COMMENT_NODE: + OutputString(stream, wxT(""), NULL, NULL); + break; + + default: + wxFAIL_MSG(wxT("unsupported node type")); + } +} + +bool wxXmlDocument::Save(wxOutputStream& stream) const { - DECLARE_DYNAMIC_CLASS(wxXmlModule) - public: - wxXmlModule() {} - bool OnInit() { wxXmlDocument::InitStandardHandlers(); return TRUE; }; - void OnExit() { wxXmlDocument::CleanUpHandlers(); }; -}; + if ( !IsOk() ) + return FALSE; -IMPLEMENT_DYNAMIC_CLASS(wxXmlModule, wxModule) + wxString s; + + wxMBConv *convMem = NULL, *convFile = NULL; +#if wxUSE_UNICODE + convFile = new wxCSConv(GetFileEncoding()); +#else + if ( GetFileEncoding() != GetEncoding() ) + { + convFile = new wxCSConv(GetFileEncoding()); + convMem = new wxCSConv(GetEncoding()); + } +#endif + s.Printf(wxT("\n"), + GetVersion().c_str(), GetFileEncoding().c_str()); + OutputString(stream, s, NULL, NULL); + OutputNode(stream, GetRoot(), 0, convMem, convFile); + OutputString(stream, wxT("\n"), NULL, NULL); + if ( convFile ) + delete convFile; + if ( convMem ) + delete convMem; -// When wxXml is loaded dynamically after the application is already running -// then the built-in module system won't pick this one up. Add it manually. -void wxXmlInitXmlModule() -{ - wxModule* module = new wxXmlModule; - module->Init(); - wxModule::RegisterModule(module); + return TRUE; } -