Try even harder to obtain an instant preview

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 517998bef60273843b0b266fe8105c30bf2a25c6..f80bde6554d38c8fe10b5f0c9aaaec32fbec7aa1 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -47,6 +47,7 @@
 #include "TextMetrics.h"
 #include "WordLangTuple.h"
 
+#include "frontends/alert.h"
 #include "frontends/Application.h"
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
@@ -605,13 +606,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_CHAR_FORWARD:
-       case LFUN_CHAR_FORWARD_SELECT:
+       case LFUN_CHAR_FORWARD_SELECT: {
                //LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur);
                needsUpdate |= cur.selHandle(act == LFUN_CHAR_FORWARD_SELECT);
-               needsUpdate |= cursorForward(cur);
+               bool const cur_moved = cursorForward(cur);
+               needsUpdate |= cur_moved;
 
-               if (!needsUpdate && oldTopSlice == cur.top()
-                               && cur.boundary() == oldBoundary) {
+               if (!cur_moved && oldTopSlice == cur.top()
+                              && cur.boundary() == oldBoundary) {
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_FORWARD);
 
@@ -630,15 +632,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        }
                }
                break;
+       }
 
        case LFUN_CHAR_BACKWARD:
-       case LFUN_CHAR_BACKWARD_SELECT:
+       case LFUN_CHAR_BACKWARD_SELECT: {
                //lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
                needsUpdate |= cur.selHandle(act == LFUN_CHAR_BACKWARD_SELECT);
-               needsUpdate |= cursorBackward(cur);
+               bool const cur_moved = cursorBackward(cur);
+               needsUpdate |= cur_moved;
 
-               if (!needsUpdate && oldTopSlice == cur.top()
-                       && cur.boundary() == oldBoundary) {
+               if (!cur_moved && oldTopSlice == cur.top()
+                              && cur.boundary() == oldBoundary) {
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
 
@@ -657,14 +661,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        }
                }
                break;
+       }
 
        case LFUN_CHAR_LEFT:
        case LFUN_CHAR_LEFT_SELECT:
                if (lyxrc.visual_cursor) {
                        needsUpdate |= cur.selHandle(act == LFUN_CHAR_LEFT_SELECT);
-                       needsUpdate |= cursorVisLeft(cur);
-                       if (!needsUpdate && oldTopSlice == cur.top()
-                                       && cur.boundary() == oldBoundary) {
+                       bool const cur_moved = cursorVisLeft(cur);
+                       needsUpdate |= cur_moved;
+                       if (!cur_moved && oldTopSlice == cur.top()
+                                      && cur.boundary() == oldBoundary) {
                                cur.undispatched();
                                cmd = FuncRequest(LFUN_FINISHED_LEFT);
                        }
@@ -685,9 +691,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_CHAR_RIGHT_SELECT:
                if (lyxrc.visual_cursor) {
                        needsUpdate |= cur.selHandle(cmd.action() == LFUN_CHAR_RIGHT_SELECT);
-                       needsUpdate |= cursorVisRight(cur);
-                       if (!needsUpdate && oldTopSlice == cur.top()
-                                       && cur.boundary() == oldBoundary) {
+                       bool const cur_moved = cursorVisRight(cur);
+                       needsUpdate |= cur_moved;
+                       if (!cur_moved && oldTopSlice == cur.top()
+                                      && cur.boundary() == oldBoundary) {
                                cur.undispatched();
                                cmd = FuncRequest(LFUN_FINISHED_RIGHT);
                        }
@@ -796,9 +803,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_WORD_RIGHT_SELECT:
                if (lyxrc.visual_cursor) {
                        needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_RIGHT_SELECT);
-                       needsUpdate |= cursorVisRightOneWord(cur);
-                       if (!needsUpdate && oldTopSlice == cur.top()
-                                       && cur.boundary() == oldBoundary) {
+                       bool const cur_moved = cursorVisRightOneWord(cur);
+                       needsUpdate |= cur_moved;
+                       if (!cur_moved && oldTopSlice == cur.top()
+                                      && cur.boundary() == oldBoundary) {
                                cur.undispatched();
                                cmd = FuncRequest(LFUN_FINISHED_RIGHT);
                        }
@@ -816,12 +824,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_WORD_FORWARD:
-       case LFUN_WORD_FORWARD_SELECT:
+       case LFUN_WORD_FORWARD_SELECT: {
                needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_FORWARD_SELECT);
-               needsUpdate |= cursorForwardOneWord(cur);
+               bool const cur_moved = cursorForwardOneWord(cur);
+               needsUpdate |= cur_moved;
 
-               if (!needsUpdate && oldTopSlice == cur.top()
-                               && cur.boundary() == oldBoundary) {
+               if (!cur_moved && oldTopSlice == cur.top()
+                              && cur.boundary() == oldBoundary) {
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_FORWARD);
 
@@ -840,14 +849,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        }
                }
                break;
+       }
 
        case LFUN_WORD_LEFT:
        case LFUN_WORD_LEFT_SELECT:
                if (lyxrc.visual_cursor) {
                        needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_LEFT_SELECT);
-                       needsUpdate |= cursorVisLeftOneWord(cur);
-                       if (!needsUpdate && oldTopSlice == cur.top()
-                                       && cur.boundary() == oldBoundary) {
+                       bool const cur_moved = cursorVisLeftOneWord(cur);
+                       needsUpdate |= cur_moved;
+                       if (!cur_moved && oldTopSlice == cur.top()
+                                      && cur.boundary() == oldBoundary) {
                                cur.undispatched();
                                cmd = FuncRequest(LFUN_FINISHED_LEFT);
                        }
@@ -865,12 +876,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_WORD_BACKWARD:
-       case LFUN_WORD_BACKWARD_SELECT:
+       case LFUN_WORD_BACKWARD_SELECT: {
                needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_BACKWARD_SELECT);
-               needsUpdate |= cursorBackwardOneWord(cur);
+               bool const cur_moved = cursorBackwardOneWord(cur);
+               needsUpdate |= cur_moved;
 
-               if (!needsUpdate && oldTopSlice == cur.top()
-                               && cur.boundary() == oldBoundary) {
+               if (!cur_moved && oldTopSlice == cur.top()
+                              && cur.boundary() == oldBoundary) {
                        cur.undispatched();
                        cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
 
@@ -890,6 +902,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        }
                }
                break;
+       }
 
        case LFUN_WORD_SELECT: {
                selectWord(cur, WHOLE_WORD);
@@ -1289,8 +1302,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        else if (arg == "wmf")
                                type = Clipboard::WmfGraphicsType;
                        else
-                               // We used to assert, but couldn't the argument come from, say, the
-                               // minibuffer and just be mistyped?
+                               // we also check in getStatus()
                                LYXERR0("Unrecognized graphics type: " << arg);
 
                        pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type);
@@ -1299,6 +1311,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                bv->buffer().errors("Paste");
                cur.clearSelection(); // bug 393
                cur.finishUndo();
+               bv->buffer().updatePreviews();
                break;
        }
 
@@ -2274,6 +2287,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                arg += " lang=" + from_ascii(cur.getFont().language()->lang());
                        }
                }
+               if (lyxrc.thesaurusdir_path.empty()) {
+                       frontend::Alert::warning(_("Path to thesaurus directory not set!"),
+                                       _("The path to the thesaurus directory has not been specified.\n"
+                                         "The thesaurus is not functional.\n"
+                                         "Please refer to sec. 6.15.1 of the User's Guide for setup\n"
+                                         "instructions."));
+               }
                bv->showDialog("thesaurus", to_utf8(arg));
                break;
        }
@@ -2923,6 +2943,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                }
 
                // unknown argument
+               LYXERR0("Unrecognized graphics type: " << arg);
+               // we don't want to assert if the user just mistyped the LFUN
+               LATTEST(cmd.origin() != FuncRequest::INTERNAL);
                enable = false;
                break;
         }