]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiWorkArea.cpp
* fix spelling in comments to please John.
[lyx.git] / src / frontends / qt4 / GuiWorkArea.cpp
index 19998a732f667264463d682b68c7c48a73b3af8f..dde2d710cae292ed2cb0cdf1aa14b75d2f8dc220 100644 (file)
 
 #include "GuiWorkArea.h"
 
+#include "ColorCache.h"
+#include "FontLoader.h"
+#include "Menus.h"
+
 #include "Buffer.h"
+#include "BufferList.h"
 #include "BufferParams.h"
 #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 "GuiCompleter.h"
 #include "GuiKeySymbol.h"
 #include "GuiPainter.h"
 #include "GuiView.h"
 #include "Language.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
+#include "LyXVC.h"
 #include "MetricsInfo.h"
 #include "qt_helpers.h"
+#include "Text.h"
 #include "version.h"
 
 #include "graphics/GraphicsImage.h"
 #include "graphics/GraphicsLoader.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/FileName.h"
-#include "support/ForkedcallsController.h"
 
 #include "frontends/Application.h"
 #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 <QMenuBar>
 
 #include <boost/bind.hpp>
-#include <boost/current_function.hpp>
+
+#include <cmath>
 
 #ifdef Q_WS_X11
 #include <QX11Info>
@@ -67,20 +83,16 @@ int const CursorWidth = 2;
 #else
 int const CursorWidth = 1;
 #endif
+int const TabIndicatorWidth = 3;
 
 #undef KeyPress
-#undef NoModifier 
+#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)
@@ -125,44 +137,71 @@ public:
 
        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; }
@@ -171,14 +210,20 @@ public:
        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_;
 };
 
 
@@ -186,41 +231,60 @@ private:
 // cursor is at the top or bottom edge of the viewport. One scroll per 0.2 s
 SyntheticMouseEvent::SyntheticMouseEvent()
        : timeout(200), restart_timeout(true),
-         x_old(-1), y_old(-1), scrollbar_value_old(-1.0)
+         x_old(-1), y_old(-1), min_scrollbar_old(-1), max_scrollbar_old(-1)
 {}
 
 
+GuiWorkArea::GuiWorkArea(QWidget *)
+       : buffer_view_(0), lyx_view_(0),
+       cursor_visible_(false),
+       need_resize_(false), schedule_redraw_(false),
+       preedit_lines_(1), completer_(new GuiCompleter(this, this)),
+       context_target_pos_()
+{
+}
 
-// 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 & gv)
+       : buffer_view_(0), read_only_(buffer.isReadonly()), lyx_view_(0),
+       cursor_visible_(false),
+       need_resize_(false), schedule_redraw_(false),
+       preedit_lines_(1), completer_(new GuiCompleter(this, this)),
+       context_target_pos_()
+{
+       setGuiView(gv);
+       setBuffer(buffer);
+       init();
+}
 
 
-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)
+void GuiWorkArea::init()
 {
-       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());
+       // 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.
+       buffer_view_->resize(viewport()->width(), viewport()->height());
        cursor_ = new frontend::CursorWidget();
        cursor_->hide();
 
-       setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
        setAcceptDrops(true);
        setMouseTracking(true);
        setMinimumSize(100, 70);
+       setFrameStyle(QFrame::NoFrame);
        updateWindowTitle();
 
        viewport()->setAutoFillBackground(false);
@@ -228,7 +292,7 @@ GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & lv)
        // the viewport because we have our own backing pixmap.
        viewport()->setAttribute(Qt::WA_NoSystemBackground);
 
-       setFocusPolicy(Qt::WheelFocus);
+       setFocusPolicy(Qt::StrongFocus);
 
        viewport()->setCursor(Qt::IBeamCursor);
 
@@ -237,30 +301,59 @@ GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & lv)
                                        this));
 
        // Initialize the vertical Scroll Bar
-       QObject::connect(verticalScrollBar(), SIGNAL(actionTriggered(int)),
-               this, SLOT(adjustViewWithScrollBar(int)));
-
-       // disable context menu for the scrollbar
-       verticalScrollBar()->setContextMenuPolicy(Qt::NoContextMenu);
-
-       // PageStep only depends on the viewport height.
-       verticalScrollBar()->setPageStep(viewport()->height());
+       QObject::connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+               this, SLOT(scrollTo(int)));
 
