Skip to content

Add onClientBrowserConsoleMessage event - #3676 follow up #3773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 21, 2024
Merged

Add onClientBrowserConsoleMessage event - #3676 follow up #3773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f64af0
#3676
TracerDS Oct 6, 2024
c5b6150
Merge branch 'master' into 061024_onClientBrowserConsoleMessage
TracerDS Oct 12, 2024
2aee2b0
Merge branch 'master' into 061024_onClientBrowserConsoleMessage
TracerDS Nov 11, 2024
10ff47b
Merge branch 'master' into 061024_onClientBrowserConsoleMessage
TracerDS Nov 13, 2024
96e3825
Merge branch 'master' into 061024_onClientBrowserConsoleMessage
Dutchman101 Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,7 @@ void CClientGame::AddBuiltInEvents()
m_Events.AddEvent("onClientBrowserTooltip", "text", NULL, false);
m_Events.AddEvent("onClientBrowserInputFocusChanged", "gainedfocus", NULL, false);
m_Events.AddEvent("onClientBrowserResourceBlocked", "url, domain, reason", NULL, false);
m_Events.AddEvent("onClientBrowserConsoleMessage", "message, source, line, level", nullptr, false);

// Misc events
m_Events.AddEvent("onClientFileDownloadComplete", "fileName, success", NULL, false);
Expand Down
10 changes: 10 additions & 0 deletions Client/mods/deathmatch/logic/CClientWebBrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,16 @@ void CClientWebBrowser::Events_OnAjaxRequest(CAjaxResourceHandlerInterface* pHan
pHandler->SetResponse(result);
}

void CClientWebBrowser::Events_OnConsoleMessage(const std::string& message, const std::string& source, int line, std::int16_t level)
{
CLuaArguments arguments;
arguments.PushString(message);
arguments.PushString(source);
arguments.PushNumber(line);
arguments.PushNumber(level);
CallEvent("onClientBrowserConsoleMessage", arguments, false);
}

bool CClientWebBrowser::AddAjaxHandler(const SString& strURL, ajax_callback_t& handler)
{
if (!m_pWebView->RegisterAjaxHandler(strURL))
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/CClientWebBrowser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class CClientWebBrowser : public CClientTexture, public CWebBrowserEventsInterfa
bool Events_OnResourceFileCheck(const SString& strURL, CBuffer& outFileData) override;
void Events_OnResourceBlocked(const SString& strURL, const SString& strDomain, unsigned char reason) override;
void Events_OnAjaxRequest(CAjaxResourceHandlerInterface* pHandler, const SString& strURL) override;
void Events_OnConsoleMessage(const std::string& message, const std::string& source, int line, std::int16_t level) override;

private:
CWebViewInterface* m_pWebView;
Expand Down
1 change: 1 addition & 0 deletions Client/sdk/core/CWebBrowserEventsInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ class CWebBrowserEventsInterface
virtual bool Events_OnResourceFileCheck(const SString& strURL, CBuffer& outFileData) = 0;
virtual void Events_OnResourceBlocked(const SString& strURL, const SString& strDomain, unsigned char reason) = 0;
virtual void Events_OnAjaxRequest(CAjaxResourceHandlerInterface* pHandler, const SString& strURL) = 0;
virtual void Events_OnConsoleMessage(const std::string& message, const std::string& source, int line, std::int16_t level) = 0;
};
Loading