rhodes 2.3.2 → 2.4.0.beta.1

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -429,6 +429,10 @@ void rho_ruby_add_to_array(VALUE ar, VALUE val)
     rb_ary_push(ar,val);
 }
 
+void rho_ruby_add_to_hash(VALUE hash, VALUE key, VALUE item) {
+	rb_hash_aset(hash, key, item);
+}
+
 VALUE rho_ruby_create_byte_array(unsigned char* buf, int length) {
 	VALUE ar = rb_ary_new2(length);
 	int i;

data/platform/shared/ruby/ext/rho/rhoruby.h

@@ -82,6 +82,8 @@ VALUE rho_ruby_create_integer(__int64 i);
 VALUE rho_ruby_create_double(double d);
 VALUE rho_ruby_create_time(long t);
 void rho_ruby_add_to_array(VALUE ar, VALUE val);
+void rho_ruby_add_to_hash(VALUE hash, VALUE key, VALUE item);
+
 
 time_t rho_ruby_get_time(VALUE rTime);
 

data/platform/shared/ruby/ext/system/system.i

@@ -51,6 +51,12 @@ extern void rho_sys_app_install(const char *url);
 #define app_uninstall rho_sys_app_uninstall
 extern void rho_sys_app_uninstall(const char *appname);
 
+#define start_timer rho_sys_start_timer
+extern void rho_sys_start_timer( int interval, const char *url, const char* params);
+
+#define stop_timer rho_sys_stop_timer
+extern void rho_sys_stop_timer( const char *url );
+
 	#if !defined(bool)
 	#define bool int
 	#define true  1
@@ -101,3 +107,5 @@ extern void open_url(const char *url);
 extern int app_installed(const char *appname);
 extern void app_install(const char *url);
 extern void app_uninstall(const char *appname);
+extern void start_timer( int interval, const char *url, const char* params);
+extern void stop_timer( const char *url);

data/platform/shared/ruby/ext/system/system_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
+ * Version 2.0.0
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -281,7 +281,7 @@
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -998,7 +998,7 @@ static VALUE _mSWIG = Qnil;
 
 /* Define custom exceptions for errors that do not map to existing Ruby
    exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
+   initialized by a funtion in C.  For C, fallback to rb_eRuntimeError.*/
 
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
@@ -1807,7 +1807,7 @@ static VALUE mSystem;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020001 
+#define SWIGVERSION 0x020000 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1865,6 +1865,12 @@ extern void rho_sys_app_install(const char *url);
 #define app_uninstall rho_sys_app_uninstall
 extern void rho_sys_app_uninstall(const char *appname);
 
+#define start_timer rho_sys_start_timer
+extern void rho_sys_start_timer( int interval, const char *url, const char* params);
+
+#define stop_timer rho_sys_stop_timer
+extern void rho_sys_stop_timer( const char *url );
+
 	#if !defined(bool)
 	#define bool int
 	#define true  1
@@ -1944,7 +1950,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:D:\Install\swigwin\Lib\ruby\rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2465,6 +2471,73 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_start_timer(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","start_timer", 1, argv[0] ));
+  } 
+  arg1 = (int)(val1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","start_timer", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","start_timer", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  start_timer(arg1,(char const *)arg2,(char const *)arg3);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return Qnil;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_stop_timer(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","stop_timer", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  stop_timer((char const *)arg1);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2759,5 +2832,7 @@ SWIGEXPORT void Init_System(void) {
   rb_define_module_function(mSystem, "app_installed?", _wrap_app_installedq___, -1);
   rb_define_module_function(mSystem, "app_install", _wrap_app_install, -1);
   rb_define_module_function(mSystem, "app_uninstall", _wrap_app_uninstall, -1);
+  rb_define_module_function(mSystem, "start_timer", _wrap_start_timer, -1);
+  rb_define_module_function(mSystem, "stop_timer", _wrap_stop_timer, -1);
 }
 

data/platform/shared/ruby/file.c

@@ -274,7 +274,8 @@ rb_stat_dev(VALUE self)
 static VALUE
 rb_stat_dev_major(VALUE self)
 {
-#if defined(major)
+    /* On Android "major" is inline function rather than macro */
+#if defined(major) || defined(OS_ANDROID)
     long dev = get_stat(self)->st_dev;
     return ULONG2NUM(major(dev));
 #else
@@ -296,7 +297,8 @@ rb_stat_dev_major(VALUE self)
 static VALUE
 rb_stat_dev_minor(VALUE self)
 {
-#if defined(minor)
+    /* On Android "minor" is inline function rather than macro */
+#if defined(minor) || defined(OS_ANDROID)
     long dev = get_stat(self)->st_dev;
     return ULONG2NUM(minor(dev));
 #else
@@ -429,7 +431,7 @@ rb_stat_rdev(VALUE self)
 static VALUE
 rb_stat_rdev_major(VALUE self)
 {
-#if defined(HAVE_ST_RDEV) && defined(major)
+#if defined(HAVE_ST_RDEV) && (defined(major) || defined(OS_ANDROID))
     long rdev = get_stat(self)->st_rdev;
     return ULONG2NUM(major(rdev));
 #else
@@ -451,7 +453,7 @@ rb_stat_rdev_major(VALUE self)
 static VALUE
 rb_stat_rdev_minor(VALUE self)
 {
-#if defined(HAVE_ST_RDEV) && defined(minor)
+#if defined(HAVE_ST_RDEV) && (defined(minor) || defined(OS_ANDROID))
     long rdev = get_stat(self)->st_rdev;
     return ULONG2NUM(minor(rdev));
 #else

data/platform/shared/ruby/gc.c

@@ -403,7 +403,7 @@ rb_objspace_alloc(void)
 /* 4KB */
 /*#define HEAP_SIZE 0x1000 */
 /* 2KB */
-#define HEAP_SIZE 0x800
+#define HEAP_SIZE 0x10000
 
 #define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE))
 

data/platform/shared/ruby/linux/ruby/config.h

@@ -232,7 +232,11 @@
 #define RUBY_SITE_LIB2 "/apps/app"
 #define RUBY_VENDOR_LIB "/lib"
 #define RUBY_VENDOR_LIB2 "/lib"
+#ifndef OS_ANDROID
 #define RUBY_PLATFORM "i686-linux"
+#else
+#define RUBY_PLATFORM "arm-android"
+#endif
 #define RUBY_ARCHLIB "/lib"
 #define RUBY_SITE_ARCHLIB "/lib"
 #define RUBY_VENDOR_ARCHLIB "/lib"
@@ -244,6 +248,9 @@
 #define HAVE_GETHOSTNAME 1
 #define HAVE_UNAME 1
 
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+
 #if defined(OS_ANDROID)
 #  define HAVE_SYS_SYSCALL_H 1
 #  define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
@@ -270,8 +277,6 @@ typedef unsigned long rlim_t;
 #  define HAVE_EACCESS 1
 #  define HAVE_UTIMENSAT 1
 #  define HAVE_GROUP_MEMBER 1
-#  define HAVE_TELLDIR 1
-#  define HAVE_SEEKDIR 1
 #  define HAVE_TIMEGM 1
 #  define HAVE_PTHREAD_ATTR_SETINHERITSCHED 1
 #  define HAVE_BACKTRACE 1

data/platform/shared/ruby/missing/acosh.c

@@ -81,10 +81,10 @@ atanh(double x)
     z = log(z > 1 ? -1 : (1 + z) / (1 - z)) / 2;
     if (neg) z = -z;
     if (isinf(z))
-#if defined(ERANGE)
-	errno = ERANGE;
-#elif defined(EDOM)
+#if defined(EDOM)
 	errno = EDOM;
+#elif defined(ERANGE)
+	errno = ERANGE;
 #else
 	;
 #endif

data/platform/shared/ruby/wince/_time.h

@@ -47,7 +47,7 @@ typedef struct {
 
 time_t mktime(struct tm* pt);
 time_t time( time_t *timer );
-struct tm *localtime(const time_t *ptime);
+struct tm * __cdecl localtime(const time_t *ptime);
 struct tm *gmtime(const time_t *tod);
 char* ctime( const time_t *t );
 char* asctime(const struct tm *tptr);

data/platform/shared/ruby/wince/stdlib.c

@@ -29,7 +29,7 @@ int mblen(const char *mbstr, size_t count)
 	for( i=0; i<count; i++ )
 	{
 		if( *p=='\0' ) break;
-		if( IsDBCSLeadByteEx( CP_ACP, *p ) )
+		if( IsDBCSLeadByteEx( CP_UTF8, *p ) )
 			n+=2, p+=2;
 		else
 			n+=1, p+=1;

data/platform/shared/ruby/wince/string_wce.c

@@ -6,14 +6,14 @@
 #include "wince.h" /* for wce_mbtowc */
 
 /* _strdup already exists in stdlib.h? */
-/*char *strdup(const char * str)
+char *strdup(const char * str)
 {
 	char *p;
 
 	p = malloc( strlen(str)+1 );
 	strcpy( p, str );
 	return p;
-}*/
+}
 
 char* strerror(int errno)
 {

data/platform/shared/ruby/wince/sys/timeb.c

@@ -5,6 +5,7 @@
 #include <windows.h>
 #include <time.h>
 #include <sys/timeb.h>
+#include "wince.h"
 
 time_t wce_FILETIME2time_t(const FILETIME* f);
 

data/platform/shared/ruby/wince/time_wce.c

@@ -13,6 +13,7 @@
 #include <windows.h>
 #include <tchar.h>
 #include <time.h>
+#include "wince.h"
 
 /* globals */
 const __int64 _onesec_in100ns = (__int64)10000000;
@@ -154,6 +155,13 @@ time_t time( time_t *timer )
 	  *timer = t;
 	return *timer;
 }
+#ifdef OS_PLATFORM_CE
+struct tm *__cdecl localtime_s(const time_t *t)
+{
+    return localtime_s(t);
+}
+#endif //OS_PLATFORM_CE
+
 /*
 struct tm *localtime( const time_t *timer )
 {

data/platform/shared/ruby/wince/wince.c

@@ -449,7 +449,7 @@ HANDLE CreateFileA(LPCSTR filename, DWORD access,
 LPSTR CharNextA(LPCSTR a)
 {
 	char *p=(char *)a;
-	if( TRUE==IsDBCSLeadByteEx(CP_ACP, (BYTE)*a) )
+	if( TRUE==IsDBCSLeadByteEx(CP_UTF8, (BYTE)*a) )
 		p+=2;
 	else
 		p++;
@@ -461,7 +461,7 @@ LPSTR CharPrevA(LPCSTR start, LPCSTR ptr)
 {
 	if( start==ptr ) return (LPSTR)start;
 	else if( start+1==ptr ) return (LPSTR)start;
-	else if( TRUE==IsDBCSLeadByteEx(CP_ACP, (BYTE)*(ptr-2)) )
+	else if( TRUE==IsDBCSLeadByteEx(CP_UTF8, (BYTE)*(ptr-2)) )
 		return (LPSTR)(ptr-2);
 	else
 		return (LPSTR)(ptr-1);
@@ -549,7 +549,7 @@ FILE *wce_fopen( const char *fname, const char *mode )
 {
 	TCHAR* tfname = wce_replaceRelativeDir(fname);
 	TCHAR* tmode = wce_mbtowc(mode);
-	FILE* fp = _tfopen(tfname, tmode);
+	FILE* fp = _wfopen(tfname, tmode);
 	free(tfname); free(tmode);
 	return fp;
 }
@@ -593,10 +593,10 @@ wchar_t* wce_mbtowc(const char* a)
 	int length;
 	wchar_t *wbuf;
 
-	length = MultiByteToWideChar(CP_ACP, 0, 
+	length = MultiByteToWideChar(CP_UTF8, 0, 
 		a, -1, NULL, 0);
 	wbuf = (wchar_t*)malloc( (length+1)*sizeof(wchar_t) );
-	MultiByteToWideChar(CP_ACP, 0,
+	MultiByteToWideChar(CP_UTF8, 0,
 		a, -1, wbuf, length);
 
 	return wbuf;
@@ -608,10 +608,10 @@ char* wce_wctomb(const wchar_t* w)
 	DWORD charlength;
 	char* pChar;
 
-	charlength = WideCharToMultiByte(CP_ACP, 0, w,
+	charlength = WideCharToMultiByte(CP_UTF8, 0, w,
 					-1, NULL, 0, NULL, NULL);
 	pChar = (char*)malloc(charlength+1);
-	WideCharToMultiByte(CP_ACP, 0, w,
+	WideCharToMultiByte(CP_UTF8, 0, w,
 		-1, pChar, charlength, NULL, NULL);
 
 	return pChar;

data/platform/shared/ruby/wince/wince.h

@@ -232,4 +232,26 @@ int __cdecl _getdrive (void);
 
 #define BUFSIZ  512
 
+#if defined(OS_PLATFORM_CE)
+#ifdef __cplusplus
+extern "C"{
+#endif
+time_t time(time_t *);
+struct tm * __cdecl localtime(const time_t *);
+size_t strftime(char *, size_t, const char *,
+	const struct tm *);
+struct tm * gmtime(const time_t *);
+extern char * tzname[2];
+time_t mktime(struct tm *);
+
+extern int _daylight;
+#define daylight _daylight
+
+extern long _timezone;
+#ifdef __cplusplus
+};
+#endif
+
+#endif
+
 #endif /* _EXT_CE_ */

data/platform/shared/rubyext/System.cpp

@@ -74,7 +74,15 @@ void rho_sys_set_push_notification(const char *url, const char* params)
 
 void rho_sys_set_screen_rotation_notification(const char *url, const char* params)
 {
-	RHODESAPP().setScreenRotationNotification(url, params);
+    rho::String s_url = "";
+    rho::String s_params = "";
+    if (url != NULL) {
+        s_url = url;
+    }
+    if (params != NULL) {
+        s_params = params;
+    }
+	RHODESAPP().setScreenRotationNotification(s_url, s_params);
 }
 
 void rho_sys_unzip_file(const char *url)
@@ -96,5 +104,15 @@ const char* rho_sys_get_start_params()
     return rho::common::CRhodesApp::getStartParameters().c_str();
 }
 
+void rho_sys_start_timer( int interval, const char *url, const char* params)
+{
+    RHODESAPP().getTimer().addTimer(interval, url, params);
+}
+
+
+void rho_sys_stop_timer( const char *url )
+{
+    RHODESAPP().getTimer().stopTimer(url);
+}
 
 } //extern "C"