-       LYXERR(Debug::GUI, BOOST_CURRENT_FUNCTION
-               << "\n viewport width\t" << viewport()->width()
-               << "\n viewport height\t" << viewport()->height());
+       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.
        setAttribute(Qt::WA_InputMethodEnabled, true);
-}
 
+       dialog_mode_ = false;
+}
 
 
 GuiWorkArea::~GuiWorkArea()
 {
        buffer_view_->buffer().workAreaManager().remove(this);
        delete buffer_view_;
+       delete cursor_;
+       // Completer has a QObject parent and is thus automatically destroyed.
+       // See #4758.
+       // delete completer_;
+}
+
+
+void GuiWorkArea::setGuiView(GuiView & gv)
+{
+       lyx_view_ = &gv;
+}
+
+
+void GuiWorkArea::setBuffer(Buffer & buffer)
+{
+       delete buffer_view_;
+       buffer_view_ = new BufferView(buffer);
+       buffer.workAreaManager().add(this);
+
+       // 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()));
+}
+
+
+void GuiWorkArea::fixVerticalScrollBar()
+{
+       if (!isFullScreen())
+               setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 }
 
 
@@ -270,6 +363,19 @@ void GuiWorkArea::close()
 }
 
 
+void GuiWorkArea::setFullScreen(bool full_screen)
+{
+       buffer_view_->setFullScreen(full_screen);
+       setFrameStyle(QFrame::NoFrame);
+       if (full_screen) {
+               setFrameStyle(QFrame::NoFrame);
+               if (lyxrc.full_screen_scrollbar)
+                       setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+       } else
+               setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+}
+
+
 BufferView & GuiWorkArea::bufferView()
 {
        return *buffer_view_;
@@ -292,11 +398,16 @@ void GuiWorkArea::stopBlinkingCursor()
 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();
 }
 
 
-void GuiWorkArea::redraw()
+void GuiWorkArea::redraw(bool update_metrics)
 {
        if (!isVisible())
                // No need to redraw in this case.
@@ -304,38 +415,50 @@ void GuiWorkArea::redraw()
 
        // No need to do anything if this is the current view. The BufferView
        // metrics are already up to date.
-       if (lyx_view_ != guiApp->currentView()) {
+       if (update_metrics || 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_) {
                hideCursor();
                showCursor();
        }
-       
+
        LYXERR(Debug::WORKAREA, "WorkArea::redraw screen");
        updateScreen();
        update(0, 0, viewport()->width(), viewport()->height());
 
+       /// \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();
+
+       setReadOnly(buffer_view_->buffer().isReadonly());
 }
 
 
 void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod)
 {
+       if (lyx_view_->isFullScreen() && lyx_view_->menuBar()->isVisible()
+               && lyxrc.full_screen_menubar) {
+               // FIXME HACK: we should not have to do this here. See related comment
+               // in GuiView::event() (QEvent::ShortcutOverride)
+               lyx_view_->menuBar()->hide();
+       }
+
        // 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_);
-       theLyXFunc().processKeySym(key, mod);
+       guiApp->processKeySym(key, mod);
 }
 
 
@@ -343,12 +466,11 @@ void GuiWorkArea::dispatch(FuncRequest const & cmd0, KeyModifier mod)
 {
        // Handle drag&drop
        if (cmd0.action == LFUN_FILE_OPEN) {
-               lyx_view_->dispatch(cmd0);
+               DispatchResult dr;
+               lyx_view_->dispatch(cmd0, dr);
                return;
        }
 
-       theLyXFunc().setLyXView(lyx_view_);
-
        FuncRequest cmd;
 
        if (cmd0.action == LFUN_MOUSE_PRESS) {
@@ -362,29 +484,31 @@ void GuiWorkArea::dispatch(FuncRequest const & cmd0, KeyModifier mod)
        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);
-               lyx_view_->updateToolbars();
+               completer_->updateVisibility(false, false);
+               lyx_view_->updateDialogs();
+               lyx_view_->updateStatusBar();
        }
 
        // 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();
        }
 }
@@ -395,8 +519,22 @@ void GuiWorkArea::resizeBufferView()
        // WARNING: Please don't put any code that will trigger a repaint here!
        // We are already inside a paint event.
        lyx_view_->setBusy(true);
