ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debugger/MemoryView: Support pasting hex/text from clipboard

This commit is contained in:
Abel Briggs 2023-06-02 18:45:52 -07:00 committed by Connor McLaughlin
parent 1b953c1dc7
commit 8b2fa73b45
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcsx2-qt/Debugger/MemoryViewWidget.cpp
View File

@ -225,6 +225,25 @@ void MemoryViewTable::InsertIntoSelectedHexView(u8 value)
QtHost::RunOnUIThread([this] { parent->update(); });
});
}
void MemoryViewTable::InsertAtCurrentSelection(const QString& text) {
if (!m_cpu->isValidAddress(selectedAddress))
return;
// If pasting into the hex view, also decode the input as hex bytes.
// This approach prevents one from pasting on a nibble boundary, but that is almost always
// user error, and we don't have an undo function in this view, so best to stay conservative.
QByteArray input = selectedText ? text.toUtf8() : QByteArray::fromHex(text.toUtf8());
Host::RunOnCPUThread([this, address = selectedAddress, cpu = m_cpu, inBytes = input] {
for (int i = 0; i < inBytes.size(); i++)
{
cpu->write8(address + i, inBytes[i]);
}
QtHost::RunOnUIThread([this, inBytes] { UpdateSelectedAddress(selectedAddress + inBytes.size()); parent->update(); });
});
}
// We need both key and keychar because `key` is easy to use, but is case insensitive
void MemoryViewTable::KeyPress(int key, QChar keychar)
{
@ -404,6 +423,10 @@ void MemoryViewWidget::customMenuRequested(QPoint pos)
action = new QAction(tr("Copy Character"));
m_contextMenu->addAction(action);
connect(action, &QAction::triggered, this, [this]() { contextCopyCharacter(); });
action = new QAction(tr("Paste"));
m_contextMenu->addAction(action);
connect(action, &QAction::triggered, this, [this]() { contextPaste(); });
}
const MemoryViewType currentViewType = m_table.GetViewType();
@ -432,6 +455,11 @@ void MemoryViewWidget::contextCopyCharacter()
QApplication::clipboard()->setText(QChar::fromLatin1(m_cpu->read8(m_table.selectedAddress)).toUpper());
}
void MemoryViewWidget::contextPaste()
{
m_table.InsertAtCurrentSelection(QApplication::clipboard()->text());
}
void MemoryViewWidget::contextGoToAddress()
{
bool ok;

2
pcsx2-qt/Debugger/MemoryViewWidget.h
View File

@ -71,6 +71,7 @@ public:
void DrawTable(QPainter& painter, const QPalette& palette, s32 height);
void SelectAt(QPoint pos);
u128 GetSelectedSegment();
void InsertAtCurrentSelection(const QString& text);
void KeyPress(int key, QChar keychar);
MemoryViewType GetViewType()
@ -109,6 +110,7 @@ public slots:
void contextCopyByte();
void contextCopySegment();
void contextCopyCharacter();
void contextPaste();
void gotoAddress(u32 address);
signals: