Merge commit

Author: Andrii Boichuk

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

@@ -148,16 +148,6 @@ int main(int argc, char *argv[])
     routeTableWithShutdownCommand->Add<webdriver::ShutdownCommand>(shutdownCommandRoute);
     wd_server->SetRouteTable(routeTableWithShutdownCommand);
 
-    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();
@@ -214,7 +204,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,10 +3,13 @@
 #include <iostream>
 #include <QtNetwork/QHostAddress>
 #include <QtCore/QMap>
+#include <QtCore/QRegExp>
 
 #define MAJOR_INDEX 6
 #define MINOR_INDEX 10
 
+VNCClient* VNCClient::_instance = NULL;
+
 static QMap<quint32, quint16> initializeMap()
 {
     QMap<quint32, quint16> resultMap;
@@ -70,10 +73,28 @@ VNCClient::~VNCClient()
     delete _serverParameters;
 }
 
+VNCClient* VNCClient::getInstance()
+{
+    if (NULL == _instance)
+    {
+        _instance = new VNCClient();
+    }
+
+    return _instance;
+}
+
 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/vnc/vncclient.h

@@ -12,9 +12,10 @@ class VNCClient : public QObject
     Q_OBJECT
 
 public:
-    VNCClient();
     ~VNCClient();
 
+    static VNCClient* getInstance();
+
     bool Init(QString remoteHost, quint16 port);
     void sendKeyEvent(QKeyEvent *key);
     void sendMouseEvent(QMouseEvent *mouse);
@@ -30,6 +31,8 @@ private slots:
     void onError(QAbstractSocket::SocketError error);
 
 private:
+    VNCClient();
+
     bool establishProtocolVersion(QByteArray& data);
     bool establishSecurity(QByteArray& data);
     bool finishHandshaking(QByteArray& data);
@@ -68,6 +71,7 @@ private slots:
     static QMap<quint32, quint16> _keymap;
 
 private:
+    static VNCClient *_instance;
     QTcpSocket *_socket;
     bool _versionEstablished;
     bool _securityEstablished;

src/webdriver/extension_qt/q_session_lifecycle_actions.cc

@@ -1,4 +1,8 @@
 #include "extension_qt/q_session_lifecycle_actions.h"
+#include "extension_qt/wd_event_dispatcher.h"
+#include "extension_qt/vnc_event_dispatcher.h"
+#include "webdriver_switches.h"
+#include "webdriver_server.h"
 
 #include "q_proxy_parser.h"
 
@@ -29,6 +33,25 @@ Error* QSessionLifeCycleActions::PostInit(const base::DictionaryValue* desired_c
 		session_->logger().Log(kInfoLogLevel, "no proxy settings requsted.");
 	}
 
+    // 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 = VNCClient::getInstance();
+        if (!client->isReady())
+            client->Init(address, port);
+
+        WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
+    }
+
 	return error;
 }
 

src/webdriver/webdriver_server.cc

@@ -1,4 +1,3 @@
-
 #include "webdriver_server.h"
 #include "webdriver_route_table.h"
 #include "commands/command.h"

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

wd_build_options.gypi

@@ -66,10 +66,17 @@
          'NOMINMAX',
          '_UNICODE',
          '_WINSOCKAPI_',
-      ],
+      ],	
     } ],
 
     [ 'OS == "mac"', {
+      'actions': [ {                                                                                                                                                 
+        'action_name': 'create_input_dir',                                                                                                                                  
+        'inputs':      [],                                                                                                                                           
+        'outputs':     [],                                                                                                                      
+        'action':      ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],                                                                                                  
+       } ],
+       
        'defines': [
          'OS_POSIX',
        ],