"Inter-word Space"

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 1df3ba307dfaf02877a8a5546c8b9039d3d08e34..6da72b34b15bdf54b5bab6e6a09cf0a4c7db30b6 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -16,6 +16,7 @@
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "lyxrc.h"
+#include "Lsstream.h"
 #include "debug.h"
 #include "bufferparams.h"
 #include "buffer.h"
@@ -25,7 +26,7 @@
 #include "intl.h"
 #include "box.h"
 #include "language.h"
-#include "support/lstrings.h"
+#include "support/tostr.h"
 #include "frontends/LyXView.h"
 #include "frontends/screen.h"
 #include "frontends/Dialogs.h"
@@ -36,6 +37,7 @@
 #include "insets/insetnewline.h"
 #include "undo_funcs.h"
 #include "text_funcs.h"
+#include "Lsstream.h"
 
 #include <ctime>
 #include <clocale>
@@ -68,11 +70,8 @@ namespace {
                }
                if (!lt->isInInset()) {
                        bv->update(lt, BufferView::SELECT);
-                       bv->showCursor();
                } else if (bv->text->refreshStatus() != LyXText::REFRESH_NONE) {
-                       bv->theLockingInset()->hideInsetCursor(bv);
                        bv->update(BufferView::SELECT);
-                       bv->showCursor();
                }
 
                if (!lt->selection.set())
@@ -96,20 +95,20 @@ namespace {
                LyXCursor const & cur, int & x, int & y)
        {
                lyx::pos_type const pos = cur.pos();
-               Paragraph /*const*/ & par = *cur.par();
+               ParagraphList::iterator par = cur.par();
 
-               if (pos >= par.size() || !par.isInset(pos))
+               if (pos >= par->size() || !par->isInset(pos))
                        return 0;
 
-               Inset /*const*/ * inset = par.getInset(pos);
+               Inset /*const*/ * inset = par->getInset(pos);
 
                if (!isEditableInset(inset))
                        return 0;
 
                // get inset dimensions
-               lyx::Assert(par.getInset(pos));
+               lyx::Assert(par->getInset(pos));
 
-               LyXFont const & font = text.getFont(bv->buffer(), &par, pos);
+               LyXFont const & font = text.getFont(bv->buffer(), par, pos);
 
                int const width = inset->width(bv, font);
                int const inset_x = font.isVisibleRightToLeft()
@@ -129,7 +128,7 @@ namespace {
                        return 0;
                }
 
-               text.setCursor(&par, pos, true);
+               text.setCursor(par, pos, true);
 
                x -= b.x1;
                // The origin of an inset is on the baseline
@@ -201,14 +200,14 @@ bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
 
 
 void LyXText::gotoInset(vector<Inset::Code> const & codes,
-                                 bool same_content)
+                       bool same_content)
 {
-       bv()->hideCursor();
        bv()->beforeChange(this);
        update();
 
        string contents;
-       if (same_content && cursor.par()->isInset(cursor.pos())) {
+       if (same_content && cursor.pos() < cursor.par()->size()
+           && cursor.par()->isInset(cursor.pos())) {
                Inset const * inset = cursor.par()->getInset(cursor.pos());
                if (find(codes.begin(), codes.end(), inset->lyxCode())
                    != codes.end())
@@ -364,7 +363,6 @@ namespace {
 
 void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
 {
-       bv->hideCursor();
        lt->update();
        InsetSpecialChar * new_inset = new InsetSpecialChar(kind);
        if (!bv->insertInset(new_inset))
@@ -387,8 +385,10 @@ void doInsertInset(LyXText * lt, FuncRequest const & cmd,
                        gotsel = true;
                }
                if (bv->insertInset(inset)) {
-                       if (edit)
-                               inset->edit(bv);
+                       if (edit) {
+                               FuncRequest cmd(bv, LFUN_INSET_EDIT, "left");
+                               inset->localDispatch(cmd);
+                       }
                        if (gotsel && pastesel)
                                bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION));
                }
@@ -418,7 +418,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
                for (; tmp != end; ++tmp) {
                        if (tmp->params().startOfAppendix()) {
-                               setUndo(bv, Undo::EDIT, &*tmp, &*boost::next(tmp));
+                               setUndo(bv, Undo::EDIT, tmp);
                                tmp->params().startOfAppendix(false);
                                int tmpy;
                                setHeightOfRow(getRow(tmp, 0, tmpy));
@@ -426,7 +426,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        }
                }
 
-               setUndo(bv, Undo::EDIT, &*pit, &*boost::next(pit));
+               setUndo(bv, Undo::EDIT, pit);
                pit->params().startOfAppendix(start);
 
                // we can set the refreshing parameters now
@@ -608,7 +608,8 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                    && isHighlyEditableInset(cursor.par()->getInset(cursor.pos()))) {
                        Inset * tmpinset = cursor.par()->getInset(cursor.pos());
                        cmd.message(tmpinset->editMessage());
-                       tmpinset->edit(bv, !is_rtl);
+                       FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "right" : "left");
+                       tmpinset->localDispatch(cmd1);
                        break;
                }
                if (!is_rtl)
@@ -633,7 +634,8 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                    isHighlyEditableInset(cursor.par()->getInset(cursor.pos()))) {
                        Inset * tmpinset = cursor.par()->getInset(cursor.pos());
                        cmd.message(tmpinset->editMessage());
-                       tmpinset->edit(bv, is_rtl);
+                       FuncRequest cmd1(bv, LFUN_INSET_EDIT, is_rtl ? "left" : "right");
+                       tmpinset->localDispatch(cmd1);
                        break;
                }
                if (is_rtl)
