X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6853b4a5d799d8fd9d55aacd517e26583eadfe8..739555e3218220043efa230cca8e44a91ae82d30:/utils/wxrc/wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index ad0c3de2ad..65a606db6e 100644
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -27,8 +27,7 @@
 #endif
 
 #include "wx/cmdline.h"
-#include "wx/xml/xml.h"
-#include "wx/xml/xmlio.h"
+#include "wx/xrc/xml.h"
 #include "wx/ffile.h"
 #include "wx/wfstream.h"
 
@@ -59,11 +58,17 @@ private:
     wxArrayString PrepareTempFiles();
     void FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath);
 
+    wxString GetInternalFileName(const wxString& name, const wxArrayString& flist);
     void DeleteTempFiles(const wxArrayString& flist);
     void MakePackageZIP(const wxArrayString& flist);
     void MakePackageCPP(const wxArrayString& flist);
+    void MakePackagePython(const wxArrayString& flist);
+
+    void OutputGettext();
+    wxArrayString FindStrings();
+    wxArrayString FindStrings(wxXmlNode *node);
             
-    bool flagVerbose, flagCPP, flagCompress;
+    bool flagVerbose, flagCPP, flagPython, flagGettext;
     wxString parOutput, parFuncname, parOutputPath;
     wxArrayString parFiles;
     int retCode;
@@ -79,21 +84,24 @@ int XmlResApp::OnRun()
 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
+        { wxCMD_LINE_SWITCH, "h", "help",  "show help message", 
+              wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "c", "cpp-code",  "output C++ source rather than .rsc file" },
-        { wxCMD_LINE_SWITCH, "u", "uncompressed",  "do not compress .xml files (C++ only)" },
-        { wxCMD_LINE_OPTION, "n", "function",  "C++ function name (with -c) [InitXmlResource]" },
-        { wxCMD_LINE_OPTION, "o", "output",  "output file [resource.rsc/cpp]" },
+        { wxCMD_LINE_SWITCH, "p", "python-code",  "output wxPython source rather than .rsc file" },
+        { wxCMD_LINE_SWITCH, "g", "gettext",  "output list of translatable strings (to stdout or file if -o used)" },
+        { wxCMD_LINE_OPTION, "n", "function",  "C++/Python function name (with -c or -p) [InitXmlResource]" },
+        { wxCMD_LINE_OPTION, "o", "output",  "output file [resource.xrs/cpp]" },
+#if 0 // not yet implemented
         { wxCMD_LINE_OPTION, "l", "list-of-handlers",  "output list of neccessary handlers to this file" },
-
-        { wxCMD_LINE_PARAM,  NULL, NULL, "input file",
-            wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
+#endif
+        { wxCMD_LINE_PARAM,  NULL, NULL, "input file(s)",
+              wxCMD_LINE_VAL_STRING, 
+              wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
 
         { wxCMD_LINE_NONE }
     };
 
-    wxXmlDocument::AddHandler(new wxXmlIOHandlerBinZ);
-
     wxCmdLineParser parser(cmdLineDesc, argc, argv);
 
     switch (parser.Parse())
@@ -105,7 +113,10 @@ int XmlResApp::OnRun()
         case 0:
             retCode = 0;
             ParseParams(parser);
-            CompileRes();
+            if (flagGettext)
+                OutputGettext();
+            else
+                CompileRes();
 #if wxUSE_GUI
             return FALSE;
 #else
@@ -128,12 +139,25 @@ int XmlResApp::OnRun()
 
 void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
 {
+    flagGettext = cmdline.Found("g");
     flagVerbose = cmdline.Found("v");
     flagCPP = cmdline.Found("c");
-    flagCompress = flagCPP && !cmdline.Found("u");
+    flagPython = cmdline.Found("p");
 
     if (!cmdline.Found("o", &parOutput)) 
-        parOutput = flagCPP ? "resource.cpp" : "resource.rsc";
+    {
+        if (flagGettext)
+            parOutput = wxEmptyString;
+        else
+        {
+            if (flagCPP)
+                parOutput = "resource.cpp";
+            else if (flagPython)
+                parOutput = "resource.py";
+            else
+                parOutput = "resource.xrs";
+        }
+    }
     parOutputPath = wxPathOnly(parOutput);
     if (!parOutputPath) parOutputPath = ".";
 
@@ -157,6 +181,8 @@ void XmlResApp::CompileRes()
     {        
         if (flagCPP)
             MakePackageCPP(files);
+        else if (flagPython)
+            MakePackagePython(files);
         else
             MakePackageZIP(files);
     }
@@ -165,6 +191,28 @@ void XmlResApp::CompileRes()
 }
 
 
+wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist)
+{
+    wxString name2 = name;
+    name2.Replace(":", "_");
+    name2.Replace("/", "_");
+    name2.Replace("\\", "_");
+    name2.Replace("*", "_");
+    name2.Replace("?", "_");
+    
+    wxString s = wxFileNameFromPath(parOutput) + "$" + name2;
+
+    if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND)
+    {        
+        for (int i = 0;; i++)
+        {
+            s.Printf(wxFileNameFromPath(parOutput) + "$%03i-" + name2, i);
+            if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND)
+                break;
+        }
+    }
+    return s;
+}
 
 wxArrayString XmlResApp::PrepareTempFiles()
 {
@@ -189,8 +237,10 @@ wxArrayString XmlResApp::PrepareTempFiles()
 
         FindFilesInXML(doc.GetRoot(), flist, path);
 
-        doc.Save(parOutputPath + "/" + name + ".xmb", flagCompress ? wxXML_IO_BINZ : wxXML_IO_BIN);
-        flist.Add(name + ".xmb");
+        wxString internalName = GetInternalFileName(parFiles[i], flist);
+        
+        doc.Save(parOutputPath + "/" + internalName);
+        flist.Add(internalName);
     }
     
     return flist;