+       Point p;
+       int h = 0;
+       buffer_view_->cursorPosAndHeight(p, h);
+       bool const cursor_in_view = buffer_view_->cursorInView(p, h);
        buffer_view_->resize(viewport()->width(), viewport()->height());
-       lyx_view_->updateLayoutChoice(false);
+       if (cursor_in_view)
+               buffer_view_->scrollToCursor();
+       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;
 }
@@ -407,39 +545,33 @@ void GuiWorkArea::showCursor()
        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;
-
-       Font const font = buffer_view_->cursor().getFont();
-       FontMetrics const & fm = theFontMetrics(font);
-       int const asc = fm.maxAscent();
-       int const des = fm.maxDescent();
-       int h = asc + des;
-       int x = 0;
-       int y = 0;
-       buffer_view_->cursor().getPos(x, y);
-       y -= asc;
-
-       // if it doesn't touch the screen, don't try to show it
-       if (y + h < 0 || y >= viewport()->height())
-               return;
-
-       cursor_visible_ = true;
-       showCursor(x, y, h, shape);
+               l_shape = false;
+
+       Point p;
+       int h = 0;
+       buffer_view_->cursorPosAndHeight(p, h);
+       // show cursor on screen
+       Cursor & cur = buffer_view_->cursor();
+       bool completable = cur.inset().showCompletionCursor()
+               && completer_->completionAvailable()
+               && !completer_->popupVisible()
+               && !completer_->inlineVisible();
+       if (buffer_view_->cursorInView(p, h)) {
+               cursor_visible_ = true;
+               showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
+       }
 }
 
 
@@ -459,50 +591,31 @@ void GuiWorkArea::toggleCursor()
                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()
 {
-       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_);
+       // 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
+       verticalScrollBar()->setRange(scroll_.min, scroll_.max);
+       verticalScrollBar()->setPageStep(scroll_.page_step);
+       verticalScrollBar()->setSingleStep(scroll_.single_step);
        verticalScrollBar()->setSliderPosition(scroll_.position);
-       verticalScrollBar()->setSingleStep(scroll_.lineScrollHeight);
-       verticalScrollBar()->setValue(scroll_.position);
-
-       verticalScrollBar()->setTracking(true);
 }
 
 
-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();
@@ -510,20 +623,98 @@ void GuiWorkArea::adjustViewWithScrollBar(int action)
 }
 
 
-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)
 {
-       // Repaint the whole screen.
-       // Note: this is different from redraw() as only the backing pixmap
-       // will be redrawn, which is cheap.
-       viewport()->repaint();
+       QPoint pos;
+       if (e->reason() == QContextMenuEvent::Mouse)
+               // the position is set on mouse press
+               pos = context_target_pos_;
+       else
+               pos = e->pos();
+       Cursor const & cur = buffer_view_->cursor();
+       if (e->reason() == QContextMenuEvent::Keyboard && cur.inTexted()) {
+               // Do not access the context menu of math right in front of before
+               // the cursor. This does not work when the cursor is in text.
+               Inset * inset = cur.paragraph().getInset(cur.pos());
+               if (inset && inset->asInsetMath())
+                       --pos.rx();
+               else if (cur.pos() > 0) {
+                       Inset * inset = cur.paragraph().getInset(cur.pos() - 1);
+                       if (inset)
+                               ++pos.rx();
+               }
+       }
+       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)
+{
+       LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << endl);
+       if (lyx_view_->currentWorkArea() != this)
+               lyx_view_->setCurrentWorkArea(this);
 
        startBlinkingCursor();
+       QAbstractScrollArea::focusInEvent(e);
 }
 
 
-void GuiWorkArea::focusOutEvent(QFocusEvent * /*event*/)
+void GuiWorkArea::focusOutEvent(QFocusEvent * e)
 {
+       LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << endl);
        stopBlinkingCursor();
+       QAbstractScrollArea::focusOutEvent(e);
 }
 
 
@@ -534,14 +725,19 @@ void GuiWorkArea::mousePressEvent(QMouseEvent * e)
                FuncRequest cmd(LFUN_MOUSE_TRIPLE, e->x(), e->y(),
                        q_button_state(e->button()));
                dispatch(cmd);
