[[ BrowserWidget ]] Add display & parent window params to browser creation functions

livecodeian · livecodeian · commit cf76aff10c80 · 2015-07-15T11:26:26.000+01:00
[[ BrowserWidget ]] Add widget function to get stack display handle
[[ BrowserWidget ]] Make widget display / window functions available to LCB
diff --git a/engine/src/browser.lcb b/engine/src/browser.lcb
@@ -61,7 +61,7 @@ public foreign handler MCBrowserLibrarySetWaitFunction(in pWait as Pointer) retu
 public foreign handler MCBrowserLibraryGetRunloopCallback(out pCallback as Pointer, out pContext as Pointer) returns CBool binds to "<builtin>"
 
 public foreign handler MCBrowserFactoryGet(in pFactoryId as NativeCString, out rFactory as MCBrowserFactoryRef) returns CBool binds to "<builtin>"
-public foreign handler MCBrowserFactoryCreateBrowser(in pFactory as MCBrowserFactoryRef, out rBrowser as MCBrowserRef) returns CBool binds to "<builtin>"
+public foreign handler MCBrowserFactoryCreateBrowser(in pFactory as MCBrowserFactoryRef, in pDisplay as Pointer, in pParentView as Pointer, out rBrowser as MCBrowserRef) returns CBool binds to "<builtin>"
 
 public foreign handler MCBrowserRetain(in pBrowser as MCBrowserRef) returns MCBrowserRef binds to "<builtin>"
 public foreign handler MCBrowserRelease(in pBrowser as MCBrowserRef) returns nothing binds to "<builtin>"
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -2456,6 +2456,21 @@ extern "C" MC_DLLEXPORT void MCWidgetEvalStackNativeView(void *&r_native_view)
 	r_native_view = MCscreen->GetNativeWindowHandle(MCwidgetobject->getw());
 }
 
