Changeset 14050 for trunk

Timestamp:

06/03/12 20:21:39 (12 years ago)

Author:

tbretz

Message:

Added InterpreterV8 as base class to allow running JavaScripts

Location:

trunk/FACT++/src

Files:

• RemoteControl.cc (modified) (2 diffs)
• RemoteControl.h (modified) (6 diffs)

trunk/FACT++/src/RemoteControl.cc

@@ -23 +23 @@
         {
             fCurrentServer = s;
-            return false;
+            return true;
         }
         lout << kRed << "Unkown server '" << s << "'" << endl;
-        return true;
+        return false;
     }
 
@@ -32 +32 @@
     {
         fCurrentServer = "";
-        return false;
+        return true;
     }
 
-    return !SendDimCommand(lout, fCurrentServer, str);
+    return SendDimCommand(lout, fCurrentServer, str);
 }
 

trunk/FACT++/src/RemoteControl.h

@@ -1 +1 @@
 #ifndef FACT_RemoteControl
 #define FACT_RemoteControl
+
+#include "InterpreterV8.h"
 
 // **************************************************************************
@@ -59 +61 @@
 
 template <class T>
-class RemoteControl : public T, public RemoteControlImp
+class RemoteControl : public T, public RemoteControlImp, public InterpreterV8
 {
 private:
@@ -135 +137 @@
         T::UpdatePrompt();
     }
+
+    // ===========================================================================
+
+    virtual void JsLoad(const std::string &)         { SetSection(-2); }
+    virtual void JsStart(const std::string &)        { SetSection(-1); }
+    virtual void JsEnd(const std::string &)          { SetSection(-3); }
+    virtual bool JsSend(const std::string &str)      { return ProcessCommand(str); }
+    virtual void JsPrint(const std::string &msg)     { fImp->Comment(msg); }
+    virtual void JsException(const std::string &str) { fImp->Error(str); }
+
+    void JsSleep(uint32_t ms)
+    {
+        const Time timeout = ms<=0 ? Time(Time::none) : Time()+boost::posix_time::millisec(ms);
+
+        T::GetStreamOut().Display(true);
+        T::GetStreamOut().SetBacklog(false);
+        T::GetStreamOut().SetNullOutput(false);
+        while (timeout>Time() && !T::IsScriptStopped())
+            usleep(1);
+        T::GetStreamOut().SetNullOutput(true);
+        T::GetStreamOut().SetBacklog(true);
+    }
+
+    int JsWait(const string &server, int32_t state, uint32_t ms)
+    {
+        const ClientList::const_iterator l = fClientList.find(server);
+        if (l==fClientList.end())
+        {
+            lout << kRed << "Server '" << server << "' not found." << endl;
+            T::StopScript();
+            return -1;
+        }
+
+        const Time timeout = ms<=0 ? Time(Time::none) : Time()+boost::posix_time::millisec(ms);
+
+        T::GetStreamOut().Display(true);
+        T::GetStreamOut().SetBacklog(false);
+        T::GetStreamOut().SetNullOutput(false);
+        while (l->second->GetState()!=state && timeout>Time() && !T::IsScriptStopped())
+            usleep(1);
+        T::GetStreamOut().SetNullOutput(true);
+        T::GetStreamOut().SetBacklog(true);
+
+        return l->second->GetState()==state;
+    }
+
+
+    // ===========================================================================
+
 
 public:
@@ -196 +247 @@
         }
 
+        if (str.substr(0, 4)==".js ")
+        {
+            JsRun(Tools::Trim(str.substr(3)));
+            return true;
+        }
+
         if (str.substr(0, 3)==".s ")
         {
@@ -210 +267 @@
             }
 
-            const ClientList::const_iterator l = fClientList.find(server);
-            if (l==fClientList.end())
-            {
-                lout << kRed << "Server '" << server << "' not found." << endl;
-                return true;
-            }
-
-            const Time timeout = ms<=0 ? Time(Time::none) : Time()+boost::posix_time::millisec(ms);
-
-            T::GetStreamOut().Display(true);
-            T::GetStreamOut().SetBacklog(false);
-            T::GetStreamOut().SetNullOutput(false);
-            while (l->second->GetState()!=state && timeout>Time() && !T::IsScriptStopped())
-                usleep(1);
-            T::GetStreamOut().SetNullOutput(true);
-            T::GetStreamOut().SetBacklog(true);
-
-            if (l->second->GetState()==state)
+            const int rc = JsWait(server, state, ms);
+
+            if (rc<0 || rc==1)
                 return true;
 
@@ -267 +309 @@
         }
 
-        return ProcessCommand(str);
+        return !ProcessCommand(str);
     }