]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfunc.C
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mathed31.diff
[lyx.git] / src / lyxfunc.C
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index d9f7e28269bffacf920d40246472989ef8cfa34f..8a3e757772b4d97e2dfb78401ea28609e17b7204 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -100,9 +100,6 @@ extern bool selection_possible;
 
 extern kb_keymap * toplevel_keymap;
 
-#if 0
-extern void MenuFax(Buffer *);
-#endif
 extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
@@ -134,13 +131,14 @@ LyXFunc::LyXFunc(LyXView * o)
 // a moveCursorUpdate to some of the functions that updated the cursor, but
 // that did not show its new position.
 inline
-void LyXFunc::moveCursorUpdate(bool selecting)
+void LyXFunc::moveCursorUpdate(LyXText * text, bool selecting)
 {
-       if (selecting || owner->view()->text->mark_set) {
-               owner->view()->text->SetSelection();
-               owner->view()->toggleToggle();
+       if (selecting || text->mark_set) {
+               text->SetSelection(owner->view());
+               if (text->bv_owner)
+                   owner->view()->toggleToggle();
        }
-       owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+       owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
        owner->view()->showCursor();
        
        /* ---> Everytime the cursor is moved, show the current font state. */
@@ -179,7 +177,7 @@ int LyXFunc::processKeySym(KeySym keysym, unsigned int state)
                        if (tli == tli->GetLockingInset()) {
                                owner->view()->unlockInset(tli);
                                owner->view()->text->CursorRight(owner->view());
-                               moveCursorUpdate(false);
+                               moveCursorUpdate(owner->view()->text, false);
                                owner->showState();
                        } else {
                                tli->UnlockInsetInInset(owner->view(),
@@ -358,17 +356,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                disable = !Exporter::IsExportable(buf, "dvi")
                        || lyxrc.print_command == "none";
                break;
-#if 0
-       case LFUN_FAX:
-               disable = !Exporter::IsExportable(buf, "ps")
-                       || lyxrc.fax_command == "none";
-               break;
-#else
        case LFUN_EXPORT:
                disable = argument == "fax" &&
                        !Exporter::IsExportable(buf, argument);
                break;
-#endif
        case LFUN_UNDO:
                disable = buf->undostack.empty();
                break;
@@ -446,9 +437,9 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
        case LFUN_VC_HISTORY:
                disable = !buf->lyxvc.inUse();
                break;
-       case LFUN_REF_BACK:
-               disable = owner->view()->NoSavedPositions();
-               break;
+       case LFUN_BOOKMARK_GOTO:
+               disable =  !owner->view()->
+                       isSavedPosition(strToUnsignedInt(argument));
        default:
                break;
         }
@@ -648,20 +639,20 @@ string const LyXFunc::Dispatch(int ac,
                                case LFUN_RIGHT:
                                        if (!owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
                                                owner->view()->text->CursorRight(owner->view());
-                                               moveCursorUpdate(false);
+                                               moveCursorUpdate(owner->view()->text, false);
                                                owner->showState();
                                        }
                                        return string();
                                case LFUN_LEFT: 
                                        if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
                                                owner->view()->text->CursorRight(owner->view());
-                                               moveCursorUpdate(false);
+                                               moveCursorUpdate(owner->view()->text, false);
                                                owner->showState();
                                        }
                                        return string();
                                case LFUN_DOWN:
                                        owner->view()->text->CursorDown(owner->view());
-                                       moveCursorUpdate(false);
+                                       moveCursorUpdate(owner->view()->text, false);
                                        owner->showState();
                                        return string();
                                default:
@@ -693,7 +684,7 @@ string const LyXFunc::Dispatch(int ac,
                     ltCur->SearchForward(owner->view(), searched_string))) {
 
                        // ??? What is that ???
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->update(ltCur, BufferView::SELECT|BufferView::FITCUR);
 
                        // ??? Needed ???
                        // clear the selection (if there is any) 
@@ -704,7 +695,7 @@ string const LyXFunc::Dispatch(int ac,
                        if (action == LFUN_WORDFINDFORWARD ) 
                                owner->view()->text->CursorRightOneWord(owner->view());
                        owner->view()->text->FinishUndo();
-                       moveCursorUpdate(false);
+                       moveCursorUpdate(owner->view()->text, false);
 
                        // ??? Needed ???
                        // set the new selection 
@@ -720,7 +711,8 @@ string const LyXFunc::Dispatch(int ac,
        case LFUN_PREFIX:
        {
                if (owner->view()->available()) {
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR);
                }
                string buf;
                keyseq.print(buf, true);
@@ -766,8 +758,8 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_APPENDIX:
                if (owner->view()->available()) {
-                       owner->view()->text->toggleAppendix(owner->view());
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       text->toggleAppendix(owner->view());
+                       owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
                break;
 
@@ -833,12 +825,6 @@ string const LyXFunc::Dispatch(int ac,
                owner->getDialogs()->showPrint();
                break;
 
-#if 0
-       case LFUN_FAX:
-               MenuFax(owner->buffer());
-               break;
-#endif
-               
        case LFUN_EXPORT:
                Exporter::Export(owner->buffer(), argument, false);
                break;
@@ -1178,7 +1164,7 @@ string const LyXFunc::Dispatch(int ac,
                
        case LFUN_VC_HISTORY:
        {
-               owner->buffer()->lyxvc.showLog();
+               owner->getDialogs()->showVCLogFile();
                break;
        }
        
@@ -1216,7 +1202,7 @@ string const LyXFunc::Dispatch(int ac,
                break;
 
        case LFUN_LATEX_LOG:
-               ShowLatexLog();
+               owner->getDialogs()->showLogFile();
                break;
                
        case LFUN_LAYOUTNO:
@@ -1270,11 +1256,13 @@ string const LyXFunc::Dispatch(int ac,
                if (current_layout != layout.second) {
                        owner->view()->hideCursor();
                        current_layout = layout.second;
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR);
                        owner->view()->text->
                                SetLayout(owner->view(), layout.second);
                        owner->setLayout(layout.second);
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        owner->view()->setState();
                }
        }
@@ -1379,28 +1367,28 @@ string const LyXFunc::Dispatch(int ac,
                break;
                
        case LFUN_UPCASE_WORD:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->ChangeWordCase(owner->view(), LyXText::text_uppercase);
                if (text->inset_owner)
                    owner->view()->updateInset(text->inset_owner, true);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                break;
                
        case LFUN_LOWCASE_WORD:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->ChangeWordCase(owner->view(), LyXText::text_lowercase);
                if (text->inset_owner)
                    owner->view()->updateInset(text->inset_owner, true);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                break;
                
        case LFUN_CAPITALIZE_WORD:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->ChangeWordCase(owner->view(),
                                     LyXText::text_capitalization);
                if (text->inset_owner)
                    owner->view()->updateInset(text->inset_owner, true);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                break;
                
        case LFUN_INSERT_LABEL:
@@ -1423,11 +1411,13 @@ string const LyXFunc::Dispatch(int ac,
                }
                break;
 
-       case LFUN_REF_BACK:
-       {
-               owner->view()->restorePosition();
-       }
-       break;
+       case LFUN_BOOKMARK_SAVE:
+               owner->view()->savePosition(strToUnsignedInt(argument));
+               break;
+
+       case LFUN_BOOKMARK_GOTO:
+               owner->view()->restorePosition(strToUnsignedInt(argument));
+               break;
 
        case LFUN_REF_GOTO:
        {
@@ -1435,12 +1425,14 @@ string const LyXFunc::Dispatch(int ac,
                if (label.empty()) {
                        InsetRef * inset = 
                                static_cast<InsetRef*>(getInsetByCode(Inset::REF_CODE));
-                       if (inset)
+                       if (inset) {
                                 label = inset->getContents();
+                               owner->view()->savePosition(0);
+                       }
                }
                
                if (!label.empty()) {
-                       owner->view()->savePosition();
+                       //owner->view()->savePosition(0);
                        if (!owner->view()->gotoLabel(label))
                                WriteAlert(_("Error"), 
                                           _("Couldn't find this label"), 
@@ -1464,8 +1456,8 @@ string const LyXFunc::Dispatch(int ac,
                LyXText * tmptext = owner->view()->text;
                bool is_rtl = tmptext->cursor.par()->isRightToLeftPar(owner->buffer()->params);
                if (!tmptext->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                if (is_rtl)
                        tmptext->CursorLeft(owner->view(), false);
                if (tmptext->cursor.pos() < tmptext->cursor.par()->Last()
@@ -1489,7 +1481,7 @@ string const LyXFunc::Dispatch(int ac,
                if (!is_rtl)
                        tmptext->CursorRight(owner->view(), false);
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
        }
        break;
@@ -1500,8 +1492,9 @@ string const LyXFunc::Dispatch(int ac,
                // it simpler? (Lgb)
                LyXText * txt = owner->view()->text;
                bool is_rtl = txt->cursor.par()->isRightToLeftPar(owner->buffer()->params);
-               if (!txt->mark_set) owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               if (!txt->mark_set)
+                       owner->view()->beforeChange(txt);
+               owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                LyXCursor cur = txt->cursor;
                if (!is_rtl)
                        txt->CursorLeft(owner->view(), false);
@@ -1530,327 +1523,326 @@ string const LyXFunc::Dispatch(int ac,
                        txt->CursorRight(owner->view(), false);
 
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
        }
        break;
                
        case LFUN_UP:
-               if (!owner->view()->text->mark_set) owner->view()->beforeChange();
-               owner->view()->update(BufferView::UPDATE);
+               if (!owner->view()->text->mark_set)
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorUp(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_DOWN:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::UPDATE);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorDown(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
 
        case LFUN_UP_PARAGRAPH:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::UPDATE);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorUpParagraph(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_DOWN_PARAGRAPH:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::UPDATE);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->text->CursorDownParagraph(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_PRIOR:
                if (!text->mark_set)
-                   owner->view()->beforeChange();
-               owner->view()->update(BufferView::UPDATE);
+                   owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->cursorPrevious(text);
                owner->view()->text->FinishUndo();
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-                   moveCursorUpdate(false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_NEXT:
                if (!text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::UPDATE);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::UPDATE);
                owner->view()->cursorNext(text);
                owner->view()->text->FinishUndo();
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-                   moveCursorUpdate(false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_HOME:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_END:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorEnd(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_SHIFT_TAB:
        case LFUN_TAB:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorTab(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_WORDRIGHT:
                if (!text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(text);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
                        text->CursorLeftOneWord(owner->view());
                else
                        text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-               moveCursorUpdate(false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_WORDLEFT:
                if (!text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(text);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
                        text->CursorRightOneWord(owner->view());
                else
                        text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-               moveCursorUpdate(false);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
        case LFUN_BEGINNINGBUF:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorTop(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
                
        case LFUN_ENDBUF:
                if (!owner->view()->text->mark_set)
-                       owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(owner->view()->text);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorBottom(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                break;
 
       
                /* cursor selection ---------------------------- */
        case LFUN_RIGHTSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
                        owner->view()->text->CursorLeft(owner->view());
                else
                        owner->view()->text->CursorRight(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
                
        case LFUN_LEFTSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
                        owner->view()->text->CursorRight(owner->view());
                else
                        owner->view()->text->CursorLeft(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
                
        case LFUN_UPSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorUp(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
                
        case LFUN_DOWNSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorDown(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
 
        case LFUN_UP_PARAGRAPHSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorUpParagraph(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
                
        case LFUN_DOWN_PARAGRAPHSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorDownParagraph(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
                
        case LFUN_PRIORSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->cursorPrevious(text);
                owner->view()->text->FinishUndo();
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-                   moveCursorUpdate(true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
        case LFUN_NEXTSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->cursorNext(text);
                owner->view()->text->FinishUndo();
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, false);
-               else
-                   moveCursorUpdate(true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
        case LFUN_HOMESEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-               owner->view()->text->CursorHome(owner->view());
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
+               text->CursorHome(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
        case LFUN_ENDSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-               owner->view()->text->CursorEnd(owner->view());
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
+               text->CursorEnd(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
        case LFUN_WORDRIGHTSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
-               if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-                       owner->view()->text->CursorLeftOneWord(owner->view());
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
+               if (text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
+                       text->CursorLeftOneWord(owner->view());
                else
-                       owner->view()->text->CursorRightOneWord(owner->view());
+                       text->CursorRightOneWord(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
        case LFUN_WORDLEFTSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                if (owner->view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params))
-                       owner->view()->text->CursorRightOneWord(owner->view());
+                       text->CursorRightOneWord(owner->view());
                else
-                       owner->view()->text->CursorLeftOneWord(owner->view());
+                       text->CursorLeftOneWord(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(text, true);
                owner->showState();
                break;
                
        case LFUN_BEGINNINGBUFSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               if (text->inset_owner)
+                   break;
+               owner->view()->update(owner->view()->text, BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorTop(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
                
        case LFUN_ENDBUFSEL:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               if (text->inset_owner)
+                   break;
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR);
                owner->view()->text->CursorBottom(owner->view());
                owner->view()->text->FinishUndo();
-               moveCursorUpdate(true);
+               moveCursorUpdate(owner->view()->text, true);
                owner->showState();
                break;
 
                // --- text changing commands ------------------------
        case LFUN_BREAKLINE:
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                owner->view()->text->InsertChar(owner->view(), LyXParagraph::META_NEWLINE);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               moveCursorUpdate(false);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               moveCursorUpdate(owner->view()->text, false);
                break;
                
        case LFUN_PROTECTEDSPACE:
        {
                LyXLayout const & style =
                        textclasslist.Style(owner->view()->buffer()->params.textclass,
-                                           owner->view()->text->cursor.par()->GetLayout());
+                                           text->cursor.par()->GetLayout());
 
                if (style.free_spacing) {
-                       owner->view()->text->InsertChar(owner->view(), ' ');
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       text->InsertChar(owner->view(), ' ');
+                       owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                } else {
-                       owner->view()->protectedBlank();
+                       owner->view()->protectedBlank(text);
                }
-               moveCursorUpdate(false);
+               moveCursorUpdate(text, false);
        }
        break;
                
        case LFUN_SETMARK:
                if (text->mark_set) {
-                       owner->view()->beforeChange();
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->beforeChange(text);
+                       owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                        setMessage(N_("Mark removed"));
                } else {
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(text);
                        text->mark_set = 1;
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+                       owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                        setMessage(N_("Mark set"));
                }
                text->sel_cursor = text->cursor;
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
                break;
                
        case LFUN_DELETE:
@@ -1858,14 +1850,15 @@ string const LyXFunc::Dispatch(int ac,
                        owner->view()->text->Delete(owner->view());
                        owner->view()->text->sel_cursor = 
                                owner->view()->text->cursor;
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        // It is possible to make it a lot faster still
                        // just comment out the line below...
                        owner->view()->showCursor();
                } else {
                        owner->view()->cut();
                }
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
                owner->showState();
                owner->view()->setState();
                break;
@@ -1894,19 +1887,22 @@ string const LyXFunc::Dispatch(int ac,
                                                 cursor.par()->align, 
                                                 cursor.par()->labelwidthstring, 0);
                                        owner->view()->text->CursorLeft(owner->view());
-                                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                                       owner->view()->update(owner->view()->text, 
+                                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                                } else {
                                        owner->view()->text->CursorLeft(owner->view());
                                        owner->view()->text->Delete(owner->view());
                                        owner->view()->text->sel_cursor = 
                                                owner->view()->text->cursor;
-                                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                                       owner->view()->update(owner->view()->text,
+                                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                                }
                        } else {
                                owner->view()->text->Delete(owner->view());
                                owner->view()->text->sel_cursor = 
                                        owner->view()->text->cursor;
-                               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                               owner->view()->update(owner->view()->text,
+                                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        }
                } else {
                        owner->view()->cut();
@@ -1916,69 +1912,56 @@ string const LyXFunc::Dispatch(int ac,
 
        /* -------> Delete word forward. */
        case LFUN_DELETE_WORD_FORWARD:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteWordForward(owner->view());
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               moveCursorUpdate(false);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
 
                /* -------> Delete word backward. */
        case LFUN_DELETE_WORD_BACKWARD:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteWordBackward(owner->view());
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               moveCursorUpdate(false);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               moveCursorUpdate(text, false);
                owner->showState();
                break;
                
                /* -------> Kill to end of line. */
        case LFUN_DELETE_LINE_FORWARD:
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->DeleteLineForward(owner->view());
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-               moveCursorUpdate(false);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               moveCursorUpdate(text, false);
                break;
                
                /* -------> Set mark off. */
        case LFUN_MARK_OFF:
-               owner->view()->beforeChange();
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->beforeChange(text);
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->sel_cursor = text->cursor;
                setMessage(N_("Mark off"));
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
                break;
 
                /* -------> Set mark on. */
        case LFUN_MARK_ON:
-               owner->view()->beforeChange();
-               owner->view()->text->mark_set = 1;
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               owner->view()->beforeChange(text);
+               text->mark_set = 1;
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR);
                text->sel_cursor = text->cursor;
-               if (text->inset_owner)
-                   owner->view()->updateInset(text->inset_owner, true);
                setMessage(N_("Mark on"));
                break;
                
        case LFUN_BACKSPACE:
        {
                if (!owner->view()->text->selection) {
-#if 0
-                       if (owner->getIntl()->getTrans()->backspace()) {
-#else
                        if (owner->getIntl()->getTrans().backspace()) {
-#endif
                                owner->view()->text->Backspace(owner->view());
                                owner->view()->text->sel_cursor = 
                                        owner->view()->text->cursor;
-                               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                               owner->view()->update(owner->view()->text,
+                                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                                // It is possible to make it a lot faster still
                                // just comment out the line below...
                                owner->view()->showCursor();
@@ -2010,12 +1993,14 @@ string const LyXFunc::Dispatch(int ac,
                                         VSpace(VSpace::NONE), cursor.par()->added_space_bottom,
                                         cursor.par()->align, 
                                         cursor.par()->labelwidthstring, 0);
-                               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                               owner->view()->update(owner->view()->text,
+                                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        } else {
                                owner->view()->text->Backspace(owner->view());
                                owner->view()->text->sel_cursor 
                                        = cursor;
-                               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                               owner->view()->update(owner->view()->text,
+                                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        }
                } else
                        owner->view()->cut();
@@ -2024,9 +2009,10 @@ string const LyXFunc::Dispatch(int ac,
 
        case LFUN_BREAKPARAGRAPH:
        {
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                owner->view()->text->BreakParagraph(owner->view(), 0);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner->view()->text->sel_cursor = 
                        owner->view()->text->cursor;
                owner->view()->setState();
@@ -2036,9 +2022,10 @@ string const LyXFunc::Dispatch(int ac,
 
        case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
        {
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                owner->view()->text->BreakParagraph(owner->view(), 1);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner->view()->text->sel_cursor = 
                        owner->view()->text->cursor;
                owner->view()->setState();
@@ -2054,7 +2041,7 @@ string const LyXFunc::Dispatch(int ac,
                
                LyXCursor cursor = owner->view()->text->cursor;
                
-               owner->view()->beforeChange();
+               owner->view()->beforeChange(owner->view()->text);
                if (cursor.pos() == 0) {
                        if (cursor.par()->added_space_top == VSpace(VSpace::NONE)) {
                                owner->view()->text->SetParagraph
@@ -2074,7 +2061,8 @@ string const LyXFunc::Dispatch(int ac,
                        //owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
 
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner->view()->text->sel_cursor = cursor;
                owner->view()->setState();
                owner->showState();
@@ -2121,16 +2109,17 @@ string const LyXFunc::Dispatch(int ac,
                if (cur_spacing != new_spacing || cur_value != new_value) {
                        par->spacing.set(new_spacing, new_value);
                        owner->view()->text->RedoParagraph(owner->view());
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
        }
        break;
        
        case LFUN_QUOTE:
-               owner->view()->beforeChange();
-               owner->view()->text->InsertChar(owner->view(), '\"');  // This " matches the single quote in the code
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-                moveCursorUpdate(false);
+               owner->view()->beforeChange(text);
+               text->InsertChar(owner->view(), '\"');  // This " matches the single quote in the code
+               owner->view()->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                moveCursorUpdate(text, false);
                break;
 
        case LFUN_HTMLURL:
@@ -2438,15 +2427,9 @@ string const LyXFunc::Dispatch(int ac,
                if (keyseq.length == -1 && keyseq.getiso() != 0) 
                        c = keyseq.getiso();
 
-#if 0
-               owner->getIntl()->getTrans()->
-                       deadkey(c, get_accent(action).accent, 
-                               owner->view()->text);
-#else
                owner->getIntl()->getTrans()
                        .deadkey(c, get_accent(action).accent, 
                                owner->view()->text);
-#endif
                
                // Need to reset, in case the minibuffer calls these
                // actions
@@ -2454,7 +2437,8 @@ string const LyXFunc::Dispatch(int ac,
                keyseq.length = 0;
                
                // copied verbatim from do_accent_char
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
                owner->view()->text->sel_cursor = 
                        owner->view()->text->cursor;
@@ -2747,17 +2731,35 @@ string const LyXFunc::Dispatch(int ac,
        }
        break;
 
-       case LFUN_CHILDINSERT:
+       case LFUN_CHILD_CREATE:
        {
-               InsetCommandParams p( "include", argument );
-               Inset * inset = new InsetInclude(p, *owner->buffer());
-               if (owner->view()->insertInset(inset, "Standard", true))
-                       inset->Edit(owner->view(), 0, 0, 0);
-               else
-                       delete inset;
+               InsetCommandParams p("include");
+ 
+               if (!argument.empty()) {
+                       if (contains(argument, "|")) {
+                               p.setContents(token(argument, '|', 0));
+                               p.setOptions(token(argument, '|', 1));
+                       } else
+                               p.setContents(argument);
+                       Dispatch(LFUN_CHILD_INSERT, p.getAsString());
+               } else
+                       owner->getDialogs()->createInclude(p.getAsString());
        }
        break;
 
+       case LFUN_CHILD_INSERT:
+       {
+               InsetCommandParams p;
+               p.setFromString(argument);
+
+               InsetInclude * inset = new InsetInclude(p, *owner->buffer());
+               if (!owner->view()->insertInset(inset))
+                       delete inset;
+               else
+                       owner->view()->updateInset(inset, true);
+       }
+       break; 
+
        case LFUN_CHILDOPEN:
        {
                string const filename =
@@ -2765,7 +2767,7 @@ string const LyXFunc::Dispatch(int ac,
                                    OnlyPath(owner->buffer()->fileName()));
                setMessage(N_("Opening child document ") +
                           MakeDisplayPath(filename) + "...");
-               owner->view()->savePosition();
+               owner->view()->savePosition(0);
                if (bufferlist.exists(filename))
                        owner->view()->buffer(bufferlist.getBuffer(filename));
                else
@@ -2799,7 +2801,8 @@ string const LyXFunc::Dispatch(int ac,
                        break;
                }
                owner->view()->text->InsertFootnoteEnvironment(owner->view(), kind);
-               owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               owner->view()->update(owner->view()->text,
+                                     BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner->view()->setState();
        }
        break;
@@ -2831,11 +2834,12 @@ string const LyXFunc::Dispatch(int ac,
                        owner->view()->text->InsertChar(owner->view(), argument[i]);
                        // This needs to be in the loop, or else we
                        // won't break lines correctly. (Asger)
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
                owner->view()->text->sel_cursor = 
                        owner->view()->text->cursor;
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
 
                // real_current_font.number can change so we need to 
                // update the minibuffer
@@ -2872,11 +2876,12 @@ string const LyXFunc::Dispatch(int ac,
                        ::strftime(datetmp, 32, arg.c_str(), now_tm);
                for (int i = 0; i < datetmp_len; i++) {
                        owner->view()->text->InsertChar(owner->view(), datetmp[i]);
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                }
 
                owner->view()->text->sel_cursor = owner->view()->text->cursor;
-               moveCursorUpdate(false);
+               moveCursorUpdate(owner->view()->text, false);
        }
        break;
 
@@ -2954,35 +2959,29 @@ string const LyXFunc::Dispatch(int ac,
                        if (lyxrc.auto_region_delete) {
                                if (owner->view()->text->selection){
                                        owner->view()->text->CutSelection(owner->view(), false);
-                                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                                       owner->view()->update(owner->view()->text,
+                                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                                }
                        }
                        
-                       owner->view()->beforeChange();
+                       owner->view()->beforeChange(owner->view()->text);
                        LyXFont const old_font(owner->view()->text->real_current_font);
                        for (string::size_type i = 0;
                             i < argument.length(); ++i) {
                                if (greek_kb_flag) {
                                        if (!math_insert_greek(owner->view(),
                                                               argument[i]))
-#if 0
-                                               owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
                                                owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
                                } else
-#if 0
-                                       owner->getIntl()->getTrans()->TranslateAndInsert(argument[i], owner->view()->text);
-#else
                                        owner->getIntl()->getTrans().TranslateAndInsert(argument[i], owner->view()->text);
-#endif
                        }
 
-                       owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       owner->view()->update(owner->view()->text,
+                                             BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 
                        owner->view()->text->sel_cursor = 
                                owner->view()->text->cursor;
-                       moveCursorUpdate(false);
+                       moveCursorUpdate(owner->view()->text, false);
 
                        // real_current_font.number can change so we need to
                        // update the minibuffer
The LyX Source Repository