rhodes 2.4.1 → 3.0.0.beta.1

data/platform/wm/rhodes/MainWindow.cpp

@@ -851,8 +851,11 @@ void __stdcall CMainWindow::OnBeforeNavigate2(IDispatch* pDisp, VARIANT * pvtURL
 
     LOG(TRACE) + "OnBeforeNavigate2: " + szURL;
 
-    if ( wcsstr(szURL, L"rho_open_target=_blank") != 0)
+    const wchar_t *to_remove;
+    if ( (to_remove = wcsstr(szURL, L"rho_open_target=_blank")) != 0)
     {
+        wcscpy((wchar_t*)to_remove, (wchar_t*)to_remove+22);
+
         LOG(INFO) + "Open external browser: " + szURL;
 #ifdef OS_WINCE
         rho_wmsys_run_app(convertToStringA(szURL).c_str(), 0 );
@@ -1143,7 +1146,7 @@ void CMainWindow::createCustomMenu()
 	RHODESAPP().getAppMenu().copyMenuItems(m_arAppMenuItems);
 
 #ifdef ENABLE_DYNAMIC_RHOBUNDLE
-    String strIndexPage = CFilePath::join(RHODESAPP().getStartUrl(),"index_erb.iseq");
+    String strIndexPage = CFilePath::join(RHODESAPP().getStartUrl(),"index"RHO_ERB_EXT);
     if ( RHODESAPP().getCurrentUrl().compare(RHODESAPP().getStartUrl()) == 0 ||
          RHODESAPP().getCurrentUrl().compare(strIndexPage) == 0 )
         m_arAppMenuItems.addElement(CAppMenuItem("Reload RhoBundle","reload_rhobundle"));

data/platform/wm/rhodes/MainWindow.h

@@ -2,6 +2,8 @@
 
 #pragma once
 
+#ifndef RHODES_EMULATOR
+
 #if !defined(_WIN32_WCE) || defined( OS_PLATFORM_CE )
 #include <exdispid.h>
 #include <exdisp.h>
@@ -256,4 +258,10 @@ private:
 
 #if !defined(_WIN32_WCE) || defined( OS_PLATFORM_CE ) 
 HBITMAP SHLoadImageFile (  LPCTSTR pszFileName );
-#endif
+#endif
+
+#else
+
+#include "emulator\MainWindowQt.h"
+
+#endif

data/platform/wm/rhodes/RhoNativeViewManager.cpp

@@ -72,7 +72,9 @@ public:
 	virtual void run() {
 		CMainWindow* mw = Rhodes_getMainWindow();
 		String sn(mView->factory_holder->viewtype);
+#ifndef RHODES_EMULATOR
 		mw->openNativeView(mView->factory_holder->factory, mView->n_view, sn);
+#endif
 		//delete this;
 	}
 
@@ -86,7 +88,9 @@ public:
 	}
 	virtual void run() {
 		CMainWindow* mw = Rhodes_getMainWindow();
+#ifndef RHODES_EMULATOR
 		mw->closeNativeView();
+#endif
 		//delete this;
 	}
 };

data/platform/wm/rhodes/Rhodes.cpp

@@ -80,13 +80,49 @@ public :
                 char* path = parseToken( token.c_str(), token.length() );
 				if (path) {
 					int len = strlen(path);
-					if (!(path[len]=='\\' || path[len]=='/')) {
+					if (!(path[len-1]=='\\' || path[len-1]=='/')) {
 						path[len] = '\\';
 						path[len+1]  = 0;
 					}
 					m_strRootPath = path;
 					free(path);
 				}
+			} else if (wcsncmp(lpszToken, _T("rhodespath"),10)==0) 
+            {
+				String token = convertToStringA(lpszToken);
+				//parseToken will allocate extra byte at the end of the returned token value
+                char* path = parseToken( token.c_str(), token.length() );
+				if (path) {
+					m_strRhodesPath = path;
+					free(path);
+				}
+			} else if (wcsncmp(lpszToken, _T("appname"),7)==0) 
+            {
+				String token = convertToStringA(lpszToken);
+				//parseToken will allocate extra byte at the end of the returned token value
+                char* path = parseToken( token.c_str(), token.length() );
+				if (path) {
+                    convertToStringW(path, m_strAppNameW);
+					free(path);
+				}
+			} else if (wcsncmp(lpszToken, _T("debughost"),9)==0) 
+            {
+				String token = convertToStringA(lpszToken);
+				//parseToken will allocate extra byte at the end of the returned token value
+                char* host = parseToken( token.c_str(), token.length() );
+				if (host) {
+					m_strDebugHost = host;
+					free(host);
+				}
+			} else if (wcsncmp(lpszToken, _T("debugport"),9)==0) 
+            {
+				String token = convertToStringA(lpszToken);
+				//parseToken will allocate extra byte at the end of the returned token value
+                char* port = parseToken( token.c_str(), token.length() );
+				if (port) {
+					m_strDebugPort = port;
+					free(port);
+				}
 			}
 #endif
 			lpszToken = FindOneOf(lpszToken, szTokens);
