Added toggleBrowserDevTools

Author: jushar

MTA10/core/CWebDevTools.cpp

@@ -0,0 +1,36 @@
+/*****************************************************************************
+*
+*  PROJECT:     Multi Theft Auto v1.x
+*               (Shared logic for modifications)
+*  LICENSE:     See LICENSE in the top level directory
+*  FILE:        core/CWebDevTools.cpp
+*  PURPOSE:     Web dev tools class
+*
+*****************************************************************************/
+#include "StdInc.h"
+#include "CWebDevTools.h"
+
+bool CWebDevTools::Show ( CWebView* pWebView )
+{
+    auto browser = pWebView->GetCefBrowser ();
+
+    // Default settings are suitable
+    CefBrowserSettings settings;
+
+    CefWindowInfo windowInfo;
+    windowInfo.SetAsPopup ( NULL, "CEF Dev Tools (MTA:SA)" );
+    
+    // Create independent CefClient (to bypass access restrictions)
+    CefRefPtr<CefClient> client { new CDevToolsClient };
+
+    // ...and show the devtools
+    browser->GetHost ()->ShowDevTools ( windowInfo, client, settings, CefPoint () );
+    return true;
+}
+
+bool CWebDevTools::Close ( CWebView* pWebView )
+{
+    pWebView->GetCefBrowser ()->GetHost ()->CloseDevTools ();
+    return true;
+}
+

MTA10/core/CWebDevTools.h

@@ -0,0 +1,25 @@
+/*****************************************************************************
+*
+*  PROJECT:     Multi Theft Auto v1.x
+*               (Shared logic for modifications)
+*  LICENSE:     See LICENSE in the top level directory
+*  FILE:        core/CWebDevTools.h
+*  PURPOSE:     Web dev tools class
+*
+*****************************************************************************/
+#pragma once
+
+class CWebDevTools
+{
+public:
+    static bool Show ( CWebView* pWebView );
+    static bool Close ( CWebView* pWebView );
+};
+
+class CDevToolsClient : public CefClient
+{
+public:
+    CDevToolsClient() = default;
+
+    IMPLEMENT_REFCOUNTING(CDevToolsClient);
+};

MTA10/core/CWebView.cpp

@@ -13,6 +13,7 @@
 #include <cef3/include/cef_parser.h>
 #include <cef3/include/cef_task.h>
 #include <cef3/include/cef_runnable.h>
