X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiWorkArea.cpp;h=c4463e3d3b41c007fa967cc2e21b0fc362ec886e;hb=2b1b33189dc4113d2744cb9a68e691fbca4b884a;hp=362f062059b2b8887a975ea98ee88c8820b17990;hpb=655a4f5515f02c057dc47abd7bdfbd4059ff494c;p=lyx.git diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 362f062059..c4463e3d3b 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -16,7 +16,13 @@ #include "ColorCache.h" #include "FontLoader.h" +#include "GuiApplication.h" +#include "GuiCompleter.h" +#include "GuiKeySymbol.h" +#include "GuiPainter.h" +#include "GuiView.h" #include "Menus.h" +#include "qt_helpers.h" #include "Buffer.h" #include "BufferList.h" @@ -26,19 +32,14 @@ #include "Cursor.h" #include "Font.h" #include "FuncRequest.h" -#include "GuiApplication.h" -#include "GuiCompleter.h" -#include "GuiKeySymbol.h" -#include "GuiPainter.h" -#include "GuiView.h" #include "KeySymbol.h" #include "Language.h" #include "LyX.h" #include "LyXRC.h" #include "LyXVC.h" -#include "qt_helpers.h" #include "Text.h" #include "TextMetrics.h" +#include "Undo.h" #include "version.h" #include "graphics/GraphicsImage.h" @@ -46,34 +47,37 @@ #include "support/convert.h" #include "support/debug.h" -#include "support/gettext.h" -#include "support/FileName.h" #include "support/lassert.h" +#include "support/TempFile.h" #include "frontends/Application.h" #include "frontends/FontMetrics.h" #include "frontends/WorkAreaManager.h" #include +#if (QT_VERSION < 0x050000) #include +#endif +#include #include -#ifdef Q_WS_MACX -#include +#ifdef Q_OS_MAC +#include #endif #include +#include #include #include #include -#include #include +#include +#include #include #include #include #include -#include "support/bind.h" - #include +#include int const TabIndicatorWidth = 3; @@ -123,15 +127,15 @@ mouse_button::state q_motion_state(Qt::MouseButtons state) namespace frontend { -class CursorWidget { +class CaretWidget { public: - CursorWidget() { - recomputeWidth(); - } + CaretWidget() : rtl_(false), l_shape_(false), completable_(false), + x_(0), caret_width_(0) + {} void draw(QPainter & painter) { - if (!show_ || !rect_.isValid()) + if (!rect_.isValid()) return; int y = rect_.top(); @@ -140,7 +144,7 @@ public: int bot = rect_.bottom(); // draw vertical line - painter.fillRect(x_, y, cursor_width_, rect_.height(), color_); + painter.fillRect(x_, y, caret_width_, rect_.height(), color_); // draw RTL/LTR indication painter.setPen(color_); @@ -148,7 +152,7 @@ public: if (rtl_) painter.drawLine(x_, bot, x_ - l, bot); else - painter.drawLine(x_, bot, x_ + cursor_width_ + r, bot); + painter.drawLine(x_, bot, x_ + caret_width_ + r, bot); } // draw completion triangle @@ -159,8 +163,8 @@ public: painter.drawLine(x_ - 1, m - d, x_ - 1 - d, m); painter.drawLine(x_ - 1, m + d, x_ - 1 - d, m); } else { - painter.drawLine(x_ + cursor_width_, m - d, x_ + cursor_width_ + d, m); - painter.drawLine(x_ + cursor_width_, m + d, x_ + cursor_width_ + d, m); + painter.drawLine(x_ + caret_width_, m - d, x_ + caret_width_ + d, m); + painter.drawLine(x_ + caret_width_, m + d, x_ + caret_width_ + d, m); } } } @@ -194,38 +198,32 @@ public: r = max(r, TabIndicatorWidth); } - // compute overall rectangle - rect_ = QRect(x - l, y, cursor_width_ + r + l, h); - } + //FIXME: LyXRC::cursor_width should be caret_width + caret_width_ = lyxrc.cursor_width + ? lyxrc.cursor_width + : 1 + int((lyxrc.currentZoom + 50) / 200.0); - void show(bool set_show = true) { show_ = set_show; } - void hide() { show_ = false; } - int cursorWidth() const { return cursor_width_; } - void recomputeWidth() { - cursor_width_ = lyxrc.cursor_width - ? lyxrc.cursor_width - : 1 + int((lyxrc.zoom + 50) / 200.0); + // compute overall rectangle + rect_ = QRect(x - l, y, caret_width_ + r + l, h); } QRect const & rect() { return rect_; } private: - /// cursor is in RTL or LTR text + /// caret is in RTL or LTR text bool rtl_; /// indication for RTL or LTR bool l_shape_; /// triangle to show that a completion is available bool completable_; /// - bool show_; - /// QColor color_; /// rectangle, possibly with l_shape and completion triangle QRect rect_; /// x position (were the vertical line is drawn) int x_; - - int cursor_width_; + /// the width of the vertical blinking bar + int caret_width_; }; @@ -237,49 +235,81 @@ SyntheticMouseEvent::SyntheticMouseEvent() GuiWorkArea::Private::Private(GuiWorkArea * parent) -: p(parent), screen_(0), buffer_view_(0), lyx_view_(0), cursor_visible_(false), -need_resize_(false), schedule_redraw_(false), preedit_lines_(1), -completer_(new GuiCompleter(p, p)) +: p(parent), buffer_view_(0), lyx_view_(0), + caret_(0), caret_visible_(false), + need_resize_(false), preedit_lines_(1), + last_pixel_ratio_(1.0), + completer_(new GuiCompleter(p, p)), dialog_mode_(false), shell_escape_(false), + read_only_(false), clean_(true), externally_modified_(false) { + int const time = QApplication::cursorFlashTime() / 2; + if (time > 0) { + caret_timeout_.setInterval(time); + caret_timeout_.start(); + } else { + // let's initialize this just to be safe + caret_timeout_.setInterval(500); + } +} + + +GuiWorkArea::Private::~Private() +{ + // If something is wrong with the buffer, we can ignore it safely + try { + buffer_view_->buffer().workAreaManager().remove(p); + } catch(...) {} + delete buffer_view_; + delete caret_; + // Completer has a QObject parent and is thus automatically destroyed. + // See #4758. + // delete completer_; } GuiWorkArea::GuiWorkArea(QWidget * /* w */) -: d(new Private(this)) +: d(new Private(this)) { + new CompressorProxy(this); // not a leak } GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & gv) : d(new Private(this)) { + new CompressorProxy(this); // not a leak setGuiView(gv); + buffer.params().display_pixel_ratio = theGuiApp()->pixelRatio(); setBuffer(buffer); init(); } +double GuiWorkArea::pixelRatio() const +{ +#if QT_VERSION >= 0x050000 + return qt_scale_factor * devicePixelRatio(); +#else + return 1.0; +#endif +} + + void GuiWorkArea::init() { // Setup the signals - connect(&d->cursor_timeout_, SIGNAL(timeout()), - this, SLOT(toggleCursor())); + connect(&d->caret_timeout_, SIGNAL(timeout()), + this, SLOT(toggleCaret())); - int const time = QApplication::cursorFlashTime() / 2; - if (time > 0) { - d->cursor_timeout_.setInterval(time); - d->cursor_timeout_.start(); - } else { - // let's initialize this just to be safe - d->cursor_timeout_.setInterval(500); - } + // This connection is closed at the same time as this is destroyed. + d->synthetic_mouse_event_.timeout.timeout.connect([this](){ + generateSyntheticMouseEvent(); + }); - d->resetScreen(); // With Qt4.5 a mouse event will happen before the first paint event // so make sure that the buffer view has an up to date metrics. d->buffer_view_->resize(viewport()->width(), viewport()->height()); - d->cursor_ = new frontend::CursorWidget(); - d->cursor_->hide(); + d->caret_ = new frontend::CaretWidget(); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setAcceptDrops(true); @@ -288,22 +318,12 @@ void GuiWorkArea::init() setFrameStyle(QFrame::NoFrame); updateWindowTitle(); - viewport()->setAutoFillBackground(false); - // We don't need double-buffering nor SystemBackground on - // the viewport because we have our own backing pixmap. - viewport()->setAttribute(Qt::WA_NoSystemBackground); - - setFocusPolicy(Qt::StrongFocus); - - d->setCursorShape(Qt::IBeamCursor); + d->updateCursorShape(); - d->synthetic_mouse_event_.timeout.timeout.connect( - bind(&GuiWorkArea::generateSyntheticMouseEvent, - this)); + // we paint our own background + viewport()->setAttribute(Qt::WA_OpaquePaintEvent); - // Initialize the vertical Scroll Bar - QObject::connect(verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(scrollTo(int))); + setFocusPolicy(Qt::StrongFocus); LYXERR(Debug::GUI, "viewport width: " << viewport()->width() << " viewport height: " << viewport()->height()); @@ -311,40 +331,20 @@ void GuiWorkArea::init() // Enables input methods for asian languages. // Must be set when creating custom text editing widgets. setAttribute(Qt::WA_InputMethodEnabled, true); - - d->dialog_mode_ = false; } GuiWorkArea::~GuiWorkArea() { - d->buffer_view_->buffer().workAreaManager().remove(this); - delete d->screen_; - delete d->buffer_view_; - delete d->cursor_; - // Completer has a QObject parent and is thus automatically destroyed. - // See #4758. - // delete completer_; delete d; } -Qt::CursorShape GuiWorkArea::cursorShape() const -{ - return viewport()->cursor().shape(); -} - - -void GuiWorkArea::Private::setCursorShape(Qt::CursorShape shape) -{ - p->viewport()->setCursor(shape); -} - - void GuiWorkArea::Private::updateCursorShape() { - setCursorShape(buffer_view_->clickableInset() - ? Qt::PointingHandCursor : Qt::IBeamCursor); + bool const clickable = buffer_view_ && buffer_view_->clickableInset(); + p->viewport()->setCursor(clickable ? Qt::PointingHandCursor + : Qt::IBeamCursor); } @@ -369,6 +369,7 @@ void GuiWorkArea::setBuffer(Buffer & buffer) if (buffer.text().paragraphs().size() > 4) setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); QTimer::singleShot(50, this, SLOT(fixVerticalScrollBar())); + Q_EMIT bufferViewChanged(); } @@ -410,14 +411,14 @@ BufferView const & GuiWorkArea::bufferView() const } -void GuiWorkArea::stopBlinkingCursor() +void GuiWorkArea::stopBlinkingCaret() { - d->cursor_timeout_.stop(); - d->hideCursor(); + d->caret_timeout_.stop(); + d->hideCaret(); } -void GuiWorkArea::startBlinkingCursor() +void GuiWorkArea::startBlinkingCaret() { // do not show the cursor if the view is busy if (view().busy()) @@ -425,23 +426,32 @@ void GuiWorkArea::startBlinkingCursor() Point p; int h = 0; - d->buffer_view_->cursorPosAndHeight(p, h); + d->buffer_view_->caretPosAndHeight(p, h); // Don't start blinking if the cursor isn't on screen. if (!d->buffer_view_->cursorInView(p, h)) return; - d->showCursor(); + d->showCaret(); //we're not supposed to cache this value. int const time = QApplication::cursorFlashTime() / 2; if (time <= 0) return; - d->cursor_timeout_.setInterval(time); - d->cursor_timeout_.start(); + d->caret_timeout_.setInterval(time); + d->caret_timeout_.start(); +} + + +void GuiWorkArea::toggleCaret() +{ + if (d->caret_visible_) + d->hideCaret(); + else + d->showCaret(); } -void GuiWorkArea::redraw(bool update_metrics) +void GuiWorkArea::scheduleRedraw(bool update_metrics) { if (!isVisible()) // No need to redraw in this case. @@ -457,17 +467,14 @@ void GuiWorkArea::redraw(bool update_metrics) d->buffer_view_->cursor().fixIfBroken(); } - // update cursor position, because otherwise it has to wait until + // update caret position, because otherwise it has to wait until // the blinking interval is over - if (d->cursor_visible_) { - d->hideCursor(); - d->showCursor(); - } + d->updateCaretGeometry(); LYXERR(Debug::WORKAREA, "WorkArea::redraw screen"); - d->updateScreen(); - update(0, 0, viewport()->width(), viewport()->height()); + viewport()->update(); + /// FIXME: is this still true now that paintEvent does the actual painting? /// \warning: scrollbar updating *must* be done after the BufferView is drawn /// because \c BufferView::updateScrollbar() is called in \c BufferView::draw(). d->updateScrollbar(); @@ -482,6 +489,14 @@ void GuiWorkArea::redraw(bool update_metrics) } +// Keep in sync with GuiWorkArea::processKeySym below +bool GuiWorkArea::queryKeySym(KeySymbol const & key, KeyModifier mod) const +{ + return guiApp->queryKeySym(key, mod); +} + + +// Keep in sync with GuiWorkArea::queryKeySym above void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod) { if (d->lyx_view_->isFullScreen() && d->lyx_view_->menuBar()->isVisible() @@ -492,42 +507,29 @@ void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod) } // In order to avoid bad surprise in the middle of an operation, - // we better stop the blinking cursor... - // the cursor gets restarted in GuiView::restartCursor() - stopBlinkingCursor(); + // we better stop the blinking caret... + // the caret gets restarted in GuiView::restartCaret() + stopBlinkingCaret(); guiApp->processKeySym(key, mod); } -void GuiWorkArea::Private::dispatch(FuncRequest const & cmd0, KeyModifier mod) +void GuiWorkArea::Private::dispatch(FuncRequest const & cmd) { // Handle drag&drop - if (cmd0.action() == LFUN_FILE_OPEN) { + if (cmd.action() == LFUN_FILE_OPEN) { DispatchResult dr; - lyx_view_->dispatch(cmd0, dr); + lyx_view_->dispatch(cmd, dr); return; } - FuncRequest cmd; - - if (cmd0.action() == LFUN_MOUSE_PRESS) { - if (mod == ShiftModifier) - cmd = FuncRequest(cmd0, "region-select"); - else if (mod == ControlModifier) - cmd = FuncRequest(cmd0, "paragraph-select"); - else - cmd = cmd0; - } - else - cmd = cmd0; - bool const notJustMovingTheMouse = cmd.action() != LFUN_MOUSE_MOTION || cmd.button() != mouse_button::none; // In order to avoid bad surprise in the middle of an operation, we better stop - // the blinking cursor. + // the blinking caret. if (notJustMovingTheMouse) - p->stopBlinkingCursor(); + p->stopBlinkingCaret(); buffer_view_->mouseEventDispatch(cmd); @@ -547,8 +549,8 @@ void GuiWorkArea::Private::dispatch(FuncRequest const & cmd0, KeyModifier mod) // FIXME: let GuiView take care of those. lyx_view_->clearMessage(); - // Show the cursor immediately after any operation - p->startBlinkingCursor(); + // Show the caret immediately after any operation + p->startBlinkingCaret(); } updateCursorShape(); @@ -559,18 +561,18 @@ void GuiWorkArea::Private::resizeBufferView() { // WARNING: Please don't put any code that will trigger a repaint here! // We are already inside a paint event. - p->stopBlinkingCursor(); + p->stopBlinkingCaret(); // Warn our container (GuiView). p->busy(true); Point point; int h = 0; - buffer_view_->cursorPosAndHeight(point, h); - bool const cursor_in_view = buffer_view_->cursorInView(point, h); + buffer_view_->caretPosAndHeight(point, h); + bool const caret_in_view = buffer_view_->cursorInView(point, h); buffer_view_->resize(p->viewport()->width(), p->viewport()->height()); - if (cursor_in_view) + if (caret_in_view) buffer_view_->scrollToCursor(); - updateScreen(); + updateCaretGeometry(); // Update scrollbars which might have changed due different // BufferView dimension. This is especially important when the @@ -580,23 +582,20 @@ void GuiWorkArea::Private::resizeBufferView() need_resize_ = false; p->busy(false); - // Eventually, restart the cursor after the resize event. + // Eventually, restart the caret after the resize event. // We might be resizing even if the focus is on another widget so we only - // restart the cursor if we have the focus. + // restart the caret if we have the focus. if (p->hasFocus()) - QTimer::singleShot(50, p, SLOT(startBlinkingCursor())); + QTimer::singleShot(50, p, SLOT(startBlinkingCaret())); } -void GuiWorkArea::Private::showCursor() +void GuiWorkArea::Private::updateCaretGeometry() { - if (cursor_visible_) - return; - - Point p; + Point point; int h = 0; - buffer_view_->cursorPosAndHeight(p, h); - if (!buffer_view_->cursorInView(p, h)) + buffer_view_->caretPosAndHeight(point, h); + if (!buffer_view_->cursorInView(point, h)) return; // RTL or not RTL @@ -613,54 +612,64 @@ void GuiWorkArea::Private::showCursor() if (realfont.language() == latex_language) l_shape = false; - // show cursor on screen + // show caret on screen Cursor & cur = buffer_view_->cursor(); bool completable = cur.inset().showCompletionCursor() && completer_->completionAvailable() && !completer_->popupVisible() && !completer_->inlineVisible(); - cursor_visible_ = true; - cursor_->recomputeWidth(); - showCursor(p.x_, p.y_, h, l_shape, isrtl, completable); + caret_visible_ = true; + + //int cur_x = buffer_view_->getPos(cur).x_; + // We may have decided to slide the cursor row so that caret + // is visible. + point.x_ -= buffer_view_->horizScrollOffset(); + + caret_->update(point.x_, point.y_, h, l_shape, isrtl, completable); } -void GuiWorkArea::Private::hideCursor() +void GuiWorkArea::Private::showCaret() { - if (!cursor_visible_) + if (caret_visible_) return; - cursor_visible_ = false; - removeCursor(); + updateCaretGeometry(); + p->viewport()->update(caret_->rect()); } -void GuiWorkArea::toggleCursor() +void GuiWorkArea::Private::hideCaret() { - if (d->cursor_visible_) - d->hideCursor(); - else - d->showCursor(); + if (!caret_visible_) + return; + + caret_visible_ = false; + //if (!qApp->focusWidget()) + p->viewport()->update(caret_->rect()); } void GuiWorkArea::Private::updateScrollbar() { + // Prevent setRange() and setSliderPosition from causing recursive calls via + // the signal valueChanged. (#10311) + QObject::disconnect(p->verticalScrollBar(), SIGNAL(valueChanged(int)), + p, SLOT(scrollTo(int))); ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters(); - // WARNING: don't touch at the scrollbar value like this: - // verticalScrollBar()->setValue(scroll_.position); - // because this would cause a recursive signal/slot calling with - // GuiWorkArea::scrollTo p->verticalScrollBar()->setRange(scroll_.min, scroll_.max); p->verticalScrollBar()->setPageStep(scroll_.page_step); p->verticalScrollBar()->setSingleStep(scroll_.single_step); - p->verticalScrollBar()->setSliderPosition(scroll_.position); + p->verticalScrollBar()->setSliderPosition(0); + // Connect to the vertical scroll bar + QObject::connect(p->verticalScrollBar(), SIGNAL(valueChanged(int)), + p, SLOT(scrollTo(int))); } void GuiWorkArea::scrollTo(int value) { - stopBlinkingCursor(); + stopBlinkingCaret(); d->buffer_view_->scrollDocView(value, true); if (lyxrc.cursor_follows_scrollbar) { @@ -668,9 +677,12 @@ void GuiWorkArea::scrollTo(int value) // FIXME: let GuiView take care of those. d->lyx_view_->updateLayoutList(); } - // Show the cursor immediately after any operation. - startBlinkingCursor(); + // Show the caret immediately after any operation. + startBlinkingCaret(); + // FIXME QT5 +#ifdef Q_WS_X11 QApplication::syncX(); +#endif } @@ -683,7 +695,7 @@ bool GuiWorkArea::event(QEvent * e) QPoint pos = helpEvent->pos(); if (pos.x() < viewport()->width()) { QString s = toqstr(d->buffer_view_->toolTip(pos.x(), pos.y())); - QToolTip::showText(helpEvent->globalPos(), s); + QToolTip::showText(helpEvent->globalPos(), formatToolTip(s,35)); } else QToolTip::hideText(); @@ -693,7 +705,13 @@ bool GuiWorkArea::event(QEvent * e) return true; } - case QEvent::ShortcutOverride: { + case QEvent::ShortcutOverride: + // keyPressEvent is ShortcutOverride-aware and only accepts the event in + // this case + keyPressEvent(static_cast(e)); + return e->isAccepted(); + + case QEvent::KeyPress: { // We catch this event in order to catch the Tab or Shift+Tab key press // which are otherwise reserved to focus switching between controls // within a dialog. @@ -738,9 +756,9 @@ void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e) } name = d->buffer_view_->contextMenu(pos.x(), pos.y()); } - + if (name.empty()) { - QAbstractScrollArea::contextMenuEvent(e); + e->accept(); return; } // always show mnemonics when the keyboard is used to show the context menu @@ -748,7 +766,7 @@ void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e) bool const keyboard = (e->reason() == QContextMenuEvent::Keyboard); QMenu * menu = guiApp->menus().menu(toqstr(name), *d->lyx_view_, keyboard); if (!menu) { - QAbstractScrollArea::contextMenuEvent(e); + e->accept(); return; } // Position the menu to the right. @@ -766,7 +784,7 @@ void GuiWorkArea::focusInEvent(QFocusEvent * e) d->lyx_view_->currentWorkArea()->bufferView().buffer().updateBuffer(); } - startBlinkingCursor(); + startBlinkingCaret(); QAbstractScrollArea::focusInEvent(e); } @@ -774,7 +792,7 @@ void GuiWorkArea::focusInEvent(QFocusEvent * e) void GuiWorkArea::focusOutEvent(QFocusEvent * e) { LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << endl); - stopBlinkingCursor(); + stopBlinkingCaret(); QAbstractScrollArea::focusOutEvent(e); } @@ -784,17 +802,19 @@ void GuiWorkArea::mousePressEvent(QMouseEvent * e) if (d->dc_event_.active && d->dc_event_ == *e) { d->dc_event_.active = false; FuncRequest cmd(LFUN_MOUSE_TRIPLE, e->x(), e->y(), - q_button_state(e->button())); + q_button_state(e->button()), q_key_state(e->modifiers())); d->dispatch(cmd); e->accept(); return; } +#if (QT_VERSION < 0x050000) && !defined(__HAIKU__) inputContext()->reset(); +#endif FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(), - q_button_state(e->button())); - d->dispatch(cmd, q_key_state(e->modifiers())); + q_button_state(e->button()), q_key_state(e->modifiers())); + d->dispatch(cmd); // Save the context menu on mouse press, because also the mouse // cursor is set on mouse press. Afterwards, we can either release @@ -814,7 +834,7 @@ void GuiWorkArea::mouseReleaseEvent(QMouseEvent * e) d->synthetic_mouse_event_.timeout.stop(); FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(), - q_button_state(e->button())); + q_button_state(e->button()), q_key_state(e->modifiers())); d->dispatch(cmd); e->accept(); } @@ -825,7 +845,7 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e) // we kill the triple click if we move doubleClickTimeout(); FuncRequest cmd(LFUN_MOUSE_MOTION, e->x(), e->y(), - q_motion_state(e->buttons())); + q_motion_state(e->buttons()), q_key_state(e->modifiers())); e->accept(); @@ -852,7 +872,7 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e) // in the first place. return; } - + d->synthetic_mouse_event_.restart_timeout = true; d->synthetic_mouse_event_.timeout.start(); // Fall through to handle this event... @@ -904,8 +924,10 @@ void GuiWorkArea::wheelEvent(QWheelEvent * ev) int const lines = qApp->wheelScrollLines(); int const page_step = verticalScrollBar()->pageStep(); // Test if the wheel mouse is set to one screen at a time. - int scroll_value = lines > page_step - ? page_step : lines * verticalScrollBar()->singleStep(); + // This is according to + // https://doc.qt.io/qt-5/qapplication.html#wheelScrollLines-prop + int scroll_value = + min(lines * verticalScrollBar()->singleStep(), page_step); // Take into account the rotation and the user preferences. scroll_value = int(scroll_value * delta * lyxrc.mouse_wheel_speed); @@ -935,7 +957,7 @@ void GuiWorkArea::generateSyntheticMouseEvent() if (up || down) { int dist = up ? -e_y : e_y - wh; time = max(min(200, 250000 / (dist * dist)), 1) ; - + if (time < 40) { step = 80000 / (time * time); time = 40; @@ -958,17 +980,23 @@ void GuiWorkArea::generateSyntheticMouseEvent() d->buffer_view_->scroll(up ? -step : step); d->buffer_view_->updateMetrics(); } else { - d->buffer_view_->scrollDocView(value + up ? -step : step, false); + d->buffer_view_->scrollDocView(value + (up ? -step : step), false); } // In which paragraph do we have to set the cursor ? Cursor & cur = d->buffer_view_->cursor(); - // FIXME: we don't know howto handle math. + // FIXME: we don't know how to handle math. Text * text = cur.text(); if (!text) return; TextMetrics const & tm = d->buffer_view_->textMetrics(text); + // Quit gracefully if there are no metrics, since otherwise next + // line would crash (bug #10324). + // This situation seems related to a (not yet understood) timing problem. + if (tm.empty()) + return; + pair pp = up ? tm.first() : tm.last(); ParagraphMetrics const & pm = *pp.second; pit_type const pit = pp.first; @@ -987,11 +1015,11 @@ void GuiWorkArea::generateSyntheticMouseEvent() break; yy += h; } - + // Find the position of the cursor bool bound; int x = d->synthetic_mouse_event_.cmd.x(); - pos_type const pos = rit->pos() + tm.getColumnNearX(pit, *rit, x, bound); + pos_type const pos = tm.getPosNearX(*rit, x, bound); // Set the cursor cur.pit() = pit; @@ -1003,16 +1031,56 @@ void GuiWorkArea::generateSyntheticMouseEvent() } +// CompressorProxy adapted from Kuba Ober https://stackoverflow.com/a/21006207 +CompressorProxy::CompressorProxy(GuiWorkArea * wa) : QObject(wa), flag_(false) +{ + qRegisterMetaType("KeySymbol"); + qRegisterMetaType("KeyModifier"); + connect(wa, SIGNAL(compressKeySym(KeySymbol, KeyModifier, bool)), + this, SLOT(slot(KeySymbol, KeyModifier, bool)), + Qt::QueuedConnection); + connect(this, SIGNAL(signal(KeySymbol, KeyModifier)), + wa, SLOT(processKeySym(KeySymbol, KeyModifier))); +} + + +bool CompressorProxy::emitCheck(bool isAutoRepeat) +{ + flag_ = true; + if (isAutoRepeat) + QCoreApplication::sendPostedEvents(this, QEvent::MetaCall); // recurse + bool result = flag_; + flag_ = false; + return result; +} + + +void CompressorProxy::slot(KeySymbol sym, KeyModifier mod, bool isAutoRepeat) +{ + if (emitCheck(isAutoRepeat)) + Q_EMIT signal(sym, mod); + else + LYXERR(Debug::KEY, "system is busy: autoRepeat key event ignored"); +} + + void GuiWorkArea::keyPressEvent(QKeyEvent * ev) { + // this is also called for ShortcutOverride events. In this case, one must + // not act but simply accept the event explicitly. + bool const act = (ev->type() != QEvent::ShortcutOverride); + // Do not process here some keys if dialog_mode_ is set - if (d->dialog_mode_ + bool const for_dialog_mode = d->dialog_mode_ && (ev->modifiers() == Qt::NoModifier || ev->modifiers() == Qt::ShiftModifier) && (ev->key() == Qt::Key_Escape || ev->key() == Qt::Key_Enter - || ev->key() == Qt::Key_Return) - ) { + || ev->key() == Qt::Key_Return); + // also do not use autoRepeat to input shortcuts + bool const autoRepeat = ev->isAutoRepeat(); + + if (for_dialog_mode || (!act && autoRepeat)) { ev->ignore(); return; } @@ -1022,52 +1090,39 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * ev) switch (ev->key()) { case Qt::Key_Enter: case Qt::Key_Return: - d->completer_->activate(); + if (act) + d->completer_->activate(); ev->accept(); return; } } - // do nothing if there are other events - // (the auto repeated events come too fast) - // it looks like this is only needed on X11 -#ifdef Q_WS_X11 - if (qApp->hasPendingEvents() && ev->isAutoRepeat()) { - switch (ev->key()) { - case Qt::Key_PageDown: - case Qt::Key_PageUp: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Up: - case Qt::Key_Down: - LYXERR(Debug::KEY, "system is busy: scroll key event ignored"); - ev->ignore(); - return; - } + KeyModifier const m = q_key_state(ev->modifiers()); + + if (act && lyxerr.debugging(Debug::KEY)) { + std::string str; + if (m & ShiftModifier) + str += "Shift-"; + if (m & ControlModifier) + str += "Control-"; + if (m & AltModifier) + str += "Alt-"; + if (m & MetaModifier) + str += "Meta-"; + LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text() + << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key() + << " keyState: " << str); } -#endif - - KeyModifier m = q_key_state(ev->modifiers()); - - std::string str; - if (m & ShiftModifier) - str += "Shift-"; - if (m & ControlModifier) - str += "Control-"; - if (m & AltModifier) - str += "Alt-"; - if (m & MetaModifier) - str += "Meta-"; - - LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text() - << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key() - << " keyState: " << str); KeySymbol sym; setKeySymbol(&sym, ev); if (sym.isOK()) { - processKeySym(sym, q_key_state(ev->modifiers())); - ev->accept(); + if (act) { + Q_EMIT compressKeySym(sym, m, autoRepeat); + ev->accept(); + } else + // here, !autoRepeat, as determined at the beginning + ev->setAccepted(queryKeySym(sym, m)); } else { ev->ignore(); } @@ -1084,10 +1139,9 @@ void GuiWorkArea::mouseDoubleClickEvent(QMouseEvent * ev) { d->dc_event_ = DoubleClick(ev); QTimer::singleShot(QApplication::doubleClickInterval(), this, - SLOT(doubleClickTimeout())); - FuncRequest cmd(LFUN_MOUSE_DOUBLE, - ev->x(), ev->y(), - q_button_state(ev->button())); + SLOT(doubleClickTimeout())); + FuncRequest cmd(LFUN_MOUSE_DOUBLE, ev->x(), ev->y(), + q_button_state(ev->button()), q_key_state(ev->modifiers())); d->dispatch(cmd); ev->accept(); } @@ -1101,149 +1155,31 @@ void GuiWorkArea::resizeEvent(QResizeEvent * ev) } -void GuiWorkArea::Private::update(int x, int y, int w, int h) -{ - p->viewport()->update(x, y, w, h); -} - - -void GuiWorkArea::paintEvent(QPaintEvent * ev) -{ - QRect const rc = ev->rect(); - // LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x() - // << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height()); - - if (d->need_resize_) { - d->resetScreen(); - d->resizeBufferView(); - if (d->cursor_visible_) { - d->hideCursor(); - d->showCursor(); - } - } - - QPainter pain(viewport()); - if (lyxrc.use_qimage) { - pain.drawImage(rc, static_cast(*d->screen_), rc); - } else { - pain.drawPixmap(rc, static_cast(*d->screen_), rc); - } - d->cursor_->draw(pain); - ev->accept(); -} - - -void GuiWorkArea::Private::updateScreen() -{ - GuiPainter pain(screen_); - buffer_view_->draw(pain); -} - - -void GuiWorkArea::Private::showCursor(int x, int y, int h, - bool l_shape, bool rtl, bool completable) -{ - if (schedule_redraw_) { - // This happens when a graphic conversion is finished. As we don't know - // the size of the new graphics, it's better the update everything. - // We can't use redraw() here because this would trigger a infinite - // recursive loop with showCursor(). - buffer_view_->resize(p->viewport()->width(), p->viewport()->height()); - updateScreen(); - updateScrollbar(); - p->viewport()->update(QRect(0, 0, p->viewport()->width(), p->viewport()->height())); - schedule_redraw_ = false; - // Show the cursor immediately after the update. - hideCursor(); - p->toggleCursor(); - return; - } - - cursor_->update(x, y, h, l_shape, rtl, completable); - cursor_->show(); - p->viewport()->update(cursor_->rect()); -} - - -void GuiWorkArea::Private::removeCursor() +void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain) { - cursor_->hide(); - //if (!qApp->focusWidget()) - p->viewport()->update(cursor_->rect()); -} - - -void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) -{ - QString const & commit_string = e->commitString(); - docstring const & preedit_string - = qstring_to_ucs4(e->preeditString()); - - if (!commit_string.isEmpty()) { - - LYXERR(Debug::KEY, "preeditString: " << e->preeditString() - << " commitString: " << e->commitString()); - - int key = 0; - - // FIXME Iwami 04/01/07: we should take care also of UTF16 surrogates here. - for (int i = 0; i != commit_string.size(); ++i) { - QKeyEvent ev(QEvent::KeyPress, key, Qt::NoModifier, commit_string[i]); - keyPressEvent(&ev); - } - } - - // Hide the cursor during the kana-kanji transformation. - if (preedit_string.empty()) - startBlinkingCursor(); - else - stopBlinkingCursor(); - - // last_width : for checking if last preedit string was/wasn't empty. - static bool last_width = false; - if (!last_width && preedit_string.empty()) { - // if last_width is last length of preedit string. - e->accept(); + if (preedit_string_.empty()) return; - } - GuiPainter pain(d->screen_); - d->buffer_view_->updateMetrics(); - d->buffer_view_->draw(pain); - FontInfo font = d->buffer_view_->cursor().getFont().fontInfo(); + // FIXME: shall we use real_current_font here? (see #10478) + FontInfo const font = buffer_view_->cursor().getFont().fontInfo(); FontMetrics const & fm = theFontMetrics(font); - int height = fm.maxHeight(); - int cur_x = d->cursor_->rect().left(); - int cur_y = d->cursor_->rect().bottom(); - - // redraw area of preedit string. - update(0, cur_y - height, viewport()->width(), - (height + 1) * d->preedit_lines_); - - if (preedit_string.empty()) { - last_width = false; - d->preedit_lines_ = 1; - e->accept(); - return; - } - last_width = true; - - // att : stores an IM attribute. - QList const & att = e->attributes(); + int const height = fm.maxHeight(); + int cur_x = caret_->rect().left(); + int cur_y = caret_->rect().bottom(); // get attributes of input method cursor. // cursor_pos : cursor position in preedit string. size_t cursor_pos = 0; bool cursor_is_visible = false; - for (int i = 0; i != att.size(); ++i) { - if (att.at(i).type == QInputMethodEvent::Cursor) { - cursor_pos = att.at(i).start; - cursor_is_visible = att.at(i).length != 0; + for (auto const & attr : preedit_attr_) { + if (attr.type == QInputMethodEvent::Cursor) { + cursor_pos = attr.start; + cursor_is_visible = attr.length != 0; break; } } - size_t preedit_length = preedit_string.length(); + size_t const preedit_length = preedit_string_.length(); // get position of selection in input method. // FIXME: isn't there a way to do this simplier? @@ -1252,12 +1188,12 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) // rLength : selected string length in IM. size_t rLength = 0; if (cursor_pos < preedit_length) { - for (int i = 0; i != att.size(); ++i) { - if (att.at(i).type == QInputMethodEvent::TextFormat) { - if (att.at(i).start <= int(cursor_pos) - && int(cursor_pos) < att.at(i).start + att.at(i).length) { - rStart = att.at(i).start; - rLength = att.at(i).length; + for (auto const & attr : preedit_attr_) { + if (attr.type == QInputMethodEvent::TextFormat) { + if (attr.start <= int(cursor_pos) + && int(cursor_pos) < attr.start + attr.length) { + rStart = attr.start; + rLength = attr.length; if (!cursor_is_visible) cursor_pos += rLength; break; @@ -1270,20 +1206,20 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) rLength = 0; } - int const right_margin = d->buffer_view_->rightMargin(); + int const right_margin = buffer_view_->rightMargin(); Painter::preedit_style ps; // Most often there would be only one line: - d->preedit_lines_ = 1; + preedit_lines_ = 1; for (size_t pos = 0; pos != preedit_length; ++pos) { - char_type const typed_char = preedit_string[pos]; + char_type const typed_char = preedit_string_[pos]; // reset preedit string style ps = Painter::preedit_default; // if we reached the right extremity of the screen, go to next line. - if (cur_x + fm.width(typed_char) > viewport()->width() - right_margin) { + if (cur_x + fm.width(typed_char) > p->viewport()->width() - right_margin) { cur_x = right_margin; cur_y += height + 1; - ++d->preedit_lines_; + ++preedit_lines_; } // preedit strings are displayed with dashed underline // and partial strings are displayed white on black indicating @@ -1302,11 +1238,75 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) // draw one character and update cur_x. cur_x += pain.preeditText(cur_x, cur_y, typed_char, font, ps); } +} + + +void GuiWorkArea::paintEvent(QPaintEvent * ev) +{ + // LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x() + // << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height()); + + if (d->need_resize_ || pixelRatio() != d->last_pixel_ratio_) + d->resizeBufferView(); + + d->last_pixel_ratio_ = pixelRatio(); + + GuiPainter pain(viewport(), pixelRatio()); + d->buffer_view_->draw(pain, d->caret_visible_); + + // The preedit text, if needed + d->paintPreeditText(pain); + + // and the caret + if (d->caret_visible_) + d->caret_->draw(pain); + ev->accept(); +} + + +void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e) +{ + LYXERR(Debug::KEY, "preeditString: " << e->preeditString() + << " commitString: " << e->commitString()); + + // insert the processed text in the document (handles undo) + if (!e->commitString().isEmpty()) { + d->buffer_view_->cursor().beginUndoGroup(); + d->buffer_view_->cursor().insert(qstring_to_ucs4(e->commitString())); + d->buffer_view_->updateMetrics(); + d->buffer_view_->cursor().endUndoGroup(); + viewport()->update(); + } - // update the preedit string screen area. - update(0, cur_y - d->preedit_lines_*height, viewport()->width(), + // Hide the caret during the test transformation. + if (e->preeditString().isEmpty()) + startBlinkingCaret(); + else + stopBlinkingCaret(); + + if (d->preedit_string_.empty() && e->preeditString().isEmpty()) { + // Nothing to do + e->accept(); + return; + } + + // The preedit text and its attributes will be used in paintPreeditText + d->preedit_string_ = qstring_to_ucs4(e->preeditString()); + d->preedit_attr_ = e->attributes(); + + + // redraw area of preedit string. + int height = d->caret_->rect().height(); + int cur_y = d->caret_->rect().bottom(); + viewport()->update(0, cur_y - height, viewport()->width(), (height + 1) * d->preedit_lines_); + if (d->preedit_string_.empty()) { + d->preedit_lines_ = 1; + e->accept(); + return; + } + // Don't forget to accept the event! e->accept(); } @@ -1319,12 +1319,12 @@ QVariant GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const // this is the CJK-specific composition window position and // the context menu position when the menu key is pressed. case Qt::ImMicroFocus: - cur_r = d->cursor_->rect(); + cur_r = d->caret_->rect(); if (d->preedit_lines_ != 1) cur_r.moveLeft(10); cur_r.moveBottom(cur_r.bottom() + cur_r.height() * (d->preedit_lines_ - 1)); - // return lower right of cursor in LyX. + // return lower right of caret in LyX. return cur_r; default: return QWidget::inputMethodQuery(query); @@ -1334,33 +1334,20 @@ QVariant GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const void GuiWorkArea::updateWindowTitle() { - docstring maximize_title; - docstring minimize_title; - - Buffer const & buf = d->buffer_view_->buffer(); - FileName const file_name = buf.fileName(); - if (!file_name.empty()) { - maximize_title = file_name.displayName(130); - minimize_title = from_utf8(file_name.onlyFileName()); - if (buf.lyxvc().inUse()) { - if (buf.lyxvc().locking()) - maximize_title += _(" (version control, locking)"); - else - maximize_title += _(" (version control)"); - } - if (!buf.isClean()) { - maximize_title += _(" (changed)"); - minimize_title += char_type('*'); - } - if (buf.isReadonly()) - maximize_title += _(" (read only)"); - } - - QString const new_title = toqstr(maximize_title); - if (new_title != windowTitle()) { - QWidget::setWindowTitle(new_title); - QWidget::setWindowIconText(toqstr(minimize_title)); - titleChanged(this); + Buffer const & buf = bufferView().buffer(); + if (buf.fileName() != d->file_name_ + || buf.params().shell_escape != d->shell_escape_ + || buf.hasReadonlyFlag() != d->read_only_ + || buf.lyxvc().vcstatus() != d->vc_status_ + || buf.isClean() != d->clean_ + || buf.notifiesExternalModification() != d->externally_modified_) { + d->file_name_ = buf.fileName(); + d->shell_escape_ = buf.params().shell_escape; + d->read_only_ = buf.hasReadonlyFlag(); + d->vc_status_ = buf.lyxvc().vcstatus(); + d->clean_ = buf.isClean(); + d->externally_modified_ = buf.notifiesExternalModification(); + Q_EMIT titleChanged(this); } } @@ -1371,12 +1358,6 @@ bool GuiWorkArea::isFullScreen() const } -void GuiWorkArea::scheduleRedraw() -{ - d->schedule_redraw_ = true; -} - - bool GuiWorkArea::inDialogMode() const { return d->dialog_mode_; @@ -1414,8 +1395,9 @@ GuiView & GuiWorkArea::view() EmbeddedWorkArea::EmbeddedWorkArea(QWidget * w): GuiWorkArea(w) { - buffer_ = theBufferList().newInternalBuffer( - support::FileName::tempName("embedded.internal").absFileName()); + support::TempFile tempfile("embedded.internal"); + tempfile.setAutoRemove(false); + buffer_ = theBufferList().newInternalBuffer(tempfile.name().absFileName()); buffer_->setUnnamed(true); buffer_->setFullyLoaded(true); setBuffer(*buffer_); @@ -1458,7 +1440,7 @@ QSize EmbeddedWorkArea::sizeHint () const void EmbeddedWorkArea::disable() { - stopBlinkingCursor(); + stopBlinkingCaret(); if (view().currentWorkArea() != this) return; // No problem if currentMainWorkArea() is 0 (setCurrentWorkArea() @@ -1473,14 +1455,14 @@ void EmbeddedWorkArea::disable() // //////////////////////////////////////////////////////////////////// -#ifdef Q_WS_MACX -class NoTabFrameMacStyle : public QMacStyle { +#ifdef Q_OS_MAC +class NoTabFrameMacStyle : public QProxyStyle { public: /// QRect subElementRect(SubElement element, const QStyleOption * option, const QWidget * widget = 0) const { - QRect rect = QMacStyle::subElementRect(element, option, widget); + QRect rect = QProxyStyle::subElementRect(element, option, widget); bool noBar = static_cast(widget)->count() <= 1; // The Qt Mac style puts the contents into a 3 pixel wide box @@ -1502,14 +1484,11 @@ NoTabFrameMacStyle noTabFrameMacStyle; TabWorkArea::TabWorkArea(QWidget * parent) - : QTabWidget(parent), clicked_tab_(-1) + : QTabWidget(parent), clicked_tab_(-1), midpressed_tab_(-1) { -#ifdef Q_WS_MACX +#ifdef Q_OS_MAC setStyle(&noTabFrameMacStyle); #endif -#if QT_VERSION < 0x040500 - lyxrc.single_close_tab_button = true; -#endif QPalette pal = palette(); pal.setColor(QPalette::Active, QPalette::Button, @@ -1525,7 +1504,7 @@ TabWorkArea::TabWorkArea(QWidget * parent) closeBufferButton = new QToolButton(this); closeBufferButton->setPalette(pal); // FIXME: rename the icon to closebuffer.png - closeBufferButton->setIcon(QIcon(getPixmap("images/", "closetab", "png"))); + closeBufferButton->setIcon(QIcon(getPixmap("images/", "closetab", "svgz,png"))); closeBufferButton->setText("Close File"); closeBufferButton->setAutoRaise(true); closeBufferButton->setCursor(Qt::ArrowCursor); @@ -1546,25 +1525,47 @@ TabWorkArea::TabWorkArea(QWidget * parent) tb->setContextMenuPolicy(Qt::CustomContextMenu); connect(tb, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showContextMenu(const QPoint &))); -#if QT_VERSION >= 0x040500 connect(tb, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int))); -#endif setUsesScrollButtons(true); } +void TabWorkArea::mousePressEvent(QMouseEvent *me) +{ + if (me->button() == Qt::MidButton) + midpressed_tab_ = tabBar()->tabAt(me->pos()); + else + QTabWidget::mousePressEvent(me); +} + + +void TabWorkArea::mouseReleaseEvent(QMouseEvent *me) +{ + if (me->button() == Qt::MidButton) { + int const midreleased_tab = tabBar()->tabAt(me->pos()); + if (midpressed_tab_ == midreleased_tab && posIsTab(me->pos())) + closeTab(midreleased_tab); + } else + QTabWidget::mouseReleaseEvent(me); +} + + void TabWorkArea::paintEvent(QPaintEvent * event) { if (tabBar()->isVisible()) { QTabWidget::paintEvent(event); } else { - // Prevent the selected tab to influence the + // Prevent the selected tab to influence the // painting of the frame of the tab widget. // This is needed for gtk style in Qt. QStylePainter p(this); +#if QT_VERSION < 0x050000 QStyleOptionTabWidgetFrameV2 opt; +#else + QStyleOptionTabWidgetFrame opt; +#endif initStyleOption(&opt); opt.rect = style()->subElementRect(QStyle::SE_TabWidgetTabPane, &opt, this); @@ -1574,15 +1575,27 @@ void TabWorkArea::paintEvent(QPaintEvent * event) } +bool TabWorkArea::posIsTab(QPoint position) +{ + // tabAt returns -1 if tab does not covers position + return tabBar()->tabAt(position) > -1; +} + + void TabWorkArea::mouseDoubleClickEvent(QMouseEvent * event) { if (event->button() != Qt::LeftButton) return; + // this code chunk is unnecessary because it seems the event only makes + // it this far if it is not on a tab. I'm not sure why this is (maybe + // it is handled and ended in DragTabBar?), and thus I'm not sure if + // this is true in all cases and if it will be true in the future so I + // leave this code for now. (skostysh, 2016-07-21) + // // return early if double click on existing tabs - for (int i = 0; i < count(); ++i) - if (tabBar()->tabRect(i).contains(event->pos())) - return; + if (posIsTab(event->pos())) + return; dispatch(FuncRequest(LFUN_BUFFER_NEW)); } @@ -1607,32 +1620,45 @@ void TabWorkArea::showBar(bool show) tabBar()->setEnabled(show); tabBar()->setVisible(show); closeBufferButton->setVisible(show && lyxrc.single_close_tab_button); -#if QT_VERSION >= 0x040500 setTabsClosable(!lyxrc.single_close_tab_button); -#endif } -GuiWorkArea * TabWorkArea::currentWorkArea() +GuiWorkAreaContainer * TabWorkArea::widget(int index) const { - if (count() == 0) - return 0; + QWidget * w = QTabWidget::widget(index); + if (!w) + return nullptr; + GuiWorkAreaContainer * wac = dynamic_cast(w); + LATTEST(wac); + return wac; +} - GuiWorkArea * wa = dynamic_cast(currentWidget()); - LASSERT(wa, /**/); - return wa; + +GuiWorkAreaContainer * TabWorkArea::currentWidget() const +{ + return widget(currentIndex()); +} + + +GuiWorkArea * TabWorkArea::workArea(int index) const +{ + GuiWorkAreaContainer * w = widget(index); + if (!w) + return nullptr; + return w->workArea(); } -GuiWorkArea * TabWorkArea::workArea(int index) +GuiWorkArea * TabWorkArea::currentWorkArea() const { - return dynamic_cast(widget(index)); + return workArea(currentIndex()); } -GuiWorkArea * TabWorkArea::workArea(Buffer & buffer) +GuiWorkArea * TabWorkArea::workArea(Buffer & buffer) const { - // FIXME: this method doesn't work if we have more than work area + // FIXME: this method doesn't work if we have more than one work area // showing the same buffer. for (int i = 0; i != count(); ++i) { GuiWorkArea * wa = workArea(i); @@ -1647,18 +1673,27 @@ GuiWorkArea * TabWorkArea::workArea(Buffer & buffer) void TabWorkArea::closeAll() { while (count()) { - GuiWorkArea * wa = workArea(0); - LASSERT(wa, /**/); + QWidget * wac = widget(0); + LASSERT(wac, return); removeTab(0); - delete wa; + delete wac; } } +int TabWorkArea::indexOfWorkArea(GuiWorkArea * w) const +{ + for (int index = 0; index < count(); ++index) + if (workArea(index) == w) + return index; + return -1; +} + + bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area) { - LASSERT(work_area, /**/); - int index = indexOf(work_area); + LASSERT(work_area, return false); + int index = indexOfWorkArea(work_area); if (index == -1) return false; @@ -1677,12 +1712,13 @@ bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area) GuiWorkArea * TabWorkArea::addWorkArea(Buffer & buffer, GuiView & view) { GuiWorkArea * wa = new GuiWorkArea(buffer, view); + GuiWorkAreaContainer * wac = new GuiWorkAreaContainer(wa); wa->setUpdatesEnabled(false); // Hide tabbar if there's no tab (avoid a resize and a flashing tabbar // when hiding it again below). if (!(currentWorkArea() && currentWorkArea()->isFullScreen())) showBar(count() > 0); - addTab(wa, wa->windowTitle()); + addTab(wac, wa->windowTitle()); QObject::connect(wa, SIGNAL(titleChanged(GuiWorkArea *)), this, SLOT(updateTabTexts())); if (currentWorkArea() && currentWorkArea()->isFullScreen()) @@ -1700,13 +1736,14 @@ GuiWorkArea * TabWorkArea::addWorkArea(Buffer & buffer, GuiView & view) bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area) { LASSERT(work_area, return false); - int index = indexOf(work_area); + int index = indexOfWorkArea(work_area); if (index == -1) return false; work_area->setUpdatesEnabled(false); + QWidget * wac = widget(index); removeTab(index); - delete work_area; + delete wac; if (count()) { // make sure the next work area is enabled. @@ -1733,7 +1770,7 @@ void TabWorkArea::on_currentTabChanged(int i) GuiWorkArea * wa = workArea(i); LASSERT(wa, return); wa->setUpdatesEnabled(true); - wa->redraw(true); + wa->scheduleRedraw(true); wa->setFocus(); /// currentWorkAreaChanged(wa); @@ -1750,7 +1787,7 @@ void TabWorkArea::closeCurrentBuffer() wa = currentWorkArea(); else { wa = workArea(clicked_tab_); - LASSERT(wa, /**/); + LASSERT(wa, return); } wa->view().closeWorkArea(wa); } @@ -1763,7 +1800,7 @@ void TabWorkArea::hideCurrentTab() wa = currentWorkArea(); else { wa = workArea(clicked_tab_); - LASSERT(wa, /**/); + LASSERT(wa, return); } wa->view().hideWorkArea(wa); } @@ -1777,7 +1814,7 @@ void TabWorkArea::closeTab(int index) wa = currentWorkArea(); else { wa = workArea(index); - LASSERT(wa, /**/); + LASSERT(wa, return); } wa->view().closeWorkArea(wa); } @@ -1787,7 +1824,7 @@ void TabWorkArea::closeTab(int index) class DisplayPath { public: /// make vector happy - DisplayPath() {} + DisplayPath() : tab_(-1), dottedPrefix_(false) {} /// DisplayPath(int tab, FileName const & filename) : tab_(tab) @@ -1817,7 +1854,7 @@ public: if (!dotted) { if (dottedPrefix_ && !prefix_.isEmpty()) - prefix_ += ".../"; + prefix_ += ellipsisSlash_; prefix_ += postfix_.front() + "/"; } dottedPrefix_ = dotted && !prefix_.isEmpty(); @@ -1830,7 +1867,7 @@ public: return filename_; bool dots = dottedPrefix_ || !postfix_.isEmpty(); - return prefix_ + (dots ? ".../" : "") + filename_; + return prefix_ + (dots ? ellipsisSlash_ : "") + filename_; } /// QString forecastPathString() const @@ -1839,7 +1876,7 @@ public: return displayString(); return prefix_ - + (dottedPrefix_ ? ".../" : "") + + (dottedPrefix_ ? ellipsisSlash_ : "") + postfix_.front() + "/"; } /// @@ -1848,6 +1885,8 @@ public: int tab() const { return tab_; } private: + /// ".../" + static QString const ellipsisSlash_; /// QString prefix_; /// @@ -1863,6 +1902,9 @@ private: }; +QString const DisplayPath::ellipsisSlash_ = QString(QChar(0x2026)) + "/"; + + /// bool operator<(DisplayPath const & a, DisplayPath const & b) { @@ -1933,15 +1975,18 @@ void TabWorkArea::updateTabTexts() continue; } - // we found a non-atomic segment segStart <= sit <= it < next. + // We found a non-atomic segment + // We know that segStart <= it < next <= paths.end(). + // The assertion below tells coverity about it. + LATTEST(segStart != paths.end()); + QString dspString = segStart->forecastPathString(); + LYXERR(Debug::GUI, "first forecast found for " + << segStart->abs() << " => " << dspString); + It sit = segStart; + ++sit; // Shift path segments and hope for the best // that it makes the path more unique. somethingChanged = true; - It sit = segStart; - QString dspString = sit->forecastPathString(); - LYXERR(Debug::GUI, "first forecast found for " - << sit->abs() << " => " << dspString); - ++sit; bool moreUnique = false; for (; sit != next; ++sit) { if (sit->forecastPathString() != dspString) { @@ -1973,11 +2018,22 @@ void TabWorkArea::updateTabTexts() for (It it = paths.begin(); it != paths.end(); ++it) { int const tab_index = it->tab(); Buffer const & buf = workArea(tab_index)->bufferView().buffer(); - QString tab_text = it->displayString(); + QString tab_text = it->displayString().replace("&", "&&"); if (!buf.fileName().empty() && !buf.isClean()) tab_text += "*"; + QString tab_tooltip = it->abs(); + if (buf.hasReadonlyFlag()) { + setTabIcon(tab_index, QIcon(getPixmap("images/", "emblem-readonly", "svgz,png"))); + tab_tooltip = qt_("%1 (read only)").arg(tab_tooltip); + } else + setTabIcon(tab_index, QIcon()); + if (buf.notifiesExternalModification()) { + QString const warn = qt_("%1 (modified externally)"); + tab_tooltip = warn.arg(tab_tooltip); + tab_text += QChar(0x26a0); + } setTabText(tab_index, tab_text); - setTabToolTip(tab_index, it->abs()); + setTabToolTip(tab_index, tab_tooltip); } } @@ -1991,9 +2047,9 @@ void TabWorkArea::showContextMenu(const QPoint & pos) // show tab popup QMenu popup; - popup.addAction(QIcon(getPixmap("images/", "hidetab", "png")), + popup.addAction(QIcon(getPixmap("images/", "hidetab", "svgz,png")), qt_("Hide tab"), this, SLOT(hideCurrentTab())); - popup.addAction(QIcon(getPixmap("images/", "closetab", "png")), + popup.addAction(QIcon(getPixmap("images/", "closetab", "svgz,png")), qt_("Close tab"), this, SLOT(closeCurrentBuffer())); popup.exec(tabBar()->mapToGlobal(pos)); @@ -2018,23 +2074,8 @@ DragTabBar::DragTabBar(QWidget* parent) : QTabBar(parent) { setAcceptDrops(true); -#if QT_VERSION >= 0x040500 setTabsClosable(!lyxrc.single_close_tab_button); -#endif -} - - -#if QT_VERSION < 0x040300 -int DragTabBar::tabAt(QPoint const & position) const -{ - const int max = count(); - for (int i = 0; i < max; ++i) { - if (tabRect(i).contains(position)) - return i; - } - return -1; } -#endif void DragTabBar::mousePressEvent(QMouseEvent * event) @@ -2075,17 +2116,12 @@ void DragTabBar::mouseMoveEvent(QMouseEvent * event) mimeData->setData("action", "tab-reordering") ; drag->setMimeData(mimeData); -#if QT_VERSION >= 0x040300 // get tab pixmap as cursor QRect r = tabRect(tab); QPixmap pixmap(r.size()); render(&pixmap, - r.topLeft()); drag->setPixmap(pixmap); drag->exec(); -#else - drag->start(Qt::MoveAction); -#endif - } @@ -2112,6 +2148,58 @@ void DragTabBar::dropEvent(QDropEvent * event) } +GuiWorkAreaContainer::GuiWorkAreaContainer(GuiWorkArea * wa, QWidget * parent) + : QWidget(parent), wa_(wa) +{ + LASSERT(wa, return); + Ui::WorkAreaUi::setupUi(this); + layout()->addWidget(wa); + connect(wa, SIGNAL(titleChanged(GuiWorkArea *)), + this, SLOT(updateDisplay())); + connect(reloadPB, SIGNAL(clicked()), this, SLOT(reload())); + connect(ignorePB, SIGNAL(clicked()), this, SLOT(ignore())); + setMessageColour({notificationFrame}, {reloadPB, ignorePB}); + updateDisplay(); +} + + +void GuiWorkAreaContainer::updateDisplay() +{ + Buffer const & buf = wa_->bufferView().buffer(); + notificationFrame->setHidden(!buf.notifiesExternalModification()); + QString const label = qt_("The file %1 changed on disk.") + .arg(toqstr(buf.fileName().displayName())); + externalModificationLabel->setText(label); +} + + +void GuiWorkAreaContainer::dispatch(FuncRequest f) const +{ + lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, + wa_->bufferView().buffer().absFileName())); + lyx::dispatch(f); +} + + +void GuiWorkAreaContainer::reload() const +{ + dispatch(FuncRequest(LFUN_BUFFER_RELOAD)); +} + + +void GuiWorkAreaContainer::ignore() const +{ + dispatch(FuncRequest(LFUN_BUFFER_EXTERNAL_MODIFICATION_CLEAR)); +} + + +void GuiWorkAreaContainer::mouseDoubleClickEvent(QMouseEvent * event) +{ + // prevent TabWorkArea from opening a new buffer on double click + event->accept(); +} + + } // namespace frontend } // namespace lyx