rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/wm/rhodes/resource.h

@@ -84,13 +84,17 @@
 #define ID_FULLSCREEN                   40029
 #define ID_CANCEL                       40030
 #define ID_SETCOOKIE                    40032
+#define IDM_EXECUTEJS                   40033
+#define IDM_STOPNAVIGATE                40034
+#define IDM_ZOOMPAGE                    40035
+#define IDM_ZOOMTEXT                    40036
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        128
-#define _APS_NEXT_COMMAND_VALUE         40031
+#define _APS_NEXT_COMMAND_VALUE         40037
 #define _APS_NEXT_CONTROL_VALUE         1022
 #define _APS_NEXT_SYMED_VALUE           111
 #endif

data/platform/wm/rhodes/rho/common/ExtManager.cpp

@@ -0,0 +1,307 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "stdafx.h"
+
+#include "common/ExtManager.h"
+#include "rubyext/WebView.h"
+#include <common/RhodesApp.h>
+
+#include "MainWindow.h"
+#include "common/app_build_capabilities.h"
+
+extern CMainWindow& getAppWindow();
+//#define IDM_NAVIGATE                    40022
+//#define IDM_EXECUTEJS                   40033
+//#define IDM_STOPNAVIGATE                40034
+//#define IDM_ZOOMPAGE                    40035
+//#define IDM_ZOOMTEXT                    40036
+extern "C" HWND getMainWnd();
+extern "C" HINSTANCE rho_wmimpl_get_appinstance();
+extern "C" void rho_sys_app_exit();
+extern "C" WCHAR* rho_wmimpl_get_configfilepath();
+
+namespace rho {
+namespace common {
+
+IMPLEMENT_LOGCLASS(CExtManager, "ExtManager");
+
+void CExtManager::registerExtension(const String& strName, IRhoExtension* pExt)
+{
+    m_hashExtensions.put(strName, pExt);
+}
+
+IRhoExtension* CExtManager::getExtByName(const String& strName)
+{
+    return m_hashExtensions.get(strName);
+}
+
+CRhoExtData CExtManager::makeExtData()
+{
+    CRhoExtData oData;
+    oData.m_hWnd = getMainWnd();
+    oData.m_hInstance = rho_wmimpl_get_appinstance();
+    oData.m_hBrowserWnd = getAppWindow().getWebKitEngine()->GetHTMLWND();
+
+    oData.m_iTabIndex = rho_webview_active_tab();
+    return oData;
+}
+
+void CExtManager::onSetPropertiesData( const wchar_t* pPropID, const wchar_t* pData)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        (it->second)->onSetPropertiesData( pPropID, pData, makeExtData() );
+    }
+}
+
+void CExtManager::onUnhandledProperty( const wchar_t* pModuleName, const wchar_t* pName, const wchar_t* pValue, const CRhoExtData& oExtData )
+{
+    rho::common::IRhoExtension* pExt = getExtByName( rho::common::convertToStringA(pModuleName) );
+    if (pExt)
+        pExt->onSetProperty( pName, pValue, oExtData );
+}
+
+void CExtManager::onBeforeNavigate(const wchar_t* szUrlBeingNavigatedTo)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        (it->second)->onBeforeNavigate( szUrlBeingNavigatedTo, makeExtData() );
+    }
+}
+
+void CExtManager::onNavigateComplete(const wchar_t* szUrlBeingNavigatedTo)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        (it->second)->onNavigateComplete( szUrlBeingNavigatedTo, makeExtData() );
+    }
+}
+
+void CExtManager::onDocumentComplete(const wchar_t* szUrlOfDocument)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        (it->second)->onNavigateComplete( szUrlOfDocument, makeExtData() );
+    }
+}
+
+void CExtManager::close()
+{
+   m_hashExtensions.clear();
+}
+
+void CExtManager::executeRubyCallback( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse)
+{
+    RHODESAPP().callCallbackWithData(szCallback, szCallbackBody, szCallbackData, bWaitForResponse );
+}
+
+void CExtManager::navigate(const wchar_t* szUrl)
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE, (LPARAM)_wcsdup(szUrl) );
+}
+
+bool CExtManager::existsJavascript(const wchar_t* szJSFunction)
+{
+#ifndef RHODES_EMULATOR
+    return getAppWindow().getWebKitEngine()->isExistJavascript(szJSFunction, rho_webview_active_tab());
+#else
+    return true;
+#endif
+}
+
+void CExtManager::executeJavascript(const wchar_t* szJSFunction)
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_EXECUTEJS, (LPARAM)_wcsdup(szJSFunction) );
+}
+
+StringW CExtManager::getCurrentUrl()
+{
+    return convertToStringW(RHODESAPP().getCurrentUrl(rho_webview_active_tab()));
+}
+
+void CExtManager::historyForward()
+{
+    rho_webview_navigate_forward();
+}
+
+void CExtManager::historyBack()
+{
+    rho_webview_navigate_back();
+}
+
+void CExtManager::refreshPage(bool bFromCache)
+{
+    rho_webview_refresh(rho_webview_active_tab());
+}
+
+void CExtManager::stopNavigate()
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_STOPNAVIGATE, (LPARAM)rho_webview_active_tab() );
+}
+
+void CExtManager::quitApp()
+{
+    rho_sys_app_exit();
+}
+
+void CExtManager::minimizeApp()
+{
+    ::ShowWindow(getMainWnd(), SW_MINIMIZE );
+}
+
+void CExtManager::restoreApp()
+{
+    ::ShowWindow(getMainWnd(), SW_RESTORE );
+}
+
+void CExtManager::resizeBrowserWindow(RECT rc)
+{
+    ::MoveWindow( getMainWnd(), rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE );
+}
+
+void CExtManager::zoomPage(float fZoom)
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_ZOOMPAGE, (LPARAM)fZoom );
+}
+
+void CExtManager::zoomText(int nZoom)
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_ZOOMTEXT, (LPARAM)nZoom );
+}
+
+int CExtManager::getTextZoom() //Enum (0 to 4)
+{
+#ifndef RHODES_EMULATOR
+    return getAppWindow().getWebKitEngine()->GetTextZoomOnTab(rho_webview_active_tab());
+#else
+    return 2;
+#endif
+}
+
+StringW CExtManager::getConfigPath()
+{
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    return rho_wmimpl_get_configfilepath();
+#else
+    return L"";
+#endif
+}
+
+StringW CExtManager::getPageTitle(UINT iTab)
+{
+#ifndef RHODES_EMULATOR
+    wchar_t szBuf[1025];
+    szBuf[0]=0;
+    getAppWindow().getWebKitEngine()->GetTitleOnTab( szBuf, 1024, iTab );    
+    return szBuf ? szBuf : L"";
+#else
+    return L"";
+#endif
+}
+
+extern "C" unsigned long rb_require(const char *fname);
+
+void CExtManager::requireRubyFile( const char* szFilePath )
+{
+    rb_require(szFilePath);
+}
+
+void CExtManager::rhoLog(int nSeverity, const char* szModule, const char* szMsg, const char* szFile, int nLine)
+{
+    rhoPlainLog(szFile, nLine, nSeverity, szModule, szMsg);
+}
+
+bool CExtManager::onWndMsg(MSG& oMsg)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        if ( (it->second)->onWndMsg( oMsg ) )
+            return true;
+    }
+
+    return false;
+}
+
+long CExtManager::OnNavigateTimeout(const wchar_t* szUrlBeingNavigatedTo)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        long lRes = (it->second)->OnNavigateTimeout( szUrlBeingNavigatedTo, makeExtData() );
+        if ( lRes )
+            return lRes;
+    }
+
+    return 0;
+}
+
+long CExtManager::OnSIPState(bool bSIPState)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        long lRes = (it->second)->OnSIPState( bSIPState, makeExtData() );
+        if ( lRes )
+            return lRes;
+    }
+
+    return 0;
+}
+
+long CExtManager::OnAlertPopup(int nEnum, void* pData)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        long lRes = (it->second)->OnAlertPopup( nEnum, pData, makeExtData() );
+        if ( lRes )
+            return lRes;
+    }
+
+    return 0;
+}
+
+long CExtManager::OnNavigateError(const wchar_t* szUrlBeingNavigatedTo)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        long lRes = (it->second)->OnNavigateError( szUrlBeingNavigatedTo, makeExtData() );
+        if ( lRes )
+            return lRes;
+    }
+
+    return 0;
+}
+
+void CExtManager::OnAppActivate(bool bActivate)
+{
+    for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
+    {
+        (it->second)->OnAppActivate( bActivate, makeExtData() );
+    }
+}
+
+} //namespace common
+} //namespace rho
+