+#include "CWebDevTools.h"
 
 CWebView::CWebView ( unsigned int uiWidth, unsigned int uiHeight, bool bIsLocal, CWebBrowserItem* pWebBrowserRenderItem, bool bTransparent )
 {
@@ -359,6 +360,14 @@ void CWebView::HandleAjaxRequest ( const SString& strURL, CAjaxResourceHandler *
     g_pCore->GetWebCore ()->AddEventToEventQueue ( func, this, "AjaxResourceRequest" );
 }
 
+bool CWebView::ToggleDevTools ( bool visible )
+{
+    if ( visible )
+        return CWebDevTools::Show ( this );
+
+    return CWebDevTools::Close ( this );
+}
+
 bool CWebView::VerifyFile ( const SString& strPath )
 {
     return m_pEventsInterface->Events_OnResourceFileCheck ( strPath );

MTA10/core/CWebView.h

@@ -81,6 +81,8 @@ class CWebView : public CWebViewInterface, private CefClient, private CefRenderH
     virtual bool HasAjaxHandler ( const SString& strURL );
     virtual void HandleAjaxRequest ( const SString& strURL, class CAjaxResourceHandler * pHandler );
 
+    virtual bool ToggleDevTools ( bool visible ) override;
+
     // CefClient methods
     virtual CefRefPtr<CefRenderHandler>     GetRenderHandler() override { return this; };
     virtual CefRefPtr<CefLoadHandler>       GetLoadHandler() override { return this; };

MTA10/core/_Core 2008.vcxproj

@@ -317,6 +317,7 @@
     <ClCompile Include="CVertexStreamBoundingBoxManager.cpp" />
     <ClCompile Include="CVideoModeManager.cpp" />
     <ClCompile Include="CWebCore.cpp" />
+    <ClCompile Include="CWebDevTools.cpp" />
     <ClCompile Include="CWebsiteRequests.cpp" />
     <ClCompile Include="CWebView.cpp" />
     <ClCompile Include="StdInc.cpp">
@@ -475,6 +476,7 @@
     <ClInclude Include="CVertexStreamBoundingBoxManager.h" />
     <ClInclude Include="CVideoModeManager.h" />
     <ClInclude Include="CWebCore.h" />
+    <ClInclude Include="CWebDevTools.h" />
     <ClInclude Include="CWebsiteRequests.h" />
     <ClInclude Include="CWebView.h" />
     <ClInclude Include="StdInc.h" />

MTA10/core/_Core 2008.vcxproj.filters

@@ -356,6 +356,9 @@
     <ClCompile Include="CAjaxResourceHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CWebDevTools.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CAdditionalVertexStreamManager.h">
@@ -1252,5 +1255,8 @@
     <ClInclude Include="CAjaxResourceHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="CWebDevTools.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

MTA10/mods/shared_logic/CClientWebBrowser.cpp

@@ -294,6 +294,11 @@ bool CClientWebBrowser::RemoveAjaxHandler ( const SString& strURL )
     return m_mapAjaxCallback.erase ( strURL ) == 1;
 }
 
+bool CClientWebBrowser::ToggleDevTools ( bool visible )
+{
+    return m_pWebView->ToggleDevTools ( visible );
+}
+
 
 CClientGUIWebBrowser::CClientGUIWebBrowser ( bool isLocal, bool isTransparent, uint width, uint height, CClientManager* pManager, CLuaMain* pLuaMain, CGUIElement* pCGUIElement, ElementID ID ) 
     : CClientGUIElement ( pManager, pLuaMain, pCGUIElement, ID )

MTA10/mods/shared_logic/CClientWebBrowser.h

@@ -58,6 +58,8 @@ class CClientWebBrowser : public CClientTexture, public CWebBrowserEventsInterfa
 
     bool                        AddAjaxHandler      ( const SString& strURL, ajax_callback_t& handler );
     bool                        RemoveAjaxHandler   ( const SString& strURL );
+
+    bool                        ToggleDevTools      ( bool visible );
 
     // CWebBrowserEventsInterface implementation
     void                        Events_OnCreated       () override;

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Browser.cpp

@@ -588,6 +588,33 @@ int CLuaFunctionDefs::GetBrowserSource ( lua_State* luaVM )
     return 1;
 }
 
+int CLuaFunctionDefs::ToggleBrowserDevTools ( lua_State* luaVM )
+{
+//  bool toggleBrowserDevTools ( browser webBrowser, bool visible )
+    CClientWebBrowser* pWebBrowser; bool visible;
+
+    CScriptArgReader argStream ( luaVM );
+    argStream.ReadUserData ( pWebBrowser );
+    argStream.ReadBool ( visible );
+
+    if ( !argStream.HasErrors () )
+    {
+        if ( g_pCore->GetWebCore ()->IsTestModeEnabled () )
+        {
+            lua_pushboolean ( luaVM, pWebBrowser->ToggleDevTools ( visible ) );
+            return 1;
+        }
+        else
+            m_pScriptDebugging->LogCustom ( luaVM, "toggleBrowserDevtools can only be used in development mode" );
+        
+    }
+    else
+        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
+
 int CLuaFunctionDefs::GUICreateBrowser ( lua_State* luaVM )
 {
 //  element guiCreateBrowser ( float x, float y, float width, float height, bool isLocal, bool isTransparent, bool relative, [element parent = nil] )

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h

@@ -1044,6 +1044,7 @@ class CLuaFunctionDefs
     LUA_DECLARE ( GetBrowserSettings );
     LUA_DECLARE ( GetBrowserSource );
     LUA_DECLARE ( SetBrowserAjaxHandler );
+    LUA_DECLARE ( ToggleBrowserDevTools );
     LUA_DECLARE ( GUICreateBrowser );
     LUA_DECLARE ( GUIGetBrowser );