* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index ad3de377e9d33ea51656d495c5964dc611689646..86c69d0646be73b59307edcc411b1dd33e30883a 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -76,6 +76,7 @@ namespace lyx {
 
 using cap::copySelection;
 using cap::cutSelection;
+using cap::pasteClipboard;
 using cap::pasteSelection;
 using cap::replaceSelection;
 
@@ -121,8 +122,7 @@ namespace {
        {
                if (selecting || cur.mark())
                        cur.setSelection();
-               if (!cur.selection())
-                       theSelection().haveSelection(false);
+               theSelection().haveSelection(cur.selection());
                cur.bv().switchKeyMap();
        }
 
@@ -144,7 +144,9 @@ namespace {
                replaceSelection(cur);
 
                if (sel.empty()) {
+#ifdef ENABLE_ASSERTIONS
                        const int old_pos = cur.pos();
+#endif
                        cur.insert(new InsetMathHull(hullSimple));
                        BOOST_ASSERT(old_pos == cur.pos());
                        cur.nextInset()->edit(cur, true);
@@ -205,9 +207,7 @@ void LyXText::cursorPrevious(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, 0);
+       setCursorFromCoordinates(cur, x, 0);
        cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
 
        if (cpar == cur.pit() && cpos == cur.pos())
@@ -226,8 +226,7 @@ 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);
+       setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
        cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
 
        if (cpar == cur.pit() && cpos == cur.pos())
@@ -270,7 +269,7 @@ bool doInsertInset(LCursor & cur, LyXText * text,
                inset->edit(cur, true);
 
        if (gotsel && pastesel) {
-               lyx::dispatch(FuncRequest(LFUN_PASTE));
+               lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
                // reset first par to default
                if (cur.lastpit() != 0 || cur.lastpos() != 0) {
                        LyXLayout_ptr const layout =
@@ -555,6 +554,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_BREAK_LINE: {
                // Not allowed by LaTeX (labels or empty par)
                if (cur.pos() > cur.paragraph().beginOfBody()) {
+                       if (!cur.selection())
+                               recordUndo(cur);
                        cap::replaceSelection(cur);
                        cur.insert(new InsetNewline);
                        cur.posRight();
@@ -759,12 +760,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_PASTE:
                cur.message(_("Paste"));
                cap::replaceSelection(cur);
-               if (isStrUnsignedInt(to_utf8(cmd.argument())))
-                       pasteSelection(cur, bv->buffer()->errorList("Paste"),
-                       convert<unsigned int>(to_utf8(cmd.argument())));
-               else
+               if (cmd.argument().empty() && !theClipboard().isInternal())
+                       pasteClipboard(cur, bv->buffer()->errorList("Paste"));
+               else {
+                       string const arg(to_utf8(cmd.argument()));
                        pasteSelection(cur, bv->buffer()->errorList("Paste"),
-                       0);
+                                       isStrUnsignedInt(arg) ?
+                                               convert<unsigned int>(arg) :
+                                               0);
+               }
                bv->buffer()->errors("Paste");
                cur.clearSelection(); // bug 393
                bv->switchKeyMap();
@@ -863,31 +867,17 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_CLIPBOARD_PASTE: {
+       case LFUN_CLIPBOARD_PASTE:
                cur.clearSelection();
-               docstring const clip = theClipboard().get();
-               if (!clip.empty()) {
-                       recordUndo(cur);
-                       if (cmd.argument() == "paragraph")
-                               insertStringAsParagraphs(cur, clip);
-                       else
-                               insertStringAsLines(cur, clip);
-               }
+               pasteClipboard(cur, bv->buffer()->errorList("Paste"),
+                              cmd.argument() == "paragraph");
+               bv->buffer()->errors("Paste");
                break;
-       }
 
-       case LFUN_PRIMARY_SELECTION_PASTE: {
-               cur.clearSelection();
-               docstring const clip = theSelection().get();
-               if (!clip.empty()) {
-                       recordUndo(cur);
-                       if (cmd.argument() == "paragraph")
-                               insertStringAsParagraphs(cur, clip);
-                       else
-                               insertStringAsLines(cur, clip);
-               }
+       case LFUN_PRIMARY_SELECTION_PASTE:
+               pasteString(cur, theSelection().get(),
+                           cmd.argument() == "paragraph");
                break;
-       }
 
        case LFUN_UNICODE_INSERT: {
                if (cmd.argument().empty())
@@ -977,7 +967,14 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                // we have to check this first
                bool paste_internally = false;
                if (cmd.button() == mouse_button::button2 && cur.selection()) {
-                       lyx::dispatch(FuncRequest(LFUN_COPY));
+                       // 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());
                        paste_internally = true;
                }
 
@@ -989,7 +986,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                // insert this
                if (cmd.button() == mouse_button::button2) {
                        if (paste_internally)
-                               lyx::dispatch(FuncRequest(LFUN_PASTE));
+                               lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
                        else
                                lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
                }
@@ -1050,7 +1047,7 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                // finish selection
                if (cmd.button() == mouse_button::button1) {
                        if (cur.selection())
-                               theSelection().haveSelection(cur.selection());
+                               theSelection().haveSelection(true);
                        needsUpdate = false;
                        cur.noUpdate();
                }
@@ -1072,7 +1069,9 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                if (lyxrc.auto_region_delete) {
                        if (cur.selection())
                                cutSelection(cur, false, false);
-                       theSelection().haveSelection(false);
+                               // cutSelection clears the X selection.
+                       else
+                               theSelection().haveSelection(false);
                }
 
                cur.clearSelection();
@@ -1742,7 +1741,28 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
                break;
 
        case LFUN_PASTE:
-               enable = cap::numberOfSelections() > 0;
+               if (cmd.argument().empty()) {
+                       if (theClipboard().isInternal())
+                               enable = cap::numberOfSelections() > 0;
+                       else
+                               enable = !theClipboard().empty();
+               } else {
+                       string const arg = to_utf8(cmd.argument());
+                       if (isStrUnsignedInt(arg)) {
+                               unsigned int n = convert<unsigned int>(arg);
+                               enable = cap::numberOfSelections() > n;
+                       } else
+                               // unknown argument
+                               enable = false;
+               }
+               break;
+
+       case LFUN_CLIPBOARD_PASTE:
+               enable = !theClipboard().empty();
+               break;
+
+       case LFUN_PRIMARY_SELECTION_PASTE:
+               enable = cur.selection() || !theSelection().empty();
                break;
 
        case LFUN_PARAGRAPH_MOVE_UP:
@@ -1815,8 +1835,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
        case LFUN_SERVER_GET_FONT:
        case LFUN_SERVER_GET_LAYOUT:
        case LFUN_LAYOUT:
-       case LFUN_CLIPBOARD_PASTE:
-       case LFUN_PRIMARY_SELECTION_PASTE:
        case LFUN_DATE_INSERT:
        case LFUN_SELF_INSERT:
        case LFUN_LINE_INSERT:
@@ -1882,4 +1900,17 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
 }
 
 
+void LyXText::pasteString(LCursor & cur, docstring const & clip,
+               bool asParagraphs)
+{
+       cur.clearSelection();
+       if (!clip.empty()) {
+               recordUndo(cur);
+               if (asParagraphs)
+                       insertStringAsParagraphs(cur, clip);
+               else
+                       insertStringAsLines(cur, clip);
+       }
+}
+
 } // namespace lyx