* src/support/unicode.C

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 96ef5b1ec3d048bf3a19fc1fbe2f9d086bd6cd9d..4450e3048f00a3679a9c9dc25a4aa17e8de10838 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -24,6 +24,7 @@
 #include "buffer_funcs.h"
 #include "bufferparams.h"
 #include "BufferView.h"
+#include "bufferview_funcs.h"
 #include "cursor.h"
 #include "coordcache.h"
 #include "CutAndPaste.h"
@@ -204,16 +205,13 @@ void LyXText::cursorPrevious(LCursor & cur)
        pit_type cpar = cur.pit();
 
        int x = cur.x_target();
+       setCursorFromCoordinates(cur, x, 0);
+       cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
 
-       // FIXME: there would maybe a need for this 'updated' boolean in the future...
-       bool updated = setCursorFromCoordinates(cur, x, 0);
-       updated |= cursorUp(cur);
-
-       if (cpar == cur.pit() && cpos == cur.pos()) {
+       if (cpar == cur.pit() && cpos == cur.pos())
                // we have a row which is taller than the workarea. The
                // simplest solution is to move to the previous row instead.
-               updated |= cursorUp(cur);
-       }
+               cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
 
        finishUndo();
        cur.updateFlags(Update::Force | Update::FitCursor);
@@ -226,15 +224,14 @@ void LyXText::cursorNext(LCursor & cur)
        pit_type cpar = cur.pit();
 
        int x = cur.x_target();
-       // FIXME: there would maybe a need for this 'updated' boolean in the future...
-       bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
-       updated |= cursorDown(cur);
+       setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+       cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
 
-       if (cpar == cur.pit() && cpos == cur.pos()) {
+       if (cpar == cur.pit() && cpos == cur.pos())
                // we have a row which is taller than the workarea. The
                // simplest solution is to move to the next row instead.
-               updated |= cursorDown(cur);
-       }
+               cur.dispatch(
+                       FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
 
        finishUndo();
        cur.updateFlags(Update::Force | Update::FitCursor);
@@ -321,7 +318,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
                LyXAction::NoUpdate) || singleParUpdate);
        // Remember the old paragraph metric (_outer_ paragraph!)
-       Dimension olddim = cur.bottom().paragraph().dim();
+       ParagraphMetrics const & pm = cur.bv().parMetrics(
+               cur.bottom().text(), cur.bottom().pit());
+       Dimension olddim = pm.dim();
 
        switch (cmd.action) {
 
@@ -781,8 +780,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_SERVER_GET_XY:
                cur.message(from_utf8(
-                       convert<string>(cursorX(cur.buffer(), cur.top(), cur.boundary()))
-                       + ' ' + convert<string>(cursorY(cur.top(), cur.boundary()))));
+                       convert<string>(cursorX(cur.bv(), cur.top(), cur.boundary()))
+                       + ' ' + convert<string>(cursorY(cur.bv(), cur.top(), cur.boundary()))));
                break;
 
        case LFUN_SERVER_SET_XY: {
@@ -979,7 +978,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                        paste_internally = true;
                }
 
-               bv->mouseSetCursor(cur);
+               // we have to update after dePM triggered
+               bool update = bv->mouseSetCursor(cur);
 
                // Insert primary selection with middle mouse
                // if there is a local selection in the current buffer,
@@ -991,7 +991,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                                lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
                }
 
-               if (cmd.button() == mouse_button::button1) {
+               if (!update && cmd.button() == mouse_button::button1) {
                        needsUpdate = false;
                        cur.noUpdate();
                }
@@ -1015,15 +1015,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                        setCursorFromCoordinates(cur, cmd.x, y);
                        cur.x_target() = cmd.x;
                        if (cmd.y >= wh)
-                               cursorDown(cur);
+                               lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
                        else if (cmd.y < 0)
-                               cursorUp(cur);
+                               lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
                        // This is to allow jumping over large insets
                        if (cur.top() == old) {
                                if (cmd.y >= wh)
-                                       cursorDown(cur);
+                                       lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
                                else if (cmd.y < 0)
-                                       cursorUp(cur);
+                                       lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
                        }
 
                        if (cur.top() == old)
@@ -1501,9 +1501,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 
        // FIXME: the following code should go in favor of fine grained
        // update flag treatment.
-       if (singleParUpdate)
+       if (singleParUpdate) {
                // Inserting characters does not change par height
-               if (cur.bottom().paragraph().dim().height()
+               ParagraphMetrics const & pms 
+                       = cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit());
+               if (pms.dim().height()
                    == olddim.height()) {
                        // if so, update _only_ this paragraph
                        cur.updateFlags(Update::SinglePar |
@@ -1512,6 +1514,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                        return;
                } else
                        needsUpdate = true;
+       }
 
        if (!needsUpdate
            && &oldTopSlice.inset() == &cur.inset()