@@ -212,22 +262,19 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
             (n->GetType() == wxXML_TEXT_NODE || 
             n->GetType() == wxXML_CDATA_SECTION_NODE) &&
             // ...it is textnode...
-            (node/*not n!*/->GetName() == "bitmap"))
+            ((node/*not n!*/->GetName() == "bitmap") ||
+             (node/*not n!*/->GetName() == "url")))
             // ...and known to contain filename
         {
             wxString fullname;
-            wxString filename = n->GetContent();
-            if (wxIsAbsolutePath(n->GetContent())) fullname = n->GetContent();
+            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent();
             else fullname = inputPath + "/" + n->GetContent();
+
+            if (flagVerbose) 
+                wxPrintf("adding     " + fullname +  "...\n");
             
-            filename.Replace("/", "_");
-            filename.Replace("\\", "_");
-            filename.Replace("*", "_");
-            filename.Replace("?", "_");
+            wxString filename = GetInternalFileName(n->GetContent(), flist);
             n->SetContent(filename);
-            
-            if (flagVerbose) 
-                wxPrintf("adding " + filename +  "...\n");
 
             flist.Add(filename);
 
@@ -285,38 +332,32 @@ static wxString FileToCppArray(wxString filename, int num)
     wxString snum;
     wxFFile file(filename, "rb");
     size_t lng = file.Length();
-    int linelng;
     
     snum.Printf("%i", num);
     output.Printf("static size_t xml_res_size_" + snum + " = %i;\n", lng);
-    output += "static unsigned char xml_res_file_" + snum + "[] = \"\\\n";
+    output += "static unsigned char xml_res_file_" + snum + "[] = {\n";
+    // we cannot use string literals because MSVC is dumb wannabe compiler
+    // with arbitrary limitation to 2048 strings :(
     
     unsigned char *buffer = new unsigned char[lng];
     file.Read(buffer, lng);
     
     for (size_t i = 0, linelng = 0; i < lng; i++)
     {
-        if (linelng > 70) 
+        tmp.Printf("%i", buffer[i]);
+        if (i != 0) output << ',';
+        if (linelng > 70)
         {
             linelng = 0;
-            output += "\\\n";
-        }
-        if (buffer[i] < 32 || buffer[i] == '"' || buffer[i] == '\\')
-        {
-            tmp.Printf("\\%03o", buffer[i]);
-            output += tmp;
-            linelng += 4;
-        }
-        else
-        {
-            output << (wxChar)buffer[i];
-            linelng++;
+            output << "\n";
         }
+        output << tmp;
+        linelng += tmp.Length()+1;
     }
     
     delete[] buffer;
     
-    output += "\"\n;\n\n";
+    output += "};\n\n";
     
     return output;
 }
