X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext3.C;h=85cf5515d6225daac73e3a421b871ca8878b84d6;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=3973d08ccc45aa4cf97005cd32c32415121a1d97;hpb=500a5f959fa713c2106855c64fac55739f8a93ff;p=lyx.git diff --git a/src/text3.C b/src/text3.C index 3973d08ccc..85cf5515d6 100644 --- a/src/text3.C +++ b/src/text3.C @@ -76,9 +76,10 @@ namespace lyx { using cap::copySelection; using cap::cutSelection; +using cap::pasteFromStack; using cap::pasteClipboard; -using cap::pasteSelection; using cap::replaceSelection; +using cap::saveSelection; using support::isStrUnsignedInt; using support::token; @@ -122,7 +123,7 @@ namespace { { if (selecting || cur.mark()) cur.setSelection(); - theSelection().haveSelection(cur.selection()); + saveSelection(cur); cur.bv().switchKeyMap(); } @@ -138,7 +139,6 @@ namespace { { recordUndo(cur); docstring sel = cur.selectionAsString(false); - //lyxerr << "selection is: '" << sel << "'" << endl; // It may happen that sel is empty but there is a selection replaceSelection(cur); @@ -434,6 +434,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_RIGHT); } + if (cur.selection()) + saveSelection(cur); break; case LFUN_CHAR_BACKWARD: @@ -450,6 +452,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_LEFT); } + if (cur.selection()) + saveSelection(cur); break; case LFUN_UP: @@ -464,6 +468,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_UP); } + if (cur.selection()) + saveSelection(cur); break; case LFUN_DOWN: @@ -478,18 +484,24 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_DOWN); } + if (cur.selection()) + saveSelection(cur); break; case LFUN_PARAGRAPH_UP: case LFUN_PARAGRAPH_UP_SELECT: needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT); needsUpdate |= cursorUpParagraph(cur); + if (cur.selection()) + saveSelection(cur); break; case LFUN_PARAGRAPH_DOWN: case LFUN_PARAGRAPH_DOWN_SELECT: needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT); needsUpdate |= cursorDownParagraph(cur); + if (cur.selection()) + saveSelection(cur); break; case LFUN_SCREEN_UP: @@ -501,6 +513,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) } else { cursorPrevious(cur); } + if (cur.selection()) + saveSelection(cur); break; case LFUN_SCREEN_DOWN: @@ -513,6 +527,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) } else { cursorNext(cur); } + if (cur.selection()) + saveSelection(cur); break; case LFUN_LINE_BEGIN: @@ -525,6 +541,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_LINE_END_SELECT: needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT); needsUpdate |= cursorEnd(cur); + if (cur.selection()) + saveSelection(cur); break; case LFUN_WORD_FORWARD: @@ -534,6 +552,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) needsUpdate |= cursorLeftOneWord(cur); else needsUpdate |= cursorRightOneWord(cur); + if (cur.selection()) + saveSelection(cur); break; case LFUN_WORD_BACKWARD: @@ -543,6 +563,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) needsUpdate |= cursorRightOneWord(cur); else needsUpdate |= cursorLeftOneWord(cur); + if (cur.selection()) + saveSelection(cur); break; case LFUN_WORD_SELECT: { @@ -697,6 +719,28 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) recordUndo(cur); InsetBase * inset = createInset(bv, cmd); if (inset) { + // FIXME (Abdel 01/02/2006): + // What follows would be a partial fix for bug 2154: + // http://bugzilla.lyx.org/show_bug.cgi?id=2154 + // This automatically put the label inset _after_ a + // numbered section. It should be possible to extend the mechanism + // to any kind of LateX environement. + // The correct way to fix that bug would be at LateX generation. + // I'll let the code here for reference as it could be used for some + // other feature like "automatic labelling". + /* + Paragraph & par = pars_[cur.pit()]; + if (inset->lyxCode() == InsetBase::LABEL_CODE + && par.layout()->labeltype == LABEL_COUNTER) { + // Go to the end of the paragraph + // Warning: Because of Change-Tracking, the last + // position is 'size()' and not 'size()-1': + cur.pos() = par.size(); + // Insert a new paragraph + FuncRequest fr(LFUN_BREAK_PARAGRAPH); + dispatch(cur, fr); + } + */ insertInset(cur, inset); cur.posRight(); } @@ -764,7 +808,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) pasteClipboard(cur, bv->buffer()->errorList("Paste")); else { string const arg(to_utf8(cmd.argument())); - pasteSelection(cur, bv->buffer()->errorList("Paste"), + pasteFromStack(cur, bv->buffer()->errorList("Paste"), isStrUnsignedInt(arg) ? convert(arg) : 0); @@ -943,7 +987,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) cursorEnd(cur); cur.setSelection(); bv->cursor() = cur; - theSelection().haveSelection(cur.selection()); + saveSelection(cur); } break; @@ -951,7 +995,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) if (cmd.button() == mouse_button::button1) { selectWord(cur, WHOLE_WORD_STRICT); bv->cursor() = cur; - theSelection().haveSelection(cur.selection()); } break; @@ -966,15 +1009,11 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // it could get cleared on the unlocking of the inset so // we have to check this first bool paste_internally = false; - if (cmd.button() == mouse_button::button2 && cur.selection()) { - // Copy the selection to the clipboard stack. This - // is done for two reasons: - // - We want it to appear in the "Edit->Paste recent" - // menu. - // - We can then use the normal copy/paste machinery - // instead of theSelection().get() to preserve - // formatting of the pasted stuff. - cap::copySelectionToStack(cur.bv().cursor()); + if (cmd.button() == mouse_button::button2 && cap::selection()) { + // Copy the selection buffer to the clipboard + // stack, because we want it to appear in the + // "Edit->Paste recent" menu. + cap::copySelectionToStack(); paste_internally = true; } @@ -985,9 +1024,13 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // if there is a local selection in the current buffer, // insert this if (cmd.button() == mouse_button::button2) { - if (paste_internally) - lyx::dispatch(FuncRequest(LFUN_PASTE, "0")); - else + if (paste_internally) { + cap::pasteSelection(cur, bv->buffer()->errorList("Paste")); + bv->buffer()->errors("Paste"); + cur.clearSelection(); // bug 393 + bv->switchKeyMap(); + finishUndo(); + } else lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph")); } @@ -1044,10 +1087,18 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) if (cmd.button() == mouse_button::button2) break; - // finish selection if (cmd.button() == mouse_button::button1) { - if (cur.selection()) - theSelection().haveSelection(true); + // if there is new selection, update persistent + // selection, otherwise, single click does not + // clear persistent selection buffer + if (cur.selection()) { + // finish selection + // if double click, cur is moved to the end of word by selectWord + // but bvcur is current mouse position + LCursor & bvcur = cur.bv().cursor(); + bvcur.selection() = true; + saveSelection(bvcur); + } needsUpdate = false; cur.noUpdate(); } @@ -1066,13 +1117,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) // "auto_region_delete", which defaults to // true (on). - if (lyxrc.auto_region_delete) { + if (lyxrc.auto_region_delete) if (cur.selection()) cutSelection(cur, false, false); - // cutSelection clears the X selection. - else - theSelection().haveSelection(false); - } cur.clearSelection(); LyXFont const old_font = real_current_font; @@ -1129,6 +1176,12 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_THEOREM_INSERT: #endif case LFUN_CAPTION_INSERT: + // Open the inset, and move the current selection + // inside it. + doInsertInset(cur, this, cmd, true, true); + cur.posRight(); + updateLabels(*bv->buffer()); + break; case LFUN_NOTE_INSERT: case LFUN_CHARSTYLE_INSERT: case LFUN_BOX_INSERT: @@ -1156,12 +1209,41 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_FLOAT_INSERT: case LFUN_FLOAT_WIDE_INSERT: - case LFUN_WRAP_INSERT: + case LFUN_WRAP_INSERT: { + bool content = cur.selection(); // will some text be moved into the inset? + doInsertInset(cur, this, cmd, true, true); cur.posRight(); + ParagraphList & pars = cur.text()->paragraphs(); + + LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass(); + + // add a separate paragraph for the caption inset + pars.push_back(Paragraph()); + pars.back().setInsetOwner(pars[0].inInset()); + pars.back().layout(tclass.defaultLayout()); + + int cap_pit = pars.size() - 1; + + // if an empty inset was created, we create an additional empty + // paragraph at the bottom so that the user can choose where to put + // the graphics (or table). + if (!content) { + pars.push_back(Paragraph()); + pars.back().setInsetOwner(pars[0].inInset()); + pars.back().layout(tclass.defaultLayout()); + + } + + // reposition the cursor to the caption + cur.pit() = cap_pit; + cur.pos() = 0; cur.dispatch(FuncRequest(LFUN_CAPTION_INSERT)); - updateLabels(cur.buffer()); + // FIXME: When leaving the Float (or Wrap) inset we should + // delete any empty paragraph left above or below the + // caption. break; + } case LFUN_INDEX_INSERT: case LFUN_NOMENCL_INSERT: { @@ -1473,6 +1555,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) case LFUN_ESCAPE: if (cur.selection()) { cur.selection() = false; + saveSelection(cur); } else { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_RIGHT);