Skip to content

Commit 9275095

Browse files
committed
Convert more line endings to LF
1 parent 15b2ec7 commit 9275095

File tree

2,420 files changed

+658864
-658864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,420 files changed

+658864
-658864
lines changed

Client/ceflauncher/Main.cpp

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
/*****************************************************************************
2-
*
3-
* PROJECT: Multi Theft Auto v1.0
4-
* (Shared logic for modifications)
5-
* LICENSE: See LICENSE in the top level directory
6-
* FILE: ceflauncher/Main.cpp
7-
* PURPOSE: CEF launcher entry point
8-
*
9-
*****************************************************************************/
10-
#define WIN32_LEAN_AND_MEAN
11-
#include <Windows.h>
12-
#include <string>
13-
14-
/*
15-
IMPORTANT
16-
17-
If this project changes, a new release build should be copied into
18-
the Shared\data\launchers directory.
19-
20-
The .exe in Shared\data\launchers will be used by the installer and updater.
21-
22-
(set flag.new_cef_exe on the build server to generate new exe)
23-
*/
24-
25-
int _declspec(dllimport) InitCEF();
26-
27-
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow)
28-
{
29-
return InitCEF();
30-
}
1+
/*****************************************************************************
2+
*
3+
* PROJECT: Multi Theft Auto v1.0
4+
* (Shared logic for modifications)
5+
* LICENSE: See LICENSE in the top level directory
6+
* FILE: ceflauncher/Main.cpp
7+
* PURPOSE: CEF launcher entry point
8+
*
9+
*****************************************************************************/
10+
#define WIN32_LEAN_AND_MEAN
11+
#include <Windows.h>
12+
#include <string>
13+
14+
/*
15+
IMPORTANT
16+
17+
If this project changes, a new release build should be copied into
18+
the Shared\data\launchers directory.
19+
20+
The .exe in Shared\data\launchers will be used by the installer and updater.
21+
22+
(set flag.new_cef_exe on the build server to generate new exe)
23+
*/
24+
25+
int _declspec(dllimport) InitCEF();
26+
27+
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow)
28+
{
29+
return InitCEF();
30+
}

