#include "BufferView.h"
#include "CoordCache.h"
#include "Cursor.h"
-#include "debug.h"
#include "Font.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "GuiApplication.h"
#include "GuiKeySymbol.h"
#include "GuiPainter.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "qt_helpers.h"
+#include "Text.h"
#include "version.h"
#include "graphics/GraphicsImage.h"
#include "graphics/GraphicsLoader.h"
+#include "support/debug.h"
+#include "support/gettext.h"
#include "support/FileName.h"
-#include "support/ForkedcallsController.h"
#include "frontends/Application.h"
-#include "frontends/Dialogs.h" // only used in setReadOnly
#include "frontends/FontMetrics.h"
#include "frontends/WorkAreaManager.h"
+#include <QContextMenuEvent>
#include <QInputContext>
-#include <QLayout>
+#include <QHelpEvent>
+#ifdef Q_WS_MACX
+#include <QMacStyle>
+#endif
#include <QMainWindow>
+#include <QMenu>
#include <QPainter>
-#include <QToolButton>
#include <QPalette>
+#include <QPixmapCache>
#include <QScrollBar>
-#include <QTabBar>
#include <QTimer>
+#include <QToolButton>
+#include <QToolTip>
#include <boost/bind.hpp>
-#include <boost/current_function.hpp>
#ifdef Q_WS_X11
#include <QX11Info>
#else
int const CursorWidth = 1;
#endif
+int const TabIndicatorWidth = 3;
#undef KeyPress
#undef NoModifier
-using std::endl;
-using std::min;
-using std::max;
-using std::string;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::FileName;
-using support::ForkedcallsController;
-
/// return the LyX mouse button state from Qt's
static mouse_button::state q_button_state(Qt::MouseButton button)
void draw(QPainter & painter)
{
- if (show_ && rect_.isValid()) {
- switch (shape_) {
- case L_SHAPE:
- painter.fillRect(rect_.x(), rect_.y(), CursorWidth, rect_.height(), color_);
- painter.setPen(color_);
- painter.drawLine(rect_.bottomLeft().x() + CursorWidth, rect_.bottomLeft().y(),
- rect_.bottomRight().x(), rect_.bottomLeft().y());
- break;
-
- case REVERSED_L_SHAPE:
- painter.fillRect(rect_.x() + rect_.height() / 3, rect_.y(), CursorWidth, rect_.height(), color_);
- painter.setPen(color_);
- painter.drawLine(rect_.bottomRight().x() - CursorWidth, rect_.bottomLeft().y(),
- rect_.bottomLeft().x(), rect_.bottomLeft().y());
- break;
-
- default:
- painter.fillRect(rect_, color_);
- break;
+ if (!show_ || !rect_.isValid())
+ return;
+
+ int y = rect_.top();
+ int l = x_ - rect_.left();
+ int r = rect_.right() - x_;
+ int bot = rect_.bottom();
+
+ // draw vertica linel
+ painter.fillRect(x_, y, CursorWidth, rect_.height(), color_);
+
+ // draw RTL/LTR indication
+ painter.setPen(color_);
+ if (l_shape_) {
+ if (rtl_)
+ painter.drawLine(x_, bot, x_ - l, bot);
+ else
+ painter.drawLine(x_, bot, x_ + CursorWidth + r, bot);
+ }
+
+ // draw completion triangle
+ if (completable_) {
+ int m = y + rect_.height() / 2;
+ int d = TabIndicatorWidth - 1;
+ if (rtl_) {
+ painter.drawLine(x_ - 1, m - d, x_ - 1 - d, m);
+ painter.drawLine(x_ - 1, m + d, x_ - 1 - d, m);
+ } else {
+ painter.drawLine(x_ + CursorWidth, m - d, x_ + CursorWidth + d, m);
+ painter.drawLine(x_ + CursorWidth, m + d, x_ + CursorWidth + d, m);
}
}
}
- void update(int x, int y, int h, CursorShape shape)
+ void update(int x, int y, int h, bool l_shape,
+ bool rtl, bool completable)
{
color_ = guiApp->colorCache().get(Color_cursor);
- shape_ = shape;
- switch (shape) {
- case L_SHAPE:
- rect_ = QRect(x, y, CursorWidth + h / 3, h);
- break;
- case REVERSED_L_SHAPE:
- rect_ = QRect(x - h / 3, y, CursorWidth + h / 3, h);
- break;
- default:
- rect_ = QRect(x, y, CursorWidth, h);
- break;
+ l_shape_ = l_shape;
+ rtl_ = rtl;
+ completable_ = completable;
+ x_ = x;
+
+ // extension to left and right
+ int l = 0;
+ int r = 0;
+
+ // RTL/LTR indication
+ if (l_shape_) {
+ if (rtl)
+ l += h / 3;
+ else
+ r += h / 3;
}
+
+ // completion triangle
+ if (completable_) {
+ if (rtl)
+ l = max(l, TabIndicatorWidth);
+ else
+ r = max(r, TabIndicatorWidth);
+ }
+
+ // compute overall rectangle
+ rect_ = QRect(x - l, y, CursorWidth + r + l, h);
}
void show(bool set_show = true) { show_ = set_show; }
QRect const & rect() { return rect_; }
private:
- ///
- CursorShape shape_;
+ /// cursor 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_;
};
-// All the below connection objects are needed because of a bug in some
-// versions of GCC (<=2.96 are on the suspects list.) By having and assigning
-// to these connections we avoid a segfault upon startup, and also at exit.
-// (Lgb)
-
-static boost::signals::connection timecon;
-
-
GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & lv)
: buffer_view_(new BufferView(buffer)), lyx_view_(&lv),
- cursor_visible_(false), cursor_timeout_(400),
- need_resize_(false), schedule_redraw_(false),
- preedit_lines_(1)
+ cursor_visible_(false),
+ need_resize_(false), schedule_redraw_(false),
+ preedit_lines_(1), completer_(this)
{
buffer.workAreaManager().add(this);
// Setup the signals
- timecon = cursor_timeout_.timeout
- .connect(boost::bind(&GuiWorkArea::toggleCursor, this));
-
- cursor_timeout_.start();
+ connect(&cursor_timeout_, SIGNAL(timeout()),
+ this, SLOT(toggleCursor()));
+
+ int const time = QApplication::cursorFlashTime() / 2;
+ if (time > 0) {
+ cursor_timeout_.setInterval(time);
+ cursor_timeout_.start();
+ } else {
+ // let's initialize this just to be safe
+ cursor_timeout_.setInterval(500);
+ }
screen_ = QPixmap(viewport()->width(), viewport()->height());
cursor_ = new frontend::CursorWidget();
cursor_->hide();
- setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+ // HACK: Prevents an additional redraw when the scrollbar pops up
+ // which regularily happens on documents with more than one page.
+ // The policy should be set to "Qt::ScrollBarAsNeeded" soon.
+ // Since we have no geometry information yet, we assume that
+ // a document needs a scrollbar if there is more then four
+ // paragraph in the outermost text.
+ if (buffer.text().paragraphs().size() > 4)
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ QTimer::singleShot(50, this, SLOT(fixVerticalScrollBar()));
+
+
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setAcceptDrops(true);
setMouseTracking(true);
setMinimumSize(100, 70);
+#ifdef Q_WS_MACX
+ setFrameStyle(QFrame::NoFrame);
+#else
+ setFrameStyle(QFrame::Box);
+#endif
updateWindowTitle();
viewport()->setAutoFillBackground(false);
this));
// Initialize the vertical Scroll Bar
- QObject::connect(verticalScrollBar(), SIGNAL(actionTriggered(int)),
- this, SLOT(adjustViewWithScrollBar(int)));
+ QObject::connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+ this, SLOT(scrollTo(int)));
- // disable context menu for the scrollbar
- verticalScrollBar()->setContextMenuPolicy(Qt::NoContextMenu);
-
- // PageStep only depends on the viewport height.
- verticalScrollBar()->setPageStep(viewport()->height());
-
- LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION
- << "\n viewport width\t" << viewport()->width()
- << "\n viewport height\t" << viewport()->height()
- << endl;
+ LYXERR(Debug::GUI, "viewport width: " << viewport()->width()
+ << " viewport height: " << viewport()->height());
// Enables input methods for asian languages.
// Must be set when creating custom text editing widgets.
}
-
GuiWorkArea::~GuiWorkArea()
{
buffer_view_->buffer().workAreaManager().remove(this);
delete buffer_view_;
+ delete cursor_;
+}
+
+
+void GuiWorkArea::fixVerticalScrollBar()
+{
+ if (!isFullScreen())
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
}
}
+void GuiWorkArea::setFullScreen(bool full_screen)
+{
+ buffer_view_->setFullScreen(full_screen);
+ if (full_screen) {
+ setFrameStyle(QFrame::NoFrame);
+ if (lyxrc.full_screen_scrollbar)
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ } else {
+#ifdef Q_WS_MACX
+ setFrameStyle(QFrame::NoFrame);
+#else
+ setFrameStyle(QFrame::Box);
+#endif
+ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+ }
+}
+
+
BufferView & GuiWorkArea::bufferView()
{
return *buffer_view_;
void GuiWorkArea::startBlinkingCursor()
{
showCursor();
- cursor_timeout_.restart();
+ //we're not supposed to cache this value.
+ int const time = QApplication::cursorFlashTime() / 2;
+ if (time <= 0)
+ return;
+ cursor_timeout_.setInterval(time);
+ cursor_timeout_.start();
}
// No need to do anything if this is the current view. The BufferView
// metrics are already up to date.
- if (lyx_view_ != theApp()->currentView()) {
+ if (lyx_view_ != guiApp->currentView()
+ || lyx_view_->currentWorkArea() != this) {
// FIXME: it would be nice to optimize for the off-screen case.
buffer_view_->updateMetrics();
buffer_view_->cursor().fixIfBroken();
}
- updateScrollbar();
-
// update cursor position, because otherwise it has to wait until
// the blinking interval is over
if (cursor_visible_) {
showCursor();
}
- ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
-
- LYXERR(Debug::WORKAREA) << "WorkArea::redraw screen" << endl;
-
- int const ymin = std::max(vi.y1, 0);
- int const ymax = vi.p2 < vi.size - 1 ? vi.y2 : viewport()->height();
-
+ LYXERR(Debug::WORKAREA, "WorkArea::redraw screen");
updateScreen();
- update(0, ymin, viewport()->width(), ymax - ymin);
+ update(0, 0, viewport()->width(), viewport()->height());
- //LYXERR(Debug::WORKAREA)
- //<< " ymin = " << ymin << " width() = " << width()
-// << " ymax-ymin = " << ymax-ymin << std::endl;
+ /// \warning: scrollbar updating *must* be done after the BufferView is drawn
+ /// because \c BufferView::updateScrollbar() is called in \c BufferView::draw().
+ updateScrollbar();
+ lyx_view_->updateStatusBar();
if (lyxerr.debugging(Debug::WORKAREA))
buffer_view_->coordCache().dump();
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.
+ // we better stop the blinking cursor...
+ // the cursor gets restarted in GuiView::restartCursor()
stopBlinkingCursor();
theLyXFunc().setLyXView(lyx_view_);
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.
- if (!(cmd.action == LFUN_MOUSE_MOTION
- && cmd.button() == mouse_button::none))
+ if (notJustMovingTheMouse)
stopBlinkingCursor();
buffer_view_->mouseEventDispatch(cmd);
// Skip these when selecting
if (cmd.action != LFUN_MOUSE_MOTION) {
- lyx_view_->updateLayoutChoice(false);
+ completer_.updateVisibility(false, false);
+ lyx_view_->updateLayoutList();
lyx_view_->updateToolbars();
}
// GUI tweaks except with mouse motion with no button pressed.
- if (!(cmd.action == LFUN_MOUSE_MOTION
- && cmd.button() == mouse_button::none)) {
+ if (notJustMovingTheMouse) {
// Slight hack: this is only called currently when we
// clicked somewhere, so we force through the display
// of the new status here.
lyx_view_->clearMessage();
- // Show the cursor immediately after any operation.
+ // Show the cursor immediately after any operation
startBlinkingCursor();
}
}
// We are already inside a paint event.
lyx_view_->setBusy(true);
buffer_view_->resize(viewport()->width(), viewport()->height());
- lyx_view_->updateLayoutChoice(false);
+ updateScreen();
+
+ // Update scrollbars which might have changed due different
+ // BufferView dimension. This is especially important when the
+ // BufferView goes from zero-size to the real-size for the first time,
+ // as the scrollbar paramters are then set for the first time.
+ updateScrollbar();
+
+ lyx_view_->updateLayoutList();
lyx_view_->setBusy(false);
+ need_resize_ = false;
}
if (cursor_visible_)
return;
- CursorShape shape = BAR_SHAPE;
-
+ // RTL or not RTL
+ bool l_shape = false;
Font const & realfont = buffer_view_->cursor().real_current_font;
BufferParams const & bp = buffer_view_->buffer().params();
bool const samelang = realfont.language() == bp.language;
bool const isrtl = realfont.isVisibleRightToLeft();
- if (!samelang || isrtl != bp.language->rightToLeft()) {
- shape = L_SHAPE;
- if (isrtl)
- shape = REVERSED_L_SHAPE;
- }
+ if (!samelang || isrtl != bp.language->rightToLeft())
+ l_shape = true;
// The ERT language hack needs fixing up
if (realfont.language() == latex_language)
- shape = BAR_SHAPE;
+ l_shape = false;
Font const font = buffer_view_->cursor().getFont();
FontMetrics const & fm = theFontMetrics(font);
int h = asc + des;
int x = 0;
int y = 0;
- buffer_view_->cursor().getPos(x, y);
+ Cursor & cur = buffer_view_->cursor();
+ cur.getPos(x, y);
y -= asc;
// if it doesn't touch the screen, don't try to show it
+ bool cursorInView = true;
if (y + h < 0 || y >= viewport()->height())
- return;
-
- cursor_visible_ = true;
- showCursor(x, y, h, shape);
+ cursorInView = false;
+
+ // show cursor on screen
+ bool completable = cur.inset().showCompletionCursor()
+ && completer_.completionAvailable()
+ && !completer_.popupVisible()
+ && !completer_.inlineVisible();
+ if (cursorInView) {
+ cursor_visible_ = true;
+ showCursor(x, y, h, l_shape, isrtl, completable);
+ }
}
hideCursor();
else
showCursor();
-
- // Use this opportunity to deal with any child processes that
- // have finished but are waiting to communicate this fact
- // to the rest of LyX.
- ForkedcallsController & fcc = ForkedcallsController::get();
- fcc.handleCompletedProcesses();
-
- cursor_timeout_.restart();
}
void GuiWorkArea::updateScrollbar()
{
- if (verticalScrollBarPolicy() != Qt::ScrollBarAlwaysOn)
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
- verticalScrollBar()->setTracking(false);
-
- buffer_view_->updateScrollbar();
ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters();
- // do what cursor movement does (some grey)
- int const h = scroll_.height + viewport()->height() / 4;
- int scroll_max_ = std::max(0, h - viewport()->height());
-
- verticalScrollBar()->setRange(0, scroll_max_);
- verticalScrollBar()->setSliderPosition(scroll_.position);
- verticalScrollBar()->setSingleStep(scroll_.lineScrollHeight);
+ // Block the scrollbar signal to prevent recursive signal/slot calling.
+ verticalScrollBar()->blockSignals(true);
+ verticalScrollBar()->setRange(scroll_.min, scroll_.max);
+ verticalScrollBar()->setPageStep(scroll_.page_step);
+ verticalScrollBar()->setSingleStep(scroll_.single_step);
verticalScrollBar()->setValue(scroll_.position);
-
- verticalScrollBar()->setTracking(true);
+ verticalScrollBar()->setSliderPosition(scroll_.position);
+ verticalScrollBar()->blockSignals(false);
}
-void GuiWorkArea::adjustViewWithScrollBar(int action)
+void GuiWorkArea::scrollTo(int value)
{
stopBlinkingCursor();
- if (action == QAbstractSlider::SliderPageStepAdd)
- buffer_view_->scrollDown(viewport()->height());
- else if (action == QAbstractSlider::SliderPageStepSub)
- buffer_view_->scrollUp(viewport()->height());
- else
- buffer_view_->scrollDocView(verticalScrollBar()->sliderPosition());
+ buffer_view_->scrollDocView(value);
if (lyxrc.cursor_follows_scrollbar) {
buffer_view_->setCursorFromScrollbar();
- lyx_view_->updateLayoutChoice(false);
+ lyx_view_->updateLayoutList();
}
// Show the cursor immediately after any operation.
startBlinkingCursor();
}
-void GuiWorkArea::focusInEvent(QFocusEvent * /*event*/)
+bool GuiWorkArea::event(QEvent * e)
+{
+ switch (e->type()) {
+ case QEvent::ToolTip: {
+ QHelpEvent * helpEvent = static_cast<QHelpEvent *>(e);
+ if (lyxrc.use_tooltip) {
+ QPoint pos = helpEvent->pos();
+ if (pos.x() < viewport()->width()) {
+ QString s = toqstr(buffer_view_->toolTip(pos.x(), pos.y()));
+ QToolTip::showText(helpEvent->globalPos(), s);
+ }
+ else
+ QToolTip::hideText();
+ }
+ // Don't forget to accept the event!
+ e->accept();
+ return true;
+ }
+
+ case QEvent::ShortcutOverride: {
+ // 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.
+ QKeyEvent * ke = static_cast<QKeyEvent*>(e);
+ if ((ke->key() != Qt::Key_Tab && ke->key() != Qt::Key_Backtab)
+ || ke->modifiers() & Qt::ControlModifier)
+ return QAbstractScrollArea::event(e);
+ keyPressEvent(ke);
+ return true;
+ }
+
+ default:
+ return QAbstractScrollArea::event(e);
+ }
+ return false;
+}
+
+
+void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
{
+ QPoint pos = e->pos();
+ docstring name = buffer_view_->contextMenu(pos.x(), pos.y());
+ if (name.empty()) {
+ QAbstractScrollArea::contextMenuEvent(e);
+ return;
+ }
+ QMenu * menu = guiApp->menus().menu(toqstr(name), *lyx_view_);
+ if (!menu) {
+ QAbstractScrollArea::contextMenuEvent(e);
+ return;
+ }
+ // Position the menu to the right.
+ // FIXME: menu position should be different for RTL text.
+ menu->exec(e->globalPos());
+ e->accept();
+}
+
+
+void GuiWorkArea::focusInEvent(QFocusEvent * e)
+{
+ if (lyx_view_->currentWorkArea() != this)
+ lyx_view_->setCurrentWorkArea(this);
+
// Repaint the whole screen.
// Note: this is different from redraw() as only the backing pixmap
// will be redrawn, which is cheap.
viewport()->repaint();
startBlinkingCursor();
+ QAbstractScrollArea::focusInEvent(e);
}
-void GuiWorkArea::focusOutEvent(QFocusEvent * /*event*/)
+void GuiWorkArea::focusOutEvent(QFocusEvent * e)
{
stopBlinkingCursor();
+ QAbstractScrollArea::focusOutEvent(e);
}
FuncRequest cmd(LFUN_MOUSE_TRIPLE, e->x(), e->y(),
q_button_state(e->button()));
dispatch(cmd);
+ e->accept();
return;
}
FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
q_button_state(e->button()));
dispatch(cmd, q_key_state(e->modifiers()));
+ e->accept();
}
FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
q_button_state(e->button()));
dispatch(cmd);
+ e->accept();
}
// 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()));
+
+ e->accept();
// If we're above or below the work area...
if (e->y() <= 20 || e->y() >= viewport()->height() - 20) {
// occurred after the one used to start the timeout
// in the first place.
return;
- else {
- synthetic_mouse_event_.restart_timeout = true;
- synthetic_mouse_event_.timeout.start();
- // Fall through to handle this event...
- }
+
+ synthetic_mouse_event_.restart_timeout = true;
+ synthetic_mouse_event_.timeout.start();
+ // Fall through to handle this event...
} else if (synthetic_mouse_event_.timeout.running()) {
// Store the event, to be possibly handled when the timeout
// Has anything changed on-screen since the last QMouseEvent
// was received?
double const scrollbar_value = verticalScrollBar()->value();
- if (e->x() != synthetic_mouse_event_.x_old ||
- e->y() != synthetic_mouse_event_.y_old ||
- scrollbar_value != synthetic_mouse_event_.scrollbar_value_old) {
- // Yes it has. Store the params used to check this.
- synthetic_mouse_event_.x_old = e->x();
- synthetic_mouse_event_.y_old = e->y();
- synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
-
- // ... and dispatch the event to the LyX core.
- dispatch(cmd);
+ if (e->x() == synthetic_mouse_event_.x_old
+ && e->y() == synthetic_mouse_event_.y_old
+ && scrollbar_value == synthetic_mouse_event_.scrollbar_value_old) {
+ // Nothing changed on-screen since the last QMouseEvent.
+ return;
}
+
+ // Yes something has changed. Store the params used to check this.
+ synthetic_mouse_event_.x_old = e->x();
+ synthetic_mouse_event_.y_old = e->y();
+ synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
+
+ // ... and dispatch the event to the LyX core.
+ dispatch(cmd);
}
-void GuiWorkArea::wheelEvent(QWheelEvent * e)
+void GuiWorkArea::wheelEvent(QWheelEvent * ev)
{
// Wheel rotation by one notch results in a delta() of 120 (see
// documentation of QWheelEvent)
- int const lines = qApp->wheelScrollLines() * e->delta() / 120;
- verticalScrollBar()->setValue(verticalScrollBar()->value() -
- lines * verticalScrollBar()->singleStep());
- adjustViewWithScrollBar();
+ int delta = ev->delta() / 120;
+ if (ev->modifiers() & Qt::ControlModifier) {
+ lyxrc.zoom -= 5 * delta;
+ if (lyxrc.zoom < 10)
+ lyxrc.zoom = 10;
+ // The global QPixmapCache is used in GuiPainter to cache text
+ // painting so we must reset it.
+ QPixmapCache::clear();
+ guiApp->fontLoader().update();
+ lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
+ } else {
+ double const lines = qApp->wheelScrollLines()
+ * lyxrc.mouse_wheel_speed * delta;
+ LYXERR(Debug::SCROLLING, "wheelScrollLines = " << qApp->wheelScrollLines()
+ << " delta = " << ev->delta() << " lines = " << lines);
+ verticalScrollBar()->setValue(verticalScrollBar()->value() -
+ int(lines * verticalScrollBar()->singleStep()));
+ }
+ ev->accept();
}
void GuiWorkArea::generateSyntheticMouseEvent()
{
-// Set things off to generate the _next_ 'pseudo' event.
+ // Set things off to generate the _next_ 'pseudo' event.
if (synthetic_mouse_event_.restart_timeout)
synthetic_mouse_event_.timeout.start();
void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
{
+ // intercept some keys if completion popup is visible
+ if (completer_.popupVisible()) {
+ switch (ev->key()) {
+ case Qt::Key_Enter:
+ case Qt::Key_Return:
+ completer_.activate();
+ ev->accept();
+ return;
+ }
+ }
+
+ // intercept keys for the completion
+ if (ev->key() == Qt::Key_Tab) {
+ completer_.tab();
+ ev->accept();
+ return;
+ }
+
+ if (completer_.popupVisible() && ev->key() == Qt::Key_Escape) {
+ completer_.hidePopup();
+ ev->accept();
+ return;
+ }
+
+ if (completer_.inlineVisible() && ev->key() == Qt::Key_Escape) {
+ completer_.hideInline();
+ ev->accept();
+ return;
+ }
+
// do nothing if there are other events
// (the auto repeated events come too fast)
// \todo FIXME: remove hard coded Qt keys, process the key binding
#ifdef Q_WS_X11
if (XEventsQueued(QX11Info::display(), 0) > 1 && ev->isAutoRepeat()
&& (Qt::Key_PageDown || Qt::Key_PageUp)) {
- LYXERR(Debug::KEY)
- << BOOST_CURRENT_FUNCTION << endl
- << "system is busy: scroll key event ignored" << endl;
+ LYXERR(Debug::KEY, "system is busy: scroll key event ignored");
ev->ignore();
return;
}
#endif
- LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
- << " count=" << ev->count()
- << " text=" << fromqstr(ev->text())
- << " isAutoRepeat=" << ev->isAutoRepeat()
- << " key=" << ev->key()
- << endl;
+ LYXERR(Debug::KEY, " count: " << ev->count()
+ << " text: " << fromqstr(ev->text())
+ << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key());
KeySymbol sym;
setKeySymbol(&sym, ev);
processKeySym(sym, q_key_state(ev->modifiers()));
+ ev->accept();
}
ev->x(), ev->y(),
q_button_state(ev->button()));
dispatch(cmd);
+ ev->accept();
}
{
QAbstractScrollArea::resizeEvent(ev);
need_resize_ = true;
+ ev->accept();
}
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() << endl;
- */
+ // LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x()
+ // << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height());
if (need_resize_) {
- verticalScrollBar()->setPageStep(viewport()->height());
screen_ = QPixmap(viewport()->width(), viewport()->height());
resizeBufferView();
- updateScreen();
hideCursor();
showCursor();
- need_resize_ = false;
}
QPainter pain(viewport());
pain.drawPixmap(rc, screen_, rc);
cursor_->draw(pain);
+ ev->accept();
}
void GuiWorkArea::updateScreen()
{
GuiPainter pain(&screen_);
- verticalScrollBar()->show();
buffer_view_->draw(pain);
}
-void GuiWorkArea::showCursor(int x, int y, int h, CursorShape shape)
+void GuiWorkArea::showCursor(int x, int y, int h,
+ bool l_shape, bool rtl, bool completable)
{
if (schedule_redraw_) {
buffer_view_->updateMetrics();
return;
}
- cursor_->update(x, y, h, shape);
+ cursor_->update(x, y, h, l_shape, rtl, completable);
cursor_->show();
viewport()->update(cursor_->rect());
}
if (!commit_string.isEmpty()) {
- LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
- << " preeditString =" << fromqstr(e->preeditString())
- << " commitString =" << fromqstr(e->commitString())
- << endl;
+ LYXERR(Debug::KEY, "preeditString: " << fromqstr(e->preeditString())
+ << " commitString: " << fromqstr(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) {
+ for (int i = 0; i != commit_string.size(); ++i) {
QKeyEvent ev(QEvent::KeyPress, key, Qt::NoModifier, commit_string[i]);
keyPressEvent(&ev);
}
// 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) {
+ 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;
// rLength : selected string length in IM.
size_t rLength = 0;
if (cursor_pos < preedit_length) {
- for (int i = 0; i < att.size(); ++i) {
+ 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) {
rLength = 0;
}
- int const right_margin = rightMargin();
+ int const right_margin = buffer_view_->rightMargin();
Painter::preedit_style ps;
// Most often there would be only one line:
preedit_lines_ = 1;
{
updateWindowTitle();
if (this == lyx_view_->currentWorkArea())
- lyx_view_->getDialogs().updateBufferDependent(false);
+ lyx_view_->updateBufferDependent(false);
+}
+
+
+bool GuiWorkArea::isFullScreen()
+{
+ return lyx_view_ && lyx_view_->isFullScreen();
}
//
////////////////////////////////////////////////////////////////////
-TabWorkArea::TabWorkArea(QWidget * parent) : QTabWidget(parent)
+#ifdef Q_WS_MACX
+class NoTabFrameMacStyle : public QMacStyle {
+public:
+ ///
+ QRect subElementRect(SubElement element, const QStyleOption * option,
+ const QWidget * widget = 0) const
+ {
+ QRect rect = QMacStyle::subElementRect(element, option, widget);
+ bool noBar = static_cast<QTabWidget const *>(widget)->count() <= 1;
+
+ // The Qt Mac style puts the contents into a 3 pixel wide box
+ // which looks very ugly and not like other Mac applications.
+ // Hence we remove this here, and moreover the 16 pixel round
+ // frame above if the tab bar is hidden.
+ if (element == QStyle::SE_TabWidgetTabContents) {
+ rect.adjust(- rect.left(), 0, rect.left(), 0);
+ if (noBar)
+ rect.setTop(0);
+ }
+
+ return rect;
+ }
+};
+
+NoTabFrameMacStyle noTabFrameMacStyle;
+#endif
+
+
+TabWorkArea::TabWorkArea(QWidget * parent)
+ : QTabWidget(parent), clicked_tab_(-1)
{
+#ifdef Q_WS_MACX
+ setStyle(&noTabFrameMacStyle);
+#endif
+
QPalette pal = palette();
pal.setColor(QPalette::Active, QPalette::Button,
pal.color(QPalette::Active, QPalette::Window));
pal.setColor(QPalette::Inactive, QPalette::Button,
pal.color(QPalette::Inactive, QPalette::Window));
- QToolButton * closeTabButton = new QToolButton(this);
- closeTabButton->setPalette(pal);
- closeTabButton->setIcon(QIcon(":/images/closetab.png"));
- closeTabButton->setText("Close");
- closeTabButton->setAutoRaise(true);
- closeTabButton->setCursor(Qt::ArrowCursor);
- closeTabButton->setToolTip(tr("Close tab"));
- closeTabButton->setEnabled(true);
-
QObject::connect(this, SIGNAL(currentChanged(int)),
this, SLOT(on_currentTabChanged(int)));
- QObject::connect(closeTabButton, SIGNAL(clicked()),
- this, SLOT(closeCurrentTab()));
- setCornerWidget(closeTabButton);
+ QToolButton * closeBufferButton = new QToolButton(this);
+ closeBufferButton->setPalette(pal);
+ // FIXME: rename the icon to closebuffer.png
+ closeBufferButton->setIcon(QIcon(":/images/closetab.png"));
+ closeBufferButton->setText("Close File");
+ closeBufferButton->setAutoRaise(true);
+ closeBufferButton->setCursor(Qt::ArrowCursor);
+ closeBufferButton->setToolTip(qt_("Close File"));
+ closeBufferButton->setEnabled(true);
+ QObject::connect(closeBufferButton, SIGNAL(clicked()),
+ this, SLOT(closeCurrentBuffer()));
+ setCornerWidget(closeBufferButton, Qt::TopRightCorner);
+
+ // setup drag'n'drop
+ QTabBar* tb = new DragTabBar;
+ connect(tb, SIGNAL(tabMoveRequested(int, int)),
+ this, SLOT(moveTab(int, int)));
+ setTabBar(tb);
+
+ // make us responsible for the context menu of the tabbar
+ tb->setContextMenuPolicy(Qt::CustomContextMenu);
+ connect(tb, SIGNAL(customContextMenuRequested(const QPoint &)),
+ this, SLOT(showContextMenu(const QPoint &)));
+
setUsesScrollButtons(true);
}
+void TabWorkArea::setFullScreen(bool full_screen)
+{
+ for (int i = 0; i != count(); ++i) {
+ if (GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i)))
+ wa->setFullScreen(full_screen);
+ }
+
+ if (lyxrc.full_screen_tabbar)
+ showBar(!full_screen && count()>1);
+}
+
+
void TabWorkArea::showBar(bool show)
{
+ tabBar()->setEnabled(show);
tabBar()->setVisible(show);
}
return 0;
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(currentWidget());
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
return wa;
}
{
for (int i = 0; i != count(); ++i) {
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
- BOOST_ASSERT(wa);
+ LASSERT(wa, return 0);
if (&wa->bufferView().buffer() == &buffer)
return wa;
}
{
while (count()) {
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(0));
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
removeTab(0);
delete wa;
}
bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area)
{
- BOOST_ASSERT(work_area);
+ LASSERT(work_area, /**/);
int index = indexOf(work_area);
if (index == -1)
return false;
}
+GuiWorkArea * TabWorkArea::addWorkArea(Buffer & buffer, GuiView & view)
+{
+ GuiWorkArea * wa = new GuiWorkArea(buffer, view);
+ 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());
+ QObject::connect(wa, SIGNAL(titleChanged(GuiWorkArea *)),
+ this, SLOT(updateTabText(GuiWorkArea *)));
+ if (currentWorkArea() && currentWorkArea()->isFullScreen())
+ setFullScreen(true);
+ else
+ // Hide tabbar if there's only one tab.
+ showBar(count() > 1);
+
+ return wa;
+}
+
+
bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area)
{
- BOOST_ASSERT(work_area);
+ LASSERT(work_area, return false);
int index = indexOf(work_area);
if (index == -1)
return false;
if (count()) {
// make sure the next work area is enabled.
currentWidget()->setUpdatesEnabled(true);
- // Hide tabbar if there's only one tab.
- showBar(count() > 1);
+ if (currentWorkArea() && currentWorkArea()->isFullScreen())
+ setFullScreen(true);
+ else
+ // Hide tabbar if there's only one tab.
+ showBar(count() > 1);
+ } else {
+ lastWorkAreaRemoved();
}
+
return true;
}
void TabWorkArea::on_currentTabChanged(int i)
{
+ // returns e.g. on application destruction
+ if (i == -1)
+ return;
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
- BOOST_ASSERT(wa);
+ LASSERT(wa, return);
BufferView & bv = wa->bufferView();
- bv.updateMetrics();
bv.cursor().fixIfBroken();
+ bv.updateMetrics();
wa->setUpdatesEnabled(true);
wa->redraw();
wa->setFocus();
///
currentWorkAreaChanged(wa);
- LYXERR(Debug::GUI) << "currentTabChanged " << i
- << "File" << bv.buffer().absFileName() << endl;
+ LYXERR(Debug::GUI, "currentTabChanged " << i
+ << "File" << bv.buffer().absFileName());
}
-void TabWorkArea::closeCurrentTab()
+void TabWorkArea::closeCurrentBuffer()
{
+ if (clicked_tab_ != -1)
+ setCurrentIndex(clicked_tab_);
+
lyx::dispatch(FuncRequest(LFUN_BUFFER_CLOSE));
}
+void TabWorkArea::closeCurrentTab()
+{
+ if (clicked_tab_ == -1)
+ removeWorkArea(currentWorkArea());
+ else {
+ GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_));
+ LASSERT(wa, /**/);
+ removeWorkArea(wa);
+ }
+}
+
+
void TabWorkArea::updateTabText(GuiWorkArea * wa)
{
int const i = indexOf(wa);
setTabText(i, wa->windowTitle());
}
+
+void TabWorkArea::showContextMenu(const QPoint & pos)
+{
+ // which tab?
+ clicked_tab_ = static_cast<DragTabBar *>(tabBar())->tabAt(pos);
+ if (clicked_tab_ != -1) {
+ // show tab popup
+ QMenu popup;
+ popup.addAction(QIcon(":/images/hidetab.png"),
+ qt_("Hide tab"), this, SLOT(closeCurrentTab()));
+ popup.addAction(QIcon(":/images/closetab.png"),
+ qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
+ popup.exec(tabBar()->mapToGlobal(pos));
+
+ clicked_tab_ = -1;
+ }
+}
+
+
+void TabWorkArea::moveTab(int fromIndex, int toIndex)
+{
+ QWidget * w = widget(fromIndex);
+ QIcon icon = tabIcon(fromIndex);
+ QString text = tabText(fromIndex);
+
+ setCurrentIndex(fromIndex);
+ removeTab(fromIndex);
+ insertTab(toIndex, w, icon, text);
+ setCurrentIndex(toIndex);
+}
+
+
+DragTabBar::DragTabBar(QWidget* parent)
+ : QTabBar(parent)
+{
+ setAcceptDrops(true);
+}
+
+
+#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)
+{
+ if (event->button() == Qt::LeftButton)
+ dragStartPos_ = event->pos();
+ QTabBar::mousePressEvent(event);
+}
+
+
+void DragTabBar::mouseMoveEvent(QMouseEvent * event)
+{
+ // If the left button isn't pressed anymore then return
+ if (!(event->buttons() & Qt::LeftButton))
+ return;
+
+ // If the distance is too small then return
+ if ((event->pos() - dragStartPos_).manhattanLength()
+ < QApplication::startDragDistance())
+ return;
+
+ // did we hit something after all?
+ int tab = tabAt(dragStartPos_);
+ if (tab == -1)
+ return;
+
+ // simulate button release to remove highlight from button
+ int i = currentIndex();
+ QMouseEvent me(QEvent::MouseButtonRelease, dragStartPos_,
+ event->button(), event->buttons(), 0);
+ QTabBar::mouseReleaseEvent(&me);
+ setCurrentIndex(i);
+
+ // initiate Drag
+ QDrag * drag = new QDrag(this);
+ QMimeData * mimeData = new QMimeData;
+ // a crude way to distinguish tab-reodering drops from other ones
+ 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
+
+}
+
+
+void DragTabBar::dragEnterEvent(QDragEnterEvent * event)
+{
+ // Only accept if it's an tab-reordering request
+ QMimeData const * m = event->mimeData();
+ QStringList formats = m->formats();
+ if (formats.contains("action")
+ && m->data("action") == "tab-reordering")
+ event->acceptProposedAction();
+}
+
+
+void DragTabBar::dropEvent(QDropEvent * event)
+{
+ int fromIndex = tabAt(dragStartPos_);
+ int toIndex = tabAt(event->pos());
+
+ // Tell interested objects that
+ if (fromIndex != toIndex)
+ tabMoveRequested(fromIndex, toIndex);
+ event->acceptProposedAction();
+}
+
+
} // namespace frontend
} // namespace lyx
projects / lyx.git / blobdiff