+               e->accept();
                return;
        }
 
+       if (e->button() == Qt::RightButton)
+               context_target_pos_ = e->pos();
+
        inputContext()->reset();
 
        FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
                q_button_state(e->button()));
        dispatch(cmd, q_key_state(e->modifiers()));
+       e->accept();
 }
 
 
@@ -553,6 +749,7 @@ void GuiWorkArea::mouseReleaseEvent(QMouseEvent * e)
        FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
                              q_button_state(e->button()));
        dispatch(cmd);
+       e->accept();
 }
 
 
@@ -561,7 +758,9 @@ 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()));
+
+       e->accept();
 
        // If we're above or below the work area...
        if (e->y() <= 20 || e->y() >= viewport()->height() - 20) {
@@ -584,11 +783,10 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e)
                        // 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
@@ -604,75 +802,128 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e)
 
        // 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
+               && synthetic_mouse_event_.min_scrollbar_old == verticalScrollBar()->minimum()
+               && synthetic_mouse_event_.max_scrollbar_old == verticalScrollBar()->maximum()) {
+               // 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_.min_scrollbar_old = verticalScrollBar()->minimum();
+       synthetic_mouse_event_.max_scrollbar_old = verticalScrollBar()->maximum();
+
+       // ... 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 const delta = ev->delta() / 120;
+       if (ev->modifiers() & Qt::ControlModifier) {
+               docstring arg = convert<docstring>(5 * delta);
+               lyx::dispatch(FuncRequest(LFUN_BUFFER_ZOOM_IN, arg));
+               return;
+       }
+
+       // Take into account the desktop wide settings.
+       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();
+
+       // Take into account the rotation.
+       scroll_value *= delta;
+
+       // Take into account user preference.
+       scroll_value = int(scroll_value * lyxrc.mouse_wheel_speed);
+       LYXERR(Debug::SCROLLING, "wheelScrollLines = " << lines
+                       << " delta = " << delta << " scroll_value = " << scroll_value
+                       << " page_step = " << page_step);
+       // Now scroll.
+       verticalScrollBar()->setValue(verticalScrollBar()->value() - scroll_value);
+
+       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();
 
        // Has anything changed on-screen since the last timeout signal
        // was received?
-       double const scrollbar_value = verticalScrollBar()->value();
-       if (scrollbar_value != synthetic_mouse_event_.scrollbar_value_old) {
-               // Yes it has. Store the params used to check this.
-               synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
-
-               // ... and dispatch the event to the LyX core.
-               dispatch(synthetic_mouse_event_.cmd);
+       int const min_scrollbar = verticalScrollBar()->minimum();
+       int const max_scrollbar = verticalScrollBar()->maximum();
+       if (min_scrollbar == synthetic_mouse_event_.min_scrollbar_old
+               && max_scrollbar == synthetic_mouse_event_.max_scrollbar_old) {
+               return;
        }
+       // Yes it has. Store the params used to check this.
+       synthetic_mouse_event_.min_scrollbar_old = min_scrollbar;
+       synthetic_mouse_event_.max_scrollbar_old = max_scrollbar;
+       // ... and dispatch the event to the LyX core.
+       dispatch(synthetic_mouse_event_.cmd);
 }
 
 
 void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
 {
+       // Do not process here some keys if dialog_mode_ is set
+       if (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->ignore();
+               return;
+       }
+
+       // 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;
+               }
+       }
+
        // 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() 
+       if (XEventsQueued(QX11Info::display(), 0) > 1 && ev->isAutoRepeat()
                        && (Qt::Key_PageDown || Qt::Key_PageUp)) {
-               LYXERR(Debug::KEY, BOOST_CURRENT_FUNCTION
-                       << "\nsystem is busy: scroll key event ignored");
+               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());
+       LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text()
+               << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key());
 
        KeySymbol sym;
        setKeySymbol(&sym, ev);
-       processKeySym(sym, q_key_state(ev->modifiers()));
+       if (sym.isOK()) {
+               processKeySym(sym, q_key_state(ev->modifiers()));
+               ev->accept();
+       } else {
+               ev->ignore();
+       }
 }
 
 
@@ -691,6 +942,7 @@ void GuiWorkArea::mouseDoubleClickEvent(QMouseEvent * ev)
                        ev->x(), ev->y(),
                        q_button_state(ev->button()));
        dispatch(cmd);
