From 6342eba8dadd73b39dd9a4b55ea08024da5834de Mon Sep 17 00:00:00 2001
From: "spider%netscape.com"
 <spider%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 20 Oct 1998 01:28:07 +0000
Subject: [PATCH] WIP: JS command parsing

git-svn-id: svn://10.0.0.236/trunk@13167 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../modules/test/src/nsTrexTestShell.cpp      | 124 ++++++++++++------
 mozilla/xpfc/canvas/src/nsXPFCCanvas.cpp      |   4 +-
 2 files changed, 89 insertions(+), 39 deletions(-)

diff --git a/mozilla/calendar/modules/test/src/nsTrexTestShell.cpp b/mozilla/calendar/modules/test/src/nsTrexTestShell.cpp
index de7c429215d..e15cfed6f3e 100644
--- a/mozilla/calendar/modules/test/src/nsTrexTestShell.cpp
+++ b/mozilla/calendar/modules/test/src/nsTrexTestShell.cpp
@@ -480,10 +480,8 @@ nsresult nsTrexTestShell::GetWebViewerContainer(nsIWebViewerContainer ** aWebVie
   return NS_OK;
 }
 
-nsresult nsTrexTestShell::SendCommand(nsString& aCommand)
+nsresult nsTrexTestShell::SendJS(nsString& aCommand)
 {
-  PRThread *t;
-
   nsIWidget * iw = nsnull;
   nsresult res = mInput->QueryInterface(kIWidgetIID, (void**)&iw);
   nsIWidget * dw = nsnull;
@@ -497,40 +495,8 @@ nsresult nsTrexTestShell::SendCommand(nsString& aCommand)
   mCommand.Truncate(0);
   aCommand.Copy(mCommand);
 
-#if 0
-
-
-  /*
-   * Start the client thread here
-   */
-
   mClientAddr.inet.ip = PR_htonl(PR_INADDR_LOOPBACK);
-  mExitMon = mClientMon;
 
-  mExitCounter = &mNumThreads;
-
-
-  t = PR_CreateThread(PR_USER_THREAD,
-                      TrexTestClientThread, 
-                      (void *) this,
-                      PR_PRIORITY_NORMAL,
-                      PR_LOCAL_THREAD,
-                      PR_UNJOINABLE_THREAD,
-                      0);
-
-  mNumThreads++;
-
-  while (mNumThreads) {
-      PR_Wait(mClientMon, PR_INTERVAL_NO_TIMEOUT);
-  }
-
-  PR_ExitMonitor(mClientMon);
-
-  NS_RELEASE(iw);
-  NS_RELEASE(dw);
-
-  return (ReceiveCommand(mCommand,mCommand));
-#else
   jsval rval;
 
   JS_EvaluateUCScriptForPrincipals(mJSContext, 
@@ -542,8 +508,19 @@ nsresult nsTrexTestShell::SendCommand(nsString& aCommand)
                                    0,
                                    &rval);
 
+  while (mNumThreads) {
+      PR_Wait(mClientMon, PR_INTERVAL_NO_TIMEOUT);
+  }
+
+  PR_ExitMonitor(mClientMon);
+
+  NS_RELEASE(iw);
+  NS_RELEASE(dw);
+
+  ReceiveCommand(mCommand,mCommand);
+
+
   return NS_OK;
-#endif
 }
 
 nsresult nsTrexTestShell::ReceiveCommand(nsString& aCommand, nsString& aReply)
@@ -586,7 +563,7 @@ nsEventStatus nsTrexTestShell::HandleEvent(nsGUIEvent *aEvent)
               PRUint32 length;
               mInput->GetText(text, 1000, length);
 
-              SendCommand(text);
+              SendJS(text);
 
             }
             break;
@@ -752,9 +729,82 @@ PR_STATIC_CALLBACK(JSBool) ZuluCommand(JSContext *cx,
                                        jsval *argv, 
                                        jsval *rval)
 {
+  /*
+   * Start the client thread here
+   */
+
+  nsTrexTestShell * a = (nsTrexTestShell*) JS_GetPrivate(cx, obj);
+
+  *rval = JSVAL_NULL;
+
+  /*
+   * XXX: Extract the command & args from JS
+   */
+
+  nsString command = "";
+  
+  if (argc >= 1) 
+  {
+
+    PRUint32 count = 0;
+
+    while (count != argc)
+    {
+      JSString * jsstring0 = JS_ValueToString(cx, argv[count]);
+      if (nsnull != jsstring0) 
+      {
+
+        if (count != 0)
+          command += " ";        
+
+        command += JS_GetStringChars(jsstring0);
+      }
+
+      *rval = JSVAL_VOID;
+
+      count++;
+    }
+  }
+  else 
+  {
+    JS_ReportError(cx, "Function zulucommand requires 1 parameter");
+    return JS_FALSE;
+  }
+
+  a->SendCommand(command);
+
+
   return JS_TRUE;
 }
 
+nsresult nsTrexTestShell::SendCommand(nsString& aCommand)
+{
+  /*
+   * Launch a thread to deal with this
+   */
+
+  PRThread *t;
+
+  mExitMon = mClientMon;
+
+  mExitCounter = &(mNumThreads);
+
+  mCommand = aCommand;
+
+  t = PR_CreateThread(PR_USER_THREAD,
+                      TrexTestClientThread, 
+                      (void *) this,
+                      PR_PRIORITY_NORMAL,
+                      PR_LOCAL_THREAD,
+                      PR_UNJOINABLE_THREAD,
+                      0);
+
+  mNumThreads++;
+
+
+  return NS_OK;
+}
+
 
 
 
diff --git a/mozilla/xpfc/canvas/src/nsXPFCCanvas.cpp b/mozilla/xpfc/canvas/src/nsXPFCCanvas.cpp
index 91fdb6912f9..294be2f8519 100644
--- a/mozilla/xpfc/canvas/src/nsXPFCCanvas.cpp
+++ b/mozilla/xpfc/canvas/src/nsXPFCCanvas.cpp
@@ -226,7 +226,7 @@ nsIXPFCCanvas * nsXPFCCanvas::CanvasFromName(nsString& aName)
    * If I am the canvas, just return
    */
 
-  if (aName == mNameID)
+  if (aName.EqualsIgnoreCase(mNameID))
     return this;
 
   /*
@@ -253,7 +253,7 @@ nsIXPFCCanvas * nsXPFCCanvas::CanvasFromName(nsString& aName)
 
     child = canvas->GetNameID();
 
-    if (child == aName) {
+    if (child.EqualsIgnoreCase(aName)) {
       NS_RELEASE(iterator);
       return canvas;
     }