+extern "C" MC_DLLEXPORT void MCWidgetEvalStackNativeDisplay(void *&r_display)
+{
+	if (MCwidgetobject == nil)
+	{
+		MCWidgetThrowNoCurrentWidgetError();
+		return;
+	}
+	
+	if (!MCscreen->platform_get_display_handle(r_display))
+	{
+		// TODO - throw error
+		return;
+	}
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 bool MCErrorCreateNamedTypeInfo(MCNameRef p_domain, MCNameRef p_name, MCStringRef p_message, MCTypeInfoRef &r_error_type)
diff --git a/engine/src/widget.mlc b/engine/src/widget.mlc
@@ -978,6 +978,9 @@ end syntax
 
 public foreign handler MCWidgetExecGetNativeLayer(out rNativeLayer as Pointer) returns nothing binds to "<builtin>"
 public foreign handler MCWidgetExecSetNativeLayer(in pNativeLayer as optional Pointer) returns nothing binds to "<builtin>"
+public foreign handler MCWidgetEvalStackNativeView(out rNativeView as Pointer) returns nothing binds to "<builtin>"
+public foreign handler MCWidgetEvalStackNativeDisplay(out rDisplay as Pointer) returns nothing binds to "<builtin>"
+
 /*
 TODO - docs
 */
diff --git a/extensions/widgets/browser/browser.lcb b/extensions/widgets/browser/browser.lcb
@@ -130,15 +130,22 @@ end handler
 
 public handler OnOpen()
 	variable tParent as Pointer
+	/* UNCHECKED */
+	MCWidgetEvalStackNativeView(tParent)
+	
 	// TODO - add widget code to get stack window handler
 	// put my native window into tParent
 
 	variable tFactory as MCBrowserFactoryRef
 	/* UNCHECKED */
 	MCBrowserFactoryGet(mBrowserType, tFactory)
 	
+	variable tDisplay as Pointer
+	/* UNCHECKED */
+	MCWidgetEvalStackNativeDisplay(tDisplay)
+	
 	/* UNCHECKED */
-	MCBrowserFactoryCreateBrowser(tFactory, mBrowser)
+	MCBrowserFactoryCreateBrowser(tFactory, tDisplay, tParent, mBrowser)
 	
 	variable tBrowserView as Pointer
 	/* UNCHECKED */
diff --git a/libbrowser/include/libbrowser.h b/libbrowser/include/libbrowser.h
@@ -107,7 +107,7 @@ class MCBrowser : public MCBrowserRefCounted
 class MCBrowserFactory : public MCBrowserRefCounted
 {
 public:
-	virtual bool CreateBrowser(MCBrowser *&r_browser) = 0;
+	virtual bool CreateBrowser(void *p_display, void *p_parent_view, MCBrowser *&r_browser) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -187,7 +187,7 @@ typedef struct __MCBrowser *MCBrowserRef;
 typedef struct __MCBrowserFactory *MCBrowserFactoryRef;
 
 MC_DLLEXPORT bool MCBrowserFactoryGet(const char *p_factory_id, MCBrowserFactoryRef &r_factory);
-MC_DLLEXPORT bool MCBrowserFactoryCreateBrowser(MCBrowserFactoryRef p_factory, MCBrowserRef &r_browser);
+MC_DLLEXPORT bool MCBrowserFactoryCreateBrowser(MCBrowserFactoryRef p_factory, void *p_display, void *p_parent_view, MCBrowserRef &r_browser);
 
 MC_DLLEXPORT MCBrowserRef MCBrowserRetain(MCBrowserRef p_browser);
 MC_DLLEXPORT void MCBrowserRelease(MCBrowserRef p_browser);
diff --git a/libbrowser/src/libbrowser.cpp b/libbrowser/src/libbrowser.cpp
@@ -145,13 +145,13 @@ bool MCBrowserFactoryGet(const char *p_factory, MCBrowserFactoryRef &r_factory)
 	return true;
 }
 
-bool MCBrowserFactoryCreateBrowser(MCBrowserFactoryRef p_factory, MCBrowserRef &r_browser)
+bool MCBrowserFactoryCreateBrowser(MCBrowserFactoryRef p_factory, void *p_display, void *p_parent_window, MCBrowserRef &r_browser)
 {
 	if (p_factory == nil)
 		return false;
 	
 	MCBrowser *t_browser;
-	if (!((MCBrowserFactory*)p_factory)->CreateBrowser(t_browser))
+	if (!((MCBrowserFactory*)p_factory)->CreateBrowser(p_display, p_parent_window, t_browser))
 		return false;
 	
 	r_browser = (MCBrowserRef)t_browser;
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
@@ -609,7 +609,8 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		if (p_browser->GetIdentifier() == m_browser_id)
 		{
 			// Close the browser window
-			MCCefPlatformCloseBrowserWindow(p_browser);
+			if (m_owner != nil)
+				m_owner->PlatformCloseBrowserWindow(p_browser);
 			
 			// return true to prevent default handling
 			return true;
@@ -915,14 +916,14 @@ MCCefBrowserBase::~MCCefBrowserBase(void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-MCBrowser *MCCefBrowserInstantiate(void *p_parent_window)
+MCBrowser *MCCefBrowserInstantiate(void *p_display, void *p_parent_window)
 {
 	// IM-2014-03-18: [[ revBrowserCEF ]] Make sure cef library is loaded before trying to create browser
 	if (!MCCefBrowserInitialise())
 		return nil;
 	
 	MCCefBrowserBase *t_browser;
-	if (!MCCefPlatformCreateBrowser(p_parent_window, t_browser))
+	if (!MCCefPlatformCreateBrowser(p_display, p_parent_window, t_browser))
 		return nil;
 	
 	if (!t_browser->Initialize())
@@ -1527,18 +1528,13 @@ bool MCCefBrowserFactory::Initialize()
 	return MCCefBrowserInitialise();
 }
 
-bool MCCefBrowserFactory::CreateBrowser(MCBrowser *&r_browser)
+bool MCCefBrowserFactory::CreateBrowser(void *p_display, void *p_parent_view, MCBrowser *&r_browser)
 {
-	void *t_parent_view;
-	t_parent_view = nil;
-	
-	MCWidgetEvalStackNativeView(t_parent_view);
-	
-	if (t_parent_view == nil)
+	if (p_parent_view == nil)
 		return false;
 	
 	MCBrowser *t_browser;
-	t_browser = MCCefBrowserInstantiate(t_parent_view);
+	t_browser = MCCefBrowserInstantiate(p_display, p_parent_view);
 	
 	if (t_browser == nil)
 		return false;
diff --git a/libbrowser/src/libbrowser_cef.h b/libbrowser/src/libbrowser_cef.h
@@ -119,6 +119,7 @@ class MCCefBrowserBase : public MCBrowserBase
 	// Platform-specific methods
 	
 	virtual void PlatformConfigureWindow(CefWindowInfo &r_info) = 0;
+	virtual void PlatformCloseBrowserWindow(CefRefPtr<CefBrowser> p_browser) = 0;
 	
 	virtual bool PlatformGetRect(MCBrowserRect &r_rect) = 0;
 	virtual bool PlatformSetRect(const MCBrowserRect &p_rect) = 0;
@@ -144,7 +145,7 @@ class MCCefBrowserFactory : public MCBrowserFactory
 	MCCefBrowserFactory();
 	virtual ~MCCefBrowserFactory();
 	
-	bool CreateBrowser(MCBrowser *&r_browser) override;
+	bool CreateBrowser(void *p_display, void *p_parent_view, MCBrowser *&r_browser) override;
 	
 	//////////
 	
@@ -153,8 +154,7 @@ class MCCefBrowserFactory : public MCBrowserFactory
 
 bool MCCefBrowserFactoryCreate(MCBrowserFactoryRef &r_factory);
 
-bool MCCefPlatformCreateBrowser(void *p_parent_window, MCCefBrowserBase *&r_browser);
-void MCCefPlatformCloseBrowserWindow(CefRefPtr<CefBrowser> p_browser);
+bool MCCefPlatformCreateBrowser(void *p_display, void *p_parent_window, MCCefBrowserBase *&r_browser);
 
 const char *MCCefPlatformGetSubProcessName(void);
 
@@ -186,8 +186,4 @@ extern "C" void *MCU_loadmodule(const char *p_source);
 extern "C" void MCU_unloadmodule(void *p_module);
 extern "C" void *MCU_resolvemodulesymbol(void *p_module, const char *p_symbol);
 
-// Engine hooks
-
-extern "C" void MCWidgetEvalStackNativeView(void *&r_native_view);
-
 #endif /* __LIBBROWSER_CEF_H__ */

Original file line number	Diff line number	Diff line change
`@@ -145,13 +145,13 @@ bool MCBrowserFactoryGet(const char *p_factory, MCBrowserFactoryRef &r_factory)`
`145`	`145`	`return true;`
`146`	`146`	`}`
`147`	`147`
`148`		`-bool MCBrowserFactoryCreateBrowser(MCBrowserFactoryRef p_factory, MCBrowserRef &r_browser)`
	`148`	`+bool MCBrowserFactoryCreateBrowser(MCBrowserFactoryRef p_factory, void p_display, void p_parent_window, MCBrowserRef &r_browser)`
`149`	`149`	`{`
`150`	`150`	`if (p_factory == nil)`
`151`	`151`	`return false;`
`152`	`152`
`153`	`153`	`MCBrowser *t_browser;`
`154`		`- if (!((MCBrowserFactory*)p_factory)->CreateBrowser(t_browser))`
	`154`	`+ if (!((MCBrowserFactory*)p_factory)->CreateBrowser(p_display, p_parent_window, t_browser))`
`155`	`155`	`return false;`
`156`	`156`
`157`	`157`	`r_browser = (MCBrowserRef)t_browser;`