@@ -732,7 +734,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        update();
                        // It is possible to make it a lot faster still
                        // just comment out the line below...
-                       bv->showCursor();
                } else {
                        update();
                        cutSelection(bv, true);
@@ -790,7 +791,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                                update();
                                // It is possible to make it a lot faster still
                                // just comment out the line below...
-                               bv->showCursor();
                        }
                } else {
                        update();
@@ -882,7 +882,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                if (cur_spacing == Spacing::Other)
                        cur_value = pit->params().spacing().getValue();
 
-               istringstream is(cmd.argument.c_str());
+               istringstream is(STRCONV(cmd.argument));
                string tmp;
                is >> tmp;
                Spacing::Space new_spacing = cur_spacing;
@@ -923,7 +923,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                break;
 
        case LFUN_INSET_TOGGLE:
-               bv->hideCursor();
                bv->beforeChange(this);
                update();
                toggleInset();
@@ -931,12 +930,12 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                bv->switchKeyMap();
                break;
 
-       case LFUN_PROTECTEDSPACE:
+       case LFUN_SPACE_INSERT:
                if (cursor.par()->layout()->free_spacing) {
                        insertChar(' ');
                        update();
                } else {
-                       specialChar(this, bv, InsetSpecialChar::PROTECTED_SEPARATOR);
+                       doInsertInset(this, cmd, false, false);
                }
                moveCursorUpdate(bv, false);
                break;
@@ -1023,7 +1022,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
        case LFUN_PASTE:
                cmd.message(_("Paste"));
-               bv->hideCursor();
                // clear the selection
                bv->toggleSelection();
                clearSelection();
@@ -1035,7 +1033,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                break;
 
        case LFUN_CUT:
-               bv->hideCursor();
                update();
                cutSelection(bv, true);
                update();
@@ -1070,7 +1067,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
        case LFUN_SETXY: {
                int x = 0;
                int y = 0;
-               istringstream is(cmd.argument.c_str());
+               istringstream is(STRCONV(cmd.argument));
                is >> x >> y;
                if (!is)
                        lyxerr << "SETXY: Could not parse coordinates in '"
@@ -1127,6 +1124,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                }
 
                bool change_layout = (current_layout != layout);
+
                if (!change_layout && selection.set() &&
                        selection.start.par() != selection.end.par())
                {
@@ -1140,8 +1138,8 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                                ++spit;
                        }
                }
+
                if (change_layout) {
-                       bv->hideCursor();
                        current_layout = layout;
                        update();
                        setLayout(layout);
@@ -1155,7 +1153,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
        case LFUN_PASTESELECTION: {
                if (!bv->buffer())
                        break;
-               bv->hideCursor();
                // this was originally a beforeChange(bv->text), i.e
                // the outermost LyXText!
                bv->beforeChange(this);
@@ -1199,7 +1196,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                else
                        c = pit->getChar(pos - 1);
 
-               bv->hideCursor();
                LyXLayout_ptr const & style = pit->layout();
 
                if (style->pass_thru ||
@@ -1239,7 +1235,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        break;
                if (cmd.button() == mouse_button::button1) {
                        if (!isInInset()) {
-                               bv->screen().hideCursor();
                                bv->screen().toggleSelection(this, bv);
                        }
                        cursorHome();
@@ -1260,7 +1255,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        break;
                if (cmd.button() == mouse_button::button1) {
                        if (!isInInset()) {
-                               bv->screen().hideCursor();
                                bv->screen().toggleSelection(this, bv);
                                selectWord(LyXText::WHOLE_WORD_STRICT);
                                bv->screen().toggleSelection(this, bv, false);
@@ -1307,8 +1301,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        break;
                }
 
-               bv->screen().hideCursor();
-
                RowList::iterator cursorrow = bv->text->cursor.row();
                bv->text->setCursorFromCoordinates(cmd.x, cmd.y + bv->text->top_y());
        #if 0
@@ -1334,7 +1326,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                bv->text->setSelection();
                bv->screen().toggleToggle(bv->text, bv);
                bv->fitCursor();
-               bv->showCursor();
                break;
        }
 
@@ -1388,7 +1379,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
                if (!inset_hit)
                        selection_possible = true;
-               bv->screen().hideCursor();
 
                // Clear the selection
                bv->screen().toggleSelection(bv->text, bv);
@@ -1403,9 +1393,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                        UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
                        selection_possible = false;
                        bv->owner()->message(inset->editMessage());
-                       //inset->edit(bv, x, y, cmd.button());
                        // We just have to lock the inset before calling a PressEvent on it!
-                       // we don't need the edit() call here! (Jug20020329)
                        if (!bv->lockInset(inset))
                                lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
                        FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());