rhodes 3.0.2 → 3.1.0.beta.1

data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp

@@ -1,8 +1,35 @@
+/*------------------------------------------------------------------------
+* (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 "NetRequestImpl.h"
 #include "common/RhoFile.h"
 #include "common/RhoFilePath.h"
+#include "common/RhodesAppBase.h"
 #include "common/StringConverter.h"
 #include "net/URI.h"
 #include "common/RhoConf.h"
@@ -53,7 +80,7 @@ void CNetRequestImpl::init(const char* method, const String& strUrl, IRhoSession
     LOG(INFO) + "Method: " + method + ";Url: " + strUrl;
     do 
     {
-        if ( !initConnection(URI::isLocalHost(strUrl.c_str()), strUrlW) )
+        if ( !initConnection(RHODESAPPBASE().isBaseUrl(strUrl.c_str()), strUrlW) )
             break;
 
         DWORD dwUrlLength = 1024;
@@ -199,6 +226,8 @@ INetResponse* CNetRequestImpl::doRequest( const char* method, const String& strU
             }
         }
         writeHeaders(m_pHeaders);
+        if ( isError() )
+            break;
 
         if ( !HttpSendRequest( m_hRequest, NULL, 0, const_cast<char*>(strBody.c_str()), strBody.length() ) )
         {

data/platform/wm/rhodes/rho/net/NetRequestImpl.h

@@ -1,8 +1,37 @@
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include <wininet.h>
 #include "net/INetRequest.h"
 #include "logging/RhoLog.h"
+#if defined(RHO_SYMBIAN) || defined(RHODES_EMULATOR)
+#include <atlstr.h>
+#endif
 
 namespace rho {
 namespace common {

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (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 "GeoLocationImpl.h"

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #if defined (_WIN32_WCE) && !defined( OS_PLATFORM_CE )

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (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 "NativeToolbar.h"
@@ -5,7 +31,7 @@
 #include "MainWindow.h"
 #include "common/RhoFilePath.h"
 #include "rubyext/WebView.h"
-#include "NativeToolbarExt.h"
+#include "rubyext/NativeToolbarExt.h"
 
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include "common/IRhoThreadImpl.h"

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

@@ -1,12 +1,39 @@
+/*------------------------------------------------------------------------
+* (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 "MainWindow.h"
-#include "NativeToolbarExt.h"
+#include "rubyext/NativeToolbarExt.h"
 
 extern CMainWindow& getAppWindow();
 
 extern "C"
 {
+int rho_wmsys_has_touchscreen();
 void remove_native_toolbar();
 void create_native_toolbar(int bar_type, rho_param *p) 
 {
@@ -45,29 +72,66 @@ VALUE nativebar_started()
 }
 
 //Tabbar
-void create_native_tabbar(int bar_type, rho_param *p) {
+void remove_native_tabbar()
+{
+#ifdef RHODES_EMULATOR
+    getAppWindow().performOnUiThread(new CNativeTabbar::CRemoveTask() );
+#endif
 }
 
-void remove_native_tabbar() {
+void create_native_tabbar(int bar_type, rho_param *p)
+{
+#ifdef RHODES_EMULATOR
+    // check for iPad SplitTabBar type -> redirect to TabBar
+    if (bar_type == VTABBAR_TYPE) {
+        bar_type = TABBAR_TYPE;
+    }
+
+	if ( bar_type == NOBAR_TYPE )
+        remove_native_tabbar();
+    else if ( bar_type == TABBAR_TYPE )
+    {
+        getAppWindow().performOnUiThread(new CNativeTabbar::CCreateTask(bar_type, p) );
+    } else
+    {
+    	RAWLOGC_ERROR("NativeTabbar", "Only Tabbar control is supported.");
+    }
+#endif
 }
 
-void native_tabbar_switch_tab(int index) {
+void native_tabbar_switch_tab(int index)
+{
+#ifdef RHODES_EMULATOR
+    getAppWindow().performOnUiThread(new CNativeTabbar::CSwitchTask(index) );
+#endif
 }
 
-void native_tabbar_set_tab_badge(int index,char *val) {
+void native_tabbar_set_tab_badge(int index,char *val)
+{
+#ifdef RHODES_EMULATOR
+    getAppWindow().performOnUiThread(new CNativeTabbar::CBadgeTask(index, val) );
+#endif
 }
 
 void nativebar_set_tab_badge(int index,char* val)
 {
+	RAWLOGC_INFO("NativeBar", "NativeBar.set_tab_badge() is DEPRECATED. Use Rho::NativeTabbar.set_tab_badge().");
+    native_tabbar_set_tab_badge(index, val);
 }
 
 int native_tabbar_get_current_tab() 
 {
+#ifdef RHODES_EMULATOR
+	return getAppWindow().tabbarGetCurrent();
+#else
 	return 0;
+#endif
 }
 
-void nativebar_switch_tab(int index) {
-	//TODO: Implement me!
+void nativebar_switch_tab(int index)
+{
+	RAWLOGC_INFO("NativeBar", "NativeBar.switch_tab() is DEPRECATED. Use Rho::NativeTabbar.switch_tab().");
+	native_tabbar_switch_tab(index);
 }
 
 //NavBar - iphone only

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (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/RhoPort.h"
@@ -13,6 +39,7 @@
 #if defined( OS_WINCE ) && !defined( OS_PLATFORM_CE )
 #include <cfgmgrapi.h>
 #include <getdeviceuniqueid.h>
+#include <wininet.h>
 #endif
 
 #ifdef OS_WINCE__
@@ -377,7 +404,7 @@ int get_msie_version(rho::String& msieVer)
 
 int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 {
-	if (strcasecmp("webview",szPropName) == 0)
+	if (strcasecmp("webview_framework",szPropName) == 0)
 	{
 #ifdef RHODES_EMULATOR
 		*resValue = rho_ruby_create_string("WEBKIT/" QTWEBKIT_VERSION_STR);
@@ -535,16 +562,21 @@ VALUE rho_sys_makephonecall(const char* callname, int nparams, char** param_name
 	return rho_ruby_get_NIL();
 }
 
-static int g_rho_has_network = 1;
+static int g_rho_has_network = 1, g_rho_has_cellnetwork = 0;
 
 void rho_sysimpl_sethas_network(int nValue)
 {
-    g_rho_has_network = nValue;
+    g_rho_has_network = nValue > 1 ? 1 : 0;
+}
+
+void rho_sysimpl_sethas_cellnetwork(int nValue)
+{
+    g_rho_has_cellnetwork = nValue;
 }
 
 VALUE rho_sys_has_network()
 {
-	return rho_ruby_create_boolean(g_rho_has_network!=0);
+	return rho_ruby_create_boolean( g_rho_has_cellnetwork != 0 || g_rho_has_network!=0);
 }
 
 void rho_sys_app_exit()

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (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 <wininet.h>
 
@@ -12,12 +38,15 @@
 
 using namespace rho;
 using namespace rho::common;
+
+extern CMainWindow& getAppWindow();
+
 extern "C" {
 HWND getMainWnd();
 
 void rho_webview_refresh(int index) 
 {
-//rho_webview_navigate(RHODESAPP().getCurrentUrl().c_str(),0);
+    //rho_webview_navigate(RHODESAPP().getCurrentUrl().c_str(),0);
     ::PostMessage( getMainWnd(), WM_COMMAND, IDM_REFRESH, (LPARAM)index );
 }
 
@@ -30,7 +59,14 @@ void rho_webview_navigate(const char* url, int index)
     }
 
     String strUrl = RHODESAPP().canonicalizeRhoUrl(url);
+#ifdef RHODES_EMULATOR
+    TNavigateData* nd = (TNavigateData*)malloc(sizeof(TNavigateData));
+    nd->index = index;
+    nd->url = _tcsdup(convertToStringW(strUrl).c_str());
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE, (LPARAM)nd );
+#else
     ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE, (LPARAM)_tcsdup(convertToStringW(strUrl).c_str()) );
+#endif
 }
 
 void rho_webview_navigate_back()
@@ -61,7 +97,11 @@ const char* rho_webview_current_location(int index)
 
 int rho_webview_active_tab() 
 {
+#ifdef RHODES_EMULATOR
+    return getAppWindow().tabbarGetCurrent();
+#else
 	return 0;
+#endif
 }
 
 void rho_webview_set_menu_items(VALUE valMenu) 
@@ -77,6 +117,12 @@ void rho_webview_full_screen_mode(int enable)
 
 void rho_webview_set_cookie(const char *url, const char *cookie)
 {
+#ifdef RHODES_EMULATOR
+    TCookieData* cd = (TCookieData*)malloc(sizeof(TCookieData));
+    cd->url = strdup(url);
+    cd->cookie = strdup(cookie);
+    ::PostMessage( getMainWnd(), WM_COMMAND, ID_SETCOOKIE, (LPARAM)cd );
+#else
 	URL_COMPONENTSA uri;
 	::memset(&uri, 0, sizeof(uri));
 	uri.dwStructSize = sizeof(uri);
@@ -103,7 +149,7 @@ void rho_webview_set_cookie(const char *url, const char *cookie)
 			break;
 		for (c = s + 1; *c == ' '; ++c);
 	}
-	
+#endif	
 }
 
 }