X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXFunc.cpp;h=b753551211f418c5e647a8e0267790457f3d1682;hb=f99d41a25a326865183879853b97ed3265499042;hp=04decddf8a080eb5dc2bf546c5e2ebcb303dd69f;hpb=4573c7f2ab48803d640025cf975215533778b085;p=lyx.git diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp index 04decddf8a..b753551211 100644 --- a/src/LyXFunc.cpp +++ b/src/LyXFunc.cpp @@ -86,6 +86,7 @@ #include "frontends/LyXView.h" #include "frontends/Menubar.h" #include "frontends/Toolbars.h" +#include "frontends/Selection.h" #include "support/environment.h" #include "support/FileFilterList.h" @@ -218,6 +219,10 @@ void LyXFunc::initKeySequences(KeyMap * kb) void LyXFunc::setLyXView(LyXView * lv) { + if (lyx_view_ && lyx_view_ != lv) + // save current selection to the selection buffer to allow + // middle-button paste in another window + cap::saveSelection(lyx_view_->view()->cursor()); lyx_view_ = lv; } @@ -989,21 +994,22 @@ void LyXFunc::dispatch(FuncRequest const & cmd) case LFUN_BUFFER_PRINT: { BOOST_ASSERT(lyx_view_ && lyx_view_->buffer()); - string target; - string target_name; - string command = split(split(argument, target, ' '), - target_name, ' '); + // FIXME: cmd.getArg() might fail if one of the arguments + // contains double quotes + string target = cmd.getArg(0); + string target_name = cmd.getArg(1); + string command = cmd.getArg(2); if (target.empty() || target_name.empty() || command.empty()) { lyxerr << "Unable to parse \"" - << argument << '"' << std::endl; + << argument << '"' << endl; break; } if (target != "printer" && target != "file") { lyxerr << "Unrecognized target \"" - << target << '"' << std::endl; + << target << '"' << endl; break; } @@ -1035,13 +1041,13 @@ void LyXFunc::dispatch(FuncRequest const & cmd) // case 3: print using a spool string const psname = changeExtension(dviname,".ps"); - command += lyxrc.print_to_file + command += ' ' + lyxrc.print_to_file + quoteName(psname) + ' ' + quoteName(dviname); string command2 = - lyxrc.print_spool_command +' '; + lyxrc.print_spool_command + ' '; if (target_name != "default") { command2 += lyxrc.print_spool_printerprefix + target_name @@ -1061,7 +1067,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd) } else { // case 2: print directly to a printer if (target_name != "default") - command += lyxrc.print_to_printer + target_name + ' '; + command += ' ' + lyxrc.print_to_printer + target_name + ' '; res = one.startscript( Systemcall::DontWait, command + quoteName(dviname)); @@ -1069,7 +1075,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd) } else { // case 1: print to a file - FileName const filename(makeAbsPath(target_name, path)); + FileName const filename(makeAbsPath(target_name, + lyx_view_->buffer()->filePath())); + FileName const dvifile(makeAbsPath(dviname, path)); if (fs::exists(filename.toFilesystemEncoding())) { docstring text = bformat( _("The file %1$s already exists.\n\n" @@ -1079,10 +1087,10 @@ void LyXFunc::dispatch(FuncRequest const & cmd) text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0) break; } - command += lyxrc.print_to_file + command += ' ' + lyxrc.print_to_file + quoteName(filename.toFilesystemEncoding()) + ' ' - + quoteName(dviname); + + quoteName(dvifile.toFilesystemEncoding()); res = one.startscript(Systemcall::DontWait, command); } @@ -1410,23 +1418,39 @@ void LyXFunc::dispatch(FuncRequest const & cmd) } case LFUN_BUFFER_CHILD_OPEN: { + // takes an optional argument, "|bool", at the end + // indicating whether this file is being opened automatically + // by LyX itself, in which case we will not want to switch + // buffers after opening. The default is false, so in practice + // it is used only when true. BOOST_ASSERT(lyx_view_); - FileName const filename = + int const arglength = argument.length(); + FileName filename; + bool autoOpen = false; + if (argument.substr(arglength - 5, 5) == "|true") { + autoOpen = true; + filename = makeAbsPath(argument.substr(0, arglength - 5), + lyx_view_->buffer()->filePath()); + } else if (argument.substr(arglength - 6, 6) == "|false") { + filename = makeAbsPath(argument.substr(0, arglength - 6), + lyx_view_->buffer()->filePath()); + } else filename = makeAbsPath(argument, lyx_view_->buffer()->filePath()); view()->saveBookmark(false); - string const parentfilename = lyx_view_->buffer()->fileName(); - if (theBufferList().exists(filename.absFilename())) - lyx_view_->setBuffer(theBufferList().getBuffer(filename.absFilename())); - else - if (lyx_view_->loadLyXFile(filename)) { - // Set the parent name of the child document. - // This makes insertion of citations and references in the child work, - // when the target is in the parent or another child document. - lyx_view_->buffer()->setParentName(parentfilename); - setMessage(bformat(_("Opening child document %1$s..."), - makeDisplayPath(filename.absFilename()))); - } else - setMessage(_("Document not loaded.")); + if (theBufferList().exists(filename.absFilename())) { + Buffer * buf = theBufferList().getBuffer(filename.absFilename()); + if (!autoOpen) + lyx_view_->setBuffer(buf, true); + else + buf->setParentName(lyx_view_->buffer()->fileName()); + } else + lyx_view_->loadLyXFile(filename, true, true, autoOpen); + + // If a screen update is required (in case where auto_open is false), + // loadLyXFile() would have taken care of it already. Otherwise we shall + // reset the update flag because it can cause a circular problem. + // See bug 3970. + updateFlags = Update::None; break; } @@ -1760,18 +1784,22 @@ void LyXFunc::dispatch(FuncRequest const & cmd) string const name = cmd.getArg(0); bool const allowauto = cmd.getArg(1) == "allowauto"; lyx_view_->toggleToolbarState(name, allowauto); - ToolbarInfo::Flags const flags = - lyx_view_->getToolbarState(name); + ToolbarInfo * tbi = lyx_view_->getToolbarInfo(name); + if (!tbi) { + setMessage(bformat(_("Unknown toolbar \"%1$s\""), + from_utf8(name))); + break; + } docstring state; - if (flags & ToolbarInfo::ON) + if (tbi->flags & ToolbarInfo::ON) state = _("on"); - else if (flags & ToolbarInfo::OFF) + else if (tbi->flags & ToolbarInfo::OFF) state = _("off"); - else if (flags & ToolbarInfo::AUTO) + else if (tbi->flags & ToolbarInfo::AUTO) state = _("auto"); setMessage(bformat(_("Toolbar \"%1$s\" state set to %2$s"), - from_ascii(name), state)); + _(tbi->gui_name), state)); break; } @@ -1805,6 +1833,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd) && !lyxaction.funcHasFlag(action, LyXAction::ReadOnly)) view()->buffer()->markDirty(); + //Do we have a selection? + theSelection().haveSelection(view()->cursor().selection()); + if (view()->cursor().inTexted()) { lyx_view_->updateLayoutChoice(); } @@ -2078,16 +2109,8 @@ void LyXFunc::closeBuffer() // goto bookmark to update bookmark pit. for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i) gotoBookmark(i+1, false, false); - if (theBufferList().close(lyx_view_->buffer(), true) && !quitting) { - if (theBufferList().empty()) { - // need this otherwise SEGV may occur while - // trying to set variables that don't exist - // since there's no current buffer - lyx_view_->getDialogs().hideBufferDependent(); - } else { - lyx_view_->setBuffer(theBufferList().first()); - } - } + + theBufferList().close(lyx_view_->buffer(), true); }