]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfunc.C
Point fix, earlier forgotten
[lyx.git] / src / lyxfunc.C
index db6362dd76d209d438fb8a6c89e63d14d2d0f12f..9c85a46ec617dc89dab45f3cb3b66c5af9710880 100644 (file)
@@ -1,19 +1,27 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxfunc.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Alfredo Braunstein
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Allan Rae
+ * \author Dekel Tsur
+ * \author Martin Vermeer
+ * \author Jürgen Vigna
  *
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "lyxfunc.h"
 #include "version.h"
 #include "kbmap.h"
-#include "lyxrow.h"
 #include "bufferlist.h"
 #include "buffer.h"
 #include "buffer_funcs.h"
@@ -68,6 +76,7 @@
 #include "support/lstrings.h"
 #include "support/tostr.h"
 #include "support/path.h"
+#include "support/path_defines.h"
 #include "support/lyxfunctional.h"
 
 #include <ctime>
@@ -111,25 +120,12 @@ LyXFunc::LyXFunc(LyXView * o)
 }
 
 
-inline
-LyXText * LyXFunc::TEXT(bool flag = true) const
-{
-       if (flag)
-               return view()->text;
-       return view()->getLyXText();
-}
-
-
-inline
-void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
+void LyXFunc::moveCursorUpdate()
 {
-       if (selecting || TEXT(flag)->selection.mark()) {
-               TEXT(flag)->setSelection();
-               if (!TEXT(flag)->isInInset())
-                   view()->toggleToggle();
-       }
-       view()->update(TEXT(flag), BufferView::SELECT);
-
+       LyXText * lt = view()->text;
+       if (lt->selection.mark())
+               lt->setSelection();
+       view()->update();
        view()->switchKeyMap();
 }
 
@@ -143,13 +139,13 @@ void LyXFunc::handleKeyFunc(kb_action action)
        }
 
        owner->getIntl().getTransManager()
-               .deadkey(c, get_accent(action).accent, TEXT(false));
+               .deadkey(c, get_accent(action).accent, view()->getLyXText());
        // Need to clear, in case the minibuffer calls these
        // actions
        keyseq.clear();
        // copied verbatim from do_accent_char
-       view()->update(TEXT(false), BufferView::SELECT);
-       TEXT(false)->selection.cursor = TEXT(false)->cursor;
+       view()->update();
+       view()->getLyXText()->selection.cursor = view()->getLyXText()->cursor;
 }
 
 
@@ -323,7 +319,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
        switch (ev.action) {
        case LFUN_EXPORT:
                disable = ev.argument != "custom"
-                       && !Exporter::IsExportable(buf, ev.argument);
+                       && !Exporter::IsExportable(*buf, ev.argument);
                break;
        case LFUN_UNDO:
                disable = buf->undostack.empty();
@@ -349,7 +345,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                disable = !buf->isLatex() || lyxrc.chktex_command == "none";
                break;
        case LFUN_BUILDPROG:
-               disable = !Exporter::IsExportable(buf, "program");
+               disable = !Exporter::IsExportable(*buf, "program");
                break;
 
        case LFUN_LAYOUT_TABULAR:
@@ -359,22 +355,22 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                break;
 
        case LFUN_DEPTH_MIN:
-               disable = !changeDepth(view(), TEXT(false), DEC_DEPTH, true);
+               disable = !changeDepth(view(), view()->getLyXText(), DEC_DEPTH, true);
                break;
 
        case LFUN_DEPTH_PLUS:
-               disable = !changeDepth(view(), TEXT(false), INC_DEPTH, true);
+               disable = !changeDepth(view(), view()->getLyXText(), INC_DEPTH, true);
                break;
 
        case LFUN_LAYOUT:
        case LFUN_LAYOUT_PARAGRAPH: {
-               InsetOld * inset = TEXT(false)->cursor.par()->inInset();
+               InsetOld * inset = view()->getLyXText()->cursor.par()->inInset();
                disable = inset && inset->forceDefaultParagraphs(inset);
                break;
        }
 
        case LFUN_INSET_OPTARG:
-               disable = (TEXT(false)->cursor.par()->layout()->optionalargs == 0);
+               disable = (view()->getLyXText()->cursor.par()->layout()->optionalargs == 0);
                break;
 
        case LFUN_TABULAR_FEATURE:
@@ -518,6 +514,9 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                        case InsetOld::NOTE_CODE:
                                disable = ev.argument != "note";
                                break;
+                       case InsetOld::BRANCH_CODE:
+                               disable = ev.argument != "branch";
+                               break;
                        default:
                                break;
                }