+       ev->accept();
 }
 
 
@@ -698,6 +950,7 @@ void GuiWorkArea::resizeEvent(QResizeEvent * ev)
 {
        QAbstractScrollArea::resizeEvent(ev);
        need_resize_ = true;
+       ev->accept();
 }
 
 
@@ -710,41 +963,43 @@ void GuiWorkArea::update(int x, int y, int w, int 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() << 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();
+               if (cursor_visible_) {
+                       hideCursor();
+                       showCursor();
+               }
        }
 
        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();
+               // 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(viewport()->width(), viewport()->height());
                updateScreen();
+               updateScrollbar();
                viewport()->update(QRect(0, 0, viewport()->width(), viewport()->height()));
                schedule_redraw_ = false;
                // Show the cursor immediately after the update.
@@ -753,7 +1008,7 @@ void GuiWorkArea::showCursor(int x, int y, int h, CursorShape shape)
                return;
        }
 
-       cursor_->update(x, y, h, shape);
+       cursor_->update(x, y, h, l_shape, rtl, completable);
        cursor_->show();
        viewport()->update(cursor_->rect());
 }
@@ -775,14 +1030,13 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
 
        if (!commit_string.isEmpty()) {
 
-               LYXERR(Debug::KEY, BOOST_CURRENT_FUNCTION
-                       << " preeditString =" << fromqstr(e->preeditString())
-                       << " commitString  =" << fromqstr(e->commitString()));
+               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) {
+               for (int i = 0; i != commit_string.size(); ++i) {
                        QKeyEvent ev(QEvent::KeyPress, key, Qt::NoModifier, commit_string[i]);
                        keyPressEvent(&ev);
                }
@@ -830,7 +1084,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
        // 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;
@@ -847,7 +1101,7 @@ 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) {
+               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) {
@@ -865,7 +1119,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
                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;
@@ -909,14 +1163,16 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
 
 QVariant GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const
 {
-       QRect cur_r(0,0,0,0);
+       QRect cur_r(0, 0, 0, 0);
        switch (query) {
-               // this is the CJK-specific composition window position.
+               // this is the CJK-specific composition window position and
+               // the context menu position when the menu key is pressed.
                case Qt::ImMicroFocus:
                        cur_r = cursor_->rect();
                        if (preedit_lines_ != 1)
                                cur_r.moveLeft(10);
-                       cur_r.moveBottom(cur_r.bottom() + cur_r.height() * preedit_lines_);
+                       cur_r.moveBottom(cur_r.bottom()
+                               + cur_r.height() * (preedit_lines_ - 1));
                        // return lower right of cursor in LyX.
                        return cur_r;
                default:
@@ -935,6 +1191,12 @@ void GuiWorkArea::updateWindowTitle()
        if (!fileName.empty()) {
                maximize_title = fileName.displayName(30);
                minimize_title = from_utf8(fileName.onlyFileName());
+               if (buf.lyxvc().inUse()) {
+                       if (buf.lyxvc().locker().empty())
+                               maximize_title +=  _(" (version control)");
+                       else
+                               maximize_title +=  _(" (version control, locking)");
+               }
                if (!buf.isClean()) {
                        maximize_title += _(" (changed)");
                        minimize_title += char_type('*');
@@ -954,22 +1216,117 @@ void GuiWorkArea::updateWindowTitle()
 }
 
 
-void GuiWorkArea::setReadOnly(bool)
+void GuiWorkArea::setReadOnly(bool read_only)
 {
+       if (read_only_ == read_only)
+               return;
+       read_only_ = read_only;
        updateWindowTitle();
        if (this == lyx_view_->currentWorkArea())
-               lyx_view_->updateBufferDependent(false);
+               lyx_view_->updateDialogs();
+}
+
+
+bool GuiWorkArea::isFullScreen()
+{
+       return lyx_view_ && lyx_view_->isFullScreen();
+}
+
+
+////////////////////////////////////////////////////////////////////
+//
+// EmbeddedWorkArea
+//
+////////////////////////////////////////////////////////////////////
+
+
+EmbeddedWorkArea::EmbeddedWorkArea(QWidget * w): GuiWorkArea(w)
+{
+       buffer_ = theBufferList().newBuffer(
+               support::FileName::tempName().absFilename() + "_embedded.internal");
+       buffer_->setUnnamed(true);
+       buffer_->setFullyLoaded(true);
+       setBuffer(*buffer_);
+       setDialogMode(true);
+}
+
+
+EmbeddedWorkArea::~EmbeddedWorkArea()
+{
+       // No need to destroy buffer and bufferview here, because it is done
+       // in theBuffeerList() destruction loop at application exit
+}
+
+
+void EmbeddedWorkArea::closeEvent(QCloseEvent * ev)
+{
+       disable();
+       GuiWorkArea::closeEvent(ev);
+}
+
+
+void EmbeddedWorkArea::hideEvent(QHideEvent * ev)
+{
+       disable();
+       GuiWorkArea::hideEvent(ev);
 }
 
 
+void EmbeddedWorkArea::disable()
+{
+       stopBlinkingCursor();
+       if (view().currentWorkArea() != this)
+               return;
+       // No problem if currentMainWorkArea() is 0 (setCurrentWorkArea()
+       // tolerates it and shows the background logo), what happens if
+       // an EmbeddedWorkArea is closed after closing all document WAs
+       view().setCurrentWorkArea(view().currentMainWorkArea());
+}
+
 ////////////////////////////////////////////////////////////////////
 //
-// TabWorkArea 
+// TabWorkArea
 //
 ////////////////////////////////////////////////////////////////////
 
-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
+#if QT_VERSION < 0x040500
+       lyxrc.single_close_tab_button = true;
+#endif
+
        QPalette pal = palette();
        pal.setColor(QPalette::Active, QPalette::Button,
                pal.color(QPalette::Active, QPalette::Window));
@@ -978,28 +1335,62 @@ TabWorkArea::TabWorkArea(QWidget * parent) : QTabWidget(parent)
        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);
+       closeBufferButton = new QToolButton(this);
+       closeBufferButton->setPalette(pal);
+       // FIXME: rename the icon to closebuffer.png
+       closeBufferButton->setIcon(QIcon(getPixmap("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)));
+       tb->setElideMode(Qt::ElideNone);
+       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 &)));
+#if QT_VERSION >= 0x040500
+       connect(tb, SIGNAL(tabCloseRequested(int)),
+               this, SLOT(closeTab(int)));
+#endif
+
        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);
+       closeBufferButton->setVisible(show && lyxrc.single_close_tab_button);
+#if QT_VERSION >= 0x040500
+       setTabsClosable(!lyxrc.single_close_tab_button);
+#endif
 }
 
 
@@ -1008,8 +1399,8 @@ GuiWorkArea * TabWorkArea::currentWorkArea()
        if (count() == 0)
                return 0;
 
-       GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(currentWidget()); 
-       BOOST_ASSERT(wa);
+       GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(currentWidget());
+       LASSERT(wa, /**/);
        return wa;
 }
 
