#include "bufferlist.h"
#include "bufferparams.h"
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "cursor.h"
#include "CutAndPaste.h"
#include "debug.h"
}
+void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
+{
+ BOOST_ASSERT(lyx_view_);
+ if (!LyX::ref().session().bookmarks().isValid(idx))
+ return;
+ BookmarksSection::Bookmark const & bm = LyX::ref().session().bookmarks().bookmark(idx);
+ BOOST_ASSERT(!bm.filename.empty());
+ string const file = bm.filename.absFilename();
+ // if the file is not opened, open it.
+ if (!theBufferList().exists(file)) {
+ if (openFile)
+ dispatch(FuncRequest(LFUN_FILE_OPEN, file));
+ else
+ return;
+ }
+ // open may fail, so we need to test it again
+ if (theBufferList().exists(file)) {
+ // if the current buffer is not that one, switch to it.
+ if (lyx_view_->buffer()->fileName() != file) {
+ if (switchToBuffer)
+ dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
+ else
+ return;
+ }
+ // moveToPosition use par_id, and par_pit and return new par_id.
+ pit_type new_pit;
+ int new_id;
+ boost::tie(new_pit, new_id) = view()->moveToPosition(bm.par_pit, bm.par_id, bm.par_pos);
+ // if par_id or pit has been changed, reset par_pit and par_id
+ // see http://bugzilla.lyx.org/show_bug.cgi?id=3092
+ if (bm.par_pit != new_pit || bm.par_id != new_id)
+ const_cast<BookmarksSection::Bookmark &>(bm).setPos(new_pit, new_id);
+ }
+}
+
+
void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
{
lyxerr[Debug::KEY] << "KeySym is " << keysym->getSymbolName() << endl;
lyxerr << BOOST_CURRENT_FUNCTION
<< " Key [action="
<< func.action << "]["
- << to_utf8(keyseq->print()) << ']'
+ << to_utf8(keyseq->print(false)) << ']'
<< endl;
}
// num_bytes == 0? (Lgb)
if (keyseq->length() > 1) {
- lyx_view_->message(keyseq->print());
+ lyx_view_->message(keyseq->print(true));
}
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
FuncStatus fs;
- bool const success = inset->getStatus(cur, fr, fs);
- // Every inset is supposed to handle this
- BOOST_ASSERT(success);
+ if (!inset->getStatus(cur, fr, fs)) {
+ // Every inset is supposed to handle this
+ BOOST_ASSERT(false);
+ }
flag |= fs;
} else {
FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
case LFUN_COMMAND_PREFIX:
BOOST_ASSERT(lyx_view_);
- lyx_view_->message(keyseq->printOptions());
+ lyx_view_->message(keyseq->printOptions(true));
break;
case LFUN_COMMAND_EXECUTE:
case LFUN_META_PREFIX:
meta_fake_bit = key_modifier::alt;
- setMessage(keyseq->print());
+ setMessage(keyseq->print(true));
break;
case LFUN_BUFFER_TOGGLE_READ_ONLY:
text, 0, 1, _("&Revert"), _("&Cancel"));
if (ret == 0)
- view()->reload();
+ reloadBuffer();
break;
}
// case 1: print to a file
command += lyxrc.print_to_file
+ quoteName(makeAbsPath(target_name,
- path))
+ path).toFilesystemEncoding())
+ ' '
+ quoteName(dviname);
res = one.startscript(Systemcall::DontWait,
break;
if (!lyx_view_->buffer()->lyxvc().inUse()) {
lyx_view_->buffer()->lyxvc().registrer();
- view()->reload();
+ reloadBuffer();
}
+ updateFlags = Update::Force;
break;
case LFUN_VC_CHECK_IN:
if (lyx_view_->buffer()->lyxvc().inUse()
&& !lyx_view_->buffer()->isReadonly()) {
lyx_view_->buffer()->lyxvc().checkIn();
- view()->reload();
+ reloadBuffer();
}
break;
if (lyx_view_->buffer()->lyxvc().inUse()
&& lyx_view_->buffer()->isReadonly()) {
lyx_view_->buffer()->lyxvc().checkOut();
- view()->reload();
+ reloadBuffer();
}
break;
case LFUN_VC_REVERT:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
lyx_view_->buffer()->lyxvc().revert();
- view()->reload();
+ reloadBuffer();
break;
case LFUN_VC_UNDO_LAST:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
lyx_view_->buffer()->lyxvc().undoLast();
- view()->reload();
+ reloadBuffer();
break;
// --- buffers ----------------------------------------
case LFUN_BUFFER_SWITCH:
BOOST_ASSERT(lyx_view_);
+ // update bookmark pit of the current buffer before switch
+ for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+ gotoBookmark(i+1, false, false);
lyx_view_->setBuffer(theBufferList().getBuffer(argument));
break;
break;
case LFUN_SERVER_NOTIFY:
- dispatch_buffer = keyseq->print();
+ dispatch_buffer = keyseq->print(false);
theLyXServer().notifyClient(to_utf8(dispatch_buffer));
break;
case LFUN_BUFFER_CHILD_OPEN: {
BOOST_ASSERT(lyx_view_);
- string const filename =
+ FileName const filename =
makeAbsPath(argument, lyx_view_->buffer()->filePath());
// FIXME Should use bformat
setMessage(_("Opening child document ") +
- makeDisplayPath(filename) + "...");
+ makeDisplayPath(filename.absFilename()) + "...");
view()->saveBookmark(false);
string const parentfilename = lyx_view_->buffer()->fileName();
- if (theBufferList().exists(filename))
- lyx_view_->setBuffer(theBufferList().getBuffer(filename));
+ if (theBufferList().exists(filename.absFilename()))
+ lyx_view_->setBuffer(theBufferList().getBuffer(filename.absFilename()));
else
- lyx_view_->loadLyXFile(FileName(filename));
+ 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.
}
case LFUN_PREFERENCES_SAVE: {
- lyxrc.write(FileName(makeAbsPath("preferences",
- package().user_support())),
+ lyxrc.write(makeAbsPath("preferences",
+ package().user_support()),
false);
break;
}
// handle the screen font changes.
lyxrc.set_font_norm_type();
theFontLoader().update();
- // All visible buffers will need resize
- view()->resize();
+ /// FIXME: only the current view will be updated. the Gui
+ /// class is able to furnish the list of views.
+ updateFlags = Update::Force;
break;
case LFUN_SET_COLOR: {
}
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
+
+ /// We force the redraw in any case because there might be
+ /// some screen font changes.
+ /// FIXME: only the current view will be updated. the Gui
+ /// class is able to furnish the list of views.
+ updateFlags = Update::Force;
break;
}
case LFUN_WINDOW_CLOSE:
BOOST_ASSERT(lyx_view_);
BOOST_ASSERT(theApp());
+ // update bookmark pit of the current buffer before window close
+ for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+ gotoBookmark(i+1, false, false);
// ask the user for saving changes or cancel quit
if (!theBufferList().quitWriteAll())
break;
lyx_view_->close();
return;
- case LFUN_BOOKMARK_GOTO: {
- BOOST_ASSERT(lyx_view_);
- unsigned int idx = convert<unsigned int>(to_utf8(cmd.argument()));
- BookmarksSection::Bookmark const bm = LyX::ref().session().bookmarks().bookmark(idx);
- BOOST_ASSERT(!bm.filename.empty());
- string const file = bm.filename.absFilename();
- // if the file is not opened, open it.
- if (!theBufferList().exists(file))
- dispatch(FuncRequest(LFUN_FILE_OPEN, file));
- // open may fail, so we need to test it again
- if (theBufferList().exists(file)) {
- // if the current buffer is not that one, switch to it.
- if (lyx_view_->buffer()->fileName() != file)
- dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
- // BOOST_ASSERT(lyx_view_->buffer()->fileName() != file);
- view()->moveToPosition(bm.par_id, bm.par_pos);
- }
+ 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);
break;
- }
case LFUN_BOOKMARK_CLEAR:
LyX::ref().session().bookmarks().clear();
if (!dispatch_msg.empty())
dispatch_msg += ' ';
- string comname = lyxaction.getActionName(cmd.action);
+ docstring comname = from_utf8(lyxaction.getActionName(cmd.action));
bool argsadded = false;
if (!cmd.argument().empty()) {
if (cmd.action != LFUN_UNKNOWN_ACTION) {
- comname += ' ' + to_utf8(cmd.argument());
+ comname += ' ' + cmd.argument();
argsadded = true;
}
}
- string const shortcuts = to_utf8(theTopLevelKeymap().printbindings(cmd));
+ docstring const shortcuts = theTopLevelKeymap().printbindings(cmd);
if (!shortcuts.empty())
comname += ": " + shortcuts;
else if (!argsadded && !cmd.argument().empty())
- comname += ' ' + to_utf8(cmd.argument());
+ comname += ' ' + cmd.argument();
if (!comname.empty()) {
comname = rtrim(comname);
- dispatch_msg += from_utf8('(' + rtrim(comname) + ')');
+ dispatch_msg += '(' + rtrim(comname) + ')';
}
lyxerr[Debug::ACTION] << "verbose dispatch msg "
if (view()->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(trypath))
+ if (isDirWriteable(FileName(trypath)))
initpath = trypath;
}
if (view()->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(trypath))
+ if (isDirWriteable(FileName(trypath)))
initpath = trypath;
}
if (view()->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(trypath))
+ if (isDirWriteable(FileName(trypath)))
initpath = trypath;
}
// save current cursor position
LyX::ref().session().lastFilePos().save(FileName(lyx_view_->buffer()->fileName()),
boost::tie(view()->cursor().pit(), view()->cursor().pos()) );
+ // 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
}
+void LyXFunc::reloadBuffer()
+{
+ FileName filename(lyx_view_->buffer()->fileName());
+ closeBuffer();
+ lyx_view_->loadLyXFile(filename);
+}
+
// Each "lyx_view_" should have it's own message method. lyxview and
// the minibuffer would use the minibuffer, but lyxserver would
// send an ERROR signal to its client. Alejandro 970603
}
-string const LyXFunc::viewStatusMessage()
+docstring const LyXFunc::viewStatusMessage()
{
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey())
- return to_utf8(keyseq->print() + "M-");
+ return keyseq->print(true) + "M-";
// Else, when a non-complete key sequence is pressed,
// show the available options.
if (keyseq->length() > 0 && !keyseq->deleted())
- return to_utf8(keyseq->printOptions());
+ return keyseq->printOptions(true);
if (!view()->buffer())
- return to_utf8(_("Welcome to LyX!"));
+ return _("Welcome to LyX!");
return view()->cursor().currentState();
}
switch (tag) {
case LyXRC::RC_ACCEPT_COMPOUND:
case LyXRC::RC_ALT_LANG:
- case LyXRC::RC_ASCIIROFF_COMMAND:
- case LyXRC::RC_ASCII_LINELEN:
+ case LyXRC::RC_PLAINTEXT_ROFF_COMMAND:
+ case LyXRC::RC_PLAINTEXT_LINELEN:
case LyXRC::RC_AUTOREGIONDELETE:
case LyXRC::RC_AUTORESET_OPTIONS:
case LyXRC::RC_AUTOSAVE:
projects / lyx.git / blobdiff