@@ -554,7 +553,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                }
 
                if (name == "print") {
-                       disable = !Exporter::IsExportable(buf, "dvi") ||
+                       disable = !Exporter::IsExportable(*buf, "dvi") ||
                                lyxrc.print_command == "none";
                } else if (name == "character") {
                        UpdatableInset * tli = view()->theLockingInset();
@@ -646,6 +645,11 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
        case LFUN_INSERT_NOTE:
                code = InsetOld::NOTE_CODE;
                break;
+       case LFUN_INSERT_BRANCH:
+               code = InsetOld::BRANCH_CODE;
+               if (buf->params.branchlist.empty())
+                       disable = true;
+               break;
        case LFUN_INSERT_LABEL:
                code = InsetOld::LABEL_CODE;
                break;
@@ -704,7 +708,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                flag.setOnOff(buf->isReadonly());
                break;
        case LFUN_APPENDIX:
-               flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+               flag.setOnOff(view()->getLyXText()->cursor.par()->params().startOfAppendix());
                break;
        case LFUN_SWITCHBUFFER:
                // toggle on the current buffer, but do not toggle off
@@ -721,7 +725,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
 
        // the font related toggles
        if (!mathcursor) {
-               LyXFont const & font = TEXT(false)->real_current_font;
+               LyXFont const & font = view()->getLyXText()->real_current_font;
                switch (ev.action) {
                case LFUN_EMPH:
                        flag.setOnOff(font.emph() == LyXFont::ON);
@@ -862,8 +866,8 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
 
        if (view()->available() && view()->theLockingInset()) {
                InsetOld::RESULT result;
-               if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
-                                    (!keyseq.deleted())))
+               if (action > 1 || (action == LFUN_UNKNOWN_ACTION &&
+                                    !keyseq.deleted()))
                {
                        UpdatableInset * inset = view()->theLockingInset();
 #if 1
@@ -909,45 +913,45 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                                // FINISHED means that the cursor should be
                                // one position after the inset.
                        } else if (result == FINISHED_RIGHT) {
-                               TEXT()->cursorRight(view());
-                               moveCursorUpdate(true, false);
+                               view()->text->cursorRight(view());
+                               moveCursorUpdate();
                                owner->clearMessage();
                                goto exit_with_message;
                        } else if (result == FINISHED_UP) {
-                               RowList::iterator const irow = TEXT()->cursorIRow();
-                               if (irow != TEXT()->rows().begin()) {
+                               RowList::iterator const irow = view()->text->cursorIRow();
+                               if (irow != view()->text->firstRow()) {
 #if 1
-                                       TEXT()->setCursorFromCoordinates(
-                                               TEXT()->cursor.ix() + inset_x,
-                                               TEXT()->cursor.iy() -
+                                       view()->text->setCursorFromCoordinates(
+                                               view()->text->cursor.x() + inset_x,
+                                               view()->text->cursor.y() -
                                                irow->baseline() - 1);
-                                       TEXT()->cursor.x_fix(TEXT()->cursor.x());
+                                       view()->text->cursor.x_fix(view()->text->cursor.x());
 #else
-                                       TEXT()->cursorUp(view());
+                                       view()->text->cursorUp(view());
 #endif
-                                       moveCursorUpdate(true, false);
+                                       moveCursorUpdate();
                                } else {
-                                       view()->update(TEXT(), BufferView::SELECT);
+                                       view()->update();
                                }
                                owner->clearMessage();
                                goto exit_with_message;
                        } else if (result == FINISHED_DOWN) {
-                               RowList::iterator const irow = TEXT()->cursorIRow();
-                               if (boost::next(irow) != TEXT()->rows().end()) {
+                               RowList::iterator const irow = view()->text->cursorIRow();
+                               if (irow != view()->text->lastRow()) {
 #if 1
-                                       TEXT()->setCursorFromCoordinates(
-                                               TEXT()->cursor.ix() + inset_x,
-                                               TEXT()->cursor.iy() -
+                                       view()->text->setCursorFromCoordinates(
+                                               view()->text->cursor.x() + inset_x,
+                                               view()->text->cursor.y() -
                                                irow->baseline() +
                                                irow->height() + 1);
-                                       TEXT()->cursor.x_fix(TEXT()->cursor.x());
+                                       view()->text->cursor.x_fix(view()->text->cursor.x());
 #else
-                                       TEXT()->cursorDown(view());
+                                       view()->text->cursorDown(view());
 #endif
                                } else {
-                                       TEXT()->cursorRight(view());
+                                       view()->text->cursorRight(view());
                                }
-                               moveCursorUpdate(true, false);
+                               moveCursorUpdate();
                                owner->clearMessage();
                                goto exit_with_message;
                        }
@@ -958,30 +962,30 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                                case LFUN_UNKNOWN_ACTION:
                                case LFUN_BREAKPARAGRAPH:
                                case LFUN_BREAKLINE:
-                                       TEXT()->cursorRight(view());
+                                       view()->text->cursorRight(view());
                                        view()->switchKeyMap();
                                        owner->view_state_changed();
                                        break;
                                case LFUN_RIGHT:
-                                       if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
-                                               TEXT()->cursorRight(view());
-                                               moveCursorUpdate(true, false);
+                                       if (!view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+                                               view()->text->cursorRight(view());
+                                               moveCursorUpdate();
                                                owner->view_state_changed();
                                        }
                                        goto exit_with_message;
                                case LFUN_LEFT:
-                                       if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
-                                               TEXT()->cursorRight(view());
-                                               moveCursorUpdate(true, false);
+                                       if (view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+                                               view()->text->cursorRight(view());
+                                               moveCursorUpdate();
                                                owner->view_state_changed();
                                        }
                                        goto exit_with_message;
                                case LFUN_DOWN:
-                                       if (boost::next(TEXT()->cursorRow()) != TEXT()->rows().end())
-                                               TEXT()->cursorDown(view());
+                                       if (view()->text->cursorRow() != view()->text->lastRow())
+                                               view()->text->cursorDown(view());
                                        else
-                                               TEXT()->cursorRight(view());
-                                       moveCursorUpdate(true, false);
+                                               view()->text->cursorRight(view());
+                                       moveCursorUpdate();
                                        owner->view_state_changed();
                                        goto exit_with_message;
                                default:
@@ -993,35 +997,31 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
 
        switch (action) {
 
-       case LFUN_ESCAPE:
-       {
-               if (!view()->available()) break;
+       case LFUN_ESCAPE: {
+               if (!view()->available())
+                       break;
                // this function should be used always [asierra060396]
-               UpdatableInset * tli =
-                       view()->theLockingInset();
+               UpdatableInset * tli = view()->theLockingInset();
                if (tli) {
                        UpdatableInset * lock = tli->getLockingInset();
 
                        if (tli == lock) {
                                view()->unlockInset(tli);
-                               TEXT()->cursorRight(view());
-                               moveCursorUpdate(true, false);
+                               view()->text->cursorRight(view());
+                               moveCursorUpdate();
                                owner->view_state_changed();
                        } else {
-                               tli->unlockInsetInInset(view(),
-                                                       lock,
-                                                       true);
+                               tli->unlockInsetInInset(view(), lock, true);
                        }
                        finishUndo();
                        // Tell the paragraph dialog that we changed paragraph
                        dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
                }
+               break;
        }
-       break;
 
-               // --- Misc -------------------------------------------
-       case LFUN_WORDFINDFORWARD  :
-       case LFUN_WORDFINDBACKWARD : {
+       case LFUN_WORDFINDFORWARD:
+       case LFUN_WORDFINDBACKWARD: {
                static string last_search;
                string searched_string;
 
@@ -1032,27 +1032,23 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                        searched_string = last_search;
                }
                bool fw = (action == LFUN_WORDFINDFORWARD);
-               if (!searched_string.empty()) {
+               if (!searched_string.empty())
                        lyx::find::find(view(), searched_string, fw);
-               }
+               break;
        }
-       break;
 
        case LFUN_PREFIX:
-       {
-               if (view()->available() && !view()->theLockingInset()) {
-                       view()->update(TEXT(), BufferView::SELECT);
-               }
+               if (view()->available() && !view()->theLockingInset())
+                       view()->update();
                owner->message(keyseq.printOptions());
-       }
-       break;
+               break;
 
        // --- Misc -------------------------------------------
        case LFUN_EXEC_COMMAND:
                owner->focus_command_buffer();
                break;
 
-       case LFUN_CANCEL:                   // RVDK_PATCH_5
+       case LFUN_CANCEL:
                keyseq.reset();
                meta_fake_bit = key_modifier::none;
                if (view()->available())
@@ -1061,20 +1057,17 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                setMessage(N_("Cancel"));
                break;
 
-       case LFUN_META_FAKE:                                 // RVDK_PATCH_5
-       {
+       case LFUN_META_FAKE:
                meta_fake_bit = key_modifier::alt;
                setMessage(keyseq.print());
-       }
-       break;
+               break;
 
        case LFUN_READ_ONLY_TOGGLE:
-               if (owner->buffer()->lyxvc.inUse()) {
+               if (owner->buffer()->lyxvc.inUse())
                        owner->buffer()->lyxvc.toggleReadOnly();
-               } else {
+               else
                        owner->buffer()->setReadonly(
                                !owner->buffer()->isReadonly());
-               }
                break;
 
        case LFUN_CENTER: // this is center and redraw.
@@ -1179,12 +1172,12 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                break;
 
        case LFUN_DEPTH_MIN:
-               changeDepth(view(), TEXT(false), DEC_DEPTH, false);
+               changeDepth(view(), view()->getLyXText(), DEC_DEPTH, false);
                owner->view_state_changed();
                break;
 
        case LFUN_DEPTH_PLUS:
-               changeDepth(view(), TEXT(false), INC_DEPTH, false);
+               changeDepth(view(), view()->getLyXText(), INC_DEPTH, false);
                owner->view_state_changed();
                break;
 
@@ -1537,7 +1530,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
 
        case LFUN_SAVEPREFERENCES:
        {
-               Path p(user_lyxdir);
+               Path p(user_lyxdir());
                lyxrc.write("preferences");
        }
        break;
@@ -1555,7 +1548,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                // if values really changed...but not very important right now. (Lgb)
                // All visible buffers will need resize
                view()->resize();
-               view()->repaint();
+               view()->update();
        }
        break;
 
@@ -1594,7 +1587,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
 #endif
                }
 
-               view()->repaint();
+               view()->update();
                break;
        }
 
@@ -1641,7 +1634,8 @@ exit_with_message:
                view()->fitCursor();
 
                // If we executed a mutating lfun, mark the buffer as dirty
-               if (!lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
+               if (!getStatus(ev).disabled()
+                   && !lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
                    && !lyxaction.funcHasFlag(ev.action, LyXAction::ReadOnly))
                        view()->buffer()->markDirty();
        }
@@ -1783,7 +1777,7 @@ void LyXFunc::open(string const & fname)
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
                        make_pair(string(_("Examples|#E#e")),
-                                 string(AddPath(system_lyxdir, "examples"))));
+                                 string(AddPath(system_lyxdir(), "examples"))));
 
                FileDialog::Result result =
                        fileDlg.open(initpath,
@@ -1858,7 +1852,7 @@ void LyXFunc::doImport(string const & argument)
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
                        make_pair(string(_("Examples|#E#e")),
-                                 string(AddPath(system_lyxdir, "examples"))));
+                                 string(AddPath(system_lyxdir(), "examples"))));
 
                string const extension = "*." + formats.extension(format)
                        + "| " + formats.prettyName(format)
@@ -1978,3 +1972,9 @@ BufferView * LyXFunc::view() const
        Assert(owner);
        return owner->view().get();
 }
+
+
+bool LyXFunc::wasMetaKey() const
+{
+       return (meta_fake_bit != key_modifier::none);
+}