@@ -1018,7 +1409,7 @@ GuiWorkArea * TabWorkArea::workArea(Buffer & buffer)
 {
        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;
        }
@@ -1030,7 +1421,7 @@ void TabWorkArea::closeAll()
 {
        while (count()) {
                GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(0));
-               BOOST_ASSERT(wa);
+               LASSERT(wa, /**/);
                removeTab(0);
                delete wa;
        }
@@ -1039,7 +1430,7 @@ void TabWorkArea::closeAll()
 
 bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area)
 {
-       BOOST_ASSERT(work_area);
+       LASSERT(work_area, /**/);
        int index = indexOf(work_area);
        if (index == -1)
                return false;
@@ -1060,21 +1451,28 @@ 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 when hiding it again).
-       showBar(count() > 0);
+       // 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 *)));
-       // Hide tabbar if there's only one tab.
-       showBar(count() > 1);
-       wa->resizeBufferView();
+               this, SLOT(updateTabTexts()));
+       if (currentWorkArea() && currentWorkArea()->isFullScreen())
+               setFullScreen(true);
+       else
+               // Hide tabbar if there's only one tab.
+               showBar(count() > 1);
+
+       updateTabTexts();
+
        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;
@@ -1086,46 +1484,407 @@ bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area)
        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
+                       // Show tabbar only if there's more than one tab.
+                       showBar(count() > 1);
+       } else
+               lastWorkAreaRemoved();
+
+       updateTabTexts();
+
        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);
