]> sigrok.org Git - pulseview.git/blobdiff - pv/views/decoder_output/QHexView.cpp
HexView: Don't send out an extra byte when exporting all data
[pulseview.git] / pv / views / decoder_output / QHexView.cpp
index 7d43cf0c4a115825721d3c1776f9fdcdb600fd9e..59fe779f57640dd77339e88582af1711560be7b4 100644 (file)
@@ -29,6 +29,7 @@
 
 #include <QApplication>
 #include <QClipboard>
+#include <QDebug>
 #include <QFont>
 #include <QKeyEvent>
 #include <QScrollBar>
 
 #include "QHexView.hpp"
 
-using std::size_t;
+const unsigned int BYTES_PER_LINE   = 16;
+const unsigned int HEXCHARS_IN_LINE = BYTES_PER_LINE * 3 - 1;
+const unsigned int GAP_ADR_HEX      = 10;
+const unsigned int GAP_HEX_ASCII    = 10;
+const unsigned int GAP_ASCII_SLIDER = 5;
 
-const unsigned int HEXCHARS_IN_LINE = 47;
-const unsigned int GAP_ADR_HEX = 10;
-const unsigned int GAP_HEX_ASCII = 16;
-const unsigned int BYTES_PER_LINE = 16;
 
-
-DataStorageArray::DataStorageArray(const QByteArray &arr)
+QHexView::QHexView(QWidget *parent):
+       QAbstractScrollArea(parent),
+       mode_(ChunkedDataMode),
+       data_(nullptr),
+       selectBegin_(0),
+       selectEnd_(0),
+       cursorPos_(0)
 {
-       data_ = arr;
-}
+       setFont(QFont("Courier", 10));
 
-QByteArray DataStorageArray::getData(size_t position, size_t length)
-{
-       return data_.mid(position, length);
-}
+       charWidth_ = fontMetrics().boundingRect('X').width();
+       charHeight_ = fontMetrics().height();
 
-size_t DataStorageArray::size()
-{
-       return data_.count();
-}
+       // Determine X coordinates of the three sub-areas
+       posAddr_  = 0;
+       posHex_   = 10 * charWidth_ + GAP_ADR_HEX;
+       posAscii_ = posHex_ + HEXCHARS_IN_LINE * charWidth_ + GAP_HEX_ASCII;
 
+       setFocusPolicy(Qt::StrongFocus);
 
+       if (palette().color(QPalette::ButtonText).toHsv().value() > 127) {
+               // Color is bright
+               chunk_colors_.emplace_back(100, 149, 237); // QColorConstants::Svg::cornflowerblue
+               chunk_colors_.emplace_back(60, 179, 113);  // QColorConstants::Svg::mediumseagreen
+               chunk_colors_.emplace_back(210, 180, 140); // QColorConstants::Svg::tan
+       } else {
+               // Color is dark
+               chunk_colors_.emplace_back(0, 0, 139);   // QColorConstants::Svg::darkblue
+               chunk_colors_.emplace_back(34, 139, 34); // QColorConstants::Svg::forestgreen
+               chunk_colors_.emplace_back(160, 82, 45); // QColorConstants::Svg::sienna
+       }
+}
 
-QHexView::QHexView(QWidget *parent):
-               QAbstractScrollArea(parent),
-               pdata_(nullptr)
+void QHexView::set_mode(Mode m)
 {
-       setFont(QFont("Courier", 10));
+       mode_ = m;
 
-       charWidth_ = fontMetrics().width(QLatin1Char('9'));
-       charHeight_ = fontMetrics().height();
+       // This is not expected to be set when data is showing,
+       // so we don't update the viewport here
+}
 
-       posAddr_ = 0;
-       posHex_ = 10 * charWidth_ + GAP_ADR_HEX;
-       posAscii_ = posHex_ + HEXCHARS_IN_LINE * charWidth_ + GAP_HEX_ASCII;
+void QHexView::set_data(const DecodeBinaryClass* data)
+{
+       data_ = data;
 
-       setMinimumWidth(posAscii_ + (BYTES_PER_LINE * charWidth_));
+       size_t size = 0;
+       if (data) {
+               size_t chunks = data_->chunks.size();
+               for (size_t i = 0; i < chunks; i++)
+                       size += data_->chunks[i].data.size();
+       }
+       data_size_ = size;
 
-       setFocusPolicy(Qt::StrongFocus);
+       viewport()->update();
 }
 
