Add support for running JS code

krzys-h · Sep 27, 2018 · 4ca6cef · 4ca6cef
1 parent b328904
commit 4ca6cef
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/GMWebExtension/GMWebExtension.cs b/GMWebExtension/GMWebExtension.cs
@@ -109,9 +109,11 @@ public void Dispose()
         public static double __webextension_native_init()
         {
             var settings = new CefSettings();
-            settings.SetOffScreenRenderingBestPerformanceArgs();
+            //settings.SetOffScreenRenderingBestPerformanceArgs();
             settings.CefCommandLineArgs.Add("autoplay-policy", "no-user-gesture-required");
             settings.CefCommandLineArgs.Remove("mute-audio");
+            foreach (var a in settings.CefCommandLineArgs)
+                Debug.WriteLine(a.Key + "=" + a.Value);
             Cef.Initialize(settings, performDependencyCheck: true, browserProcessHandler: null);
             return 1;
         }
@@ -280,5 +282,27 @@ public static double browser_resize(double browserIdDouble, double w, double h)
 
             return 1;
         }
+
+        [DllExport(CallingConvention.Cdecl)]
+        public static double browser_js(double browserIdDouble, string js)
+        {
+            int browserId = (int)browserIdDouble; // this is so stupid, GML...
+            if (browserId < 0 || browserId >= browsers.Count || browsers[browserId] == null)
+                return 0;
+
+            browsers[browserId].browser.ExecuteScriptAsync(js);
+
+            return 1;
+        }
+
+        [DllExport(CallingConvention.Cdecl)]
+        public static double browser_is_initialized(double browserIdDouble)
+        {
+            int browserId = (int)browserIdDouble; // this is so stupid, GML...
+            if (browserId < 0 || browserId >= browsers.Count || browsers[browserId] == null)
+                return 0;
+
+            return browsers[browserId].browser.IsBrowserInitialized ? 1 : 0;
+        }
     }
 }
diff --git a/Project5.gmx/extensions/GMWebBrowser.extension.gmx b/Project5.gmx/extensions/GMWebBrowser.extension.gmx
@@ -3,7 +3,7 @@
   <name>GMWebBrowser</name>
   <version>1.0.0</version>
   <packageID></packageID>
-  <ProductID>ACBD3CFF4E539AD869A0E8E3B4B022DD</ProductID>
+  <ProductID></ProductID>
   <date>26/09/18</date>
   <license>Free to use, also for commercial games.</license>
   <description></description>
@@ -160,6 +160,29 @@
             <arg>2</arg>
           </args>
         </function>
+        <function>
+          <name>browser_js</name>
+          <externalName>browser_js</externalName>
+          <kind>12</kind>
+          <help>browser_js(browserId, code)</help>
+          <returnType>2</returnType>
+          <argCount>2</argCount>
+          <args>
+            <arg>2</arg>
+            <arg>1</arg>
+          </args>
+        </function>
+        <function>
+          <name>browser_is_initialized</name>
+          <externalName>browser_is_initialized</externalName>
+          <kind>12</kind>
+          <help></help>
+          <returnType>2</returnType>
+          <argCount>1</argCount>
+          <args>
+            <arg>2</arg>
+          </args>
+        </function>
       </functions>
       <constants>
         <constant>

diff --git a/README.md b/README.md
@@ -14,6 +14,8 @@ browser_load(browser_id, url)
 browser_load_html(browser_id, html)
 browser_resize(browser_id, width, height)
 browser_draw(browser_id, x, y)
+browser_is_initialized(browser_id)
+browser_js(browser_id, js)
 
 // In the Social async event (this is what all extensions are supposed to use apparently and I hate it):
 var event_id = async_load[? "id"];