-       BufferView & bv = wa->bufferView();
-       bv.cursor().fixIfBroken();
-       bv.updateMetrics();
+       LASSERT(wa, return);
        wa->setUpdatesEnabled(true);
-       wa->redraw();
+       wa->redraw(true);
        wa->setFocus();
        ///
        currentWorkAreaChanged(wa);
 
        LYXERR(Debug::GUI, "currentTabChanged " << i
-               << "File" << bv.buffer().absFileName());
+               << " File: " << wa->bufferView().buffer().absFileName());
+}
+
+
+void TabWorkArea::closeCurrentBuffer()
+{
+       GuiWorkArea * wa;
+       if (clicked_tab_ == -1)
+               wa = currentWorkArea();
+       else {
+               wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_));
+               LASSERT(wa, /**/);
+       }
+       wa->view().closeWorkArea(wa);
+}
+
+
+void TabWorkArea::hideCurrentTab()
+{
+       GuiWorkArea * wa;
+       if (clicked_tab_ == -1)
+               wa = currentWorkArea();
+       else {
+               wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_));
+               LASSERT(wa, /**/);
+       }
+       wa->view().hideWorkArea(wa);
+}
+
+
+void TabWorkArea::closeTab(int index)
+{
+       on_currentTabChanged(index);
+       GuiWorkArea * wa;
+       if (index == -1)
+               wa = currentWorkArea();
+       else {
+               wa = dynamic_cast<GuiWorkArea *>(widget(index));
+               LASSERT(wa, /**/);
+       }
+       wa->view().closeWorkArea(wa);
+}
+
+
+///
+class DisplayPath {
+public:
+       /// make vector happy
+       DisplayPath() {}
+       ///
+       DisplayPath(int tab, FileName const & filename)
+               : tab_(tab)
+       {
+               filename_ = (filename.extension() == "lyx") ?
+                       toqstr(filename.onlyFileNameWithoutExt())
+                       : toqstr(filename.onlyFileName());
+               postfix_ = toqstr(filename.absoluteFilePath()).
+                       split("/", QString::SkipEmptyParts);
+               postfix_.pop_back();
+               abs_ = toqstr(filename.absoluteFilePath());
+               dottedPrefix_ = false;
+       }
+
+       /// Absolute path for debugging.
+       QString abs() const
+       {
+               return abs_;
+       }
+       /// Add the first segment from the postfix or three dots to the prefix.
+       /// Merge multiple dot tripples. In fact dots are added lazily, i.e. only
+       /// when really needed.
+       void shiftPathSegment(bool dotted)
+       {
+               if (postfix_.count() <= 0)
+                       return;
+
+               if (!dotted) {
+                       if (dottedPrefix_ && !prefix_.isEmpty())
+                               prefix_ += ".../";
+                       prefix_ += postfix_.front() + "/";
+               }
+               dottedPrefix_ = dotted && !prefix_.isEmpty();
+               postfix_.pop_front();
+       }
+       ///
+       QString displayString() const
+       {
+               if (prefix_.isEmpty())
+                       return filename_;
+
+               bool dots = dottedPrefix_ || !postfix_.isEmpty();
+               return prefix_ + (dots ? ".../" : "") + filename_;
+       }
+       ///
+       QString forecastPathString() const
+       {
+               if (postfix_.count() == 0)
+                       return displayString();
+
+               return prefix_
+                       + (dottedPrefix_ ? ".../" : "")
+                       + postfix_.front() + "/";
+       }
+       ///
+       bool final() const { return postfix_.empty(); }
+       ///
+       int tab() const { return tab_; }
+
+private:
+       ///
+       QString prefix_;
+       ///
+       QStringList postfix_;
+       ///
+       QString filename_;
+       ///
+       QString abs_;
+       ///
+       int tab_;
+       ///
+       bool dottedPrefix_;
+};
+
+
+///
+bool operator<(DisplayPath const & a, DisplayPath const & b)
+{
+       return a.displayString() < b.displayString();
+}
+
+///
+bool operator==(DisplayPath const & a, DisplayPath const & b)
+{
+       return a.displayString() == b.displayString();
+}
+
+
+void TabWorkArea::updateTabTexts()
+{
+       size_t n = count();
+       if (n == 0)
+               return;
+       std::list<DisplayPath> paths;
+       typedef std::list<DisplayPath>::iterator It;
+
+       // collect full names first: path into postfix, empty prefix and
+       // filename without extension
+       for (size_t i = 0; i < n; ++i) {
+               GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(i));
+               FileName const fn = i_wa->bufferView().buffer().fileName();
+               paths.push_back(DisplayPath(i, fn));
+       }
+
+       // go through path segments and see if it helps to make the path more unique
+       bool somethingChanged = true;
+       bool allFinal = false;
+       while (somethingChanged && !allFinal) {
+               // adding path segments changes order
+               paths.sort();
+
+               LYXERR(Debug::GUI, "updateTabTexts() iteration start");
+               somethingChanged = false;
+               allFinal = true;
+
+               // find segments which are not unique (i.e. non-atomic)
+               It it = paths.begin();
+               It segStart = it;
+               QString segString = it->displayString();
+               for (; it != paths.end(); ++it) {
+                       // look to the next item
+                       It next = it;
+                       ++next;
+
+                       // final?
+                       allFinal = allFinal && it->final();
+
+                       LYXERR(Debug::GUI, "it = " << it->abs()
+                              << " => " << it->displayString());
+
+                       // still the same segment?
+                       QString nextString;
+                       if ((next != paths.end()
+                            && (nextString = next->displayString()) == segString))
+                               continue;
+                       LYXERR(Debug::GUI, "segment ended");
+
+                       // only a trivial one with one element?
+                       if (it == segStart) {
+                               // start new segment
+                               segStart = next;
+                               segString = nextString;
+                               continue;
+                       }
+
+                       // we found a non-atomic segment segStart <= sit <= it < next.
+                       // 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) {
+                                       LYXERR(Debug::GUI, "different forecast found for "
+                                               << sit->abs() << " => " << sit->forecastPathString());
+                                       moreUnique = true;
+                                       break;
+                               }
+                               LYXERR(Debug::GUI, "same forecast found for "
+                                       << sit->abs() << " => " << dspString);
+                       }
+
+                       // if the path segment helped, add it. Otherwise add dots
+                       bool dots = !moreUnique;
+                       LYXERR(Debug::GUI, "using dots = " << dots);
+                       for (sit = segStart; sit != next; ++sit) {
+                               sit->shiftPathSegment(dots);
+                               LYXERR(Debug::GUI, "shifting "
+                                       << sit->abs() << " => " << sit->displayString());
+                       }
+
+                       // start new segment
+                       segStart = next;
+                       segString = nextString;
+               }
+       }
+
+       // set new tab titles
+       for (It it = paths.begin(); it != paths.end(); ++it) {
+               GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(it->tab()));
+               Buffer & buf = i_wa->bufferView().buffer();
+               if (!buf.fileName().empty() && !buf.isClean())
+                       setTabText(it->tab(), it->displayString() + "*");
+               else
+                       setTabText(it->tab(), it->displayString());
+       }
 }
 
 
-void TabWorkArea::closeCurrentTab()
+void TabWorkArea::showContextMenu(const QPoint & pos)
 {
-       lyx::dispatch(FuncRequest(LFUN_BUFFER_CLOSE));
+       // which tab?
+       clicked_tab_ = static_cast<DragTabBar *>(tabBar())->tabAt(pos);
+       if (clicked_tab_ == -1)
+               return;
+
+       // show tab popup
+       QMenu popup;
+       popup.addAction(QIcon(getPixmap("images/", "hidetab", "png")),
+               qt_("Hide tab"), this, SLOT(hideCurrentTab()));
+       popup.addAction(QIcon(getPixmap("images/", "closetab", "png")),
+               qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
+       popup.exec(tabBar()->mapToGlobal(pos));
+
+       clicked_tab_ = -1;
 }
 
 
-void TabWorkArea::updateTabText(GuiWorkArea * wa)
+void TabWorkArea::moveTab(int fromIndex, int toIndex)
 {
-       int const i = indexOf(wa);
-       if (i < 0)
+       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 >= 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)
+{
+       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;
-       setTabText(i, wa->windowTitle());
+
+       // 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
 
-#include "GuiWorkArea_moc.cpp"
+#include "moc_GuiWorkArea.cpp"