#include <sstream>
+
+namespace lyx {
+
using bv_funcs::freefont2string;
-using lyx::docstring;
-
-using lyx::support::absolutePath;
-using lyx::support::addName;
-using lyx::support::addPath;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::contains;
-using lyx::support::FileFilterList;
-using lyx::support::fileSearch;
-using lyx::support::ForkedcallsController;
-using lyx::support::i18nLibFileSearch;
-using lyx::support::isDirWriteable;
-using lyx::support::isFileReadable;
-using lyx::support::isStrInt;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::package;
-using lyx::support::quoteName;
-using lyx::support::rtrim;
-using lyx::support::split;
-using lyx::support::subst;
-using lyx::support::Systemcall;
-using lyx::support::token;
-using lyx::support::trim;
-using lyx::support::prefixIs;
+using support::absolutePath;
+using support::addName;
+using support::addPath;
+using support::bformat;
+using support::changeExtension;
+using support::contains;
+using support::FileFilterList;
+using support::fileSearch;
+using support::ForkedcallsController;
+using support::i18nLibFileSearch;
+using support::isDirWriteable;
+using support::isFileReadable;
+using support::isStrInt;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::package;
+using support::quoteName;
+using support::rtrim;
+using support::split;
+using support::subst;
+using support::Systemcall;
+using support::token;
+using support::trim;
+using support::prefixIs;
using std::endl;
using std::make_pair;
using std::istringstream;
using std::ostringstream;
-namespace Alert = lyx::frontend::Alert;
-namespace biblio = lyx::biblio;
+namespace Alert = frontend::Alert;
namespace fs = boost::filesystem;
namespace {
-bool getStatus(LCursor cursor,
+bool getLocalStatus(LCursor cursor,
FuncRequest const & cmd, FuncStatus & status)
{
// Try to fix cursor in case it is broken.
void LyXFunc::handleKeyFunc(kb_action action)
{
- char c = encoded_last_key;
+ char_type c = encoded_last_key;
- if (keyseq->length()) {
+ if (keyseq->length())
c = 0;
- }
lyx_view_->view()->getIntl().getTransManager()
.deadkey(c, get_accent(action).accent, view()->getLyXText());
return;
}
- Encoding const * encoding = view()->cursor().getEncoding();
-
+ //Encoding const * encoding = view()->cursor().getEncoding();
//encoded_last_key = keysym->getISOEncoded(encoding ? encoding->name() : "");
size_t encoded_last_key = keysym->getUCSEncoded();
// num_bytes == 0? (Lgb)
if (keyseq->length() > 1) {
- lyx_view_->message(lyx::from_utf8(keyseq->print()));
+ lyx_view_->message(from_utf8(keyseq->print()));
}
dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
FuncRequest::KEYBOARD));
lyxerr[Debug::KEY]
- << "SelfInsert arg[`" << lyx::to_utf8(arg) << "']" << endl;
+ << "SelfInsert arg[`" << to_utf8(arg) << "']" << endl;
}
} else {
dispatch(func);
buf = lyx_view_->buffer();
if (cmd.action == LFUN_NOACTION) {
- flag.message(lyx::from_utf8(N_("Nothing to do")));
+ flag.message(from_utf8(N_("Nothing to do")));
flag.enabled(false);
return flag;
}
}
if (flag.unknown()) {
- flag.message(lyx::from_utf8(N_("Unknown action")));
+ flag.message(from_utf8(N_("Unknown action")));
return flag;
}
if (!flag.enabled()) {
if (flag.message().empty())
- flag.message(lyx::from_utf8(N_("Command disabled")));
+ flag.message(from_utf8(N_("Command disabled")));
return flag;
}
// Check whether we need a buffer
if (!lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer) && !buf) {
// no, exit directly
- flag.message(lyx::from_utf8(N_("Command not allowed with"
+ flag.message(from_utf8(N_("Command not allowed with"
"out any document open")));
flag.enabled(false);
return flag;
case LFUN_BUFFER_SWITCH:
// toggle on the current buffer, but do not toggle off
// the other ones (is that a good idea?)
- if (lyx::to_utf8(cmd.argument()) == buf->fileName())
+ if (to_utf8(cmd.argument()) == buf->fileName())
flag.setOnOff(true);
break;
case LFUN_BUFFER_EXPORT:
enable = cmd.argument() == "custom"
- || Exporter::isExportable(*buf, lyx::to_utf8(cmd.argument()));
+ || Exporter::isExportable(*buf, to_utf8(cmd.argument()));
break;
case LFUN_BUFFER_CHKTEX:
// solution, we consider only the first action of the sequence
case LFUN_COMMAND_SEQUENCE: {
// argument contains ';'-terminated commands
- string const firstcmd = token(lyx::to_utf8(cmd.argument()), ';', 0);
+ string const firstcmd = token(to_utf8(cmd.argument()), ';', 0);
FuncRequest func(lyxaction.lookupFunc(firstcmd));
func.origin = cmd.origin;
flag = getStatus(func);
case LFUN_LYXRC_APPLY:
case LFUN_BUFFER_NEXT:
case LFUN_BUFFER_PREVIOUS:
+ case LFUN_WINDOW_NEW:
// these are handled in our dispatch()
break;
default:
-
- if (!::getStatus(cur, cmd, flag))
+ if (!getLocalStatus(cur, cmd, flag))
flag = view()->getStatus(cmd);
}
if (buf && buf->isReadonly()
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
- flag.message(lyx::from_utf8(N_("Document is read-only")));
+ flag.message(from_utf8(N_("Document is read-only")));
flag.enabled(false);
}
if (buf && lookupChangeType(cur, true) == Change::DELETED
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
- flag.message(lyx::from_utf8(N_("This portion of the document is deleted.")));
+ flag.message(from_utf8(N_("This portion of the document is deleted.")));
flag.enabled(false);
}
// the default error message if we disable the command
if (!flag.enabled() && flag.message().empty())
- flag.message(lyx::from_utf8(N_("Command disabled")));
+ flag.message(from_utf8(N_("Command disabled")));
return flag;
}
void loadTextclass(string const & name)
{
- std::pair<bool, lyx::textclass_type> const tc_pair =
+ std::pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(name);
if (!tc_pair.first) {
return;
}
- lyx::textclass_type const tc = tc_pair.second;
+ textclass_type const tc = tc_pair.second;
if (!textclasslist[tc].load()) {
docstring s = bformat(_("The document could not be converted\n"
"into the document class %1$s."),
- lyx::from_utf8(textclasslist[tc].name()));
+ from_utf8(textclasslist[tc].name()));
Alert::error(_("Could not change class"), s);
}
}
void LyXFunc::dispatch(FuncRequest const & cmd)
{
BOOST_ASSERT(view());
- string const argument = lyx::to_utf8(cmd.argument());
+ string const argument = to_utf8(cmd.argument());
kb_action const action = cmd.action;
- lyxerr[Debug::ACTION] << "LyXFunc::dispatch: cmd: " << cmd << endl;
+ lyxerr[Debug::ACTION] << endl << "LyXFunc::dispatch: cmd: " << cmd << endl;
//lyxerr << "LyXFunc::dispatch: cmd: " << cmd << endl;
// we have not done anything wrong yet.
// redraw the screen at the end (first of the two drawing steps).
//This is done unless explicitely requested otherwise
- bool update = true;
- // also do the second redrawing step. Only done if requested.
- bool updateforce = false;
+ Update::flags updateFlags = Update::FitCursor;
FuncStatus const flag = getStatus(cmd);
if (!flag.enabled()) {
bool const fw = action == LFUN_WORD_FIND_FORWARD;
string const data =
- lyx::find::find2string(searched_string, true, false, fw);
- lyx::find::find(view(), FuncRequest(LFUN_WORD_FIND, data));
+ find2string(searched_string, true, false, fw);
+ find(view(), FuncRequest(LFUN_WORD_FIND, data));
break;
}
case LFUN_COMMAND_PREFIX:
- lyx_view_->message(lyx::from_utf8(keyseq->printOptions()));
+ lyx_view_->message(from_utf8(keyseq->printOptions()));
break;
case LFUN_COMMAND_EXECUTE:
case LFUN_META_PREFIX:
meta_fake_bit = key_modifier::alt;
- setMessage(lyx::from_utf8(keyseq->print()));
+ setMessage(from_utf8(keyseq->print()));
break;
case LFUN_BUFFER_TOGGLE_READ_ONLY:
lyx_view_->message(str + _(" done."));
} else
writeAs(lyx_view_->buffer());
- update = false;
+ updateFlags = Update::None;
break;
case LFUN_BUFFER_WRITE_AS:
writeAs(lyx_view_->buffer(), argument);
- update = false;
+ updateFlags = Update::None;
break;
case LFUN_BUFFER_RELOAD: {
// Push directory path.
string const path = buffer->temppath();
- lyx::support::Path p(path);
+ support::Path p(path);
// there are three cases here:
// 1. we print to a file
break;
case LFUN_MENU_OPEN:
- lyx_view_->getMenubar().openByName(lyx::from_utf8(argument));
+ lyx_view_->getMenubar().openByName(from_utf8(argument));
break;
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_NAME:
- setMessage(lyx::from_utf8(lyx_view_->buffer()->fileName()));
+ setMessage(from_utf8(lyx_view_->buffer()->fileName()));
lyxerr[Debug::INFO] << "FNAME["
<< lyx_view_->buffer()->fileName()
<< "] " << endl;
break;
case LFUN_SERVER_NOTIFY:
- dispatch_buffer = lyx::from_utf8(keyseq->print());
- theLyXServer().notifyClient(lyx::to_utf8(dispatch_buffer));
+ dispatch_buffer = from_utf8(keyseq->print());
+ theLyXServer().notifyClient(to_utf8(dispatch_buffer));
break;
case LFUN_SERVER_GOTO_FILE_ROW: {
case LFUN_DIALOG_SHOW: {
string const name = cmd.getArg(0);
- string data = trim(lyx::to_utf8(cmd.argument()).substr(name.size()));
+ string data = trim(to_utf8(cmd.argument()).substr(name.size()));
if (name == "character") {
data = freefont2string();
case LFUN_DIALOG_SHOW_NEW_INSET: {
string const name = cmd.getArg(0);
- string data = trim(lyx::to_utf8(cmd.argument()).substr(name.size()));
+ string data = trim(to_utf8(cmd.argument()).substr(name.size()));
if (name == "bibitem" ||
name == "bibtex" ||
name == "index" ||
}
case LFUN_PREFERENCES_SAVE: {
- lyx::support::Path p(package().user_support());
+ support::Path p(package().user_support());
lyxrc.write("preferences", false);
break;
}
bformat(_("Set-color \"%1$s\" failed "
"- color is undefined or "
"may not be redefined"),
- lyx::from_utf8(lyx_name)));
+ from_utf8(lyx_name)));
break;
}
#warning FIXME!! The graphics cache no longer has a changeDisplay method.
#endif
#if 0
- lyx::graphics::GCache::get().changeDisplay(true);
+ graphics::GCache::get().changeDisplay(true);
#endif
}
break;
}
case LFUN_MESSAGE:
- lyx_view_->message(lyx::from_utf8(argument));
+ lyx_view_->message(from_utf8(argument));
break;
case LFUN_EXTERNAL_EDIT: {
}
// ideally, the update flag should be set by the insets,
// but this is not possible currently
- updateforce = true;
+ updateFlags = Update::Force | Update::FitCursor;
break;
}
it->dispatch(tmpcur, fr);
}
}
- updateforce = true;
+ updateFlags = Update::Force | Update::FitCursor;
break;
}
case LFUN_TEXTCLASS_APPLY: {
Buffer * buffer = lyx_view_->buffer();
- lyx::textclass_type const old_class =
+ textclass_type const old_class =
buffer->params().textclass;
loadTextclass(argument);
- std::pair<bool, lyx::textclass_type> const tc_pair =
+ std::pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(argument);
if (!tc_pair.first)
break;
- lyx::textclass_type const new_class = tc_pair.second;
+ textclass_type const new_class = tc_pair.second;
if (old_class == new_class)
// nothing to do
break;
buffer->params().textclass = new_class;
StableDocIterator backcur(view()->cursor());
ErrorList & el = buffer->errorList("Class Switch");
- lyx::cap::switchBetweenClasses(
+ cap::switchBetweenClasses(
old_class, new_class,
static_cast<InsetText &>(buffer->inset()), el);
buffer->errors("Class Switch");
updateLabels(*buffer);
- updateforce = true;
+ updateFlags = Update::Force | Update::FitCursor;
break;
}
break;
}
+ case LFUN_WINDOW_NEW:
+ BOOST_ASSERT(theApp);
+ LyX::ref().newLyXView();
+
default: {
view()->cursor().dispatch(cmd);
- updateforce |= view()->cursor().result().update();
+ updateFlags = view()->cursor().result().update();
if (!view()->cursor().result().dispatched())
- updateforce |= view()->dispatch(cmd);
+ if (view()->dispatch(cmd))
+ updateFlags = Update::Force | Update::FitCursor;
break;
}
}
// Redraw screen unless explicitly told otherwise.
// This also initializes the position cache for all insets
// in (at least partially) visible top-level paragraphs.
- if (updateforce)
- view()->update(Update::FitCursor | Update::Force);
- else if (update)
- view()->update(Update::FitCursor);
+ bool needSecondUpdate = false;
+ if (updateFlags != Update::None)
+ view()->update(updateFlags);
+ else
+ needSecondUpdate = view()->fitCursor();
- lyx_view_->redrawWorkArea();
+ if (needSecondUpdate || updateFlags != Update::None) {
+ view()->buffer()->changed();
+ }
+ lyx_view_->updateStatusBar();
// if we executed a mutating lfun, mark the buffer as dirty
if (flag.enabled()
}
if (!quitting)
// FIXME UNICODE: _() does not support anything but ascii.
- // Do we need a lyx::to_ascii() method?
+ // Do we need a to_ascii() method?
sendDispatchMessage(getMessage(), cmd);
}
|| cmd.origin == FuncRequest::COMMANDBUFFER);
if (cmd.action == LFUN_SELF_INSERT || !verbose) {
- lyxerr[Debug::ACTION] << "dispatch msg is " << lyx::to_utf8(msg) << endl;
+ lyxerr[Debug::ACTION] << "dispatch msg is " << to_utf8(msg) << endl;
if (!msg.empty())
lyx_view_->message(msg);
return;
if (!cmd.argument().empty()) {
if (cmd.action != LFUN_UNKNOWN_ACTION) {
- comname += ' ' + lyx::to_utf8(cmd.argument());
+ comname += ' ' + to_utf8(cmd.argument());
argsadded = true;
}
}
if (!shortcuts.empty())
comname += ": " + shortcuts;
else if (!argsadded && !cmd.argument().empty())
- comname += ' ' + lyx::to_utf8(cmd.argument());
+ comname += ' ' + to_utf8(cmd.argument());
if (!comname.empty()) {
comname = rtrim(comname);
- dispatch_msg += lyx::from_utf8('(' + rtrim(comname) + ')');
+ dispatch_msg += from_utf8('(' + rtrim(comname) + ')');
}
lyxerr[Debug::ACTION] << "verbose dispatch msg "
- << lyx::to_utf8(dispatch_msg) << endl;
+ << to_utf8(dispatch_msg) << endl;
if (!dispatch_msg.empty())
lyx_view_->message(dispatch_msg);
}
if (fromTemplate) {
FileDialog fileDlg(_("Select template file"),
LFUN_SELECT_FILE_SYNC,
- make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)),
- make_pair(_("Templates|#T#t"), lyx::from_utf8(lyxrc.template_path)));
+ make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
+ make_pair(_("Templates|#T#t"), from_utf8(lyxrc.template_path)));
FileDialog::Result result =
- fileDlg.open(lyx::from_utf8(lyxrc.template_path),
+ fileDlg.open(from_utf8(lyxrc.template_path),
FileFilterList(_("LyX Documents (*.lyx)")),
docstring());
return;
if (result.second.empty())
return;
- templname = lyx::to_utf8(result.second);
+ templname = to_utf8(result.second);
}
Buffer * const b = newFile(filename, templname, !name.empty());
if (fname.empty()) {
FileDialog fileDlg(_("Select document to open"),
LFUN_FILE_OPEN,
- make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)),
- make_pair(_("Examples|#E#e"), lyx::from_utf8(addPath(package().system_support(), "examples"))));
+ make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
+ make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support(), "examples"))));
FileDialog::Result result =
- fileDlg.open(lyx::from_utf8(initpath),
+ fileDlg.open(from_utf8(initpath),
FileFilterList(_("LyX Documents (*.lyx)")),
docstring());
if (result.first == FileDialog::Later)
return;
- filename = lyx::to_utf8(result.second);
+ filename = to_utf8(result.second);
// check selected filename
if (filename.empty()) {
FileDialog fileDlg(text,
LFUN_BUFFER_IMPORT,
- make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)),
+ make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
make_pair(_("Examples|#E#e"),
- lyx::from_utf8(addPath(package().system_support(), "examples"))));
+ from_utf8(addPath(package().system_support(), "examples"))));
docstring filter = formats.prettyName(format);
filter += " (*.";
// FIXME UNICODE
- filter += lyx::from_utf8(formats.extension(format));
+ filter += from_utf8(formats.extension(format));
filter += ')';
FileDialog::Result result =
- fileDlg.open(lyx::from_utf8(initpath),
+ fileDlg.open(from_utf8(initpath),
FileFilterList(filter),
docstring());
if (result.first == FileDialog::Later)
return;
- filename = lyx::to_utf8(result.second);
+ filename = to_utf8(result.second);
// check selected filename
if (filename.empty())
string const lyxfile = changeExtension(filename, ".lyx");
// Check if the document already is open
- if (lyx::use_gui && theBufferList().exists(lyxfile)) {
+ if (use_gui && theBufferList().exists(lyxfile)) {
if (!theBufferList().close(theBufferList().getBuffer(lyxfile), true)) {
lyx_view_->message(_("Canceled."));
return;
return keyseq->printOptions();
if (!view()->buffer())
- return lyx::to_utf8(_("Welcome to LyX!"));
+ return to_utf8(_("Welcome to LyX!"));
return view()->cursor().currentState();
}
if (lyxrc_orig.document_path != lyxrc_new.document_path) {
if (fs::exists(lyxrc_new.document_path) &&
fs::is_directory(lyxrc_new.document_path)) {
- using lyx::support::package;
- package().document_dir() = lyxrc.document_path;
+ support::package().document_dir() = lyxrc.document_path;
}
}
case LyXRC::RC_ESC_CHARS:
case LyXRC::RC_NUMLASTFILES:
case LyXRC::RC_PATH_PREFIX:
if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
- using lyx::support::prependEnvPath;
- prependEnvPath("PATH", lyxrc.path_prefix);
+ support::prependEnvPath("PATH", lyxrc.path_prefix);
}
case LyXRC::RC_PERS_DICT:
case LyXRC::RC_POPUP_BOLD_FONT:
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) {
- namespace os = lyx::support::os;
- os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
+ support::os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
}
case LyXRC::RC_UIFILE:
case LyXRC::RC_USER_EMAIL:
}
} // namespace anon
+
+
+} // namespace lyx
projects / lyx.git / blobdiff