Skip to content

fix input scalar in typed debugger window issue #1295 #1931

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

Open
xcasadio wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix input scalar in typed debugger window issue #1295 #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
085afc0
fix input scalar in typed debugger window
xcasadio May 18, 2025
41a85be
fix input scalar in typed debugger window
xcasadio May 27, 2025
e0e5c63
Merge branch 'main' into xcasadio/fix-typed-debugger-watch-input-scalar
xcasadio May 31, 2025
250d10b
Merge branch 'main' into xcasadio/fix-typed-debugger-watch-input-scalar
xcasadio Jun 9, 2025
8e3382a
Merge remote-tracking branch 'upstream/main' into xcasadio/fix-typed-…
xcasadio Jun 24, 2025
28c066f
Merge branch 'main' into xcasadio/fix-typed-debugger-watch-input-scalar
nicolasnoble Jul 27, 2025
bd6bf54
Merge remote-tracking branch 'upstream/main' into xcasadio/fix-typed-…
xcasadio Aug 13, 2025
3406d6f
Merge branch 'main' into xcasadio/fix-typed-debugger-watch-input-scalar
xcasadio Aug 31, 2025
9194c6a
Merge branch 'main' into xcasadio/fix-typed-debugger-watch-input-scalar
xcasadio Dec 11, 2025
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
54 changes: 28 additions & 26 deletions src/gui/widgets/typed_debugger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,7 @@ void PCSX::Widgets::TypedDebugger::displayNode(WatchTreeNode* node, const uint32
printValue(nodeType, node->size, value);
ImGui::TableNextColumn(); // New value.
memFile->wSeek(startAddress, SEEK_SET);
displayNewValueInput(nodeType, node->size, value, memFile);
ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_TextDisabled]);
ImGui::TextUnformatted("--");
ImGui::PopStyleColor();
displayNewValueInput(nodeType, node->size, value, memFile, currentAddress);
ImGui::TableNextColumn(); // Breakpoints.
if (watchView) {
displayBreakpointOptions(node, currentAddress);
Expand Down Expand Up @@ -551,56 +548,61 @@ void PCSX::Widgets::TypedDebugger::printValue(const char* type, size_t type_size
// Make an input widget for the value at the given address of the given type. If
// type is not a known primitive, it'll try to allow editing of the value
// anyway.
void PCSX::Widgets::TypedDebugger::displayNewValueInput(const char* type, size_t type_size, Slice value,
IO<File> memFile) {
static char s[64];
void PCSX::Widgets::TypedDebugger::displayNewValueInput(const char* type, size_t type_size, const Slice& value,
IO<File>& memFile, uint32_t address) {
static const int8_t step = 1;
static const int8_t stepFast = 100;
const auto signedFormat = m_hex ? "%x" : "%d";
const auto unsignedFormat = m_hex ? "%x" : "%u";
const auto inputFlags = m_hex ? ImGuiInputTextFlags_CharsHexadecimal : ImGuiInputTextFlags_CharsDecimal;
const uint32_t address = memFile->rTell();

switch (type_size) {
case 1:
if (equals(type, "char")) {
if (ImGui::InputScalar(fmt::format(f_("New value##{}"), address).c_str(), ImGuiDataType_S8, &m_newValue,
&step, &stepFast, signedFormat, inputFlags)) {
memFile->write<int8_t>(m_newValue);
m_newValues[address] = *value.data<int8_t>();
if (ImGui::InputScalar(fmt::format(f_("##{}"), address).c_str(), ImGuiDataType_S8,
&m_newValues[address], &step, &stepFast, signedFormat, inputFlags)) {
memFile->write<int8_t>(m_newValues[address]);
}
} else {
// We have a uchar or something of size 1.
if (ImGui::InputScalar(fmt::format(f_("New value##{}"), address).c_str(), ImGuiDataType_U8, &m_newValue,
&step, &stepFast, unsignedFormat, inputFlags)) {
memFile->write<uint8_t>(m_newValue);

m_newValues[address] = *value.data<uint8_t>();
if (ImGui::InputScalar(fmt::format(f_("##{}"), address).c_str(), ImGuiDataType_U8,
&m_newValues[address], &step, &stepFast, unsignedFormat, inputFlags)) {
memFile->write<uint8_t>(m_newValues[address]);
}
}
break;
case 2:
if (equals(type, "short")) {
if (ImGui::InputScalar(fmt::format(f_("New value##{}"), address).c_str(), ImGuiDataType_S16,
&m_newValue, &step, &stepFast, signedFormat, inputFlags)) {
memFile->write<int16_t>(m_newValue);
m_newValues[address] = *value.data<int16_t>();
if (ImGui::InputScalar(fmt::format(f_("##{}"), address).c_str(), ImGuiDataType_S16,
&m_newValues[address], &step, &stepFast, signedFormat, inputFlags)) {
memFile->write<int16_t>(m_newValues[address]);
}
} else {
// We have a ushort or something of size 2.
if (ImGui::InputScalar(fmt::format(f_("New value##{}"), address).c_str(), ImGuiDataType_U16,
&m_newValue, &step, &stepFast, unsignedFormat, inputFlags)) {
memFile->write<uint16_t>(m_newValue);
m_newValues[address] = *value.data<uint16_t>();
if (ImGui::InputScalar(fmt::format(f_("##{}"), address).c_str(), ImGuiDataType_U16,
&m_newValues[address], &step, &stepFast, unsignedFormat, inputFlags)) {
memFile->write<uint16_t>(m_newValues[address]);
}
}
break;
case 4:
if (equals(type, "int") || equals(type, "long")) {
if (ImGui::InputScalar(fmt::format(f_("New value##{}"), address).c_str(), ImGuiDataType_S32,
&m_newValue, &step, &stepFast, signedFormat, inputFlags)) {
memFile->write<int32_t>(m_newValue);
m_newValues[address] = *value.data<int32_t>();
if (ImGui::InputScalar(fmt::format(f_("##{}"), address).c_str(), ImGuiDataType_S32,
&m_newValues[address], &step, &stepFast, signedFormat, inputFlags)) {
memFile->write<int32_t>(m_newValues[address]);
}
} else {
// We have uint or something of size 4.
if (ImGui::InputScalar(fmt::format(f_("New value##{}"), address).c_str(), ImGuiDataType_U32,
&m_newValue, &step, &stepFast, unsignedFormat, inputFlags)) {
memFile->write<uint32_t>(m_newValue);
m_newValues[address] = *value.data<uint32_t>();
if (ImGui::InputScalar(fmt::format(f_("##{}"), address).c_str(), ImGuiDataType_U32,
&m_newValues[address], &step, &stepFast, unsignedFormat, inputFlags)) {
memFile->write<uint32_t>(m_newValues[address]);
}
}
break;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widgets/typed_debugger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class TypedDebugger {
std::vector<PCSX::Debug::Breakpoint*> m_watchBreakpoints;
std::unordered_map<uint32_t, std::array<uint8_t, 4>> m_disabledInstructions;
bool m_hex = false;
uint32_t m_newValue = 0;
std::unordered_map<uint32_t, uint64_t> m_newValues;

/**
* Functions.
Expand Down Expand Up @@ -156,7 +156,7 @@ class TypedDebugger {
uint32_t extraImGuiId = 0);
void printValue(const char* type, size_t type_size, void* value);
void printValue(const char* type, size_t type_size, Slice value);
void displayNewValueInput(const char* type, size_t size_type, Slice value, IO<File> memFile);
void displayNewValueInput(const char* type, size_t size_type, const Slice& value, IO<File>& memFile, uint32_t address);
void displayBreakpointOptions(WatchTreeNode* node, const uint32_t address);

/**
Expand Down