@@ -331,20 +372,23 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
         wxPrintf("creating C++ source file " + parOutput +  "...\n");
     
     file.Write("\
-#include \"wx/wxprec.h\"\n\
+//\n\
+// This file was automatically generated by wxrc, do not edit by hand.\n\
+//\n\n\
+#include <wx/wxprec.h>\n\
 \n\
 #ifdef __BORLANDC__\n\
     #pragma hdrstop\n\
 #endif\n\
 \n\
 #ifndef WX_PRECOMP\n\
-    #include \"wx/wx.h\"\n\
+    #include <wx/wx.h>\n\
 #endif\n\
 \
-#include \"wx/filesys.h\"\n\
-#include \"wx/fs_mem.h\"\n\
-#include \"wx/xml/xmlres.h\"\n\
-#include \"wx/xml/xh_all.h\"\n\
+#include <wx/filesys.h>\n\
+#include <wx/fs_mem.h>\n\
+#include <wx/xrc/xmlres.h>\n\
+#include <wx/xrc/xh_all.h>\n\
 \n");
 
     for (i = 0; i < flist.Count(); i++)
@@ -356,10 +400,10 @@ void " + parFuncname + "()\n\
 \n\
     // Check for memory FS. If not present, load the handler:\n\
     {\n\
-        wxMemoryFSHandler::AddFile(\"xml_resource/dummy_file\", \"dummy one\");\n\
+        wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n\
         wxFileSystem fsys;\n\
-        wxFSFile *f = fsys.OpenFile(\"memory:xml_resource/dummy_file\");\n\
-        wxMemoryFSHandler::RemoveFile(\"xml_resource/dummy_file\");\n\
+        wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n\
+        wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n\
         if (f) delete f;\n\
         else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n\
     }\n\
@@ -368,20 +412,211 @@ void " + parFuncname + "()\n\
     for (i = 0; i < flist.Count(); i++)
     {
         wxString s;
-        s.Printf("    wxMemoryFSHandler::AddFile(\"xml_resource/" + flist[i] +
+        s.Printf("    wxMemoryFSHandler::AddFile(\"XRC_resource/" + flist[i] +
                  "\", xml_res_file_%i, xml_res_size_%i);\n", i, i);
         file.Write(s);
     }
 
     for (i = 0; i < parFiles.Count(); i++)
     {
-        wxString name, ext, path;
-        wxSplitPath(parFiles[i], &path, &name, &ext);
-        file.Write("    wxTheXmlResource->Load(\"memory:xml_resource/" + 
-                   name + ".xmb" + "\");\n");
+        file.Write("    wxXmlResource::Get()->Load(\"memory:XRC_resource/" + 
+                   GetInternalFileName(parFiles[i], flist) + "\");\n");
+    }
+    
+    file.Write("}\n");
+
+
+}
+
+static wxString FileToPythonArray(wxString filename, int num)
+{
+    wxString output;
+    wxString tmp;
+    wxString snum;
+    wxFFile file(filename, "rb");
+    size_t lng = file.Length();
+    
+    snum.Printf("%i", num);
+    output = "    xml_res_file_" + snum + " = \"\"\"\\\n";
+    
+    unsigned char *buffer = new unsigned char[lng];
+    file.Read(buffer, lng);
+    
+    for (size_t i = 0, linelng = 0; i < lng; i++)
+    {
+        unsigned char c = buffer[i];
+        if (c == '\n')
+        {
+            tmp = (wxChar)c;
+            linelng = 0;
+        }
+        else if (c < 32 || c > 127)
+            tmp.Printf("\\x%02x", c);
+        else if (c == '\\')
+            tmp = "\\\\";
+        else
+            tmp = (wxChar)c;
+        if (linelng > 70)
+        {
+            linelng = 0;
+            output << "\\\n";
+        }
+        output << tmp;
+        linelng += tmp.Length();
+    }
+    
+    delete[] buffer;
+    
+    output += "\"\"\"\n\n";
+    
+    return output;
+}
+
+
+void XmlResApp::MakePackagePython(const wxArrayString& flist)
+{
+    wxFFile file(parOutput, "wt");
+    size_t i;
+
+    if (flagVerbose) 
+        wxPrintf("creating Python source file " + parOutput +  "...\n");
+    
+    file.Write(
+       "#\n"
+       "# This file was automatically generated by wxrc, do not edit by hand.\n"
+       "#\n\n"
+       "from wxPython.wx import *\n"
+       "from wxPython.xrc import *\n\n"
+    );
+
+    
+    file.Write("def " + parFuncname + "():\n");
+
+    for (i = 0; i < flist.Count(); i++)
+        file.Write(FileToPythonArray(flist[i], i));
+
+    for (i = 0; i < flist.Count(); i++)
+    {
+        wxString s;
+        s.Printf("    wxXmlResource_Get().LoadFromString(xml_res_file_%i)\n", i);
+        file.Write(s);
+    }
+}
+
+
+
+void XmlResApp::OutputGettext()
+{
+    wxArrayString str = FindStrings();
+    
+    wxFFile fout;
+    if (!parOutput) fout.Attach(stdout);
+    else fout.Open(parOutput, _T("wt"));
+    
+    for (size_t i = 0; i < str.GetCount(); i++)
+        fout.Write(_T("_(\"") + str[i] + _T("\");\n"));
+    
+    if (!parOutput) fout.Detach();
+}
+
+
+
+wxArrayString XmlResApp::FindStrings()
+{
+    wxArrayString arr, a2;
+
+    for (size_t i = 0; i < parFiles.Count(); i++)
+    {
+        if (flagVerbose) 
+            wxPrintf("processing " + parFiles[i] +  "...\n");
+
+        wxXmlDocument doc;        
+        if (!doc.Load(parFiles[i]))
+        {
+            wxLogError("Error parsing file " + parFiles[i]);
+            retCode = 1;
+            continue;
+        }
+        a2 = FindStrings(doc.GetRoot());
+        WX_APPEND_ARRAY(arr, a2);
     }
     
-    file.Write("\n}\n");
+    return arr;
+}
 
 
+
+static wxString ConvertText(const wxString& str)
+{
+    wxString str2;
+    const wxChar *dt;
+
+    for (dt = str.c_str(); *dt; dt++)
+    {
+        if (*dt == wxT('_'))
+        {
+            if ( *(++dt) == wxT('_') )
+                str2 << wxT('_');
+            else
+                str2 << wxT('&') << *dt;
+        }
+        else 
+        {
+            switch (*dt)
+            {
+                case wxT('\n') : str2 << wxT("\\n"); break;
+                case wxT('\t') : str2 << wxT("\\t"); break;
+                case wxT('\r') : str2 << wxT("\\r"); break;
+                case wxT('\\') : str2 << wxT("\\\\"); break;
+                case wxT('"')  : str2 << wxT("\\\""); break;
+                default        : str2 << *dt; break;
+            }
+        }
+    }
+
+    return str2;
+}
+
+
+wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
+{
+    wxArrayString arr;
+
+    wxXmlNode *n = node;
+    if (n == NULL) return arr;
+    n = n->GetChildren();
+    
+    while (n)
+    {
+        if ((node->GetType() == wxXML_ELEMENT_NODE) &&
+            // parent is an element, i.e. has subnodes...
+            (n->GetType() == wxXML_TEXT_NODE || 
+            n->GetType() == wxXML_CDATA_SECTION_NODE) &&
+            // ...it is textnode...
+            (
+                node/*not n!*/->GetName() == _T("label") ||
+                (node/*not n!*/->GetName() == _T("value") &&
+                               !n->GetContent().IsNumber()) ||
+                node/*not n!*/->GetName() == _T("help") ||
+                node/*not n!*/->GetName() == _T("longhelp") ||
+                node/*not n!*/->GetName() == _T("tooltip") ||
+                node/*not n!*/->GetName() == _T("htmlcode") ||
+                node/*not n!*/->GetName() == _T("title") ||
+                node/*not n!*/->GetName() == _T("item")
+            ))
+            // ...and known to contain translatable string
+        {
+            arr.Add(ConvertText(n->GetContent()));
+        }
+        
+        // subnodes:
+        if (n->GetType() == wxXML_ELEMENT_NODE)
+        {
+            wxArrayString a2 = FindStrings(n);
+            WX_APPEND_ARRAY(arr, a2);
+        }
+        
+        n = n->GetNext();
+    }
+    return arr;
 }