* src/frontends/qt4/QTocDialog.C (updateGui):

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 4450e3048f00a3679a9c9dc25a4aa17e8de10838..2e595fadb85da2a8faf1220fbba20f3a588a9b9f 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -121,8 +121,7 @@ namespace {
        {
                if (selecting || cur.mark())
                        cur.setSelection();
-               if (!cur.selection())
-                       theSelection().haveSelection(false);
+               theSelection().haveSelection(cur.selection());
                cur.bv().switchKeyMap();
        }
 
@@ -144,7 +143,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);
@@ -267,7 +268,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 =
@@ -756,13 +757,16 @@ 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())
+                       pasteString(cur, theClipboard().get(), true);
+               else {
+                       string const arg(to_utf8(cmd.argument()));
                        pasteSelection(cur, bv->buffer()->errorList("Paste"),
-                       0);
-               bv->buffer()->errors("Paste");
+                                       isStrUnsignedInt(arg) ?
+                                               convert<unsigned int>(arg) :
+                                               0);
+                       bv->buffer()->errors("Paste");
+               }
                cur.clearSelection(); // bug 393
                bv->switchKeyMap();
                finishUndo();
@@ -860,31 +864,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                break;
        }
 
-       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);
-               }
+       case LFUN_CLIPBOARD_PASTE:
+               pasteString(cur, theClipboard().get(),
+                           cmd.argument() == "paragraph");
                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())
@@ -974,7 +962,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;
                }
 
@@ -986,7 +981,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"));
                }
@@ -1047,7 +1042,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();
                }
@@ -1069,7 +1064,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();
@@ -1739,7 +1736,23 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
                break;
 
        case LFUN_PASTE:
-               enable = cap::numberOfSelections() > 0;
+               // FIXME: This is not correct, but the correct code below is
+               // expensive
+               enable = cap::numberOfSelections() > 0 ||
+                       !theClipboard().isInternal();
+#if 0
+               if (cmd.argument().empty()) {
+                       if (theClipboard().isInternal())
+                               enable = cap::numberOfSelections() > 0;
+                       else
+                               enable = !theClipboard().get().empty();
+               } else if (isStrUnsignedInt(to_utf8(cmd.argument()))) {
+                       int n = convert<unsigned int>(to_utf8(cmd.argument()));
+                       enable = cap::numberOfSelections() > n;
+               } else
+                       // unknown argument
+                       enable = false;
+#endif
                break;
 
        case LFUN_PARAGRAPH_MOVE_UP:
@@ -1879,4 +1892,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