rhodes 2.0.0.beta1 → 2.0.0.beta2

data/platform/shared/ruby/thread_win32.c

@@ -385,10 +385,18 @@ static void
 native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex)
 {
     DWORD r;
+    DWORD dwErr = 0;
     struct cond_event_entry entry;
+    //WinMo BUG: in release mode CreateEventW without name inside non-main thread does not work
+    static int nCounter = 0;
+    wchar_t buf[20];
+    wsprintfW(buf, L"REvent%d", nCounter);
+    nCounter = nCounter + 1;
 
     entry.next = 0;
-    entry.event = CreateEvent(0, FALSE, FALSE, 0);
+    entry.event = CreateEventW(0, FALSE, FALSE, buf);
+//    dwErr = GetLastError();
+//    printf("CreateEvent: %d; %d", entry.event, dwErr);
 
     /* cond is guarded by mutex */
     if (cond->next) {

data/platform/shared/rubyJVM/src/com/rho/Capabilities.java

@@ -0,0 +1,6 @@
+package com.rho;
+
+public class Capabilities {
+  public static final boolean ENABLE_PUSH = true;
+  public static final boolean RUNAS_SERVICE = true;
+}

data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java

@@ -158,7 +158,7 @@ public class RhodesApp
     		String strBody = "rho_callback=1";
     		
             strBody += "&width=";   strBody += width;
-    		strBody += "&heigth=";  strBody += height;
+    		strBody += "&height=";  strBody += height;
     		strBody += "&degrees="; strBody += degrees;
     		
             if ( m_strScreenRotationCallbackParams.length() > 0 )

data/platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java

@@ -64,7 +64,7 @@ public class ClientRegister extends RhoThread
     public void run() 
     {
     	LOG.INFO("ClientRegister start");    	
-    	while(true) 
+    	while(!m_bStop) 
     	{
     		try
     		{

data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubySymbol_Methods.java

@@ -1,6 +1,6 @@
 package com.xruby.GeneratedMethods;
+import com.xruby.runtime.builtin.RubyString;
 import com.xruby.runtime.lang.*;
-import com.xruby.runtime.lang.RubySymbol;
 public class RubySymbol_Methods{
 public static void initMethods( RubyClass klass){
 
@@ -24,6 +24,11 @@ klass.defineMethod( "to_s", new RubyNoArgMethod(){
 klass.aliasMethod("id2name","to_s");
 klass.aliasMethod("to_str","to_s");
 
+klass.defineMethod( "length", new RubyNoArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyBlock block ){
+		return ((RubySymbol)receiver).rubyLength();}
+});
+
 klass.defineMethod( "===", new RubyOneArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block ){
 		return ((RubySymbol)receiver).sym_eqq(arg);}

data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubyTime_Methods.java

@@ -123,9 +123,9 @@ klass.defineMethod( "zone", new RubyNoArgMethod(){
 		return ((RubyTime)receiver).zone();}
 });
 
-klass.defineMethod( "initialize", new RubyNoArgMethod(){ 
-	protected RubyValue run(RubyValue receiver, RubyBlock block ){
-		return ((RubyTime)receiver).initialize();}
+klass.defineMethod( "initialize", new RubyVarArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
+		return ((RubyTime)receiver).initialize(args);}
 });
 klass.defineAllocMethod(new RubyNoArgMethod(){
 	protected RubyValue run(RubyValue receiver, RubyBlock block )	{

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/InputStreamExecutor.java

@@ -20,7 +20,7 @@ public class InputStreamExecutor implements RubyIOExecutor {
 		m_is = is;
 	}
 	public InputStreamExecutor(String filename, String mode) {
-		if ( mode != "r" )
+		if ( !mode.equals("r") )
 			throw new Error("Read Only!");
 		
     	try {

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyArray.java

@@ -756,7 +756,11 @@ public class RubyArray extends RubyBasic implements Iterable/*<RubyValue>*/ {
     }
 
     //@RubyLevelMethod(name="each")
-    public RubyValue each(RubyBlock block) {
+    public RubyValue each(RubyBlock block) 
+    {
+    	if ( block == null )
+    		return this;
+    	
 //        for (RubyValue item : array_) {
         for (Iterator iter = array_.iterator(); iter.hasNext();) {
         	RubyValue item = (RubyValue)iter.next();
@@ -769,7 +773,11 @@ public class RubyArray extends RubyBasic implements Iterable/*<RubyValue>*/ {
     }
 
     //@RubyLevelMethod(name="each_index")
-    public RubyValue each_index(RubyBlock block) {
+    public RubyValue each_index(RubyBlock block) 
+    {
+    	if ( block == null )
+    		return this;
+    	
         for (int i=0;i<size();i++) {
             RubyValue v = block.invoke(this, new RubyFixnum(i));
             if (block.breakedOrReturned()) {
@@ -780,7 +788,11 @@ public class RubyArray extends RubyBasic implements Iterable/*<RubyValue>*/ {
     }
 
     //@RubyLevelMethod(name="reverse_each")
-    public RubyValue reverse_each(RubyBlock block) {
+    public RubyValue reverse_each(RubyBlock block) 
+    {
+    	if ( block == null )
+    		return this;
+    	
         ListIterator/*<RubyValue>*/ ite = array_.listIterator(array_.size());
         while (ite.hasPrevious()) {
             RubyValue v = block.invoke(this, (RubyValue)ite.previous());

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyString.java

@@ -128,7 +128,10 @@ public class RubyString extends RubyBasic {
             return appendString((RubyString)v);
         } else {
             RubyValue r = RubyAPI.callPublicNoArgMethod(v, null, RubyID.toSID);
-            return appendString((RubyString)r);
+            if ( r instanceof RubyString )
+            	return appendString((RubyString)r);
+            
+            return ObjectFactory.createString(r.toString());
         }
     }
 
@@ -907,7 +910,9 @@ public class RubyString extends RubyBasic {
     //@RubyLevelMethod(name="each", alias="each_line")
     public RubyValue each(RubyBlock block) {
         // FIXME: for each line
-        block.invoke(this, this);
+    	if ( block != null )
+    		block.invoke(this, this);
+    	
         return this;
     }
 
@@ -1277,6 +1282,9 @@ public class RubyString extends RubyBasic {
     //@RubyLevelMethod(name="each_byte")
     public RubyValue each_byte(RubyBlock block) 
     {
+    	if ( block == null )
+    		return this;
+    	
         String string = toString();
         byte bytes[] = null;
         try{

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyTime.java

@@ -49,7 +49,18 @@ public class RubyTime extends RubyBasic {
 
     //RHO_COMMENT : initialize
     //@RubyLevelMethod(name="initialize")
-    public RubyTime initialize() {
+    public RubyTime initialize(RubyArray args) 
+    {
+    	if ( args != null )
+    	{
+	    	if ( args.size() > 0 )
+	    		date_.set(Calendar.YEAR, args.get(0).toInt());
+	    	if ( args.size() > 1 )
+	    		date_.set(Calendar.MONTH, args.get(1).toInt()-1);
+	    	if ( args.size() > 2 )
+	    		date_.set(Calendar.DAY_OF_MONTH, args.get(2).toInt());
+    	}
+    	
         return this;
     }
     

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubyKernelModule.java

@@ -763,24 +763,33 @@ public class RubyKernelModule {
     //@RubyLevelMethod(name="open")
     public static RubyValue open(RubyValue receiver, RubyArray args, RubyBlock block) {
         String filename = args.get(0).toStr();
-        RubyIO io;
+        String mode = "r";
+
+    	//RHO_COMMENT
+        RubyIO io = null;
         if (args.size() <= 1) {
-            //io = ObjectFactory.createFile(filename, "r");
-        	//RHO_COMMENT
-        	io = ObjectFactory.createResourceFile(filename, "r");
-        	//RHO_COMMENT
         } else if (args.get(1) instanceof RubyFixnum) {
-            String mode = "r";
             int i = args.get(1).toInt();
             if ((i & RDWR) != 0) {
                 mode = mode + "w";
             }
-            io = ObjectFactory.createFile(filename, mode);
         } else {
-            RubyString mode = (RubyString) args.get(1);
-            io = ObjectFactory.createFile(filename, mode.toString());
+            RubyString val = (RubyString) args.get(1);
+            mode = val.toString();
         }
 
+        try{
+        	io = ObjectFactory.createResourceFile(filename, mode);
+        }catch (java.lang.Error exc)
+        {
+        	LOG.ERROR("Cannot open file from jar: " + filename, exc);
+        }
+        
+        if ( io == null )
+        	io = ObjectFactory.createFile(filename, mode);
+        
+    	//RHO_COMMENT
+        
         if (null == block) {
             return io;
         } else {

data/platform/shared/rubyJVM/src/com/xruby/runtime/lang/RubySymbol.java

@@ -72,6 +72,11 @@ public class RubySymbol extends RubyValue {
         return this;
     }
 
+    //@RubyLevelMethod(name="length")
+    public RubyFixnum rubyLength() {
+        return ObjectFactory.createFixnum(id.toString().length());
+    }
+    
     //@RubyLevelMethod(name="inspect")
     public RubyString rubyInspect() {
         String value = this.toString();

data/platform/shared/rubyJVM/src/org/json/me/JSONArray.java

@@ -214,7 +214,8 @@ public class JSONArray {
     public double getDouble(int index) throws JSONException {
         Object o = get(index);
         try {
-            return Double.valueOf((String)o).doubleValue();
+        	Double v = (o instanceof Double) ? (Double)o : Double.valueOf((String)o);
+            return v.doubleValue();
         } catch (Exception e) {
             throw new JSONException("JSONArray[" + index +
                 "] is not a number.");

data/platform/shared/unzip/unzip.cpp

@@ -1696,7 +1696,7 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
 
 
 
-extern const char inflate_copyright[] =
+extern const char zlib_inflate_copyright[] =
    " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
 // If you use the zlib library in a product, an acknowledgment is welcome
 // in the documentation of your product. If for some reason you cannot

data/platform/wm/build/wm.rake

@@ -204,27 +204,48 @@ namespace "run" do
     task :dev => ["device:wm:production"] do
    	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"    
-	  args   = ['dev', $targetdir + '/' +  $appname + ".cab", $appname]
+	  args   = [ 'dev', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/rhodes.exe" ]
 	  puts "\nStarting application on the device"
 	  puts "Please, connect you device via ActiveSync.\n\n"
-	  puts Jake.run(detool,args)
+	  Jake.run(detool,args)
     end
 
     desc "Build and run on WM6 emulator"
     task :emu => ["device:wm:production"] do
+   	  cd $startdir + "/res/build-tools"
+	  detool = "detool.exe"    
+	  args   = [ 'emu', '"Windows Mobile 6 Professional Emulator"', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/rhodes.exe" ]
+	  puts "\nStarting application on the WM6 emulator\n\n"
+	  Jake.run(detool,args)
+    end
+
+    desc "Build, install .cab  and run on the Windows Phone"
+    task :devcab => ["device:wm:production"] do
+   	  cd $startdir + "/res/build-tools"
+	  detool = "detool.exe"    
+	  args   = ['devcab', $targetdir + '/' +  $appname + ".cab", $appname]
+	  puts "\nStarting application on the device"
+	  puts "Please, connect you device via ActiveSync.\n\n"
+	  Jake.run(detool,args)
+    end
+
+    desc "Build, install .cab and run on WM6 emulator"
+    task :emucab => ["device:wm:production"] do
   	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"
-	  args   = ['emu', '"Windows Mobile 6 Professional Emulator"', $targetdir + '/' +  $appname + ".cab", $appname]
+	  args   = ['emucab', '"Windows Mobile 6 Professional Emulator"', $targetdir + '/' +  $appname + ".cab", $appname]
 	  puts "\nStarting application on the WM6 emulator\n\n"
-	  puts Jake.run(detool,args)
+	  Jake.run(detool,args)
     end
   end
 	
   desc "Run win32" 
   task :win32 => ["build:win32"] do
     args = [' ']
-    chdir $config["build"]["wmpath"]
-    Thread.new { Jake.run("bin\\win32\\rhodes\\Debug\\rhodes", args) }
+#    chdir $config["build"]["wmpath"]
+#    Thread.new { Jake.run("bin\\win32\\rhodes\\Debug\\rhodes", args) }
+    Jake.run2 "bin\\win32\\rhodes\\Debug\\rhodes.exe", args, {:directory => $config["build"]["wmpath"], :nowait => true}
+    
     $stdout.flush
     chdir $startdir
     

data/platform/wm/rhodes/Alert.cpp

@@ -5,6 +5,7 @@
 #endif
 
 #include <common/RhodesApp.h>
+#include <common/rhoparams.h>
 
 #include "Alert.h"
 #include "MainWindow.h"
@@ -12,13 +13,259 @@
 
 extern "C" HWND getMainWnd();
 
+/**
+ ********************************************************************************
+ * CAlertDialog members.
+ ********************************************************************************
+ */
+
+//TODO: 
+//      - smart alignment and win32
+//      - review for memory leaks.
+
+typedef CWinTraits <WS_CAPTION  | WS_VISIBLE | WS_POPUP | DS_CENTER> CAlertDialogTraits;
+
+CAlertDialog::CAlertDialog(Params *params)
+{
+	m_title    = params->m_title;
+	m_message  = params->m_message;
+	m_callback = params->m_callback;
+	m_icon     = params->m_icon;
+
+	int id = ID_ALERT_DLG_BUTTON_FIRST;
+	for (Hashtable<String, String>::iterator itr = params->m_buttons.begin(); itr != params->m_buttons.end(); ++itr) {
+		if(id > ID_ALERT_DLG_BUTTON_LAST) {
+			LOG(ERROR) + "too many buttons";
+			break;
+		}
+		m_buttons.addElement(CustomButton(itr->first, itr->second, id++));
+	}
+}
+
+CAlertDialog::~CAlertDialog()
+{
+}
+
+void CAlertDialog::DoInitTemplate() 
+{
+#ifdef OS_WINCE
+	int initialWidth  = GetSystemMetrics(SM_CXSCREEN)/3;
+#else 
+	int initialWidth  = CMainWindow::getScreenWidth()/3;
+#endif
+	int initialHeight = initialWidth/3;
+
+	m_Template.Create(false, convertToStringW(m_title).c_str(), 
+						0, 
+						0,
+						initialWidth, 
+						initialHeight,
+						CAlertDialogTraits::GetWndStyle(0), 
+						CAlertDialogTraits::GetWndExStyle(0));
+}
+
+void CAlertDialog::DoInitControls() 
+{
+}
+
+LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL&bHandled)
+{
+#define MAX(i, j)   ((i) > (j) ? (i) : (j))
+
+	const int GAP = 10;   //space around dialog
+	const int INDENT = 8; //for dialog items
+	const unsigned int iconHeight = 42;
+	//space around label on buttons.
+	const int btnHIndent = 12; //horizontal
+	const int btnVIndent = 8;  //vertical
+#ifdef OS_WINCE
+	unsigned int maxWidth  = GetSystemMetrics(SM_CXSCREEN) - (GAP * 2);
+	unsigned int maxHeight = GetSystemMetrics(SM_CYSCREEN) - (GAP * 2);
+#else
+	unsigned int maxWidth  = CMainWindow::getScreenWidth() - (GAP * 2);
+	unsigned int maxHeight = CMainWindow::getScreenWidth() - (GAP * 2);
+#endif
+	unsigned int msgWidth  = 0, msgHeight = 0;
+	CClientDC dc(m_hWnd);
+	TEXTMETRIC tm = { 0 };
+	RECT dlgRect, iconRect = {0 }, msgRect = { 0 }, buttonsRect = { 0 };
+	RECT rect = {0}; POINT point = { 0 };
+#ifdef OS_WINCE
+	int iconId = 0;
+#else
+	LPWSTR iconId = NULL;
+#endif
+
+	GetClientRect(&dlgRect);
+	LOG(INFO) + "dlgRect: " + dlgRect.left + " " + dlgRect.top + " " + dlgRect.right + " " + dlgRect.bottom; 
+
+	/**
+	 * Icon.
+	 */
+#ifdef OS_WINCE
+	if (m_icon == "alert")
+		iconId = MB_ICONWARNING;
+	else if (m_icon == "question")
+		iconId = MB_ICONQUESTION;
+	else if (m_icon == "info")
+		iconId = MB_ICONINFORMATION;
+#else
+	if (m_icon == "alert")
+		iconId = IDI_WARNING;
+	else if (m_icon == "question")
+		iconId = IDI_QUESTION;
+	else if (m_icon == "info")
+		iconId = IDI_INFORMATION;
+#endif 
+	
+	//if icon has predefined type - try to load it from system resources.
+	if (iconId != 0) {
+#ifdef OS_WINCE
+		HMODULE hGWES = LoadLibraryEx( L"gwes.exe", NULL, LOAD_LIBRARY_AS_DATAFILE );
+		HICON hIcon = LoadIcon(hGWES, MAKEINTRESOURCE(iconId));
+#else
+		HICON hIcon = LoadIcon(NULL, iconId);
+#endif
+
+		if (hIcon == NULL) {
+			LOG(ERROR) + "Failed to load icon";
+		} else {
+			iconRect.left = INDENT; 
+			iconRect.top  = INDENT;
+			iconRect.right  = iconRect.left + iconHeight; 
+			iconRect.bottom = iconRect.top + iconHeight;
+
+			m_iconCtrl.Create(m_hWnd, iconRect, NULL, WS_CHILD | WS_VISIBLE | SS_ICON);
+
+			if (m_iconCtrl.SetIcon(hIcon) == NULL)
+				LOG(INFO) + "Failed to set icon";
+		}
+	}
+
+	/**
+	 * Message.
+	 */
+	GetClientRect(&dlgRect);
+	dc.GetTextMetrics(&tm);
+	
+	msgWidth = m_message.length() * tm.tmAveCharWidth + (2 * INDENT);
+	msgHeight = (tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading);
+	point.x = iconRect.right; point.y = iconRect.top;
+
+	int desiredDlgWidth = iconRect.right + msgWidth + (INDENT * 2);
+
+	//if ((desiredDlgWidth > (dlgRect.right - dlgRect.left))) { //adjust dialog window
+	if ( m_buttons.size() != 0 ) {
+		if ((point.x + msgWidth) > maxWidth) {
+			msgWidth = maxWidth - iconRect.right;
+			msgHeight = (((m_message.length() * tm.tmAveCharWidth) / msgWidth) + 1) 
+						* (tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading);
+			desiredDlgWidth = iconRect.right + msgWidth + (INDENT * 2);
+		} else {
+			msgHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading;
+		}
+			
+		if (m_buttons.size() == 0) {
+			MoveWindow(GAP, GAP, 
+						desiredDlgWidth + 13 + INDENT, 
+						MAX((unsigned int )iconRect.bottom, msgHeight) + msgHeight + GetSystemMetrics(SM_CYCAPTION) + INDENT);
+		} else { 
+			MoveWindow(GAP, GAP, 
+						desiredDlgWidth + 13 + INDENT, 
+						MAX((unsigned int )iconRect.bottom, msgHeight)  + GetSystemMetrics(SM_CYCAPTION) + INDENT + 
+						(tm.tmHeight + btnVIndent + INDENT * 2)); //reserved place for buttons
+		}
+	}
+
+	msgRect.left = iconRect.right + INDENT;
+	msgRect.top  = iconRect.top;
+	msgRect.right  = iconRect.right + msgWidth + 2 * INDENT + INDENT * 2; 
+	msgRect.bottom = msgRect.top + msgHeight;
+
+	//LOG(DEBUG) + " msgWidth: " + msgWidth;
+	//LOG(DEBUG) + " msgRect: " + msgRect.left + " " + msgRect.top + " " + msgRect.right + " " + msgRect.bottom;
+
+	m_messageCtrl.Create(m_hWnd, msgRect, NULL, WS_CHILD | WS_VISIBLE);
+	m_messageCtrl.SetWindowText(convertToStringW(m_message).c_str());
+
+	//for Wait dailog text should be centered
+	if (m_buttons.size() == 0) {
+		m_messageCtrl.CenterWindow();
+	}
+	
+	/**
+	 * Buttons.
+	 */
+	int btnsNum = m_buttons.size(); 
+	int btnsWidth = 0, btnsHeight =tm.tmHeight + btnVIndent;
+
+	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
+		btnsWidth += (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent + (INDENT * 2);
+	}
+
+	point.x = INDENT, point.y = (iconHeight > msgHeight ? point.y = iconHeight + 6 : msgHeight + 2) + INDENT;
+
+	unsigned int btnWidth = 0, btnHeight = 0;
+	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
+		btnWidth = (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent;
+		btnHeight = tm.tmHeight + btnVIndent;
+
+		RECT rc = {point.x, point.y, point.x + btnWidth, point.y + btnHeight};
+		itr->Create(m_hWnd, rc, 
+					convertToStringW(itr->m_title).c_str(),
+					WS_CHILD | WS_VISIBLE 
+#if defined(OS_WINDOWS)
+					| BS_DEFPUSHBUTTON 
+#endif
+					, 0, 
+					itr->m_numId);
+
+		point.x += btnWidth + INDENT;
+	}
+
+	CenterWindow();
+
+	return bHandled = FALSE;
+
+#undef MAX
+}
+
+bool CAlertDialog::findButton(int id, CustomButton &btn)
+{
+	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
+		if (itr->m_numId == id) {
+			btn = *itr;
+			return true;
+		}
+	}
+	
+	return false;
+}
+
+LRESULT CAlertDialog::OnAlertDialogButton (WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+	CustomButton cbtn;
+	if (findButton((int) wID, cbtn))
+		rho_rhodesapp_callPopupCallback(m_callback.c_str(), cbtn.m_strId.c_str(), cbtn.m_title.c_str());
+	else
+		LOG(ERROR) + "internal error";
+
+	EndDialog(wID);
+	return 0;
+}
+
+/**
+ ********************************************************************************
+ * CAlert members.
+ ********************************************************************************
+ */
+
 IMPLEMENT_LOGCLASS(CAlert, "Alert");
 
-void CAlert::showPopup(String message)
+void CAlert::showPopup(CAlertDialog::Params *params)
 {
     HWND main_wnd = getMainWnd();
-	::PostMessage(main_wnd, WM_ALERT_SHOWPOPUP, 0,
-                  (LPARAM )strdup(message.c_str()));
+	::PostMessage(main_wnd, WM_ALERT_SHOW_POPUP, 0, (LPARAM ) params);
 }
 
 #if defined(_WIN32_WCE)
@@ -55,8 +302,89 @@ void CAlert::playFile(String fileName)
 
 #endif //_WIN32_WCE
 
-extern "C" void alert_show_popup(char* message) {
-    CAlert::showPopup(message);
+extern "C" void alert_show_popup(rho_param *p)
+{
+	if (p->type == RHO_PARAM_STRING) {
+		CAlert::showPopup(new CAlertDialog::Params(String(p->v.string)));
+	} else if (p->type == RHO_PARAM_HASH) {
+		String title, message, callback, icon;
+		String btnId, btnTitle;
+		Hashtable<String, String> buttons;
+
+		for (int i = 0, lim = p->v.hash->size; i < lim; ++i) {
+			char *name = p->v.hash->name[i];
+            rho_param *value = p->v.hash->value[i];
+			
+			if (strcasecmp(name, "title") == 0) {
+                if (value->type != RHO_PARAM_STRING) {
+                    RAWLOG_ERROR("'title' should be string");
+                    continue;
+                }
+                title = value->v.string;
+            }
+			else if (strcasecmp(name, "message") == 0) {
+                if (value->type != RHO_PARAM_STRING) {
+                    RAWLOG_ERROR("'message' should be string");
+                    continue;
+                }
+                message = value->v.string;
+            }
+            else if (strcasecmp(name, "callback") == 0) {
+                if (value->type != RHO_PARAM_STRING) {
+                    RAWLOG_ERROR("'callback' should be string");
+                    continue;
+                }
+                callback = value->v.string;
+            } else if (strcasecmp(name, "icon") == 0) {
+                if (value->type != RHO_PARAM_STRING) {
+                    RAWLOG_ERROR("'title' should be string");
+                    continue;
+                }
+                icon = value->v.string;
+            }
+
+            else if (strcasecmp(name, "buttons") == 0) {
+				if (value->type != RHO_PARAM_ARRAY) {
+                    RAWLOG_ERROR("'buttons' should be array");
+                    continue;
+                }
+				for (int j = 0, limj = value->v.array->size; j < limj; ++j) {
+					rho_param *arrValue = value->v.array->value[j];
+					switch (arrValue->type) {
+						case RHO_PARAM_STRING:
+							btnId    = arrValue->v.string;
+							btnTitle = arrValue->v.string;
+							break;
+						case RHO_PARAM_HASH:
+							for (int k = 0, limk = arrValue->v.hash->size; k < limk; ++k) {
+                                char *sName = arrValue->v.hash->name[k];
+                                rho_param *sValue = arrValue->v.hash->value[k];
+                                if (sValue->type != RHO_PARAM_STRING) {
+                                    RAWLOG_ERROR("Illegal type of button item's value");
+                                    continue;
+                                }
+                                if (strcasecmp(sName, "id") == 0)
+                                    btnId = sValue->v.string;
+                                else if (strcasecmp(sName, "title") == 0)
+                                    btnTitle = sValue->v.string;
+                            } 
+							break;
+						default:
+							RAWLOG_ERROR("Illegal type of button item");
+							continue;
+					}
+					if (btnId == "" || btnTitle == "") {
+						RAWLOG_ERROR("Incomplete button item");
+						continue;
+					}
+
+					buttons.put(btnTitle, btnId);
+				}
+			}//buttons
+		}
+		
+		CAlert::showPopup(new CAlertDialog::Params(title, message, icon, callback, buttons));
+	}
 }
 
 extern "C" void alert_vibrate(void*) {
@@ -73,4 +401,6 @@ extern "C" void alert_play_file(char* file_name, ...) {
 
 extern "C" void alert_hide_popup()
 {
+	HWND main_wnd = getMainWnd();
+	::PostMessage(main_wnd, WM_ALERT_HIDE_POPUP, 0, 0);
 }