Remove the XOpenIM test as lyxlookup.C has been buried.

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index eae7919996ef97f7220243d76495f2a385cc294e..48bc0c0a7edcc4c91d81b5052a6ee7b7f0c730ed 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -47,7 +47,7 @@ extern string current_layout;
 extern int bibitemMaxWidth(BufferView *, LyXFont const &);
 
 // the selection possible is needed, that only motion events are
-// used, where the bottom press event was on the drawing area too 
+// used, where the bottom press event was on the drawing area too
 bool selection_possible = false;
 
 
@@ -104,7 +104,7 @@ namespace {
 
                Inset /*const*/ * inset = par.getInset(pos);
 
-               if (!isEditableInset(inset)) 
+               if (!isEditableInset(inset))
                        return 0;
 
                // get inset dimensions
@@ -124,8 +124,9 @@ namespace {
                );
 
                if (!b.contained(x, y)) {
-                       lyxerr[Debug::GUI] << "Missed inset at x,y " << x << "," << y
-                               << " box " << b << endl;
+                       lyxerr[Debug::GUI] << "Missed inset at x,y "
+                                          << x << ',' << y
+                                          << " box " << b << endl;
                        return 0;
                }
 
@@ -371,7 +372,7 @@ void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
 Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 {
        lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << cmd.action
-                             <<"] arg[" << cmd.argument << "]" << endl;
+                             <<"] arg[" << cmd.argument << ']' << endl;
 
        BufferView * bv = cmd.view();
 
@@ -383,9 +384,15 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
 
                // ensure that we have only one start_of_appendix in this document
                Paragraph * tmp = ownerParagraph();
-               for (; tmp; tmp = tmp->next())
-                       tmp->params().startOfAppendix(false);
+               for (; tmp; tmp = tmp->next()) {
+                       if (tmp->params().startOfAppendix()) {
+                               setUndo(bv, Undo::EDIT, tmp, tmp->next());
+                               tmp->params().startOfAppendix(false);
+                               break;
+                       }
+               }
 
+               setUndo(bv, Undo::EDIT, par, par->next());
                par->params().startOfAppendix(start);
 
                // we can set the refreshing parameters now
@@ -553,11 +560,23 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                finishChange(bv, true);
                break;
 
+       case LFUN_WORDSEL: {
+               update(bv, false);
+               LyXCursor cur1;
+               LyXCursor cur2;
+               getWord(cur1, cur2, WHOLE_WORD);
+               setCursor(bv, cur1.par(), cur1.pos());
+               bv->beforeChange(this);
+               setCursor(bv, cur2.par(), cur2.pos());
+               finishChange(bv, true);
+               break;
+       }
+
        case LFUN_RIGHT: {
                bool is_rtl = cursor.par()->isRightToLeftPar(bv->buffer()->params);
                if (!selection.mark())
                        bv->beforeChange(this);
-               update(bv);
+               update(bv, false);
                if (is_rtl)
                        cursorLeft(bv, false);
                if (cursor.pos() < cursor.par()->size()
@@ -580,7 +599,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                bool const is_rtl = cursor.par()->isRightToLeftPar(bv->buffer()->params);
                if (!selection.mark())
                        bv->beforeChange(this);
-               update(bv);
+               update(bv, false);
                LyXCursor const cur = cursor;
                if (!is_rtl)
                        cursorLeft(bv, false);
@@ -1030,7 +1049,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                if (!is)
                        lyxerr << "SETXY: Could not parse coordinates in '"
                               << cmd.argument << std::endl;
-               else 
+               else
                        setCursorFromCoordinates(bv, x, y);
                break;
        }
@@ -1092,6 +1111,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                                        change_layout = true;
                                        break;
                                }
+                               spar = spar->next();
                        }
                }
                if (change_layout) {
@@ -1271,7 +1291,8 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                // in some other local environment, but I would like to leave this here
                // for the moment until I can remove this (Jug 20020418)
                if (y_before < bv->text->cursor.y())
-                       lyxerr << y_before << ":" << bv->text->cursor.y() << endl;
+                       lyxerr << y_before << ':'
+                              << bv->text->cursor.y() << endl;
        #endif
                // This is to allow jumping over large insets
                if (cursorrow == bv->text->cursor.row()) {
@@ -1402,7 +1423,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                // do nothing if we used the mouse wheel
                if (!bv->buffer())
                        break;
-       
+
                if (cmd.button() == mouse_button::button4
                 || cmd.button() == mouse_button::button5)
                        break;
@@ -1580,7 +1601,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
        case LFUN_INSET_WRAP:
        case LFUN_TABULAR_INSERT:
        case LFUN_INDEX_INSERT:
-       case LFUN_INDEX_PRINT: 
+       case LFUN_INDEX_PRINT:
        case LFUN_PARENTINSERT:
        case LFUN_TOC_INSERT:
        {