don't rm emergency saves ever

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 878a7e59752774e0fa1dead3ce044aebd7bd712e..eafdf9d1377f1807c74930bda3497ae10a96cc6d 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -57,7 +57,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/signals/connection.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <unistd.h>
 #include <sys/wait.h>
@@ -72,6 +72,7 @@ using std::make_pair;
 using std::min;
 
 using lyx::pos_type;
+using namespace bv_funcs;
 
 extern BufferList bufferlist;
 
@@ -186,7 +187,7 @@ void BufferView::Pimpl::buffer(Buffer * b)
                // FIXME: needed when ?
                bv_->text->top_y(screen().topCursorVisible(bv_->text->cursor, bv_->text->top_y()));
 
-               // Similarly, buffer-dependent dialogs should be updated or
+               // Buffer-dependent dialogs should be updated or
                // hidden. This should go here because some dialogs (eg ToC)
                // require bv_->text.
                owner_->getDialogs().updateBufferDependent(true);
@@ -209,6 +210,13 @@ void BufferView::Pimpl::buffer(Buffer * b)
        owner_->updateLayoutChoice();
        owner_->updateWindowTitle();
 
+       if (buffer_) {
+               // Don't forget to update the Layout
+               string const layoutname =
+                       bv_->text->cursor.par()->layout()->name();
+               owner_->setLayout(layoutname);
+       }
+
        if (grfx::Previews::activated() && buffer_)
                grfx::Previews::get().generateBufferPreviews(*buffer_);
 }
@@ -227,8 +235,10 @@ bool BufferView::Pimpl::fitCursor()
 
        dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
 
-       if (ret)
-               updateScrollbar();
+       // We need to always update, in case we did a
+       // paste and we stayed anchored to a row, but
+       // the actual height of the doc changed ...
+       updateScrollbar();
        return ret;
 }
 
@@ -265,11 +275,11 @@ int BufferView::Pimpl::resizeCurrentBuffer()
        owner_->message(_("Formatting document..."));
 
        if (bv_->text) {
-               par = bv_->text->cursor.par();
+               par = &*bv_->text->cursor.par();
                pos = bv_->text->cursor.pos();
-               selstartpar = bv_->text->selection.start.par();
+               selstartpar = &*bv_->text->selection.start.par();
                selstartpos = bv_->text->selection.start.pos();
-               selendpar = bv_->text->selection.end.par();
+               selendpar = &*bv_->text->selection.end.par();
                selendpos = bv_->text->selection.end.pos();
                selection = bv_->text->selection.set();
                mark_set = bv_->text->selection.mark();
@@ -327,6 +337,9 @@ int BufferView::Pimpl::resizeCurrentBuffer()
        switchKeyMap();
        owner_->busy(false);
 
+       // reset the "Formatting..." message
+       owner_->clearMessage();
+
        updateScrollbar();
 
        return 0;
@@ -364,6 +377,8 @@ void BufferView::Pimpl::scrollDocView(int value)
        if (!buffer_)
                return;
 
+       screen().hideCursor();
+
        screen().draw(bv_->text, bv_, value);
 
        if (!lyxrc.cursor_follows_scrollbar)
@@ -411,6 +426,18 @@ void BufferView::Pimpl::workAreaKeyPress(LyXKeySymPtr key,
                                         key_modifier::state state)
 {
        bv_->owner()->getLyXFunc().processKeySym(key, state);
+
+       /* This is perhaps a bit of a hack. When we move
+        * around, or type, it's nice to be able to see
+        * the cursor immediately after the keypress. So
+        * we reset the toggle timeout and force the visibility
+        * of the cursor. Note we cannot do this inside
+        * dispatch() itself, because that's called recursively.
+        */
+       if (available()) {
+               cursor_timeout.restart();
+               screen().showCursor(*bv_);
+       }
 }
 
 
@@ -443,10 +470,9 @@ void BufferView::Pimpl::selectionRequested()
 void BufferView::Pimpl::selectionLost()
 {
        if (available()) {
-               hideCursor();
+               screen().hideCursor();
                toggleSelection();
                bv_->getLyXText()->clearSelection();
-               showCursor();
                bv_->text->xsel_cache.set(false);
        }
 }
@@ -552,11 +578,7 @@ void BufferView::Pimpl::cursorToggle()
                return;
        }
 