@@ -110,6 +146,7 @@ public :
         }
         // Note: In this sample, we don't respond differently to different hr success codes.
 
+#ifndef RHODES_EMULATOR
         // Allow only one instance of the application.
         // the "| 0x01" activates the correct owned window of the previous instance's main window
 		HWND hWnd = NULL;
@@ -128,6 +165,7 @@ public :
 			SetForegroundWindow( HWND( DWORD(hWnd) | 0x01 ) );
 			return S_FALSE;
 		}
+#endif
 
 		rho_logconf_Init(m_strRootPath.c_str());
 
@@ -146,6 +184,10 @@ public :
 				parseHttpProxyURI(RHOCONF().getString("http_proxy_url"));
 			}
 		}
+        if (m_strDebugHost.length() > 0)
+		    RHOCONF().setString("debug_host", m_strDebugHost, false);
+        if (m_strDebugPort.length() > 0)
+            RHOCONF().setString("debug_port", m_strDebugPort, false);
 #endif
         //::SetThreadPriority(GetCurrentThread(),10);
 
@@ -187,7 +229,7 @@ public :
 	    }
 
         rho::common::CRhodesApp::Create(m_strRootPath );
-        String strTitle = RHODESAPP().getAppTitle();
+        RHODESAPP().setRhodesPath(m_strRhodesPath);
 
         DWORD dwStyle = WS_VISIBLE;
 
@@ -195,7 +237,12 @@ public :
         dwStyle |= WS_OVERLAPPEDWINDOW;
 #endif
         // Create the main application window
+#ifdef RHODES_EMULATOR
+        m_appWindow.Initialize(m_strAppNameW.c_str());
+#else
+        String strTitle = RHODESAPP().getAppTitle();
         m_appWindow.Create(NULL, CWindow::rcDefault, convertToStringW(strTitle).c_str(), dwStyle);