data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp

@@ -385,7 +385,7 @@ String CNativeToolbar::CToolbarBtn::getDefaultImagePath(const String& strAction)
     else if ( strcasecmp(strAction.c_str(), "forward")==0 )
         strImagePath = "lib/res/forward_btn.png";
 
-    return strImagePath.length() > 0 ? CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath) : String();
+    return strImagePath.length() > 0 ? CFilePath::join( RHODESAPP().getRhoRuntimePath(), strImagePath) : String();
 }
 
 CNativeToolbar::CToolbarBtn::CToolbarBtn( const char *label, const char *action, const char *icon, int nItemWidth  )

data/platform/wm/rhodes/rho/rubyext/RhoSignature.cpp

@@ -880,7 +880,7 @@ void CRhoSignature::onSetProperty(const wchar_t* pName, const wchar_t* pValue, c
     // if action is coming like show/hide call correspondign methods
 }
 
-void CRhoSignature::onBeforeNavigate(const CRhoExtData& oExtData)
+void CRhoSignature::onBeforeNavigate(const wchar_t* szUrlBeingNavigatedTo, const CRhoExtData& oExtData)
 {
     hideSignature();
 }

data/platform/wm/rhodes/rho/rubyext/RhoSignature.h

@@ -76,7 +76,7 @@ public:
 
     //IRhoExtension
     virtual void onSetProperty(const wchar_t* pName, const wchar_t* pValue, const common::CRhoExtData& oExtData);
