Added command line switches for VNC

Changed VNC start from application to WD

Author: Andrii Moroz

inc/webdriver_switches.h

@@ -69,8 +69,13 @@ class Switches {
 
     /// \page page_webdriver_switches WD Server switches
     /// - <b>vnc</b><br>
-    /// Enabling VNC support (by default - false)
-    static const char kVNCEnabled[];
+    /// VNC server listening port (by default - 5900)
+    static const char kVNCPort[];
+
+    /// \page page_webdriver_switches WD Server switches
+    /// - <b>vnc</b><br>
+    /// VNC server IP address (by default - 127.0.0.1)
+    static const char kVNCServer[];
 
 };
 

src/Test/main.cc

@@ -140,17 +140,6 @@ int main(int argc, char *argv[])
     if (0 != wd_server->Configure(cmd_line)) {
         return 1;
     }
-
-    VNCClient *client = new VNCClient();
-    client->Init("http://127.0.0.1", 5900);
-
-
-    CommandLine cmdLine = webdriver::Server::GetInstance()->GetCommandLine();
-
-    if (cmdLine.HasSwitch(webdriver::Switches::kVNCEnabled))
-    {
-        WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
-    }
 
 	setQtSettings();
     wd_server->Start();
@@ -207,7 +196,9 @@ void PrintHelp() {
                 << "                                  described above (port, root, etc.)"             << std::endl
                 << "wi-server      false              If true, web inspector will be enabled"         << std::endl
                 << "wi-port        9222               Web inspector listening port"                   << std::endl
-                << "version                           Print version information to stdout and exit"   << std::endl;
+                << "version                           Print version information to stdout and exit"   << std::endl
+                << "vnc-port       5900               VNC server listening port"                      << std::endl
+                << "vnc-server     127.0.0.1          VNC server IP address"                          << std::endl;
 }
 
 

src/vnc/vncclient.cc

@@ -3,6 +3,7 @@
 #include <iostream>
 #include <QtNetwork/QHostAddress>
 #include <QtCore/QMap>
+#include <QtCore/QRegExp>
 
 #define MAJOR_INDEX 6
 #define MINOR_INDEX 10
@@ -73,7 +74,15 @@ VNCClient::~VNCClient()
 bool VNCClient::Init(QString remoteHost, quint16 port)
 {
     _socket = new QTcpSocket();
-    _socket->connectToHost(QHostAddress::LocalHost, port);
+    QHostAddress addr;
+
+    if (!addr.setAddress(remoteHost))
+    {
+        remoteHost.replace(QRegExp("http*://"), "");
+        addr.setAddress(remoteHost);
+    }
+
+    _socket->connectToHost(addr, port);
 
     // QObject::connect(_socket, SIGNAL(bytesWritten(qint64)), this, SLOT(readSocket(qint64)));
     QObject::connect(_socket, SIGNAL(readyRead()), this, SLOT(readSocket()));

src/webdriver/webdriver_server.cc

@@ -1,8 +1,12 @@
+#include <QtCore/QString>
 
 #include "webdriver_server.h"
 #include "webdriver_route_table.h"
 #include "commands/command.h"
 #include "commands/response.h"
+#include "vnc/vncclient.h"
+#include "extension_qt/wd_event_dispatcher.h"
+#include "extension_qt/vnc_event_dispatcher.h"
 
 #include "mongoose.h"
 
@@ -137,6 +141,25 @@ int Server::Start() {
     }
     opts[mg_options_.size()] = NULL;
 
+    // start VNC module
+    CommandLine cmdLine = webdriver::Server::GetInstance()->GetCommandLine();
+    if (cmdLine.HasSwitch(webdriver::Switches::kVNCServer) || cmdLine.HasSwitch(webdriver::Switches::kVNCPort))
+    {
+        QString address = "127.0.0.1";
+        int port = 5900;
+
+        if (cmdLine.HasSwitch(webdriver::Switches::kVNCServer))
+            address = cmdLine.GetSwitchValueASCII(webdriver::Switches::kVNCServer).c_str();
+        if (cmdLine.HasSwitch(webdriver::Switches::kVNCPort))
+            port = QString(cmdLine.GetSwitchValueASCII(webdriver::Switches::kVNCPort).c_str()).toInt();
+
+        VNCClient *client = new VNCClient();
+        client->Init(address, port);
+
+
+        WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
+    }
+
     // Initialize SHTTPD context.
     mg_ctx_ = mg_start((mg_callback_t)&ProcessHttpRequestCb,
                         this,

src/webdriver/webdriver_switches.cc

@@ -22,6 +22,8 @@ const char Switches::kWIServer[] = "wi-server";
 
 const char Switches::kWIPort[] = "wi-port";
 
-const char Switches::kVNCEnabled[] = "vnc";
+const char Switches::kVNCPort[] = "vnc-port";
+
+const char Switches::kVNCServer[] = "vnc-server";
 
 }  // namespace webdriver