+#endif
         if (NULL == m_appWindow.m_hWnd)
         {
             return S_FALSE;
@@ -243,6 +290,9 @@ public :
 
     void RunMessageLoop( ) throw( )
     {
+#ifdef RHODES_EMULATOR
+        m_appWindow.MessageLoop();
+#else
         MSG msg;
         while (GetMessage(&msg, NULL, 0, 0))
         {
@@ -252,6 +302,7 @@ public :
                 DispatchMessage(&msg);
             }
         }
+#endif
 
 #if defined(OS_WINCE)&& !defined( OS_PLATFORM_CE )
         CGPSController* pGPS = CGPSController::Instance();
@@ -418,7 +469,8 @@ public :
 
 private:
     CMainWindow m_appWindow;
-    rho::String m_strRootPath;
+    rho::String m_strRootPath, m_strRhodesPath, m_strDebugHost, m_strDebugPort;
+    rho::StringW m_strAppNameW;
 	int m_nRestarting;
 
 #ifdef OS_WINDOWS
@@ -578,10 +630,12 @@ char* parseToken( const char* start, int len ) {
         return NULL;
 
     const char* szValue = start + i+1;
-    int nValueLen = len - (i+1);
+    int nValueLen = 0;
+
+    while(*szValue==' ' || *szValue=='\'' || *szValue=='"' && nValueLen >= 0 ){ szValue++;}
+    while(szValue[nValueLen] && szValue[nValueLen] !='\'' && szValue[nValueLen] != '"' ){ nValueLen++;}
 
-    while(*szValue==' ' || *szValue=='\'' || *szValue=='"' && nValueLen >= 0 ){ szValue++; nValueLen--;}
-    while(nValueLen > 0 && (szValue[nValueLen-1]==' ' || szValue[nValueLen-1]=='\'' || szValue[nValueLen-1]=='"')) nValueLen--;
+    //while(nValueLen > 0 && (szValue[nValueLen-1]==' ' || szValue[nValueLen-1]=='\'' || szValue[nValueLen-1]=='"')) nValueLen--;
 
 	char* value = (char*) malloc(nValueLen+2);
 	strncpy(value, szValue, nValueLen);

data/platform/wm/rhodes/emulator/ExternalWebView.cpp

@@ -0,0 +1,20 @@
+#include "ExternalWebView.h"
+#include "ui_ExternalWebView.h"
+
+ExternalWebView::ExternalWebView(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ExternalWebView)
+{
+    ui->setupUi(this);
+    this->ui->webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    this->move(0,0);
+}
+
+ExternalWebView::~ExternalWebView()
+{
+}
+
+void ExternalWebView::navigate(QUrl url)
+{
+    ui->webView->setUrl(url);
+}

data/platform/wm/rhodes/emulator/ExternalWebView.h

@@ -0,0 +1,23 @@
+#ifndef EXTERNALWEBVIEW_H
+#define EXTERNALWEBVIEW_H
+
+#include <QWidget>
+#include <QUrl>
+
+namespace Ui {
+    class ExternalWebView;
+}
+
+class ExternalWebView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ExternalWebView(QWidget *parent = 0);
+    ~ExternalWebView();
+    void navigate(QUrl url);
+private:
+    Ui::ExternalWebView *ui;
+};
+
+#endif // EXTERNALWEBVIEW_H

data/platform/wm/rhodes/emulator/ExternalWebView.ui

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ExternalWebView</class>
+ <widget class="QWidget" name="ExternalWebView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>External Browser</string>
+  </property>
+  <property name="locale">
+   <locale language="English" country="UnitedStates"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWebView" name="webView">
+     <property name="url">
+      <url>
+       <string>about:blank</string>
+      </url>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKit/QWebView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

data/platform/wm/rhodes/emulator/MainWindowCallback.h

@@ -0,0 +1,18 @@
+#ifndef MAINWINDOWCALLBACK_H
+#define MAINWINDOWCALLBACK_H
+
+#include <string>
+
+class IMainWindowCallback
+{
+public:
+    virtual void updateSizeProperties(int width, int height) = 0;
+    virtual void onActivate(int active) = 0;
+    virtual void logEvent(const ::std::string& message) = 0;
+    virtual void createCustomMenu(void) = 0;
+    virtual void onCustomMenuItemCommand(int nItemPos) = 0;
+protected:
+    virtual ~IMainWindowCallback() {};
+};
+
+#endif // MAINWINDOWCALLBACK_H

data/platform/wm/rhodes/emulator/MainWindowProxy.cpp

@@ -0,0 +1,268 @@
+#pragma warning(disable:4996)
+#include "MainWindowProxy.h"
+#include "common/RhodesApp.h"
+#include "common/RhoConf.h"
+#include "common/RhoFilePath.h"
+#include "NativeToolbarQt.h"
+#include "rho/rubyext/NativeToolbarExt.h"
+#undef null
+#include <QString>
+#include <QApplication>
+#include <QtGui/QAction>
+#include "QtMainWindow.h"
+
+IMPLEMENT_LOGCLASS(CMainWindowProxy,"MainWindowProxy");
+
+extern "C" int rho_wmsys_has_touchscreen();
+
+using namespace rho;
+using namespace rho::common;
+
+CMainWindowProxy::CMainWindowProxy(void):
+    qtApplication(NULL),
+    qtMainWindow(NULL)
+{
+}
+
+CMainWindowProxy::~CMainWindowProxy(void)
+{
+    if (qtMainWindow) delete (QtMainWindow*)qtMainWindow;
+    if (qtApplication) delete (QApplication*)qtApplication;
+}
+
+void CMainWindowProxy::navigate(const wchar_t* url)
+{
+    LOG(INFO) + "navigate: '"+url+"'";
+    ((QtMainWindow*)qtMainWindow)->navigate(QUrl(QString::fromWCharArray(url)));
+}
+
+void CMainWindowProxy::setCallback(IMainWindowCallback* callback)
+{
+    ((QtMainWindow*)qtMainWindow)->setCallback(callback);
+}
+
+void* CMainWindowProxy::init(IMainWindowCallback* callback, const wchar_t* title)
+{
+    int argc = 0;
+    qtApplication = (void*)new QApplication(argc, 0);
+    qtMainWindow = (void*)new QtMainWindow();
+    ((QtMainWindow*)qtMainWindow)->setWindowTitle(QString::fromWCharArray(title));
+    ((QtMainWindow*)qtMainWindow)->setCallback(callback);
+    ((QtMainWindow*)qtMainWindow)->show();
+
+    return (void*)((QtMainWindow*)qtMainWindow)->winId();
+}
+
+void CMainWindowProxy::messageLoop(void)
+{
+    qApp->exec();
+}
+
+void CMainWindowProxy::GoBack(void)
+{
+    LOG(INFO) + "back";
+    ((QtMainWindow*)qtMainWindow)->GoBack();
+}
+
+void CMainWindowProxy::GoForward(void)
+{
+    LOG(INFO) + "forward";
+    ((QtMainWindow*)qtMainWindow)->GoForward();
+}
+
+void CMainWindowProxy::Refresh(void)
+{
+    LOG(INFO) + "refresh";
+    ((QtMainWindow*)qtMainWindow)->Refresh();
+}
+
+bool CMainWindowProxy::isStarted()
+{
+    return true;
+}
+
+int CMainWindowProxy::getHeight()
+{
+    return ((QtMainWindow*)qtMainWindow)->toolbarGetHeight();
+}
+
+
+void CMainWindowProxy::removeToolbar()
+{
+    ((QtMainWindow*)qtMainWindow)->toolbarHide();
+}
+
+void CMainWindowProxy::removeAllButtons()
+{
+    ((QtMainWindow*)qtMainWindow)->toolbarRemoveAllButtons();
+}
+
+static QColor getColorFromString(const char* szColor)
+{
+    if ( !szColor || !*szColor )
+        return QColor(0, 0, 0);
+
+    int c = atoi(szColor);
+
+    int cR = (c & 0xFF0000) >> 16;
+    int cG = (c & 0xFF00) >> 8;
+    int cB = (c & 0xFF);
+
+    return QColor(cR, cG, cB);
+}
+
+void CMainWindowProxy::createToolbar(rho_param *p)
+{
+    if (!rho_rhodesapp_check_mode() || !rho_wmsys_has_touchscreen() )
+        return;
+
+    int bar_type = TOOLBAR_TYPE;
+	std::auto_ptr<QColor> m_rgbBackColor (NULL);
+    std::auto_ptr<QColor> m_rgbMaskColor (NULL);
+    int m_nHeight = CNativeToolbar::MIN_TOOLBAR_HEIGHT;
+
+    rho_param *params = NULL;
+    switch (p->type) 
+    {
+        case RHO_PARAM_ARRAY:
+            params = p;
+            break;
+        case RHO_PARAM_HASH: 
+            {
+                for (int i = 0, lim = p->v.hash->size; i < lim; ++i) 
+                {
+                    const char *name = p->v.hash->name[i];
+                    rho_param *value = p->v.hash->value[i];
+                    
+                    if (strcasecmp(name, "background_color") == 0) 
+                        m_rgbBackColor.reset(new QColor(getColorFromString(value->v.string)));
+                    else if (strcasecmp(name, "mask_color") == 0) 
+                        m_rgbMaskColor.reset(new QColor(getColorFromString(value->v.string)));
+                    else if (strcasecmp(name, "view_height") == 0) 
+                        m_nHeight = atoi(value->v.string);
+                    else if (strcasecmp(name, "buttons") == 0 || strcasecmp(name, "tabs") == 0) 
+                        params = value;
+                }
+            }
+            break;
+        default: {
+            LOG(ERROR) + "Unexpected parameter type for create_nativebar, should be Array or Hash";
+            return;
+        }
+    }
+    
+    if (!params) {
+        LOG(ERROR) + "Wrong parameters for create_nativebar";
+        return;
+    }
+
+    int size = params->v.array->size;
+    if ( size == 0 )
+    {
+        removeToolbar();
+        return;
+    }
+
+    removeAllButtons();
+
+    int nSeparators = 0;
+    bool wasSeparator = false;
+    for (int ipass=0; ipass < 2; ++ipass) {
+        for (int i = 0; i < size; ++i) 
+        {
+            rho_param *hash = params->v.array->value[i];
+            if (hash->type != RHO_PARAM_HASH) {
+                LOG(ERROR) + "Unexpected type of array item for create_nativebar, should be Hash";
+                return;
+            }
+            
+            const char *label = NULL;
+            const char *action = NULL;
+            const char *icon = NULL;
+            const char *colored_icon = NULL;
+            int  nItemWidth = 0;
+
+            for (int j = 0, lim = hash->v.hash->size; j < lim; ++j) 
+            {
+                const char *name = hash->v.hash->name[j];
+                rho_param *value = hash->v.hash->value[j];
+                if (value->type != RHO_PARAM_STRING) {
+                    LOG(ERROR) + "Unexpected '" + name + "' type, should be String";
+                    return;
+                }
+                
+                if (strcasecmp(name, "label") == 0)
+                    label = value->v.string;
+                else if (strcasecmp(name, "action") == 0)
+                    action = value->v.string;
+                else if (strcasecmp(name, "icon") == 0)
+                    icon = value->v.string;
+                else if (strcasecmp(name, "colored_icon") == 0)
+                    colored_icon = value->v.string;
+                else if (strcasecmp(name, "width") == 0)
+                    nItemWidth = atoi(value->v.string);
+            }
+            
+            if (label == NULL && bar_type == TOOLBAR_TYPE)
+                label = "";
+            
+            if ( label == NULL || action == NULL) {
+                LOG(ERROR) + "Illegal argument for create_nativebar";
+                return;
+            }
+            if ( strcasecmp(action, "forward") == 0 && rho_conf_getBool("jqtouch_mode") )
+                continue;
+
+            if (!action) action = "";
+
+            if (ipass==0) {
+                if (strcasecmp(action, "separator")==0)
+                    ++nSeparators;
+            } else {
+                LOG(INFO) + "addToolbarButton: Label: '"+label+"';Action: '"+action+"'";
+                if (strcasecmp(action, "separator")==0) {
+                    if (nSeparators!=1)
+                        ((QtMainWindow*)qtMainWindow)->toolbarAddSeparator();
+                    else
+                        wasSeparator = true;
+                } else {
+                    String strImagePath;
+                    if ( icon && *icon )
+                        strImagePath = rho::common::CFilePath::join( RHODESAPP().getRhoRootPath(), icon );
+                    else {
+                        if ( strcasecmp(action, "options")==0 )
+                            strImagePath = "res/options_btn.wm.png";
+                        else if ( strcasecmp(action, "home")==0 )
+                            strImagePath = "res/home_btn.wm.png";
+                        else if ( strcasecmp(action, "refresh")==0 )
+                            strImagePath = "res/refresh_btn.wm.png";
+                        else if ( strcasecmp(action, "back")==0 )
+                            strImagePath = "res/back_btn.wm.png";
+                        else if ( strcasecmp(action, "forward")==0 )
+                            strImagePath = "res/forward_btn.wm.png";
+                        strImagePath = strImagePath.length() > 0 ? CFilePath::join( RHODESAPP().getRhodesPath(), "lib/framework/" + strImagePath) : String();
+                    }
+
+                    ((QtMainWindow*)qtMainWindow)->toolbarAddAction(QIcon(QString(strImagePath.c_str())), QString(label), action, wasSeparator);
+                }
+            }
+        }
+    }
+	((QtMainWindow*)qtMainWindow)->setToolbarStyle(false, (m_rgbBackColor.get()!=NULL ? m_rgbBackColor->name() : ""));
+    ((QtMainWindow*)qtMainWindow)->toolbarShow();
+}
+
+void CMainWindowProxy::menuClear()
+{
+    ((QtMainWindow*)qtMainWindow)->menuClear();
+}
+
+void CMainWindowProxy::menuAddSeparator()
+{
+    ((QtMainWindow*)qtMainWindow)->menuAddSeparator();
+}
+
+void CMainWindowProxy::menuAddAction(const char* label, int item)
+{
+    ((QtMainWindow*)qtMainWindow)->menuAddAction(QString(label), item);
+}