*/
#include <config.h>
-#include <vector>
#include "LyXFunc.h"
#include "Converter.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "support/debug.h"
#include "DispatchResult.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "support/gettext.h"
#include "InsetIterator.h"
#include "Intl.h"
#include "KeyMap.h"
#include "Server.h"
#include "Session.h"
#include "TextClassList.h"
-#include "ToolbarBackend.h"
#include "insets/InsetBox.h"
#include "insets/InsetBranch.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
-#include "frontends/FileDialog.h"
-#include "frontends/FontLoader.h"
#include "frontends/KeySymbol.h"
#include "frontends/LyXView.h"
#include "frontends/Selection.h"
+#include "support/debug.h"
#include "support/environment.h"
-#include "support/FileFilterList.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/Path.h"
#include "support/Package.h"
#include "support/os.h"
#include <sstream>
+#include <vector>
using namespace std;
using namespace lyx::support;
namespace Alert = frontend::Alert;
-extern bool quitting;
-extern bool use_gui;
-
namespace {
-bool import(LyXView * lv, FileName const & filename,
- string const & format, ErrorList & errorList)
-{
- docstring const displaypath = makeDisplayPath(filename.absFilename());
- lv->message(bformat(_("Importing %1$s..."), displaypath));
-
- FileName const lyxfile(changeExtension(filename.absFilename(), ".lyx"));
-
- string loader_format;
- vector<string> loaders = theConverters().loaders();
- if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
- for (vector<string>::const_iterator it = loaders.begin();
- it != loaders.end(); ++it) {
- if (theConverters().isReachable(format, *it)) {
- string const tofile =
- changeExtension(filename.absFilename(),
- formats.extension(*it));
- if (!theConverters().convert(0, filename, FileName(tofile),
- filename, format, *it, errorList))
- return false;
- loader_format = *it;
- break;
- }
- }
- if (loader_format.empty()) {
- frontend::Alert::error(_("Couldn't import file"),
- bformat(_("No information for importing the format %1$s."),
- formats.prettyName(format)));
- return false;
- }
- } else {
- loader_format = format;
- }
-
-
- if (loader_format == "lyx") {
- Buffer * buf = theLyXFunc().loadAndViewFile(lyxfile);
- if (!buf) {
- // we are done
- lv->message(_("file not imported!"));
- return false;
- }
- updateLabels(*buf);
- lv->setBuffer(buf);
- buf->errors("Parse");
- } else {
- Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
- if (b)
- lv->setBuffer(b);
- else
- return false;
- bool as_paragraphs = loader_format == "textparagraph";
- string filename2 = (loader_format == format) ? filename.absFilename()
- : changeExtension(filename.absFilename(),
- formats.extension(loader_format));
- lv->view()->insertPlaintextFile(FileName(filename2), as_paragraphs);
- theLyXFunc().setLyXView(lv);
- lyx::dispatch(FuncRequest(LFUN_MARK_OFF));
- }
-
- // we are done
- lv->message(_("imported."));
- return true;
-}
-
-
-
// This function runs "configure" and then rereads lyx.defaults to
// reconfigure the automatic settings.
void reconfigure(LyXView & lv, string const & option)
lv.message(_("Running configure..."));
// Run configure in user lyx directory
- support::PathChanger p(package().user_support());
+ PathChanger p(package().user_support());
string configure_command = package().configure_command();
configure_command += option;
Systemcall one;
p.pop();
// emit message signal.
lv.message(_("Reloading configuration..."));
- lyxrc.read(support::libFileSearch(string(), "lyxrc.defaults"));
+ lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
// Re-read packages.lst
LaTeXFeatures::getAvailable();
dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
FuncRequest::KEYBOARD));
LYXERR(Debug::KEY, "SelfInsert arg[`" << to_utf8(arg) << "']");
+ lyx_view_->updateCompletion(true, true);
}
} else {
dispatch(func);
+ if (func.action == LFUN_CHAR_DELETE_BACKWARD)
+ // backspace is not a self-insertion. But it
+ // still should not hide the completion popup.
+ // FIXME: more clever way to detect those movements
+ lyx_view_->updateCompletion(false, true);
+ else
+ lyx_view_->updateCompletion(false, false);
}
lyx_view_->restartCursor();
case LFUN_DIALOG_TOGGLE:
case LFUN_DIALOG_SHOW:
case LFUN_DIALOG_UPDATE:
+ if (cmd.argument() == "prefs"
+ || cmd.argument() == "aboutlyx")
+ enable = true;
+ else if (lyx_view_)
+ return lyx_view_->getStatus(cmd);
+ else
+ enable = false;
+ break;
+
case LFUN_TOOLBAR_TOGGLE:
case LFUN_INSET_APPLY:
case LFUN_BUFFER_WRITE:
case LFUN_BUFFER_WRITE_AS:
+ case LFUN_SPLIT_VIEW:
+ case LFUN_CLOSE_TAB_GROUP:
+ case LFUN_COMPLETION_POPUP:
+ case LFUN_COMPLETION_INLINE:
+ case LFUN_COMPLETION_COMPLETE:
if (lyx_view_)
return lyx_view_->getStatus(cmd);
enable = false;
}
// This could be used for the no-GUI version. The GUI version is handled in
- // LyXView::getStatus().
+ // LyXView::getStatus(). See above.
/*
case LFUN_BUFFER_WRITE:
case LFUN_BUFFER_WRITE_AS: {
case LFUN_CALL: {
FuncRequest func;
- std::string name = to_utf8(cmd.argument());
+ string name = to_utf8(cmd.argument());
if (LyX::ref().topLevelCmdDef().lock(name, func)) {
func.origin = cmd.origin;
flag = getStatus(func);
case LFUN_BUFFER_AUTO_SAVE:
case LFUN_RECONFIGURE:
case LFUN_HELP_OPEN:
- case LFUN_FILE_NEW:
case LFUN_FILE_OPEN:
case LFUN_DROP_LAYOUTS_CHOICE:
case LFUN_MENU_OPEN:
case LFUN_DIALOG_HIDE:
case LFUN_DIALOG_DISCONNECT_INSET:
case LFUN_BUFFER_CHILD_OPEN:
+ case LFUN_UI_TOGGLE:
case LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR:
case LFUN_KEYMAP_OFF:
case LFUN_KEYMAP_PRIMARY:
void loadTextClass(string const & name)
{
- std::pair<bool, textclass_type> const tc_pair =
+ pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(name);
if (!tc_pair.first) {
lyxerr << "Document class \"" << name
<< "\" does not exist."
- << std::endl;
+ << endl;
return;
}
if (!format) {
lyxerr << "Format \"" << format_name
<< "\" not recognized!"
- << std::endl;
+ << endl;
break;
}
string const path = buffer->temppath();
// Prevent the compiler from optimizing away p
FileName pp(path);
- support::PathChanger p(pp);
+ PathChanger p(pp);
// there are three cases here:
// 1. we print to a file
break;
}
+ // FIXME: There is need for a command-line import.
+ /*
case LFUN_BUFFER_IMPORT:
doImport(argument);
break;
+ */
case LFUN_BUFFER_AUTO_SAVE:
lyx_view_->buffer()->autoSave();
}
lyx_view_->message(bformat(_("Opening help file %1$s..."),
makeDisplayPath(fname.absFilename())));
- Buffer * buf = loadAndViewFile(fname, false);
+ Buffer * buf = lyx_view_->loadDocument(fname, false);
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
reloadBuffer();
break;
- // --- buffers ----------------------------------------
-
- case LFUN_FILE_NEW: {
- BOOST_ASSERT(lyx_view_);
- string name;
- string tmpname = split(argument, name, ':'); // Split filename
- Buffer * const b = newFile(name, tmpname);
- if (b)
- lyx_view_->setBuffer(b);
- updateFlags = Update::None;
- break;
- }
-
- case LFUN_FILE_OPEN:
- BOOST_ASSERT(lyx_view_);
- open(argument);
- updateFlags = Update::None;
- break;
-
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_NAME:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (theBufferList().exists(s.absFilename()))
buf = theBufferList().getBuffer(s.absFilename());
else {
- buf = loadAndViewFile(s);
+ buf = lyx_view_->loadDocument(s);
loaded = true;
}
}
}
default:
lyxerr << "Inset type '" << name <<
- "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << std:: endl;
+ "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << endl;
insetCodeOK = false;
break;
} // end switch(code)
} else {
setMessage(bformat(_("Opening child document %1$s..."),
makeDisplayPath(filename.absFilename())));
- child = loadAndViewFile(filename, true);
+ child = lyx_view_->loadDocument(filename, false);
parsed = true;
}
if (child) {
TextClassPtr oldClass = buffer->params().getTextClassPtr();
view()->cursor().recordUndoFullDocument();
buffer->params().clearLayoutModules();
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
TextClassPtr oldClass = buffer->params().getTextClassPtr();
view()->cursor().recordUndoFullDocument();
buffer->params().addLayoutModule(argument);
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
loadTextClass(argument);
- std::pair<bool, textclass_type> const tc_pair =
+ pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(argument);
if (!tc_pair.first)
TextClassPtr oldClass = buffer->params().getTextClassPtr();
view()->cursor().recordUndoFullDocument();
buffer->params().setBaseClass(new_class);
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
textclass_type const tc = buffer->params().getBaseClass();
textclasslist.reset(tc);
buffer->params().setBaseClass(tc);
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
case LFUN_BOOKMARK_GOTO:
// go to bookmark, open unopened file and switch to buffer if necessary
gotoBookmark(convert<unsigned int>(to_utf8(cmd.argument())), true, true);
+ updateFlags = Update::FitCursor;
break;
case LFUN_BOOKMARK_CLEAR:
LyX::ref().session().bookmarks().clear();
break;
- default: {
+ default:
BOOST_ASSERT(theApp());
// Let the frontend dispatch its own actions.
if (theApp()->dispatch(cmd))
break;
}
- // FIXME: Probably a good idea to inverse the Cursor and BufferView
- // dispatching.
+ BOOST_ASSERT(lyx_view_->view());
+ // Let the current BufferView dispatch its own actions.
+ if (view()->dispatch(cmd)) {
+ // The BufferView took care of its own updates if needed.
+ updateFlags = Update::None;
+ break;
+ }
// Let the current Cursor dispatch its own actions.
- BOOST_ASSERT(lyx_view_->view());
+ Cursor old = view()->cursor();
+ view()->cursor().getPos(cursorPosBeforeDispatchX_,
+ cursorPosBeforeDispatchY_);
view()->cursor().dispatch(cmd);
+
+ // notify insets we just left
+ if (view()->cursor() != old) {
+ old.fixIfBroken();
+ bool badcursor = notifyCursorLeaves(old, view()->cursor());
+ if (badcursor)
+ view()->cursor().fixIfBroken();
+ }
+
updateFlags = view()->cursor().result().update();
- if (!view()->cursor().result().dispatched())
- // Let the current BufferView dispatch its own actions.
- updateFlags = view()->dispatch(cmd);
- break;
- }
}
if (lyx_view_ && lyx_view_->buffer()) {
if (flag.enabled()
&& !lyxaction.funcHasFlag(action, LyXAction::NoBuffer)
&& !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
- lyx_view_->buffer()->markDirty();
+ lyx_view_->buffer()->markDirty();
//Do we have a selection?
theSelection().haveSelection(view()->cursor().selection());
}
-Buffer * LyXFunc::loadAndViewFile(FileName const & filename, bool tolastfiles)
-{
- lyx_view_->setBusy(true);
-
- Buffer * newBuffer = checkAndLoadLyXFile(filename);
-
- if (!newBuffer) {
- lyx_view_->message(_("Document not loaded."));
- lyx_view_->setBusy(false);
- return 0;
- }
-
- lyx_view_->setBuffer(newBuffer);
-
- // scroll to the position when the file was last closed
- if (lyxrc.use_lastfilepos) {
- LastFilePosSection::FilePos filepos =
- LyX::ref().session().lastFilePos().load(filename);
- lyx_view_->view()->moveToPosition(filepos.pit, filepos.pos, 0, 0);
- }
-
- if (tolastfiles)
- LyX::ref().session().lastFiles().add(filename);
-
- lyx_view_->setBusy(false);
- return newBuffer;
-}
-
-
-void LyXFunc::open(string const & fname)
-{
- string initpath = lyxrc.document_path;
-
- if (lyx_view_->buffer()) {
- string const trypath = lyx_view_->buffer()->filePath();
- // If directory is writeable, use this as default.
- if (FileName(trypath).isDirWritable())
- initpath = trypath;
- }
-
- string filename;
-
- if (fname.empty()) {
- FileDialog dlg(_("Select document to open"), LFUN_FILE_OPEN);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(), "examples")));
-
- FileDialog::Result result =
- dlg.open(from_utf8(initpath),
- FileFilterList(_("LyX Documents (*.lyx)")),
- docstring());
-
- if (result.first == FileDialog::Later)
- return;
-
- filename = to_utf8(result.second);
-
- // check selected filename
- if (filename.empty()) {
- lyx_view_->message(_("Canceled."));
- return;
- }
- } else
- filename = fname;
-
- // get absolute path of file and add ".lyx" to the filename if
- // necessary
- FileName const fullname = fileSearch(string(), filename, "lyx");
- if (!fullname.empty())
- filename = fullname.absFilename();
-
- // if the file doesn't exist, let the user create one
- if (!fullname.exists()) {
- // the user specifically chose this name. Believe him.
- Buffer * const b = newFile(filename, string(), true);
- if (b)
- lyx_view_->setBuffer(b);
- return;
- }
-
- docstring const disp_fn = makeDisplayPath(filename);
- lyx_view_->message(bformat(_("Opening document %1$s..."), disp_fn));
-
- docstring str2;
- Buffer * buf = loadAndViewFile(fullname);
- if (buf) {
- updateLabels(*buf);
- lyx_view_->setBuffer(buf);
- buf->errors("Parse");
- str2 = bformat(_("Document %1$s opened."), disp_fn);
- } else {
- str2 = bformat(_("Could not open document %1$s"), disp_fn);
- }
- lyx_view_->message(str2);
-}
-
-
-void LyXFunc::doImport(string const & argument)
-{
- string format;
- string filename = split(argument, format, ' ');
-
- LYXERR(Debug::INFO, "LyXFunc::doImport: " << format
- << " file: " << filename);
-
- // need user interaction
- if (filename.empty()) {
- string initpath = lyxrc.document_path;
-
- if (lyx_view_->buffer()) {
- string const trypath = lyx_view_->buffer()->filePath();
- // If directory is writeable, use this as default.
- if (FileName(trypath).isDirWritable())
- initpath = trypath;
- }
-
- docstring const text = bformat(_("Select %1$s file to import"),
- formats.prettyName(format));
-
- FileDialog dlg(text, LFUN_BUFFER_IMPORT);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(), "examples")));
-
- docstring filter = formats.prettyName(format);
- filter += " (*.";
- // FIXME UNICODE
- filter += from_utf8(formats.extension(format));
- filter += ')';
-
- FileDialog::Result result =
- dlg.open(from_utf8(initpath),
- FileFilterList(filter),
- docstring());
-
- if (result.first == FileDialog::Later)
- return;
-
- filename = to_utf8(result.second);
-
- // check selected filename
- if (filename.empty())
- lyx_view_->message(_("Canceled."));
- }
-
- if (filename.empty())
- return;
-
- // get absolute path of file
- FileName const fullname(makeAbsPath(filename));
-
- FileName const lyxfile(changeExtension(fullname.absFilename(), ".lyx"));
-
- // Check if the document already is open
- Buffer * buf = theBufferList().getBuffer(lyxfile.absFilename());
- if (use_gui && buf) {
- lyx_view_->setBuffer(buf);
- if (!lyx_view_->closeBuffer()) {
- lyx_view_->message(_("Canceled."));
- return;
- }
- }
-
- // if the file exists already, and we didn't do
- // -i lyx thefile.lyx, warn
- if (lyxfile.exists() && fullname != lyxfile) {
- docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
-
- docstring text = bformat(_("The document %1$s already exists.\n\n"
- "Do you want to overwrite that document?"), file);
- int const ret = Alert::prompt(_("Overwrite document?"),
- text, 0, 1, _("&Overwrite"), _("&Cancel"));
-
- if (ret == 1) {
- lyx_view_->message(_("Canceled."));
- return;
- }
- }
-
- ErrorList errorList;
- import(lyx_view_, fullname, format, errorList);
- // FIXME (Abdel 12/08/06): Is there a need to display the error list here?
-}
-
-
void LyXFunc::closeBuffer()
{
// goto bookmark to update bookmark pit.
// The user has already confirmed that the changes, if any, should
// be discarded. So we just release the Buffer and don't call closeBuffer();
theBufferList().release(lyx_view_->buffer());
- Buffer * buf = loadAndViewFile(filename);
+ Buffer * buf = lyx_view_->loadDocument(filename);
docstring const disp_fn = makeDisplayPath(filename.absFilename());
docstring str;
if (buf) {
case LyXRC::RC_BIBTEX_COMMAND:
case LyXRC::RC_BINDFILE:
case LyXRC::RC_CHECKLASTFILES:
+ case LyXRC::RC_COMPLETION_INLINE_DELAY:
+ case LyXRC::RC_COMPLETION_INLINE_DOTS:
+ case LyXRC::RC_COMPLETION_INLINE_MATH:
+ case LyXRC::RC_COMPLETION_INLINE_TEXT:
+ case LyXRC::RC_COMPLETION_POPUP_AFTER_COMPLETE:
+ case LyXRC::RC_COMPLETION_POPUP_DELAY:
+ case LyXRC::RC_COMPLETION_POPUP_MATH:
+ case LyXRC::RC_COMPLETION_POPUP_TEXT:
case LyXRC::RC_USELASTFILEPOS:
case LyXRC::RC_LOADSESSION:
case LyXRC::RC_CHKTEX_COMMAND:
if (lyxrc_orig.document_path != lyxrc_new.document_path) {
FileName path(lyxrc_new.document_path);
if (path.exists() && path.isDirectory())
- support::package().document_dir() = FileName(lyxrc.document_path);
+ package().document_dir() = FileName(lyxrc.document_path);
}
case LyXRC::RC_ESC_CHARS:
case LyXRC::RC_EXAMPLEPATH:
case LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS:
case LyXRC::RC_LANGUAGE_PACKAGE:
case LyXRC::RC_LANGUAGE_USE_BABEL:
+ case LyXRC::RC_MACRO_EDIT_STYLE:
case LyXRC::RC_MAKE_BACKUP:
case LyXRC::RC_MARK_FOREIGN_LANGUAGE:
+ case LyXRC::RC_MOUSE_WHEEL_SPEED:
case LyXRC::RC_NUMLASTFILES:
case LyXRC::RC_PATH_PREFIX:
if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
- support::prependEnvPath("PATH", lyxrc.path_prefix);
+ prependEnvPath("PATH", lyxrc.path_prefix);
}
case LyXRC::RC_PERS_DICT:
case LyXRC::RC_PREVIEW:
case LyXRC::RC_TEX_ALLOWS_SPACES:
case LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS:
if (lyxrc_orig.windows_style_tex_paths != lyxrc_new.windows_style_tex_paths) {
- support::os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
+ os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
}
case LyXRC::RC_UIFILE:
case LyXRC::RC_USER_EMAIL:
case LyXRC::RC_USE_ESC_CHARS:
case LyXRC::RC_USE_INP_ENC:
case LyXRC::RC_USE_PERS_DICT:
+ case LyXRC::RC_USE_TOOLTIP:
case LyXRC::RC_USE_PIXMAP_CACHE:
case LyXRC::RC_USE_SPELL_LIB:
case LyXRC::RC_VIEWDVI_PAPEROPTION:
case LyXRC::RC_SORT_LAYOUTS:
+ case LyXRC::RC_FULL_SCREEN_LIMIT:
+ case LyXRC::RC_FULL_SCREEN_SCROLLBAR:
+ case LyXRC::RC_FULL_SCREEN_TABBAR:
+ case LyXRC::RC_FULL_SCREEN_TOOLBARS:
+ case LyXRC::RC_FULL_SCREEN_WIDTH:
+ case LyXRC::RC_VISUAL_CURSOR:
case LyXRC::RC_VIEWER:
case LyXRC::RC_LAST:
break;