-       if (!bv_->theLockingInset()) {
-               screen().cursorToggle(bv_);
-       } else {
-               bv_->theLockingInset()->toggleInsetCursor(bv_);
-       }
+       screen().toggleCursor(*bv_);
 
        cursor_timeout.restart();
 }
@@ -627,7 +649,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
                if (b != 0) buffer(b);
        }
 
-       Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
+       Paragraph * par = &*buffer_->getParFromID(saved_positions[i].par_id);
        if (!par)
                return;
 
@@ -685,22 +707,6 @@ void BufferView::Pimpl::insetUnlock()
 }
 
 
-void BufferView::Pimpl::showCursor()
-{
-       if (bv_->theLockingInset())
-               bv_->theLockingInset()->showInsetCursor(bv_);
-       else
-               screen().showCursor(bv_->text, bv_);
-}
-
-
-void BufferView::Pimpl::hideCursor()
-{
-       if (!bv_->theLockingInset())
-               screen().hideCursor();
-}
-
-
 void BufferView::Pimpl::toggleSelection(bool b)
 {
        if (bv_->theLockingInset())
@@ -893,7 +899,7 @@ void BufferView::Pimpl::trackChanges()
                buf->undostack.clear();
        } else {
                update(BufferView::SELECT);
-               bv_->text->setCursor(&(*buf->paragraphs.begin()), 0);
+               bv_->text->setCursor(buf->paragraphs.begin(), 0);
 #warning changes FIXME
                //moveCursorUpdate(false);
 
@@ -922,11 +928,24 @@ bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & ev_in)
        if (!available())
                return false;
 
+       screen().hideCursor();
+
        bool const res = dispatch(ev_in);
 
+       // see workAreaKeyPress
+       cursor_timeout.restart();
+       screen().showCursor(*bv_);
+
+       // FIXME: we should skip these when selecting
        bv_->owner()->updateLayoutChoice();
+       bv_->owner()->updateToolbar();
        bv_->fitCursor();
 
+       // slight hack: this is only called currently when
+       // we clicked somewhere, so we force through the display
+       // of the new status here.
+       bv_->owner()->clearMessage();
+
        return res;
 }
 
@@ -955,15 +974,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                // a tabular-inset
                break;
 
-       case LFUN_LAYOUT_COPY:
-               bv_->copyEnvironment();
-               break;
-
-       case LFUN_LAYOUT_PASTE:
-               bv_->pasteEnvironment();
-               switchKeyMap();
-               break;
-
        case LFUN_FILE_INSERT:
                MenuInsertLyXFile(ev.argument);
                break;
@@ -1141,7 +1151,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                }
        }
        break;
-       
+
        case LFUN_FLOAT_LIST:
                if (tclass.floats().typeExist(ev.argument)) {
                        Inset * inset = new InsetFloatList(ev.argument);
@@ -1154,7 +1164,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                break;
 
        case LFUN_LAYOUT_PARAGRAPH: {
-               Paragraph const * par = bv_->getLyXText()->cursor.par();
+               Paragraph const * par = &*bv_->getLyXText()->cursor.par();
                if (!par)
                        break;
 
@@ -1167,7 +1177,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
        }
 
        case LFUN_PARAGRAPH_UPDATE: {
-               Paragraph const * par = bv_->getLyXText()->cursor.par();
+               Paragraph const * par = &*bv_->getLyXText()->cursor.par();
                if (!par)
                        break;
 
@@ -1219,7 +1229,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
 
        case LFUN_ACCEPT_ALL_CHANGES: {
                update(BufferView::SELECT);
-               bv_->text->setCursor(&(*bv_->buffer()->paragraphs.begin()), 0);
+               bv_->text->setCursor(bv_->buffer()->paragraphs.begin(), 0);
 #warning FIXME changes
                //moveCursorUpdate(false);
 
@@ -1232,7 +1242,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
 
        case LFUN_REJECT_ALL_CHANGES: {
                update(BufferView::SELECT);
-               bv_->text->setCursor(&(*bv_->buffer()->paragraphs.begin()), 0);
+               bv_->text->setCursor(bv_->buffer()->paragraphs.begin(), 0);
 #warning FIXME changes
                //moveCursorUpdate(false);
 
@@ -1356,7 +1366,6 @@ void BufferView::Pimpl::updateInset(Inset * inset)
        Inset * tl_inset = inset;
        while (tl_inset->owner())
                tl_inset = tl_inset->owner();
-       hideCursor();
        if (tl_inset == inset) {
                update(BufferView::UPDATE);
                if (bv_->text->updateInset(inset)) {