phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 17:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: skip #showtooltip and other # directives when executing macros

Browse source 
Macros often start with a #showtooltip or #show directive line; these
should not be executed as chat commands.  The firstMacroCommand() helper
now scans forward through the macro text, skipping blank lines and any
line starting with '#', and executes the first actual command line.

Applies to all three execution paths: left-click, keyboard shortcut,
and right-click Execute menu item.
This commit is contained in:
Kelsi 2026-03-18 02:27:34 -07:00
parent db0f868549
commit c3be43de58
1 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/ui/game_screen.cpp
View file

@ -256,6 +256,9 @@ bool GameScreen::shouldShowMessage(const game::MessageChatData& msg, int tabInde
return (tab.typeMask & typeBit) != 0; return (tab.typeMask & typeBit) != 0;
} }
// Forward declaration — defined near sendChatMessage below
static std::string firstMacroCommand(const std::string& macroText);
void GameScreen::render(game::GameHandler& gameHandler) { void GameScreen::render(game::GameHandler& gameHandler) {
// Set up chat bubble callback (once) // Set up chat bubble callback (once)
if (!chatBubbleCallbackSet_) { if (!chatBubbleCallbackSet_) {
@ -2835,11 +2838,9 @@ void GameScreen::processTargetInput(game::GameHandler& gameHandler) {
} else if (bar[slotIdx].type == game::ActionBarSlot::ITEM && bar[slotIdx].id != 0) { } else if (bar[slotIdx].type == game::ActionBarSlot::ITEM && bar[slotIdx].id != 0) {
gameHandler.useItemById(bar[slotIdx].id); gameHandler.useItemById(bar[slotIdx].id);
} else if (bar[slotIdx].type == game::ActionBarSlot::MACRO) { } else if (bar[slotIdx].type == game::ActionBarSlot::MACRO) {
const std::string& macroTxt = gameHandler.getMacroText(bar[slotIdx].id); std::string cmd = firstMacroCommand(gameHandler.getMacroText(bar[slotIdx].id));
if (!macroTxt.empty()) { if (!cmd.empty()) {
size_t nl = macroTxt.find('\n'); strncpy(chatInputBuffer, cmd.c_str(), sizeof(chatInputBuffer) - 1);
std::string firstLine = (nl != std::string::npos) ? macroTxt.substr(0, nl) : macroTxt;
strncpy(chatInputBuffer, firstLine.c_str(), sizeof(chatInputBuffer) - 1);
chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0'; chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0';
sendChatMessage(gameHandler); sendChatMessage(gameHandler);
} }
@ -5239,6 +5240,24 @@ void GameScreen::renderFocusFrame(game::GameHandler& gameHandler) {
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} }
// Returns the first executable line of a macro text block, skipping blank lines
// and # directive lines (e.g. #showtooltip). Returns empty string if none found.
static std::string firstMacroCommand(const std::string& macroText) {
size_t pos = 0;
while (pos <= macroText.size()) {
size_t nl = macroText.find('\n', pos);
std::string line = (nl != std::string::npos) ? macroText.substr(pos, nl - pos) : macroText.substr(pos);
if (!line.empty() && line.back() == '\r') line.pop_back();
size_t start = line.find_first_not_of(" \t");
if (start != std::string::npos) line = line.substr(start);
if (!line.empty() && line.front() != '#')
return line;
if (nl == std::string::npos) break;
pos = nl + 1;
}
return {};
}
void GameScreen::sendChatMessage(game::GameHandler& gameHandler) { void GameScreen::sendChatMessage(game::GameHandler& gameHandler) {
if (strlen(chatInputBuffer) > 0) { if (strlen(chatInputBuffer) > 0) {
std::string input(chatInputBuffer); std::string input(chatInputBuffer);
@ -7558,12 +7577,9 @@ void GameScreen::renderActionBar(game::GameHandler& gameHandler) {
} else if (slot.type == game::ActionBarSlot::ITEM && slot.id != 0) { } else if (slot.type == game::ActionBarSlot::ITEM && slot.id != 0) {
gameHandler.useItemById(slot.id); gameHandler.useItemById(slot.id);
} else if (slot.type == game::ActionBarSlot::MACRO) { } else if (slot.type == game::ActionBarSlot::MACRO) {
const std::string& text = gameHandler.getMacroText(slot.id); std::string cmd = firstMacroCommand(gameHandler.getMacroText(slot.id));
if (!text.empty()) { if (!cmd.empty()) {
// Execute first line of macro as a chat command strncpy(chatInputBuffer, cmd.c_str(), sizeof(chatInputBuffer) - 1);
size_t nl = text.find('\n');
std::string firstLine = (nl != std::string::npos) ? text.substr(0, nl) : text;
strncpy(chatInputBuffer, firstLine.c_str(), sizeof(chatInputBuffer) - 1);
chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0'; chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0';
sendChatMessage(gameHandler); sendChatMessage(gameHandler);
} }
@ -7599,11 +7615,9 @@ void GameScreen::renderActionBar(game::GameHandler& gameHandler) {
ImGui::TextDisabled("Macro #%u", slot.id); ImGui::TextDisabled("Macro #%u", slot.id);
ImGui::Separator(); ImGui::Separator();
if (ImGui::MenuItem("Execute")) { if (ImGui::MenuItem("Execute")) {
const std::string& text = gameHandler.getMacroText(slot.id); std::string cmd = firstMacroCommand(gameHandler.getMacroText(slot.id));
if (!text.empty()) { if (!cmd.empty()) {
size_t nl = text.find('\n'); strncpy(chatInputBuffer, cmd.c_str(), sizeof(chatInputBuffer) - 1);
std::string firstLine = (nl != std::string::npos) ? text.substr(0, nl) : text;
strncpy(chatInputBuffer, firstLine.c_str(), sizeof(chatInputBuffer) - 1);
chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0'; chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0';
sendChatMessage(gameHandler); sendChatMessage(gameHandler);
} }