finished fixing removeAutoInsets()

[lyx.git] / src / BufferView_pimpl.C

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index ca6784f1ee74eaca260aedd67791637c4f4254d0..220390374e5b8989bf4b948f6a9abfefda0a3c84 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -28,6 +28,7 @@
 #include "gettext.h"
 #include "ParagraphParameters.h"
 #include "undo_funcs.h"
+#include "lyxtextclasslist.h"
 
 #include "frontends/Dialogs.h"
 #include "frontends/Alert.h"
@@ -70,7 +71,7 @@
 #include <ctime>
 #include <unistd.h>
 #include <sys/wait.h>
-#include <locale.h>
+#include <clocale>
 
 
 extern lyx::layout_type current_layout;
@@ -367,7 +368,9 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                bv_->theLockingInset(the_locking_inset);
        }
        bv_->text->first = screen_->topCursorVisible(bv_->text);
+#if 0
        buffer_->resizeInsets(bv_);
+#endif
        // this will scroll the screen such that the cursor becomes visible
        updateScrollbar();
        redraw();
@@ -680,25 +683,25 @@ void BufferView::Pimpl::doubleClick(int /*x*/, int /*y*/, unsigned int button)
 {
        // select a word
        if (!buffer_)
-           return;
+               return;
 
        LyXText * text = bv_->getLyXText();
 
        if (text->bv_owner && bv_->theLockingInset())
-           return;
+               return;
 
        if (screen_.get() && button == 1) {
-           if (text->bv_owner) {
-               screen_->hideCursor();
-               screen_->toggleSelection(text, bv_);
-               text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
-               screen_->toggleSelection(text, bv_, false);
-           } else {
-               text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
-           }
-           /* This will fit the cursor on the screen
-            * if necessary */
-           update(text, BufferView::SELECT|BufferView::FITCUR);
+               if (text->bv_owner) {
+                       screen_->hideCursor();
+                       screen_->toggleSelection(text, bv_);
+                       text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+                       screen_->toggleSelection(text, bv_, false);
+               } else {
+                       text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
+               }
+               /* This will fit the cursor on the screen
+                * if necessary */
+               update(text, BufferView::SELECT|BufferView::FITCUR);
        }
 }
 
@@ -715,13 +718,17 @@ void BufferView::Pimpl::tripleClick(int /*x*/, int /*y*/, unsigned int button)
            return;
 
        if (screen_.get() && (button == 1)) {
-               screen_->hideCursor();
-               screen_->toggleSelection(text, bv_);
+               if (text->bv_owner) {
+                       screen_->hideCursor();
+                       screen_->toggleSelection(text, bv_);
+               }
                text->cursorHome(bv_);
                text->selection.cursor = text->cursor;
                text->cursorEnd(bv_);
                text->setSelection(bv_);
-               screen_->toggleSelection(text, bv_, false);
+               if (text->bv_owner) {
+                       screen_->toggleSelection(text, bv_, false);
+               }
                /* This will fit the cursor on the screen
                 * if necessary */
                update(text, BufferView::SELECT|BufferView::FITCUR);
@@ -903,6 +910,8 @@ Inset * BufferView::Pimpl::checkInset(LyXText const & text, LyXCursor const & cu
        Box b(insetDimensions(text, cursor));
 
        if (!b.contained(x, y)) {
+               lyxerr[Debug::GUI] << "Missed inset at x,y " << x << "," << y 
+                       << " box " << b << endl;
                return 0;
        }
  
@@ -1554,7 +1563,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
        case LFUN_PASTESELECTION:
        {
                bool asPara = false;
-               if (argument == "paragraph") asPara = true;
+               if (argument == "paragraph")
+                       asPara = true;
                pasteClipboard(asPara);
        }
        break;
@@ -2614,13 +2624,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
                        if (cursor.par()->params().spaceTop() == VSpace(VSpace::NONE)) {
                                lt->setParagraph
                                        (bv_,
-                                        cursor.par()->params().lineTop(),      
+                                        cursor.par()->params().lineTop(),
                                         cursor.par()->params().lineBottom(),
-                                        cursor.par()->params().pagebreakTop(), 
+                                        cursor.par()->params().pagebreakTop(),
                                         cursor.par()->params().pagebreakBottom(),
                                         VSpace(VSpace::DEFSKIP), cursor.par()->params().spaceBottom(),
-                                        cursor.par()->params().spacing(), 
-                                        cursor.par()->params().align(), 
+                                        cursor.par()->params().spacing(),
+                                        cursor.par()->params().align(),
                                         cursor.par()->params().labelWidthString(), 1);
                                //update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        } 
@@ -3269,9 +3279,8 @@ void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind)
                update(lt, BufferView::SELECT|BufferView::FITCUR);
                InsetSpecialChar * new_inset = 
                        new InsetSpecialChar(kind);
-               insertInset(new_inset);
-               // Ok, what happens here if we are unable to insert
-               // the inset? Leak it?
+               if (!insertInset(new_inset))
+                       delete new_inset;
        }
 }
 
@@ -3402,8 +3411,7 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
                                return;
                        }
                } else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
-                       if (bv_->text->updateInset(bv_,
-                                                  bv_->theLockingInset())) {
+                       if (bv_->text->updateInset(bv_,  bv_->theLockingInset())) {
                                update();
                                if (mark_dirty){
                                        buffer_->markDirty();
@@ -3457,9 +3465,9 @@ void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
  
        if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
                if (bv_->text->cursor.pos() 
-                   || bv_->text->cursor.par() != bv_->text->firstParagraph()) {
+                   || bv_->text->cursor.par() != bv_->text->ownerParagraph()) {
                        LyXCursor tmp = bv_->text->cursor;
-                       bv_->text->cursor.par(bv_->text->firstParagraph());
+                       bv_->text->cursor.par(bv_->text->ownerParagraph());
                        bv_->text->cursor.pos(0);
                        if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
                                bv_->text->cursor = tmp;