]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView2.C
More fixes to insettabular/text (and some missing features added).
[lyx.git] / src / BufferView2.C
index 524a4f100189c65bc43ebc735cb3440eb7d0e6b8..218950a75c015531594202102c041360f9878f3c 100644 (file)
@@ -39,6 +39,7 @@ using std::endl;
 using std::ifstream;
 using std::vector;
 using std::find;
+using std::count;
 
 // Inserts a file into current document
 bool BufferView::insertLyXFile(string const & filen)
@@ -52,10 +53,10 @@ bool BufferView::insertLyXFile(string const & filen)
 {
        if (filen.empty()) return false;
 
-       string fname = MakeAbsPath(filen);
+       string const fname = MakeAbsPath(filen);
 
        // check if file exist
-       FileInfo fi(fname);
+       FileInfo const fi(fname);
 
        if (!fi.readable()) {
                WriteAlert(_("Error!"),
@@ -74,7 +75,7 @@ bool BufferView::insertLyXFile(string const & filen)
                return false;
        }
        
-       char c = ifs.peek();
+       char const c = ifs.peek();
        
        LyXLex lex(0, 0);
        lex.setStream(ifs);
@@ -93,6 +94,7 @@ bool BufferView::insertLyXFile(string const & filen)
        return res;
 }
 
+
 bool BufferView::removeAutoInsets()
 {
        LyXParagraph * par = buffer()->paragraph;
@@ -144,10 +146,10 @@ void BufferView::insertErrors(TeXErrors & terr)
        for (TeXErrors::Errors::const_iterator cit = terr.begin();
             cit != terr.end();
             ++cit) {
-               string desctext((*cit).error_desc);
-               string errortext((*cit).error_text);
-               string msgtxt = desctext + '\n' + errortext;
-               int errorrow = (*cit).error_in_line;
+               string const desctext((*cit).error_desc);
+               string const errortext((*cit).error_text);
+               string const msgtxt = desctext + '\n' + errortext;
+               int const errorrow = (*cit).error_in_line;
 
                // Insert error string for row number
                int tmpid = -1; 
@@ -197,14 +199,15 @@ void BufferView::setCursorFromRow(int row)
        text->SetCursor(this, texrowpar, tmppos);
 }
 
+
 bool BufferView::insertInset(Inset * inset, string const & lout,
-                        bool no_table)
+                            bool /*no_table*/)
 {
        // if we are in a locking inset we should try to insert the
        // inset there otherwise this is a illegal function now
-       if (the_locking_inset) {
-               if (the_locking_inset->InsertInsetAllowed(inset))
-                   return the_locking_inset->InsertInset(this, inset);
+       if (theLockingInset()) {
+               if (theLockingInset()->InsertInsetAllowed(inset))
+                   return theLockingInset()->InsertInset(this, inset);
                return false;
        }
 
@@ -263,10 +266,10 @@ bool BufferView::open_new_inset(UpdatableInset * new_inset)
 {
        beforeChange();
        text->FinishUndo();
-       if (!insertInset(new_inset))
+       if (!insertInset(new_inset)) {
+               delete new_inset;
                return false;
-       text->CursorLeft(this);
-       update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       }
        new_inset->Edit(this, 0, 0, 0);
        return true;
 }
@@ -282,7 +285,7 @@ bool BufferView::gotoLabel(string const & label)
        for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
             it != buffer()->inset_iterator_end(); ++it) {
                vector<string> labels = (*it)->getLabelList();
-               if ( find(labels.begin(),labels.end(),label)
+               if (find(labels.begin(),labels.end(),label)
                     != labels.end()) {
                        beforeChange();
                        text->SetCursor(this, it.getPar(), it.getPos());
@@ -440,7 +443,7 @@ void BufferView::menuUndo()
 
 void BufferView::menuRedo()
 {
-       if (the_locking_inset) {
+       if (theLockingInset()) {
                owner()->getMiniBuffer()->Set(_("Redo not yet supported in math mode"));
                return;
        }    
@@ -657,7 +660,7 @@ string const BufferView::nextWord(float & value)
 {
        if (!available()) {
                value = 1;
-               return 0;
+               return string();
        }
 
        return text->SelectNextWord(this, value);
@@ -716,11 +719,11 @@ void BufferView::replaceWord(string const & replacestring)
 
 bool BufferView::lockInset(UpdatableInset * inset)
 {
-       if (!the_locking_inset && inset) {
-               the_locking_inset = inset;
+       if (!theLockingInset() && inset) {
+               theLockingInset(inset);
                return true;
        } else if (inset) {
-           return the_locking_inset->LockInsetInInset(this, inset);
+           return theLockingInset()->LockInsetInInset(this, inset);
        }
        return false;
 }
@@ -728,25 +731,36 @@ bool BufferView::lockInset(UpdatableInset * inset)
 
 void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
-       if (the_locking_inset && available()) {
+       if (theLockingInset() && available()) {
                LyXCursor cursor = text->cursor;
                if ((cursor.pos() - 1 >= 0) &&
                    (cursor.par()->GetChar(cursor.pos() - 1) ==
                     LyXParagraph::META_INSET) &&
                    (cursor.par()->GetInset(cursor.pos() - 1) ==
-                    the_locking_inset->GetLockingInset()))
+                    theLockingInset()->GetLockingInset()))
                        text->SetCursor(this, cursor,
                                        cursor.par(), cursor.pos() - 1);
-               y += cursor.y() + the_locking_inset->InsetInInsetY();
+               LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
+               LyXText * txt = getLyXText();
+               if (theLockingInset()->GetLockingInset()->LyxCode() ==
+                   Inset::TEXT_CODE &&
+                   (txt->real_current_font.language() !=
+                    buffer()->params.language
+                    || txt->real_current_font.isVisibleRightToLeft()
+                    != buffer()->params.language->RightToLeft()))
+                       shape = (txt->real_current_font.isVisibleRightToLeft())
+                               ? LyXScreen::REVERSED_L_SHAPE
+                               : LyXScreen::L_SHAPE;
+               y += cursor.y() + theLockingInset()->InsetInInsetY();
                pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
-                                                 LyXScreen::BAR_SHAPE);
+                                                 shape);
        }
 }
 
 
 void BufferView::hideLockedInsetCursor()
 {
-       if (the_locking_inset && available()) {
+       if (theLockingInset() && available()) {
                pimpl_->screen_->HideCursor();
        }
 }
@@ -754,9 +768,9 @@ void BufferView::hideLockedInsetCursor()
 
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
-       if (the_locking_inset && available()){
-               y += text->cursor.y() + the_locking_inset->InsetInInsetY();
-               if (pimpl_->screen_->FitManualCursor(text, x, y, asc, desc))
+       if (theLockingInset() && available()) {
+               y += text->cursor.y() + theLockingInset()->InsetInInsetY();
+               if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
 }
@@ -764,13 +778,13 @@ void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 
 int BufferView::unlockInset(UpdatableInset * inset)
 {
-       if (inset && the_locking_inset == inset) {
+       if (inset && theLockingInset() == inset) {
                inset->InsetUnlock(this);
-               the_locking_inset = 0;
+               theLockingInset(0);
                text->FinishUndo();
                return 0;
-       } else if (inset && the_locking_inset &&
-                  the_locking_inset->UnlockInsetInInset(this, inset)) {
+       } else if (inset && theLockingInset() &&
+                  theLockingInset()->UnlockInsetInInset(this, inset)) {
                text->FinishUndo();
                return 0;
        }
@@ -780,7 +794,7 @@ int BufferView::unlockInset(UpdatableInset * inset)
 
 void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
 {
-       if (!the_locking_inset)
+       if (!theLockingInset())
                return; // shouldn't happen
        if (kind == Undo::EDIT) // in this case insets would not be stored!
                kind = Undo::FINISH;
@@ -804,11 +818,11 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
                return;
 
        // first check for locking insets
-       if (the_locking_inset) {
-               if (the_locking_inset == inset) {
-                       if (text->UpdateInset(this, inset)){
+       if (theLockingInset()) {
+               if (theLockingInset() == inset) {
+                       if (text->UpdateInset(this, inset)) {
                                update();
-                               if (mark_dirty){
+                               if (mark_dirty) {
                                        if (buffer()->isLyxClean())
                                                owner()->getMiniBuffer()->
                                                        setTimer(4);
@@ -817,8 +831,8 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
                                updateScrollbar();
                                return;
                        }
-               } else if (the_locking_inset->UpdateInsetInInset(this,inset)) {
-                       if (text->UpdateInset(this, the_locking_inset)) {
+               } else if (theLockingInset()->UpdateInsetInInset(this,inset)) {
+                       if (text->UpdateInset(this, theLockingInset())) {
                                update();
                                if (mark_dirty){
                                        if (buffer()->isLyxClean())
@@ -836,7 +850,7 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
        if (available()) {
                hideCursor();
                update(BufferView::UPDATE);
-               if (text->UpdateInset(this, inset)){
+               if (text->UpdateInset(this, inset)) {
                        if (mark_dirty)
                                update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        else 
@@ -846,6 +860,7 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty)
        }
 }
 
+
 bool BufferView::ChangeRefs(string const & from, string const & to)
 {
        bool flag = false;
@@ -892,3 +907,41 @@ bool BufferView::ChangeRefs(string const & from, string const & to)
        text->SetCursorIntern(this, cursor.par(), cursor.pos());
        return flag;
 }
+
+
+bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
+{
+       // Check if the label 'from' appears more than once
+       vector<string> labels = buffer()->getLabelList();
+       if (count(labels.begin(), labels.end(), from) > 1)
+               return false;
+
+       return ChangeRefs(from, to);
+}
+
+
+UpdatableInset * BufferView::theLockingInset() const
+{
+       // If NULL is not allowed we should put an Assert here. (Lgb)
+       if (text)
+               return text->the_locking_inset;
+       return 0;
+}
+
+
+void BufferView::theLockingInset(UpdatableInset * inset)
+{
+    text->the_locking_inset = inset;
+}
+
+
+LyXText * BufferView::getLyXText() const
+{
+       if (theLockingInset()) {
+               LyXText * txt = theLockingInset()->getLyXText(this);
+               if (txt)
+                       return txt;
+       }
+       return text;
+}
+