-    virtual void onBeforeNavigate(const common::CRhoExtData& oExtData);
+    virtual void onBeforeNavigate(const wchar_t* szUrlBeingNavigatedTo, const common::CRhoExtData& oExtData);
 };
 
 class CRhoSignatureWindow : public CDialogImpl <CRhoSignatureWindow>

data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp

@@ -422,6 +422,8 @@ int get_msie_version(rho::String& msieVer)
 }
 #endif
 
+static int g_rho_has_network = 1, g_rho_has_cellnetwork = 0;
+
 int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 {
 	if (strcasecmp("webview_framework",szPropName) == 0)
@@ -576,6 +578,18 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
     }
 #endif
 
+	if (strcasecmp("has_cell_network",szPropName) == 0) 
+    {
+        *resValue = rho_ruby_create_boolean( g_rho_has_cellnetwork != 0 );
+        return 1;
+    }
+
+	if (strcasecmp("has_wifi_network",szPropName) == 0) 
+    {
+        *resValue = rho_ruby_create_boolean( g_rho_has_network != 0 );
+        return 1;
+    }
+
     return 0;
 }
 
@@ -584,8 +598,6 @@ VALUE rho_sys_makephonecall(const char* callname, int nparams, char** param_name
 	return rho_ruby_get_NIL();
 }
 
-static int g_rho_has_network = 1, g_rho_has_cellnetwork = 0;
-
 void rho_sysimpl_sethas_network(int nValue)
 {
     g_rho_has_network = nValue > 1 ? 1 : 0;

data/platform/wm/rhodes/rho/rubyext/WebView.cpp

@@ -81,12 +81,15 @@ void rho_webview_navigate_forward()
 
 const char* rho_webview_execute_js(const char* js, int index) 
 {
-    String strJS = "javascript:";
-    strJS += js;
+   // String strJS = "javascript:";
+    //strJS += js;
 
 	//RAWTRACEC1("Execute JS: %s", js);
 
-    rho_webview_navigate(strJS.c_str(), index);
+    //rho_webview_navigate(strJS.c_str(), index);
+    StringW strJsW;
+    convertToStringW(js, strJsW);
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_EXECUTEJS, (LPARAM)_tcsdup(strJsW.c_str()) );
 	return "";
 }
 

data/platform/wm/rhodes/rhodes.vcproj

@@ -707,7 +707,7 @@
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(OutDir)"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="0"
 				StackReserveSize="196608"
 				StackCommitSize="4096"
@@ -3869,6 +3869,10 @@
 			<Filter
 				Name="common"
 				>
+				<File
+					RelativePath=".\rho\common\ExtManager.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\rho\common\RhoClassFactory.cpp"
 					>

data/platform/wm/rhodes/simulator/MainWindowQt.cpp

@@ -398,7 +398,7 @@ void CMainWindow::createToolbar(rho_param *p)
                             strImagePath = "res/back_btn.wm.png";
                         else if ( strcasecmp(action, "forward")==0 )
                             strImagePath = "res/forward_btn.wm.png";
-                        strImagePath = strImagePath.length() > 0 ? CFilePath::join( RHOSIMCONF().getRhodesPath(), "lib/framework/" + strImagePath) : String();
+                        strImagePath = strImagePath.length() > 0 ? CFilePath::join( RHOSIMCONF().getRhoRuntimePath(), "lib/framework/" + strImagePath) : String();
                     }
 
                     ((QtMainWindow*)qtMainWindow)->toolbarAddAction(QIcon(QString(strImagePath.c_str())), QString(label), action, wasSeparator);
@@ -712,6 +712,27 @@ LRESULT CMainWindow::OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND
     return 0;
 }
 
+LRESULT CMainWindow::OnExecuteJS(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
+{
+    TNavigateData* nd = (TNavigateData*)hWndCtl;
+    if (nd) {
+        LPTSTR wcurl = (LPTSTR)(nd->url);
+        if (wcurl) {
+
+            StringW strUrlW;
+            if(_memicmp(wcurl,L"JavaScript:",11*2) != 0)
+                strUrlW = L"javascript:";
+
+            strUrlW += wcurl;
+
+            Navigate2((LPWSTR)strUrlW.c_str(), nd->index);
+            free(wcurl);
+        }
+        free(nd);
+    }
+    return 0;
+}
+
 LRESULT CMainWindow::OnSetCookieCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
 {
     TCookieData* cd = (TCookieData*)hWndCtl;