Client/ceflauncher_DLL/CCefApp.h

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
1-
/*****************************************************************************
2-
*
3-
* PROJECT: Multi Theft Auto v1.0
4-
* (Shared logic for modifications)
5-
* LICENSE: See LICENSE in the top level directory
6-
* FILE: ceflauncher/CCefApp.h
7-
* PURPOSE: CefApp implementation
8-
*
9-
*****************************************************************************/
10-
#include <cef3/include/cef_app.h>
11-
#include <string>
12-
#include <sstream>
13-
#include "V8Helpers.h"
14-
using V8Helpers::CV8Handler;
15-
16-
class CCefApp : public CefApp, public CefRenderProcessHandler
17-
{
18-
public:
19-
CCefApp() {}
20-
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override { return this; };
21-
22-
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
23-
virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override
24-
{
25-
if (m_bHasInputFocus)
26-
{
27-
if (node)
28-
return;
29-
30-
// Tell MTA that we lost input focus
31-
auto message = CefProcessMessage::Create("InputFocus");
32-
message->GetArgumentList()->SetBool(0, false);
33-
browser->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
34-
35-
// Set variable to ensure that the event does not trigger twice
36-
m_bHasInputFocus = false;
37-
return;
38-
}
39-
else
40-
{
41-
if (!node)
42-
return;
43-
44-
if (node->GetType() == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && !node->GetFormControlElementType().empty())
45-
{
46-
auto message = CefProcessMessage::Create("InputFocus");
47-
message->GetArgumentList()->SetBool(0, true);
48-
browser->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
49-
50-
// Set variable to ensure that the event does not trigger twice
51-
m_bHasInputFocus = true;
52-
}
53-
}
54-
}
55-
56-
virtual void OnRegisterCustomSchemes(CefRawPtr<CefSchemeRegistrar> registrar) override
57-
{
58-
// Register custom MTA scheme (has to be called in all proceseses)
59-
registrar->AddCustomScheme("mtalocal", CEF_SCHEME_OPTION_CSP_BYPASSING);
60-
}
61-
62-
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
63-
// //
64-
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override
65-
{
66-
// Get global object and create a v8 handler instance
67-
CefRefPtr<CefV8Value> globalObject = context->GetGlobal();
68-
CefRefPtr<CV8Handler> handler = new CV8Handler(frame);
69-
70-
// Create MTA object
71-
CefRefPtr<CefV8Value> mtaObject = CefV8Value::CreateObject(nullptr, nullptr);
72-
73-
// Bind V8 --> C++ functions
74-
V8Helpers::BindV8Function(handler, mtaObject, "triggerEvent", Javascript_triggerEvent);
75-
76-
// Assign mtaObject to global object
77-
globalObject->SetValue("mta", mtaObject, V8_PROPERTY_ATTRIBUTE_NONE);
78-
}
79-
80-
static void Javascript_triggerEvent(CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments)
81-
{
82-
if (arguments.size() == 0)
83-
return;
84-
85-
CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments("TriggerLuaEvent", arguments);
86-
frame->GetBrowser()->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
87-
}
88-
89-
public:
90-
IMPLEMENT_REFCOUNTING(CCefApp);
91-
92-
private:
93-
bool m_bHasInputFocus = false;
94-
};
1+
/*****************************************************************************
2+
*
3+
* PROJECT: Multi Theft Auto v1.0
4+
* (Shared logic for modifications)
5+
* LICENSE: See LICENSE in the top level directory
6+
* FILE: ceflauncher/CCefApp.h
7+
* PURPOSE: CefApp implementation
8+
*
9+
*****************************************************************************/
10+
#include <cef3/include/cef_app.h>
11+
#include <string>
12+
#include <sstream>
13+
#include "V8Helpers.h"
14+
using V8Helpers::CV8Handler;
15+
16+
class CCefApp : public CefApp, public CefRenderProcessHandler
17+
{
18+
public:
19+
CCefApp() {}
20+
virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override { return this; };
21+
22+
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnFocusedNodeChanged(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefDOMNode%3E)
23+
virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefDOMNode> node) override
24+
{
25+
if (m_bHasInputFocus)
26+
{
27+
if (node)
28+
return;
29+
30+
// Tell MTA that we lost input focus
31+
auto message = CefProcessMessage::Create("InputFocus");
32+
message->GetArgumentList()->SetBool(0, false);
33+
browser->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
34+
35+
// Set variable to ensure that the event does not trigger twice
36+
m_bHasInputFocus = false;
37+
return;
38+
}
39+
else
40+
{
41+
if (!node)
42+
return;
43+
44+
if (node->GetType() == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && !node->GetFormControlElementType().empty())
45+
{
46+
auto message = CefProcessMessage::Create("InputFocus");
47+
message->GetArgumentList()->SetBool(0, true);
48+
browser->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
49+
50+
// Set variable to ensure that the event does not trigger twice
51+
m_bHasInputFocus = true;
52+
}
53+
}
54+
}
55+
56+
virtual void OnRegisterCustomSchemes(CefRawPtr<CefSchemeRegistrar> registrar) override
57+
{
58+
// Register custom MTA scheme (has to be called in all proceseses)
59+
registrar->AddCustomScheme("mtalocal", CEF_SCHEME_OPTION_CSP_BYPASSING);
60+
}
61+
62+
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderProcessHandler.html#OnContextCreated(CefRefPtr%3CCefBrowser%3E,CefRefPtr%3CCefFrame%3E,CefRefPtr%3CCefV8Context%3E)
63+
// //
64+
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override
65+
{
66+
// Get global object and create a v8 handler instance
67+
CefRefPtr<CefV8Value> globalObject = context->GetGlobal();
68+
CefRefPtr<CV8Handler> handler = new CV8Handler(frame);
69+
70+
// Create MTA object
71+
CefRefPtr<CefV8Value> mtaObject = CefV8Value::CreateObject(nullptr, nullptr);
72+
73+
// Bind V8 --> C++ functions
74+
V8Helpers::BindV8Function(handler, mtaObject, "triggerEvent", Javascript_triggerEvent);
75+
76+
// Assign mtaObject to global object
77+
globalObject->SetValue("mta", mtaObject, V8_PROPERTY_ATTRIBUTE_NONE);
78+
}
79+
80+
static void Javascript_triggerEvent(CefRefPtr<CefFrame> frame, const CefV8ValueList& arguments)
81+
{
82+
if (arguments.size() == 0)
83+
return;
84+
85+
CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments("TriggerLuaEvent", arguments);
86+
frame->GetBrowser()->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
87+
}
88+
89+
public:
90+
IMPLEMENT_REFCOUNTING(CCefApp);
91+
92+
private:
93+
bool m_bHasInputFocus = false;
94+
};

0 commit comments

Comments
 (0)