Add onClientChatboxLayoutChange event #3448
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /***************************************************************************** | ||
| * | ||
| * PROJECT: Multi Theft Auto | ||
| * LICENSE: See LICENSE in the top level directory | ||
| * FILE: core/CClientChatboxVariables.h | ||
| * PURPOSE: Header file for client chatbox variables | ||
| * | ||
| * Multi Theft Auto is available from http://www.multitheftauto.com/ | ||
| * | ||
| *****************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <SharedUtil.Misc.h> | ||
|
|
||
| #define MAX_CHATBOX_LAYOUT_CVARS 21 | ||
|
|
||
| static const SFixedArray<const char*, MAX_CHATBOX_LAYOUT_CVARS>& g_chatboxLayoutCVars = {{"chat_font", | ||
| "chat_lines", | ||
| "chat_color", | ||
| "chat_text_color", | ||
| "chat_input_color", | ||
| "chat_input_prefix_color", | ||
| "chat_input_text_color", | ||
| "chat_scale", | ||
| "chat_position_offset_x", | ||
| "chat_position_offset_y", | ||
| "chat_position_horizontal", | ||
| "chat_position_vertical", | ||
| "chat_text_alignment", | ||
| "chat_width", | ||
| "chat_css_style_text", | ||
| "chat_css_style_background", | ||
| "chat_line_life", | ||
| "chat_line_fade_out", | ||
| "chat_use_cegui", | ||
| "text_scale", | ||
| "chat_text_outline"}}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
| #define ALLOC_STATS_MODULE_NAME "client" | ||
| #include "SharedUtil.hpp" | ||
| #include <core/CClientCommands.h> | ||
| #include <../Client/core/CClientChatboxVariables.h> | ||
|
There was a problem hiding this comment. The header belongs in |
||
|
|
||
| CCoreInterface* g_pCore = NULL; | ||
| CLocalizationInterface* g_pLocalization = NULL; | ||
|
|
@@ -305,6 +306,75 @@ void CClient::OnWindowFocusChange(bool state) | |
| g_pClientGame->OnWindowFocusChange(state); | ||
| } | ||
|
|
||
| void CClient::OnChatboxLayoutChange() | ||
| { | ||
| if (g_pClientGame) | ||
| { | ||
| CCVarsInterface* pCVars = g_pCore->GetCVars(); | ||
| SString strCVarValue; | ||
| std::stringstream ss; | ||
| float fNumber, fX, fY; | ||
| int iR, iG, iB, iA; | ||
| CLuaArguments chatboxItemList; | ||
|
|
||
| for (unsigned int i = 0; i < MAX_CHATBOX_LAYOUT_CVARS; i++) | ||
|
There was a problem hiding this comment. You could use an array of struct for enum class DummyType {
STRING,
BOOLEAN,
FLOAT1,
FLOAT2,
FLOAT4,
};
struct Dummy {
const char* name;
DummyType type;
}; |
||
| { | ||
| chatboxItemList.PushString(g_chatboxLayoutCVars[i]); | ||
| if (g_chatboxLayoutCVars[i] == "chat_color" || g_chatboxLayoutCVars[i] == "chat_text_color" || g_chatboxLayoutCVars[i] == "chat_input_color" || | ||
| g_chatboxLayoutCVars[i] == "chat_input_prefix_color" || g_chatboxLayoutCVars[i] == "chat_input_text_color") | ||
| { | ||
| pCVars->Get(g_chatboxLayoutCVars[i], strCVarValue); | ||
| if (strCVarValue.empty()) | ||
| continue; | ||
| ss.clear(); | ||
| ss.str(strCVarValue); | ||
| ss >> iR >> iG >> iB >> iA; | ||
|
|
||
| CLuaArguments chatboxColorItem; | ||
| chatboxColorItem.PushNumber(1); | ||
| chatboxColorItem.PushNumber(iR); | ||
| chatboxColorItem.PushNumber(2); | ||
| chatboxColorItem.PushNumber(iG); | ||
| chatboxColorItem.PushNumber(3); | ||
| chatboxColorItem.PushNumber(iB); | ||
| chatboxColorItem.PushNumber(4); | ||
| chatboxColorItem.PushNumber(iA); | ||
|
|
||
| chatboxItemList.PushTable(&chatboxColorItem); | ||
| } | ||
| else if (g_chatboxLayoutCVars[i] == "chat_scale") | ||
| { | ||
| pCVars->Get(g_chatboxLayoutCVars[i], strCVarValue); | ||
| if (strCVarValue.empty()) | ||
| continue; | ||
| ss.clear(); | ||
| ss.str(strCVarValue); | ||
| ss >> fX >> fY; | ||
|
|
||
| CLuaArguments numberTable; | ||
| numberTable.PushNumber(1); | ||
| numberTable.PushNumber(fX); | ||
| numberTable.PushNumber(2); | ||
| numberTable.PushNumber(fY); | ||
|
|
||
| chatboxItemList.PushTable(&numberTable); | ||
| } | ||
| else | ||
| { | ||
| pCVars->Get(g_chatboxLayoutCVars[i], fNumber); | ||
| if (g_chatboxLayoutCVars[i] == "chat_use_cegui") | ||
| chatboxItemList.PushBoolean(fNumber ? true : false); | ||
| else | ||
| chatboxItemList.PushNumber(fNumber); | ||
| } | ||
| } | ||
|
|
||
| CLuaArguments Arguments; | ||
| Arguments.PushTable(&chatboxItemList); | ||
| g_pClientGame->GetRootEntity()->CallEvent("onClientChatboxLayoutChange", Arguments, false); | ||
| } | ||
| } | ||
|
|
||
| CClient::InitializeArguments CClient::ExtractInitializeArguments(const char* arguments) | ||
| { | ||
| // Format: "nickname [password]" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,8 @@ class CClient : public CClientBase | |
|
|
||
| void OnWindowFocusChange(bool state) override; | ||
|
|
||
| void OnChatboxLayoutChange(); | ||
|
|
||
| private: | ||
| struct InitializeArguments | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2784,6 +2784,8 @@ void CClientGame::AddBuiltInEvents() | |
| m_Events.AddEvent("onClientWeaponFire", "ped, x, y, z", NULL, false); | ||
|
|
||
| m_Events.AddEvent("onClientWorldSound", "group, index, x, y, z", nullptr, false); | ||
|
|
||
| m_Events.AddEvent("onClientChatboxLayoutChange", "chatboxLayout", NULL, false); | ||
| } | ||
|
|
||
| void CClientGame::DrawFPS() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -446,6 +446,8 @@ class CClientGame | |
|
|
||
| void OnWindowFocusChange(bool state); | ||
|
|
||
| void OnChatboxLayoutChange(); | ||
|
|
||
| private: | ||
| // CGUI Callbacks | ||
| bool OnKeyDown(CGUIKeyEventArgs Args); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,28 +11,7 @@ | |
|
|
||
| #include "StdInc.h" | ||
| #include <lua/CLuaFunctionParser.h> | ||
| #include <../Client/core/CClientChatboxVariables.h> | ||
|
|
||
| void CLuaGUIDefs::LoadFunctions() | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,6 @@ | |
| #pragma once | ||
| #include "CLuaDefs.h" | ||
|
|
||
|
|
||
| class CLuaGUIDefs : public CLuaDefs | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,4 +34,6 @@ class CClientBase | |
| virtual void GetPlayerNames(std::vector<SString>& vPlayerNames) = 0; | ||
|
|
||
| virtual void OnWindowFocusChange(bool state) = 0; | ||
|
|
||
| virtual void OnChatboxLayoutChange() = 0; | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SString constructor can do
printfformatting.