[Gnash-commit] /srv/bzr/gnash/trunk r12151: new files for handing the XML protocol for ExternalInterface.

[Rob Savoye]

------------------------------------------------------------
revno: 12151
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-14 16:25:34 -0600
message:
  new files for handing the XML protocol for ExternalInterface.
added:
  plugin/npapi/external.cpp
  plugin/npapi/external.h

=== added file 'plugin/npapi/external.cpp'
--- a/plugin/npapi/external.cpp 1970-01-01 00:00:00 +0000
+++ b/plugin/npapi/external.cpp 2010-04-14 22:25:34 +0000
@@ -0,0 +1,234 @@
+// 
+//   Copyright (C) 2010 Free Software Foundation, Inc
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#include <string>
+#include <sstream>
+#include <vector>
+#include <cstring>
+#include <cstdlib>
+
+#include "npapi.h"
+#include "npruntime.h"
+#include "external.h"
+
+ExternalInterface::ExternalInterface ()
+{
+}
+
+ExternalInterface::~ExternalInterface ()
+{
+}
+
+// Create an Invoke message for the standalone Gnash
+std::string
+ExternalInterface::makeInvoke (const std::string &method,
+                               std::vector<std::string> args)
+{
+    std::stringstream ss;
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeNull ()
+{
+    std::stringstream ss;
+    
+    ss << "<null/>";
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeTrue ()
+{
+    std::stringstream ss;
+
+    ss << "<true/>";
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeFalse ()
+{
+    std::stringstream ss;
+    
+    ss << "<false/>";
+
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeString (const std::string &str)
+{
+    std::stringstream ss;
+
+    ss << "<string>" << str << "</string>";
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeNumber (double num)
+{
+    std::stringstream ss;
+
+    ss << "<number>" << num << "</number>";
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeNumber (int num)
+{
+    std::stringstream ss;
+
+    ss << "<number>" << num << "</number>";
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeNumber (unsigned int num)
+{
+    std::stringstream ss;
+    
+    ss << "<number>" << num << "</number>";
+
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeArray (std::vector<std::string> args)
+{
+    std::stringstream ss;
+    std::vector<std::string>::iterator it;
+    int index = 0;
+    
+    ss << "<array>";
+    for (it == args.begin(); it != args.end(); ++it) {
+        ss << "<property is = \">" << index++ << "\"";
+        index++;
+    }
+    
+    ss << "</array>";
+    
+    return ss.str();
+}
+
+std::string
+ExternalInterface::makeObject (std::vector<std::string> args)
+{
+    std::stringstream ss;
+    
+    return ss.str();
+}
+
+NPVariant *
+ExternalInterface::parseXML(const std::string &xml)
+{
+    NPVariant *value =  (NPVariant *)NPN_MemAlloc(sizeof(NPVariant));
+    NULL_TO_NPVARIANT(*value);
+    
+    if (xml.empty()) {
+        return value;
+    }
+    std::string::size_type start = 0;
+    std::string::size_type end;
+    std::string tag;
+
+    // Look for the ending > in the first part of the data for the tag
+    end = xml.find(">");
+    if (end != std::string::npos) {
+        tag = xml.substr(start, end);
+        // Look for the easy ones first
+        if (tag == "<null/>") {
+            NULL_TO_NPVARIANT(*value);
+        } else if (tag == "<true/>") {
+            BOOLEAN_TO_NPVARIANT(true, *value);
+        } else if (tag == "<false/>") {
+            BOOLEAN_TO_NPVARIANT(false, *value);
+        } else if (tag == "<number>") {
+            start = end + 1;
+            end = xml.find("</number>");
+            std::string str = xml.substr(start, end);
+            if (str.find(".") != std::string::npos) {
+                double num = strtod(str.c_str(), NULL);
+                DOUBLE_TO_NPVARIANT(num, *value);
+            } else {
+                int num = strtol(str.c_str(), NULL, 0);
+                INT32_TO_NPVARIANT(num, *value);
+            }
+        } else if (tag == "<string>") {
+            start = end + 1;
+            end = xml.find("</string>");
+            std::string str = xml.substr(start, end);
+            int length = str.size();;
+            char *data = (char *)NPN_MemAlloc(length+1);
+            std::copy(str.begin(), str.end(), data);
+            data[length] = 0;  // terminate the new string or bad things happen
+            // When an NPVariant becomes a string object, it *does not* make a 
copy.
+            // Instead it stores the pointer (and length) we just allocated.
+            STRINGN_TO_NPVARIANT(data, length, *value);
+        }
+    }
+    
+    return value;
+}
+
+std::string
+ExternalInterface::convertNPVariant (NPVariant *value)
+{
+    std::stringstream ss;
+    
+    if (NPVARIANT_IS_DOUBLE(*value)) {
+        double num = NPVARIANT_TO_DOUBLE(*value);
+        ss << "<number>" << num << "</number>";
+    } else if (NPVARIANT_IS_STRING(*value)) {
+        std::string str(NPVARIANT_TO_STRING(*value).UTF8Characters);
+        ss << "<string>" << str << "</string>";
+    } else if (NPVARIANT_IS_BOOLEAN(*value)) {
+        bool flag = NPVARIANT_TO_BOOLEAN(*value);
+        if (flag) {
+            ss << "<true/>";
+        } else {
+            ss << "<false/>";
+        }
+    } else if (NPVARIANT_IS_INT32(*value)) {
+        int num = NPVARIANT_TO_INT32(*value);
+        ss << "<number>" << num << "</number>";
+    } else if (NPVARIANT_IS_NULL(*value)) {
+        ss << "<null/>";
+    } else if (NPVARIANT_IS_VOID(*value)) {
+        ss << "<void/>";
+    } else if (NPVARIANT_IS_OBJECT(*value)) {
+        ss << "<object>";
+    }    
+    
+    return ss.str();
+}
+
+// local Variables:
+// mode: C++
+// indent-tabs-mode: nil
+// End:

=== added file 'plugin/npapi/external.h'
--- a/plugin/npapi/external.h   1970-01-01 00:00:00 +0000
+++ b/plugin/npapi/external.h   2010-04-14 22:25:34 +0000
@@ -0,0 +1,62 @@
+// 
+//   Copyright (C) 2010 Free Software Foundation, Inc
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#ifndef GNASH_PLUGIN_EXTERNAL_H
+#define GNASH_PLUGIN_EXTERNAL_H
+
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#include <string>
+#include <sstream>
+#include <vector>
+
+#include "npapi.h"
+#include "npruntime.h"
+
+class ExternalInterface
+{
+ public:
+  ExternalInterface ();
+  ~ExternalInterface ();
+
+  // Create an Invoke message for the standalone Gnash
+  std::string makeInvoke (const std::string &method, std::vector<std::string> 
args);
+
+  std::string makeNull ();
+  std::string makeTrue ();
+  std::string makeFalse ();
+  std::string makeString (const std::string &str);
+  std::string makeNumber (double num);
+  std::string makeNumber (int num);
+  std::string makeNumber (unsigned int num);
+  std::string makeArray (std::vector<std::string> args);
+  std::string makeObject (std::vector<std::string> args);
+
+  NPVariant *parseXML(const std::string &xml);
+  std::string convertNPVariant (NPVariant *npv);
+
+};
+
+#endif // GNASH_PLUGIN_EXTERNAL_H
+
+// local Variables:
+// mode: C++
+// indent-tabs-mode: nil
+// End: