diff options
author | 2021-01-28 02:59:43 +1100 | |
---|---|---|
committer | 2021-01-28 02:59:43 +1100 | |
commit | 83c9637635c575972c039d7d63a48d788e41ba34 (patch) | |
tree | 59bad3ada8a0f0f61bf503da21acef0f237d4d6b /src/osd/modules/debugger/qt/debuggerview.cpp | |
parent | 832acf5731d68ca411b5fb358ddb4e79ef0faffa (diff) |
-Qt debugger updates:
* Added context menu with Copy Visible and Paste commands to debug views (partially addresses #6066).
* Made memory view last PC display a context menu item.
* Fixed crash on right-clicking a memory view showing something other than an address space.
-debugger: Fixed commas in dumpkbd output.
Diffstat (limited to 'src/osd/modules/debugger/qt/debuggerview.cpp')
-rw-r--r-- | src/osd/modules/debugger/qt/debuggerview.cpp | 297 |
1 files changed, 178 insertions, 119 deletions
diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp index 150ca8519c5..8b7086684d0 100644 --- a/src/osd/modules/debugger/qt/debuggerview.cpp +++ b/src/osd/modules/debugger/qt/debuggerview.cpp @@ -1,54 +1,56 @@ // license:BSD-3-Clause // copyright-holders:Andrew Gardner #include "emu.h" -#include <QtWidgets/QScrollBar> -#include <QtWidgets/QApplication> -#include <QtGui/QPainter> -#include <QtGui/QKeyEvent> - #include "debuggerview.h" #include "modules/lib/osdobj_common.h" +#include <QtCore/QMimeData> +#include <QtGui/QClipboard> +#include <QtGui/QKeyEvent> +#include <QtGui/QPainter> +#include <QtWidgets/QApplication> +#include <QtWidgets/QScrollBar> + #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) #define horizontalAdvance width #endif -DebuggerView::DebuggerView(const debug_view_type& type, - running_machine* machine, - QWidget* parent) : +DebuggerView::DebuggerView( + debug_view_type type, + running_machine &machine, + QWidget *parent) : QAbstractScrollArea(parent), - m_preferBottom(false), + m_machine(machine), m_view(nullptr), - m_machine(machine) + m_preferBottom(false) { - // I like setting the font per-view since it doesn't override the menuing fonts. - const char *const selectedFont(downcast<osd_options &>(m_machine->options()).debugger_font()); - const float selectedFontSize(downcast<osd_options &>(m_machine->options()).debugger_font_size()); + // I like setting the font per-view since it doesn't override the menu fonts. + const char *const selectedFont(downcast<osd_options &>(m_machine.options()).debugger_font()); + const float selectedFontSize(downcast<osd_options &>(m_machine.options()).debugger_font_size()); QFont viewFontRequest((!*selectedFont || !strcmp(selectedFont, OSDOPTVAL_AUTO)) ? "Courier New" : selectedFont); viewFontRequest.setFixedPitch(true); viewFontRequest.setStyleHint(QFont::TypeWriter); viewFontRequest.setPointSize((selectedFontSize <= 0) ? 11 : selectedFontSize); setFont(viewFontRequest); - m_view = m_machine->debug_view().alloc_view(type, - DebuggerView::debuggerViewUpdate, - this); + m_view = m_machine.debug_view().alloc_view( + type, + DebuggerView::debuggerViewUpdate, + this); - connect(verticalScrollBar(), &QScrollBar::valueChanged, - this, &DebuggerView::verticalScrollSlot); - connect(horizontalScrollBar(), &QScrollBar::valueChanged, - this, &DebuggerView::horizontalScrollSlot); + connect(verticalScrollBar(), &QScrollBar::valueChanged, this, &DebuggerView::verticalScrollSlot); + connect(horizontalScrollBar(), &QScrollBar::valueChanged, this, &DebuggerView::horizontalScrollSlot); } DebuggerView::~DebuggerView() { - if (m_machine && m_view) - m_machine->debug_view().free_view(*m_view); + if (m_view) + m_machine.debug_view().free_view(*m_view); } -void DebuggerView::paintEvent(QPaintEvent* event) +void DebuggerView::paintEvent(QPaintEvent *event) { // Tell the MAME debug view how much real estate is available QFontMetrics actualFont = fontMetrics(); @@ -67,17 +69,10 @@ void DebuggerView::paintEvent(QPaintEvent* event) const int verticalScrollCharDiff = m_view->total_size().y - m_view->visible_size().y; const int verticalScrollSize = verticalScrollCharDiff < 0 ? 0 : verticalScrollCharDiff+verticalScrollAdjust; - bool atEnd = false; - if (verticalScrollBar()->value() == verticalScrollBar()->maximum()) - { - atEnd = true; - } + const bool atEnd = verticalScrollBar()->value() == verticalScrollBar()->maximum(); verticalScrollBar()->setRange(0, verticalScrollSize); if (m_preferBottom && atEnd) - { verticalScrollBar()->setValue(verticalScrollSize); - } - // Draw the viewport widget QPainter painter(viewport()); @@ -104,44 +99,37 @@ void DebuggerView::paintEvent(QPaintEvent* event) QColor fgColor(0,0,0); QColor bgColor(255,255,255); - if(textAttr & DCA_VISITED) - { + if (textAttr & DCA_VISITED) bgColor.setRgb(0xc6, 0xe2, 0xff); - } - if(textAttr & DCA_ANCILLARY) - { + + if (textAttr & DCA_ANCILLARY) bgColor.setRgb(0xe0, 0xe0, 0xe0); - } - if(textAttr & DCA_SELECTED) - { + + if (textAttr & DCA_SELECTED) bgColor.setRgb(0xff, 0x80, 0x80); - } - if(textAttr & DCA_CURRENT) - { + + if (textAttr & DCA_CURRENT) bgColor.setRgb(0xff, 0xff, 0x00); - } + if ((textAttr & DCA_SELECTED) && (textAttr & DCA_CURRENT)) - { bgColor.setRgb(0xff,0xc0,0x80); - } - if(textAttr & DCA_CHANGED) - { + + if (textAttr & DCA_CHANGED) fgColor.setRgb(0xff, 0x00, 0x00); - } - if(textAttr & DCA_INVALID) - { + + if (textAttr & DCA_INVALID) fgColor.setRgb(0x00, 0x00, 0xff); - } - if(textAttr & DCA_DISABLED) + + if (textAttr & DCA_DISABLED) { - fgColor.setRgb((fgColor.red() + bgColor.red()) >> 1, - (fgColor.green() + bgColor.green()) >> 1, - (fgColor.blue() + bgColor.blue()) >> 1); + fgColor.setRgb( + (fgColor.red() + bgColor.red()) >> 1, + (fgColor.green() + bgColor.green()) >> 1, + (fgColor.blue() + bgColor.blue()) >> 1); } + if(textAttr & DCA_COMMENT) - { fgColor.setRgb(0x00, 0x80, 0x00); - } bgBrush.setColor(bgColor); painter.setBackground(bgBrush); @@ -176,52 +164,54 @@ void DebuggerView::keyPressEvent(QKeyEvent* event) int keyPress = -1; switch (event->key()) { - case Qt::Key_Up: - keyPress = DCH_UP; - break; - case Qt::Key_Down: - keyPress = DCH_DOWN; - break; - case Qt::Key_Left: - keyPress = DCH_LEFT; - if (ctrlDown) keyPress = DCH_CTRLLEFT; - break; - case Qt::Key_Right: - keyPress = DCH_RIGHT; - if (ctrlDown) keyPress = DCH_CTRLRIGHT; - break; - case Qt::Key_PageUp: - keyPress = DCH_PUP; - break; - case Qt::Key_PageDown: - keyPress = DCH_PDOWN; - break; - case Qt::Key_Home: - keyPress = DCH_HOME; - if (ctrlDown) keyPress = DCH_CTRLHOME; - break; - case Qt::Key_End: - keyPress = DCH_END; - if (ctrlDown) keyPress = DCH_CTRLEND; - break; - case Qt::Key_0: keyPress = '0'; break; - case Qt::Key_1: keyPress = '1'; break; - case Qt::Key_2: keyPress = '2'; break; - case Qt::Key_3: keyPress = '3'; break; - case Qt::Key_4: keyPress = '4'; break; - case Qt::Key_5: keyPress = '5'; break; - case Qt::Key_6: keyPress = '6'; break; - case Qt::Key_7: keyPress = '7'; break; - case Qt::Key_8: keyPress = '8'; break; - case Qt::Key_9: keyPress = '9'; break; - case Qt::Key_A: keyPress = 'a'; break; - case Qt::Key_B: keyPress = 'b'; break; - case Qt::Key_C: keyPress = 'c'; break; - case Qt::Key_D: keyPress = 'd'; break; - case Qt::Key_E: keyPress = 'e'; break; - case Qt::Key_F: keyPress = 'f'; break; - default: - return QWidget::keyPressEvent(event); + case Qt::Key_Up: + keyPress = DCH_UP; + break; + case Qt::Key_Down: + keyPress = DCH_DOWN; + break; + case Qt::Key_Left: + keyPress = DCH_LEFT; + if (ctrlDown) + keyPress = DCH_CTRLLEFT; + break; + case Qt::Key_Right: + keyPress = DCH_RIGHT; + if (ctrlDown) + keyPress = DCH_CTRLRIGHT; + break; + case Qt::Key_PageUp: + keyPress = DCH_PUP; + break; + case Qt::Key_PageDown: + keyPress = DCH_PDOWN; + break; + case Qt::Key_Home: + keyPress = DCH_HOME; + if (ctrlDown) keyPress = DCH_CTRLHOME; + break; + case Qt::Key_End: + keyPress = DCH_END; + if (ctrlDown) keyPress = DCH_CTRLEND; + break; + case Qt::Key_0: keyPress = '0'; break; + case Qt::Key_1: keyPress = '1'; break; + case Qt::Key_2: keyPress = '2'; break; + case Qt::Key_3: keyPress = '3'; break; + case Qt::Key_4: keyPress = '4'; break; + case Qt::Key_5: keyPress = '5'; break; + case Qt::Key_6: keyPress = '6'; break; + case Qt::Key_7: keyPress = '7'; break; + case Qt::Key_8: keyPress = '8'; break; + case Qt::Key_9: keyPress = '9'; break; + case Qt::Key_A: keyPress = 'a'; break; + case Qt::Key_B: keyPress = 'b'; break; + case Qt::Key_C: keyPress = 'c'; break; + case Qt::Key_D: keyPress = 'd'; break; + case Qt::Key_E: keyPress = 'e'; break; + case Qt::Key_F: keyPress = 'f'; break; + default: + return QWidget::keyPressEvent(event); } m_view->set_cursor_visible(true); @@ -235,26 +225,59 @@ void DebuggerView::keyPressEvent(QKeyEvent* event) } -void DebuggerView::mousePressEvent(QMouseEvent* event) +void DebuggerView::mousePressEvent(QMouseEvent *event) { - if (m_view == nullptr) + if (!m_view) return; + QFontMetrics actualFont = fontMetrics(); + const double fontWidth = actualFont.horizontalAdvance(QString(100, '_')) / 100.; + const int fontHeight = std::max(1, actualFont.lineSpacing()); + + debug_view_xy topLeft = m_view->visible_position(); + debug_view_xy clickViewPosition; + clickViewPosition.x = topLeft.x + (event->x() / fontWidth); + clickViewPosition.y = topLeft.y + (event->y() / fontHeight); + if (event->button() == Qt::LeftButton) { - QFontMetrics actualFont = fontMetrics(); - const double fontWidth = actualFont.horizontalAdvance(QString(100, '_')) / 100.; - const int fontHeight = std::max(1, actualFont.lineSpacing()); - - debug_view_xy topLeft = m_view->visible_position(); - debug_view_xy clickViewPosition; - clickViewPosition.x = topLeft.x + (event->x() / fontWidth); - clickViewPosition.y = topLeft.y + (event->y() / fontHeight); m_view->process_click(DCK_LEFT_CLICK, clickViewPosition); - - viewport()->update(); - update(); } + else if (event->button() == Qt::MiddleButton) + { + m_view->process_click(DCK_MIDDLE_CLICK, clickViewPosition); + } + else if (event->button() == Qt::RightButton) + { + if (m_view->cursor_supported()) + { + m_view->set_cursor_position(clickViewPosition); + m_view->set_cursor_visible(true); + } + } + + viewport()->update(); + update(); +} + + +void DebuggerView::contextMenuEvent(QContextMenuEvent *event) +{ + QMenu *const menu = new QMenu(this); + addItemsToContextMenu(menu); + menu->popup(event->globalPos()); +} + + +void DebuggerView::addItemsToContextMenu(QMenu *menu) +{ + QAction *const copyAct = new QAction("Copy Visible", menu); + QAction *const pasteAct = new QAction("Paste", menu); + pasteAct->setEnabled(QApplication::clipboard()->mimeData()->hasText()); + connect(copyAct, &QAction::triggered, this, &DebuggerView::copyVisibleSlot); + connect(pasteAct, &QAction::triggered, this, &DebuggerView::pasteSlot); + menu->addAction(copyAct); + menu->addAction(pasteAct); } @@ -270,10 +293,46 @@ void DebuggerView::horizontalScrollSlot(int value) } -void DebuggerView::debuggerViewUpdate(debug_view& debugView, void* osdPrivate) +void DebuggerView::copyVisibleSlot() +{ + // get visible text + debug_view_xy const visarea = m_view->visible_size(); + debug_view_char const *viewdata = m_view->viewdata(); + if (!viewdata) + return; + + // turn into a plain string, trimming trailing whitespace + std::string text; + for (uint32_t row = 0; row < visarea.y; row++, viewdata += visarea.x) + { + std::string::size_type const start = text.length(); + for (uint32_t col = 0; col < visarea.x; ++col) + text += wchar_t(viewdata[col].byte); + std::string::size_type const nonblank = text.find_last_not_of("\t\n\v\r "); + if ((nonblank != std::string::npos) && (nonblank >= start)) + text.resize(nonblank + 1); + text += "\n"; + } + + // copy to the clipboard + QApplication::clipboard()->setText(text.c_str()); +} + + +void DebuggerView::pasteSlot() +{ + for (QChar ch : QApplication::clipboard()->text()) + { + if ((32 <= ch.unicode()) && (127 >= ch.unicode())) + m_view->process_char(ch.unicode()); + } +} + + +void DebuggerView::debuggerViewUpdate(debug_view &debugView, void *osdPrivate) { - // Get a handle to the DebuggerView being updated & redraw - DebuggerView* dView = (DebuggerView*)osdPrivate; + // Get a handle to the DebuggerView being updated and redraw + DebuggerView *dView = reinterpret_cast<DebuggerView *>(osdPrivate); dView->verticalScrollBar()->setValue(dView->view()->visible_position().y); dView->horizontalScrollBar()->setValue(dView->view()->visible_position().x); dView->viewport()->update(); |