-QHexView::~QHexView()
+unsigned int QHexView::get_bytes_per_line() const
 {
-       if (pdata_)
-               delete pdata_;
+       return BYTES_PER_LINE;
 }
 
-void QHexView::setData(DataStorage *pData)
+void QHexView::clear()
 {
        verticalScrollBar()->setValue(0);
+       data_ = nullptr;
+       data_size_ = 0;
 
-       if (pdata_)
-               delete pdata_;
-
-       pdata_ = pData;
-       cursorPos_ = 0;
-       resetSelection(0);
+       viewport()->update();
 }
 
 void QHexView::showFromOffset(size_t offset)
 {
-       if (pdata_ && (offset < pdata_->size())) {
+       if (data_ && (offset < data_size_)) {
                setCursorPos(offset * 2);
 
                int cursorY = cursorPos_ / (2 * BYTES_PER_LINE);
                verticalScrollBar() -> setValue(cursorY);
        }
+
+       viewport()->update();
 }
 
-void QHexView::clear()
+QSizePolicy QHexView::sizePolicy() const
 {
-       verticalScrollBar()->setValue(0);
+       return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+}
+
+pair<size_t, size_t> QHexView::get_selection() const
+{
+       size_t start = selectBegin_ / 2;
+       size_t end = selectEnd_ / 2;
+
+       if (start == end) {
+               // Nothing is currently selected
+               start = 0;
+               end = data_size_;
+       } if (end < data_size_)
+               end++;
+
+       return std::make_pair(start, end);
+}
+
+size_t QHexView::create_hex_line(size_t start, size_t end, QString* dest,
+       bool with_offset, bool with_ascii)
+{
+       dest->clear();
+
+       // Determine start address for the row
+       uint64_t row = start / BYTES_PER_LINE;
+       uint64_t offset = row * BYTES_PER_LINE;
+       end = std::min((uint64_t)end, offset + BYTES_PER_LINE);
+
+       if (with_offset)
+               dest->append(QString("%1 ").arg(row * BYTES_PER_LINE, 10, 16, QChar('0')).toUpper());
+
+       initialize_byte_iterator(offset);
+       for (size_t i = offset; i < offset + BYTES_PER_LINE; i++) {
+               uint8_t value = 0;
+
+               if (i < end)
+                       value = get_next_byte();
+
+               if ((i < start) || (i >= end))
+                       dest->append("   ");
+               else
+                       dest->append(QString("%1 ").arg(value, 2, 16, QChar('0')).toUpper());
+       }
+
+       if (with_ascii) {
+               initialize_byte_iterator(offset);
+               for (size_t i = offset; i < end; i++) {
+                       uint8_t value = get_next_byte();
+
+                       if ((value < 0x20) || (value > 0x7E))
+                               value = '.';
+
+                       if (i < start)
+                               dest->append(' ');
+                       else
+                               dest->append((char)value);
+               }
+       }
+
+       return end;
+}
+
+void QHexView::initialize_byte_iterator(size_t offset)
+{
+       current_chunk_id_ = 0;
+       current_chunk_offset_ = 0;
+       current_offset_ = offset;
+
+       size_t chunks = data_->chunks.size();
+       for (size_t i = 0; i < chunks; i++) {
+               size_t size = data_->chunks[i].data.size();
+
+               if (offset >= size) {
+                       current_chunk_id_++;
+                       offset -= size;
+               } else {
+                       current_chunk_offset_ = offset;
+                       break;
+               }
+       }
+
+       if (current_chunk_id_ < data_->chunks.size())
+               current_chunk_ = data_->chunks[current_chunk_id_];
 }
 
-QSize QHexView::fullSize() const
+uint8_t QHexView::get_next_byte(bool* is_next_chunk)
 {
-       if (!pdata_)
-               return QSize(0, 0);
+       if (is_next_chunk != nullptr)
+               *is_next_chunk = (current_chunk_offset_ == 0);
 
+       uint8_t v = 0;
+       if (current_chunk_offset_ < current_chunk_.data.size())
+               v = current_chunk_.data[current_chunk_offset_];
+
+       current_offset_++;
+       current_chunk_offset_++;
+
+       if (current_offset_ > data_size_) {
+               qWarning() << "QHexView::get_next_byte() overran binary data boundary:" <<
+                       current_offset_ << "of" << data_size_ << "bytes";
+               return 0xEE;
+       }
+
+       if ((current_chunk_offset_ == current_chunk_.data.size()) && (current_offset_ < data_size_)) {
+               current_chunk_id_++;
+               current_chunk_offset_ = 0;
+               current_chunk_ = data_->chunks[current_chunk_id_];
+       }
+
+       return v;
+}
+
+QSize QHexView::getFullSize() const
+{
        size_t width = posAscii_ + (BYTES_PER_LINE * charWidth_);
-       size_t height = pdata_->size() / BYTES_PER_LINE;
-       if (pdata_->size() % BYTES_PER_LINE)
+
+       if (verticalScrollBar()->isEnabled())
+               width += GAP_ASCII_SLIDER + verticalScrollBar()->width();
+
+       if (!data_ || (data_size_ == 0))
+               return QSize(width, 0);
+
+       size_t height = data_size_ / BYTES_PER_LINE;
+
+       if (data_size_ % BYTES_PER_LINE)
                height++;
 
        height *= charHeight_;
@@ -131,97 +264,164 @@ QSize QHexView::fullSize() const
 
 void QHexView::paintEvent(QPaintEvent *event)
 {
-       if (!pdata_)
-               return;
-
        QPainter painter(viewport());
 
-       QSize areaSize = viewport()->size();
-       QSize widgetSize = fullSize();
-       verticalScrollBar()->setPageStep(areaSize.height() / charHeight_);
-       verticalScrollBar()->setRange(0, (widgetSize.height() - areaSize.height()) / charHeight_ + 1);
+       // Calculate and update the widget and paint area sizes
+       QSize widgetSize = getFullSize();
+       setMinimumWidth(widgetSize.width());
+       setMaximumWidth(widgetSize.width());
+       QSize areaSize = viewport()->size() - QSize(0, charHeight_);
+
+       // Only show scrollbar if the content goes beyond the visible area
+       if (widgetSize.height() > areaSize.height()) {
+               verticalScrollBar()->setEnabled(true);
+               verticalScrollBar()->setPageStep(areaSize.height() / charHeight_);
+               verticalScrollBar()->setRange(0, ((widgetSize.height() - areaSize.height())) / charHeight_ + 1);
+       } else
+               verticalScrollBar()->setEnabled(false);
+
+       // Fill widget background
+       painter.fillRect(event->rect(), palette().color(QPalette::Base));
+
+       if (!data_ || (data_size_ == 0)) {
+               painter.setPen(palette().color(QPalette::Text));
+               QString s = tr("No data available");
+               int x = (areaSize.width() - fontMetrics().boundingRect(s).width()) / 2;
+               int y = areaSize.height() / 2;
+               painter.drawText(x, y, s);
+               return;
+       }
 
+       // Determine first/last line indices
        size_t firstLineIdx = verticalScrollBar()->value();
 
-       size_t lastLineIdx = firstLineIdx + areaSize.height() / charHeight_;
-       if (lastLineIdx > (pdata_->size() / BYTES_PER_LINE)) {
-               lastLineIdx = pdata_->size() / BYTES_PER_LINE;
-               if (pdata_->size() % BYTES_PER_LINE)
+       size_t lastLineIdx = firstLineIdx + (areaSize.height() / charHeight_);
+       if (lastLineIdx > (data_size_ / BYTES_PER_LINE)) {
+               lastLineIdx = data_size_ / BYTES_PER_LINE;
+               if (data_size_ % BYTES_PER_LINE)
                        lastLineIdx++;
        }
 
-       painter.fillRect(event->rect(), this->palette().color(QPalette::Base));
-
-       QColor addressAreaColor = QColor(0xd4, 0xd4, 0xd4, 0xff);
+       // Fill address area background
        painter.fillRect(QRect(posAddr_, event->rect().top(),
-               posHex_ - GAP_ADR_HEX + 2, height()), addressAreaColor);
+               posHex_ - (GAP_ADR_HEX / 2), height()), palette().color(QPalette::Window));
+
+       // Paint divider line between hex and ASCII areas
+       int line_x = posAscii_ - (GAP_HEX_ASCII / 2);
+       painter.setPen(palette().color(QPalette::Midlight));
+       painter.drawLine(line_x, event->rect().top(), line_x, height());
+
+       // Paint address area
+       painter.setPen(palette().color(QPalette::ButtonText));
 
-       int linePos = posAscii_ - (GAP_HEX_ASCII / 2);
-       painter.setPen(Qt::gray);
+       int yStart = 2 * charHeight_;
+       for (size_t lineIdx = firstLineIdx, y = yStart; lineIdx < lastLineIdx; lineIdx++) {
 
-       painter.drawLine(linePos, event->rect().top(), linePos, height());
+               QString address = QString("%1").arg(lineIdx * 16, 10, 16, QChar('0')).toUpper();
+               painter.drawText(posAddr_, y, address);
+               y += charHeight_;
+       }
 
-       painter.setPen(Qt::black);
+       // Paint top row with hex offsets
+       painter.setPen(palette().color(QPalette::ButtonText));
+       for (int offset = 0; offset <= 0xF; offset++)
+               painter.drawText(posHex_ + (1 + offset * 3) * charWidth_,
+                       charHeight_, QString::number(offset, 16).toUpper());
 
-       int yPosStart = charHeight_;
+       // Paint hex values
+       QBrush regular = palette().buttonText();
+       QBrush selected = palette().highlight();
 
-       QBrush def = painter.brush();
-       QBrush selected = QBrush(QColor(0x6d, 0x9e, 0xff, 0xff));
-       QByteArray data = pdata_->getData(firstLineIdx * BYTES_PER_LINE, (lastLineIdx - firstLineIdx) * BYTES_PER_LINE);
+       bool multiple_chunks = (data_->chunks.size() > 1);
+       unsigned int chunk_color = 0;
 
-       for (size_t lineIdx = firstLineIdx, yPos = yPosStart; lineIdx < lastLineIdx; lineIdx++) {
-               QString address = QString("%1").arg(lineIdx * 16, 10, 16, QChar('0'));
-               painter.drawText(posAddr_, yPos, address);
+       initialize_byte_iterator(firstLineIdx * BYTES_PER_LINE);
+       yStart = 2 * charHeight_;
+       for (size_t lineIdx = firstLineIdx, y = yStart; lineIdx < lastLineIdx; lineIdx++) {
 
-               int xPos = posHex_;
-               for (size_t i = 0; i < BYTES_PER_LINE && ((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) < (size_t)data.size(); i++) {
+               int x = posHex_;
+               for (size_t i = 0; (i < BYTES_PER_LINE) && (current_offset_ < data_size_); i++) {
                        size_t pos = (lineIdx * BYTES_PER_LINE + i) * 2;
-                       if ((pos >= selectBegin_) && (pos < selectEnd_)) {
-                               painter.setBackground(selected);
-                               painter.setBackgroundMode(Qt::OpaqueMode);
-                       }
 
-                       QString val = QString::number((data.at((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) & 0xF0) >> 4, 16);
-                       painter.drawText(xPos, yPos, val);
+                       // Fetch byte
+                       bool is_next_chunk;
+                       uint8_t byte_value = get_next_byte(&is_next_chunk);
 
-                       if (((pos+1) >= selectBegin_) && ((pos+1) < selectEnd_)) {
-                               painter.setBackground(selected);
+                       if (is_next_chunk) {
+                               chunk_color++;
+                               if (chunk_color == chunk_colors_.size())
+                                       chunk_color = 0;
+                       }
+
+                       if ((pos >= selectBegin_) && (pos < selectEnd_)) {
                                painter.setBackgroundMode(Qt::OpaqueMode);
+                               painter.setBackground(selected);
+                               painter.setPen(palette().color(QPalette::HighlightedText));
                        } else {
-                               painter.setBackground(def);
-                               painter.setBackgroundMode(Qt::OpaqueMode);
+                               painter.setBackground(regular);
+                               painter.setBackgroundMode(Qt::TransparentMode);
+                               if (!multiple_chunks)
+                                       painter.setPen(palette().color(QPalette::Text));
+                               else
+                                       painter.setPen(chunk_colors_[chunk_color]);
                        }
 
-                       val = QString::number((data.at((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) & 0xF), 16);
-                       painter.drawText(xPos + charWidth_, yPos, val);
+                       // First nibble
+                       QString val = QString::number((byte_value & 0xF0) >> 4, 16).toUpper();
+                       painter.drawText(x, y, val);
 
-                       painter.setBackground(def);
-                       painter.setBackgroundMode(Qt::OpaqueMode);
+                       // Second nibble
+                       val = QString::number((byte_value & 0xF), 16).toUpper();
+                       painter.drawText(x + charWidth_, y, val);
 
-                       xPos += 3 * charWidth_;
+                       if ((pos >= selectBegin_) && (pos < selectEnd_ - 1) && (i < BYTES_PER_LINE - 1))
+                               painter.drawText(x + 2 * charWidth_, y, QString(' '));
+
+                       x += 3 * charWidth_;
                }
 
-               int xPosAscii = posAscii_;
-               for (size_t i = 0; ((lineIdx - firstLineIdx) * BYTES_PER_LINE + i) < (size_t)data.size() && (i < BYTES_PER_LINE); i++) {
-                       char ch = data[(unsigned int)((lineIdx - firstLineIdx) * BYTES_PER_LINE + i)];
+               y += charHeight_;
+       }
+
+       // Paint ASCII characters
+       initialize_byte_iterator(firstLineIdx * BYTES_PER_LINE);
+       yStart = 2 * charHeight_;
+       for (size_t lineIdx = firstLineIdx, y = yStart; lineIdx < lastLineIdx; lineIdx++) {
 
-                       if ((ch < 0x20) || (ch > 0x7e))
+               int x = posAscii_;
+               for (size_t i = 0; (i < BYTES_PER_LINE) && (current_offset_ < data_size_); i++) {
+                       // Fetch byte
+                       uint8_t ch = get_next_byte();
+
+                       if ((ch < 0x20) || (ch > 0x7E))
                                ch = '.';
 
-                       painter.drawText(xPosAscii, yPos, QString(ch));
-                       xPosAscii += charWidth_;
+                       size_t pos = (lineIdx * BYTES_PER_LINE + i) * 2;
+                       if ((pos >= selectBegin_) && (pos < selectEnd_)) {
+                               painter.setBackgroundMode(Qt::OpaqueMode);
+                               painter.setBackground(selected);
+                               painter.setPen(palette().color(QPalette::HighlightedText));
+                       } else {
+                               painter.setBackgroundMode(Qt::TransparentMode);
+                               painter.setBackground(regular);
+                               painter.setPen(palette().color(QPalette::Text));
+                       }
+
+                       painter.drawText(x, y, QString(ch));
+                       x += charWidth_;
                }
 
-               yPos += charHeight_;
+               y += charHeight_;
        }
 
+       // Paint cursor
        if (hasFocus()) {
                int x = (cursorPos_ % (2 * BYTES_PER_LINE));
                int y = cursorPos_ / (2 * BYTES_PER_LINE);
                y -= firstLineIdx;
                int cursorX = (((x / 2) * 3) + (x % 2)) * charWidth_ + posHex_;
-               int cursorY = y * charHeight_ + 4;
-               painter.fillRect(cursorX, cursorY, 2, charHeight_, this->palette().color(QPalette::WindowText));
+               int cursorY = charHeight_ + y * charHeight_ + 4;
+               painter.fillRect(cursorX, cursorY, 2, charHeight_, palette().color(QPalette::WindowText));
        }
 }
 
@@ -229,9 +429,7 @@ void QHexView::keyPressEvent(QKeyEvent *event)
 {
        bool setVisible = false;
 
-       /*****************************************************************************/
-       /* Cursor movements */
-       /*****************************************************************************/
+       // Cursor movements
        if (event->matches(QKeySequence::MoveToNextChar)) {
                setCursorPos(cursorPos_ + 1);
                resetSelection(cursorPos_);
@@ -275,8 +473,7 @@ void QHexView::keyPressEvent(QKeyEvent *event)
                setVisible = true;
        }
        if (event->matches(QKeySequence::MoveToEndOfDocument)) {
-               if (pdata_)
-                       setCursorPos(pdata_->size() * 2);
+               setCursorPos(data_size_ * 2);
                resetSelection(cursorPos_);
                setVisible = true;
        }
@@ -286,13 +483,10 @@ void QHexView::keyPressEvent(QKeyEvent *event)
                setVisible = true;
        }
 
-       /*****************************************************************************/
-       /* Select commands */
-       /*****************************************************************************/
+       // Select commands
        if (event->matches(QKeySequence::SelectAll)) {
                resetSelection(0);
-               if (pdata_)
-                       setSelection(2 * pdata_->size() + 1);
+               setSelection(2 * data_size_);
                setVisible = true;
        }
        if (event->matches(QKeySequence::SelectNextChar)) {
@@ -345,52 +539,38 @@ void QHexView::keyPressEvent(QKeyEvent *event)
                setVisible = true;
        }
        if (event->matches(QKeySequence::SelectEndOfDocument)) {
-               int pos = 0;
-               if (pdata_)
-                       pos = pdata_->size() * 2;
+               int pos = data_size_ * 2;
                setCursorPos(pos);
                setSelection(pos);
                setVisible = true;
        }
        if (event->matches(QKeySequence::SelectStartOfDocument)) {
-               int pos = 0;
-               setCursorPos(pos);
-               setSelection(pos);
+               setCursorPos(0);
+               setSelection(0);
                setVisible = true;
        }
 
-       if (event->matches(QKeySequence::Copy) && (pdata_)) {
+       if (event->matches(QKeySequence::Copy) && (data_)) {
                QString text;
-               int idx = 0;
-               int copyOffset = 0;
-
-               QByteArray data = pdata_->getData(selectBegin_ / 2, (selectEnd_ - selectBegin_) / 2 + 1);
-               if (selectBegin_ % 2) {
-                       text += QString::number((data.at((idx+1) / 2) & 0xF), 16);
-                       text += " ";
-                       idx++;
-                       copyOffset = 1;
-               }
 
-               int selectedSize = selectEnd_ - selectBegin_;
-               while (idx < selectedSize) {
-                       QString val = QString::number((data.at((copyOffset + idx) / 2) & 0xF0) >> 4, 16);
-                       if ((idx + 1) < selectedSize) {
-                               val += QString::number((data.at((copyOffset + idx) / 2) & 0xF), 16);
-                               val += " ";
-                       }
-                       text += val;
+               initialize_byte_iterator(selectBegin_ / 2);
 
-                       if ((idx/2) % BYTES_PER_LINE == (BYTES_PER_LINE - 1))
-                               text += "\n";
+               size_t selectedSize = (selectEnd_ - selectBegin_ + 1) / 2;
+               for (size_t i = 0; i < selectedSize; i++) {
+                       uint8_t byte_value = get_next_byte();
 
-                       idx += 2;
+                       QString s = QString::number((byte_value & 0xF0) >> 4, 16).toUpper() +
+                               QString::number((byte_value & 0xF), 16).toUpper() + " ";
+                       text += s;
+
+                       if (i % BYTES_PER_LINE == (BYTES_PER_LINE - 1))
+                               text += "\n";
                }
 
                QClipboard *clipboard = QApplication::clipboard();
-               clipboard->setText(text);
+               clipboard->setText(text, QClipboard::Clipboard);
                if (clipboard->supportsSelection())
-                       clipboard->setText(text);
+                       clipboard->setText(text, QClipboard::Selection);
        }
 
        if (setVisible)
@@ -401,7 +581,7 @@ void QHexView::keyPressEvent(QKeyEvent *event)
 
 void QHexView::mouseMoveEvent(QMouseEvent *event)
 {
-       int actPos = cursorPos(event->pos());
+       int actPos = cursorPosFromMousePos(event->pos());
        setCursorPos(actPos);
        setSelection(actPos);
 
@@ -410,7 +590,7 @@ void QHexView::mouseMoveEvent(QMouseEvent *event)
 
 void QHexView::mousePressEvent(QMouseEvent *event)
 {
-       int cPos = cursorPos(event->pos());
+       int cPos = cursorPosFromMousePos(event->pos());
 
        if ((QApplication::keyboardModifiers() & Qt::ShiftModifier) && (event->button() == Qt::LeftButton))
                setSelection(cPos);
@@ -422,26 +602,29 @@ void QHexView::mousePressEvent(QMouseEvent *event)
        viewport()->update();
 }
 
-size_t QHexView::cursorPos(const QPoint &position)
+size_t QHexView::cursorPosFromMousePos(const QPoint &position)
 {
-       int pos = -1;
+       size_t pos = -1;
 
        if (((size_t)position.x() >= posHex_) &&
                ((size_t)position.x() < (posHex_ + HEXCHARS_IN_LINE * charWidth_))) {
 
-               int x = (position.x() - posHex_) / charWidth_;
+               // Note: We add 1.5 character widths so that selection across
+               // byte gaps is smoother
+               size_t x = (position.x() + (1.5 * charWidth_ / 2) - posHex_) / charWidth_;
 
-               if ((x % 3) == 0)
-                       x = (x / 3) * 2;
-               else
-                       x = ((x / 3) * 2) + 1;
+               // Note: We allow only full bytes to be selected, not nibbles,
+               // so we round to the nearest byte gap
+               x = (2 * x + 1) / 3;
 
-               int firstLineIdx = verticalScrollBar()->value();
-               int y = (position.y() / charHeight_) * 2 * BYTES_PER_LINE;
+               size_t firstLineIdx = verticalScrollBar()->value();
+               size_t y = ((position.y() / charHeight_) - 1) * 2 * BYTES_PER_LINE;
                pos = x + y + firstLineIdx * BYTES_PER_LINE * 2;
        }
 
-       return pos;
+       size_t max_pos = data_size_ * 2;
+
+       return std::min(pos, max_pos);
 }
 
 void QHexView::resetSelection()
@@ -479,15 +662,10 @@ void QHexView::setCursorPos(int position)
        if (position < 0)
                position = 0;
 
-       int maxPos = 0;
-       if (pdata_) {
-               maxPos = pdata_->size() * 2;
-               if (pdata_->size() % BYTES_PER_LINE)
-                       maxPos++;
-       }
+       int max_pos = data_size_ * 2;
 
-       if (position > maxPos)
-               position = maxPos;
+       if (position > max_pos)
+               position = max_pos;
 
        cursorPos_ = position;
 }
@@ -496,13 +674,14 @@ void QHexView::ensureVisible()
 {
        QSize areaSize = viewport()->size();
 
-       int firstLineIdx = verticalScrollBar() -> value();
+       int firstLineIdx = verticalScrollBar()->value();
        int lastLineIdx = firstLineIdx + areaSize.height() / charHeight_;
 
        int cursorY = cursorPos_ / (2 * BYTES_PER_LINE);
 
        if (cursorY < firstLineIdx)
-               verticalScrollBar() -> setValue(cursorY);
-       else if(cursorY >= lastLineIdx)
-               verticalScrollBar() -> setValue(cursorY - areaSize.height() / charHeight_ + 1);
+               verticalScrollBar()->setValue(cursorY);
+       else
+               if(cursorY >= lastLineIdx)
+                       verticalScrollBar()->setValue(cursorY - areaSize.height() / charHeight_ + 1);
 }