moved DelayedCmd from Screen.cc to FbTk/Timer.cc, added it to the keys file

1 files changed, 37 insertions, 1 deletions

diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index 9492ac6..ff568dc 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -24,7 +24,8 @@
 
 #include "Timer.hh"
 
-#include "Command.hh"
+#include "ObjectRegistry.hh"
+#include "StringUtil.hh"
 
 //use GNU extensions
 #ifndef _GNU_SOURCE
@@ -246,6 +247,41 @@ void Timer::addTimer(Timer *timer) {
 
 }
 
+Command *DelayedCmd::parse(const std::string &command,
+                           const std::string &args, bool trusted) {
+
+    std::string cmd_str;
+    int err = StringUtil::getStringBetween(cmd_str, args.c_str(), '{', '}');
+    if (err == 0)
+        return 0;
+
+    RefCount<Command> cmd(ObjectRegistry<Command>::instance().parse(cmd_str, trusted));
+    if (*cmd == 0)
+        return 0;
+
+    int delay = 200000;
+    StringUtil::fromString<int>(args.c_str() + err, delay);
+
+    return new DelayedCmd(cmd, delay);
+}
+
+REGISTER_OBJECT_PARSER(delay, DelayedCmd::parse, Command);
+
+DelayedCmd::DelayedCmd(RefCount<Command> &cmd, unsigned int timeout) {
+    timeval to; // defaults to 200ms
+    to.tv_sec = timeout/1000000;
+    to.tv_usec = timeout % 1000000;
+    m_timer.setTimeout(to);
+    m_timer.setCommand(cmd);
+    m_timer.fireOnce(true);
+}
+
+void DelayedCmd::execute() {
+    if (m_timer.isTiming())
+        m_timer.stop();
+    m_timer.start();
+}
+
 void Timer::removeTimer(Timer *timer) {
     assert(timer);
     m_timerlist.remove(timer);