#include "vspace.h"
#include "pariterator.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Gui.h"
-#include "frontends/LyXView.h"
#include "frontends/Clipboard.h"
#include "frontends/Selection.h"
#include "support/convert.h"
#include "support/lyxtime.h"
-#include "mathed/math_hullinset.h"
-#include "mathed/math_macrotemplate.h"
+#include "mathed/InsetMathHull.h"
+#include "mathed/MathMacroTemplate.h"
#include <boost/current_function.hpp>
#include <clocale>
#include <sstream>
-using lyx::char_type;
-using lyx::docstring;
-using lyx::pos_type;
-using lyx::cap::copySelection;
-using lyx::cap::cutSelection;
-using lyx::cap::pasteSelection;
-using lyx::cap::replaceSelection;
+namespace lyx {
-using lyx::support::isStrUnsignedInt;
-using lyx::support::token;
+using cap::copySelection;
+using cap::cutSelection;
+using cap::pasteSelection;
+using cap::replaceSelection;
-using lyx::frontend::Gui;
-using lyx::frontend::Clipboard;
+using support::isStrUnsignedInt;
+using support::token;
using std::endl;
using std::string;
if (selecting || cur.mark())
cur.setSelection();
if (!cur.selection())
- cur.bv().owner()->gui().selection().haveSelection(false);
+ theSelection().haveSelection(false);
cur.bv().switchKeyMap();
}
void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
{
recordUndo(cur);
- string sel = lyx::to_utf8(cur.selectionAsString(false));
+ docstring sel = cur.selectionAsString(false);
//lyxerr << "selection is: '" << sel << "'" << endl;
// It may happen that sel is empty but there is a selection
if (sel.empty()) {
const int old_pos = cur.pos();
- cur.insert(new MathHullInset(hullSimple));
+ cur.insert(new InsetMathHull(hullSimple));
BOOST_ASSERT(old_pos == cur.pos());
cur.nextInset()->edit(cur, true);
// don't do that also for LFUN_MATH_MODE
// create a macro if we see "\\newcommand"
// somewhere, and an ordinary formula
// otherwise
- istringstream is(sel);
- if (sel.find("\\newcommand") == string::npos
- && sel.find("\\def") == string::npos)
+ if (sel.find(from_ascii("\\newcommand")) == string::npos
+ && sel.find(from_ascii("\\def")) == string::npos)
{
- MathHullInset * formula = new MathHullInset;
+ InsetMathHull * formula = new InsetMathHull;
+ istringstream is(to_utf8(sel));
LyXLex lex(0, 0);
lex.setStream(is);
formula->read(cur.buffer(), lex);
// delimiters are left out
formula->mutate(hullSimple);
cur.insert(formula);
- } else
- cur.insert(new MathMacroTemplate(is));
+ } else {
+ cur.insert(new MathMacroTemplate(sel));
+ }
}
- cur.message(N_("Math editor mode"));
+ cur.message(from_utf8(N_("Math editor mode")));
}
} // namespace anon
bool LyXText::cursorPrevious(LCursor & cur)
{
pos_type cpos = cur.pos();
- lyx::pit_type cpar = cur.pit();
+ pit_type cpar = cur.pit();
int x = cur.x_target();
bool LyXText::cursorNext(LCursor & cur)
{
pos_type cpos = cur.pos();
- lyx::pit_type cpar = cur.pit();
+ pit_type cpar = cur.pit();
int x = cur.x_target();
bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
void specialChar(LCursor & cur, InsetSpecialChar::Kind kind)
{
- lyx::cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
cur.insert(new InsetSpecialChar(kind));
cur.posRight();
}
recordUndo(cur);
bool gotsel = false;
if (cur.selection()) {
- cur.bv().owner()->dispatch(FuncRequest(LFUN_CUT));
+ lyx::dispatch(FuncRequest(LFUN_CUT));
gotsel = true;
}
text->insertInset(cur, inset);
if (edit)
inset->edit(cur, true);
- if (gotsel && pastesel)
- cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
+ if (gotsel && pastesel) {
+ lyx::dispatch(FuncRequest(LFUN_PASTE));
+ // reset first par to default
+ if (cur.lastpit() != 0 || cur.lastpos() != 0) {
+ LyXLayout_ptr const layout =
+ cur.buffer().params().getLyXTextClass().defaultLayout();
+ cur.text()->paragraphs().begin()->layout(layout);
+ }
+ }
return true;
}
-void update(LCursor & cur)
-{
- //we don't call update(true, false) directly to save a metrics call
- if (cur.bv().fitCursor())
- cur.bv().update(Update::Force);
-}
-
-
} // anon namespace
}
-bool LyXText::isRTL(Paragraph const & par) const
+bool LyXText::isRTL(Buffer const & buffer, Paragraph const & par) const
{
- return par.isRightToLeftPar(bv()->buffer()->params());
+ return par.isRightToLeftPar(buffer.params());
}
{
lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
+ // FIXME: We use the update flag to indicates wether a singlePar or a
+ // full screen update is needed. We reset it here but shall we restore it
+ // at the end?
+ cur.noUpdate();
+
BOOST_ASSERT(cur.text() == this);
BufferView * bv = &cur.bv();
CursorSlice oldTopSlice = cur.top();
case LFUN_PARAGRAPH_MOVE_DOWN: {
pit_type const pit = cur.pit();
- recUndo(pit, pit + 1);
+ recUndo(cur, pit, pit + 1);
finishUndo();
std::swap(pars_[pit], pars_[pit + 1]);
case LFUN_PARAGRAPH_MOVE_UP: {
pit_type const pit = cur.pit();
- recUndo(pit - 1, pit);
+ recUndo(cur, pit - 1, pit);
finishUndo();
std::swap(pars_[pit], pars_[pit - 1]);
// ensure that we have only one start_of_appendix in this document
for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
if (pars_[tmp].params().startOfAppendix()) {
- recUndo(tmp);
+ recUndo(cur, tmp);
pars_[tmp].params().startOfAppendix(false);
break;
}
case LFUN_BUFFER_BEGIN:
case LFUN_BUFFER_BEGIN_SELECT:
- cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
if (cur.depth() == 1) {
- needsUpdate = cursorTop(cur);
+ needsUpdate |= cursorTop(cur);
} else {
cur.undispatched();
}
case LFUN_BUFFER_END:
case LFUN_BUFFER_END_SELECT:
- cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
if (cur.depth() == 1) {
- needsUpdate = cursorBottom(cur);
+ needsUpdate |= cursorBottom(cur);
} else {
cur.undispatched();
}
case LFUN_CHAR_FORWARD_SELECT:
//lyxerr << BOOST_CURRENT_FUNCTION
// << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorLeft(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_FORWARD_SELECT);
+ if (isRTL(*cur.bv().buffer(), cur.paragraph()))
+ needsUpdate |= cursorLeft(cur);
else
- needsUpdate = cursorRight(cur);
+ needsUpdate |= cursorRight(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
case LFUN_CHAR_BACKWARD:
case LFUN_CHAR_BACKWARD_SELECT:
//lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorRight(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_CHAR_BACKWARD_SELECT);
+ if (isRTL(*cur.bv().buffer(), cur.paragraph()))
+ needsUpdate |= cursorRight(cur);
else
- needsUpdate = cursorLeft(cur);
+ needsUpdate |= cursorLeft(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
case LFUN_UP:
case LFUN_UP_SELECT:
- update(cur);
//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_UP_SELECT);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_UP_SELECT);
+
+ needsUpdate |= cursorUp(cur);
- needsUpdate = cursorUp(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
cur.undispatched();
case LFUN_DOWN:
case LFUN_DOWN_SELECT:
- update(cur);
//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
- needsUpdate = cursorDown(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
+ needsUpdate |= cursorDown(cur);
+
if (!needsUpdate && oldTopSlice == cur.top() &&
cur.boundary() == oldBoundary)
{
case LFUN_PARAGRAPH_UP:
case LFUN_PARAGRAPH_UP_SELECT:
- cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
- needsUpdate = cursorUpParagraph(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
+ needsUpdate |= cursorUpParagraph(cur);
break;
case LFUN_PARAGRAPH_DOWN:
case LFUN_PARAGRAPH_DOWN_SELECT:
- cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
- needsUpdate = cursorDownParagraph(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
+ needsUpdate |= cursorDownParagraph(cur);
break;
case LFUN_SCREEN_UP:
case LFUN_SCREEN_UP_SELECT:
- update(cur);
- cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
if (cur.pit() == 0 && cur.textRow().pos() == 0) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
} else {
- needsUpdate = cursorPrevious(cur);
+ needsUpdate |= cursorPrevious(cur);
}
break;
case LFUN_SCREEN_DOWN:
case LFUN_SCREEN_DOWN_SELECT:
- update(cur);
- cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
if (cur.pit() == cur.lastpit()
&& cur.textRow().endpos() == cur.lastpos()) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_DOWN);
} else {
- needsUpdate = cursorNext(cur);
+ needsUpdate |= cursorNext(cur);
}
break;
case LFUN_LINE_BEGIN:
case LFUN_LINE_BEGIN_SELECT:
- update(cur);
- cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
- needsUpdate = cursorHome(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
+ needsUpdate |= cursorHome(cur);
break;
case LFUN_LINE_END:
case LFUN_LINE_END_SELECT:
- update(cur);
- cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
- needsUpdate = cursorEnd(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
+ needsUpdate |= cursorEnd(cur);
break;
case LFUN_WORD_FORWARD:
case LFUN_WORD_FORWARD_SELECT:
- cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorLeftOneWord(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
+ if (isRTL(*cur.bv().buffer(), cur.paragraph()))
+ needsUpdate |= cursorLeftOneWord(cur);
else
- needsUpdate = cursorRightOneWord(cur);
+ needsUpdate |= cursorRightOneWord(cur);
break;
case LFUN_WORD_BACKWARD:
case LFUN_WORD_BACKWARD_SELECT:
- cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorRightOneWord(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
+ if (isRTL(*cur.bv().buffer(), cur.paragraph()))
+ needsUpdate |= cursorRightOneWord(cur);
else
- needsUpdate = cursorLeftOneWord(cur);
+ needsUpdate |= cursorLeftOneWord(cur);
break;
case LFUN_WORD_SELECT: {
- selectWord(cur, lyx::WHOLE_WORD);
+ selectWord(cur, WHOLE_WORD);
finishChange(cur, true);
break;
}
case LFUN_BREAK_LINE: {
// Not allowed by LaTeX (labels or empty par)
if (cur.pos() > cur.paragraph().beginOfBody()) {
- lyx::cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
cur.insert(new InsetNewline);
cur.posRight();
moveCursor(cur, false);
if (cur.pos() == cur.paragraph().size())
// Par boundary, force full-screen update
singleParUpdate = false;
- needsUpdate = erase(cur);
+ needsUpdate |= erase(cur);
cur.resetAnchor();
// It is possible to make it a lot faster still
// just comment out the line below...
case LFUN_CHAR_DELETE_BACKWARD:
if (!cur.selection()) {
- if (bv->owner()->getIntl().getTransManager().backspace()) {
+ if (bv->getIntl().getTransManager().backspace()) {
// Par boundary, full-screen update
if (cur.pos() == 0)
singleParUpdate = false;
- needsUpdate = backspace(cur);
+ needsUpdate |= backspace(cur);
cur.resetAnchor();
// It is possible to make it a lot faster still
// just comment out the line below...
break;
case LFUN_BREAK_PARAGRAPH:
- lyx::cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
breakParagraph(cur, 0);
cur.resetAnchor();
bv->switchKeyMap();
break;
case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
- lyx::cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
breakParagraph(cur, 1);
cur.resetAnchor();
bv->switchKeyMap();
case LFUN_BREAK_PARAGRAPH_SKIP: {
// When at the beginning of a paragraph, remove
// indentation. Otherwise, do the same as LFUN_BREAK_PARAGRAPH.
- lyx::cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
if (cur.pos() == 0)
- cur.paragraph().params().labelWidthString(string());
+ cur.paragraph().params().labelWidthString(docstring());
else
breakParagraph(cur, 0);
cur.resetAnchor();
if (cur_spacing == Spacing::Other)
cur_value = par.params().spacing().getValueAsString();
- istringstream is(lyx::to_utf8(cmd.argument()));
+ istringstream is(to_utf8(cmd.argument()));
string tmp;
is >> tmp;
Spacing::Space new_spacing = cur_spacing;
} else if (tmp == "default") {
new_spacing = Spacing::Default;
} else {
- lyxerr << _("Unknown spacing argument: ")
- << lyx::to_utf8(cmd.argument()) << endl;
+ lyxerr << to_utf8(_("Unknown spacing argument: "))
+ << to_utf8(cmd.argument()) << endl;
}
if (cur_spacing != new_spacing || cur_value != new_value)
par.params().spacing(Spacing(new_spacing, new_value));
}
case LFUN_INSET_DISSOLVE:
- needsUpdate = dissolveInset(cur);
+ needsUpdate |= dissolveInset(cur);
break;
case LFUN_INSET_SETTINGS:
break;
case LFUN_CHARS_TRANSPOSE:
- recordUndo(cur);
+ charsTranspose(cur);
break;
case LFUN_PASTE:
cur.message(_("Paste"));
- lyx::cap::replaceSelection(cur);
- if (isStrUnsignedInt(lyx::to_utf8(cmd.argument())))
+ cap::replaceSelection(cur);
+ if (isStrUnsignedInt(to_utf8(cmd.argument())))
pasteSelection(cur, bv->buffer()->errorList("Paste"),
- convert<unsigned int>(lyx::to_utf8(cmd.argument())));
+ convert<unsigned int>(to_utf8(cmd.argument())));
else
pasteSelection(cur, bv->buffer()->errorList("Paste"),
0);
break;
case LFUN_SERVER_GET_XY:
- cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
- + convert<string>(cursorY(cur.top(), cur.boundary())));
+ cur.message(from_utf8(
+ convert<string>(cursorX(cur.buffer(), cur.top(), cur.boundary()))
+ + ' ' + convert<string>(cursorY(cur.top(), cur.boundary()))));
break;
case LFUN_SERVER_SET_XY: {
int x = 0;
int y = 0;
- istringstream is(lyx::to_utf8(cmd.argument()));
+ istringstream is(to_utf8(cmd.argument()));
is >> x >> y;
if (!is)
lyxerr << "SETXY: Could not parse coordinates in '"
- << lyx::to_utf8(cmd.argument()) << std::endl;
+ << to_utf8(cmd.argument()) << std::endl;
else
setCursorFromCoordinates(cur, x, y);
break;
case LFUN_SERVER_GET_FONT:
if (current_font.shape() == LyXFont::ITALIC_SHAPE)
- cur.message("E");
+ cur.message(from_ascii("E"));
else if (current_font.shape() == LyXFont::SMALLCAPS_SHAPE)
- cur.message("N");
+ cur.message(from_ascii("N"));
else
- cur.message("0");
+ cur.message(from_ascii("0"));
break;
case LFUN_SERVER_GET_LAYOUT:
- cur.message(cur.paragraph().layout()->name());
+ cur.message(from_utf8(cur.paragraph().layout()->name()));
break;
case LFUN_LAYOUT: {
- lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
- << lyx::to_utf8(cmd.argument()) << endl;
-
- // This is not the good solution to the empty argument
- // problem, but it will hopefully suffice for 1.2.0.
- // The correct solution would be to augument the
- // function list/array with information about what
- // functions needs arguments and their type.
- if (cmd.argument().empty()) {
- cur.errorMessage(_("LyX function 'layout' needs an argument."));
- break;
- }
+ string layout = to_ascii(cmd.argument());
+ lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) " << layout << endl;
// Derive layout number from given argument (string)
// and current buffer's textclass (number)
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
- bool hasLayout = tclass.hasLayout(lyx::to_utf8(cmd.argument()));
- string layout = lyx::to_utf8(cmd.argument());
+ if (layout.empty())
+ layout = tclass.defaultLayoutName();
+ bool hasLayout = tclass.hasLayout(layout);
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
}
if (!hasLayout) {
- cur.errorMessage(string(N_("Layout ")) + lyx::to_utf8(cmd.argument()) +
- N_(" not known"));
+ cur.errorMessage(from_utf8(N_("Layout ")) + cmd.argument() +
+ from_utf8(N_(" not known")));
break;
}
if (change_layout) {
current_layout = layout;
setLayout(cur, layout);
- bv->owner()->setLayout(layout);
+ // inform the GUI that the layout has changed.
+ bv->layoutChanged(layout);
bv->switchKeyMap();
}
break;
case LFUN_CLIPBOARD_PASTE: {
cur.clearSelection();
- docstring const clip = bv->owner()->gui().clipboard().get();
+ docstring const clip = theClipboard().get();
if (!clip.empty()) {
recordUndo(cur);
if (cmd.argument() == "paragraph")
case LFUN_PRIMARY_SELECTION_PASTE: {
cur.clearSelection();
- docstring const clip = bv->owner()->gui().selection().get();
+ docstring const clip = theSelection().get();
if (!clip.empty()) {
recordUndo(cur);
if (cmd.argument() == "paragraph")
break;
}
+ case LFUN_UNICODE_INSERT: {
+ if (cmd.argument().empty())
+ break;
+ docstring hexstring = cmd.argument();
+ if (lyx::support::isHex(hexstring)) {
+ char_type c = lyx::support::hexToInt(hexstring);
+ if (c > 32 && c < 0x10ffff) {
+ lyxerr << "Inserting c: " << c << endl;
+ docstring s = docstring(1, c);
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, s));
+ }
+ }
+ break;
+ }
+
case LFUN_QUOTE_INSERT: {
- lyx::cap::replaceSelection(cur);
+ cap::replaceSelection(cur);
Paragraph & par = cur.paragraph();
- lyx::pos_type pos = cur.pos();
- lyx::char_type c;
+ pos_type pos = cur.pos();
+ char_type c;
if (pos == 0)
c = ' ';
else if (cur.prevInset() && cur.prevInset()->isSpace())
BufferParams const & bufparams = bv->buffer()->params();
if (!style->pass_thru
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
- string arg = lyx::to_utf8(cmd.argument());
+ string arg = to_utf8(cmd.argument());
if (arg == "single")
cur.insert(new InsetQuotes(c,
bufparams.quotes_language,
cur.posRight();
}
else
- bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
break;
}
case LFUN_DATE_INSERT:
if (cmd.argument().empty())
- bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
- lyx::formatted_time(lyx::current_time())));
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
+ formatted_time(current_time())));
else
- bv->owner()->dispatch(FuncRequest(LFUN_SELF_INSERT,
- lyx::formatted_time(lyx::current_time(), lyx::to_utf8(cmd.argument()))));
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
+ formatted_time(current_time(), to_utf8(cmd.argument()))));
break;
case LFUN_MOUSE_TRIPLE:
cursorEnd(cur);
cur.setSelection();
bv->cursor() = cur;
- bv->owner()->gui().selection().haveSelection(cur.selection());
+ theSelection().haveSelection(cur.selection());
}
break;
case LFUN_MOUSE_DOUBLE:
if (cmd.button() == mouse_button::button1) {
- selectWord(cur, lyx::WHOLE_WORD_STRICT);
+ selectWord(cur, WHOLE_WORD_STRICT);
bv->cursor() = cur;
- bv->owner()->gui().selection().haveSelection(cur.selection());
+ theSelection().haveSelection(cur.selection());
}
break;
// we have to check this first
bool paste_internally = false;
if (cmd.button() == mouse_button::button2 && cur.selection()) {
- bv->owner()->dispatch(FuncRequest(LFUN_COPY));
+ lyx::dispatch(FuncRequest(LFUN_COPY));
paste_internally = true;
}
// insert this
if (cmd.button() == mouse_button::button2) {
if (paste_internally)
- bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
+ lyx::dispatch(FuncRequest(LFUN_PASTE));
else
- bv->owner()->dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
+ lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
+ }
+
+ if (cmd.button() == mouse_button::button1) {
+ needsUpdate = false;
+ cur.noUpdate();
}
break;
break;
// finish selection
- if (cmd.button() == mouse_button::button1)
- bv->owner()->gui().selection().haveSelection(cur.selection());
+ if (cmd.button() == mouse_button::button1) {
+ if (cur.selection())
+ theSelection().haveSelection(cur.selection());
+ needsUpdate = false;
+ cur.noUpdate();
+ }
bv->switchKeyMap();
- bv->owner()->updateMenubar();
- bv->owner()->updateToolbars();
break;
}
if (lyxrc.auto_region_delete) {
if (cur.selection())
cutSelection(cur, false, false);
- bv->owner()->gui().selection().haveSelection(false);
+ theSelection().haveSelection(false);
}
cur.clearSelection();
docstring::const_iterator end = cmd.argument().end();
for (; cit != end; ++cit)
#if 0
- bv->owner()->getIntl().getTransManager().
+ bv->getIntl().getTransManager().
translateAndInsert(*cit, this);
#else
insertChar(bv->cursor(), *cit);
case LFUN_URL_INSERT: {
InsetCommandParams p("url");
string const data = InsetCommandMailer::params2string("url", p);
- bv->owner()->getDialogs().show("url", data, 0);
+ bv->showInsetDialog("url", data, 0);
break;
}
case LFUN_HTML_INSERT: {
InsetCommandParams p("htmlurl");
string const data = InsetCommandMailer::params2string("url", p);
- bv->owner()->getDialogs().show("url", data, 0);
+ bv->showInsetDialog("url", data, 0);
break;
}
case LFUN_LABEL_INSERT: {
+ InsetCommandParams p("label");
// Try to generate a valid label
- string const contents = cmd.argument().empty() ?
- cur.getPossibleLabel() : lyx::to_utf8(cmd.argument());
-
- InsetCommandParams p("label", contents);
+ p["name"] = (cmd.argument().empty()) ?
+ cur.getPossibleLabel() :
+ cmd.argument();
string const data = InsetCommandMailer::params2string("label", p);
if (cmd.argument().empty()) {
- bv->owner()->getDialogs().show("label", data, 0);
+ bv->showInsetDialog("label", data, 0);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
if (doInsertInset(cur, this, cmd, false, true))
cur.posRight();
else
- bv->owner()->getDialogs().show("tabularcreate");
+ bv->showDialog("tabularcreate");
break;
cur.dispatch(FuncRequest(LFUN_LAYOUT, "Caption"));
break;
- case LFUN_INDEX_INSERT: {
+ case LFUN_INDEX_INSERT:
+ case LFUN_NOMENCL_INSERT: {
InsetBase * inset = createInset(&cur.bv(), cmd);
if (!inset)
break;
cur.clearSelection();
insertInset(cur, inset);
inset->edit(cur, true);
+ // Show the dialog for the nomenclature entry, since the
+ // description entry still needs to be filled in.
+ if (cmd.action == LFUN_NOMENCL_INSERT)
+ InsetCommandMailer("nomenclature",
+ *reinterpret_cast<InsetCommand *>(inset)).showDialog(&cur.bv());
cur.posRight();
break;
}
case LFUN_INDEX_PRINT:
+ case LFUN_NOMENCL_PRINT:
case LFUN_TOC_INSERT:
case LFUN_HFILL_INSERT:
case LFUN_LINE_INSERT:
case LFUN_MATH_MACRO:
if (cmd.argument().empty())
- cur.errorMessage(N_("Missing argument"));
+ cur.errorMessage(from_utf8(N_("Missing argument")));
else {
- string s = lyx::to_utf8(cmd.argument());
+ string s = to_utf8(cmd.argument());
string const s1 = token(s, ' ', 1);
int const nargs = s1.empty() ? 0 : convert<int>(s1);
string const s2 = token(s, ' ', 2);
string const type = s2.empty() ? "newcommand" : s2;
- cur.insert(new MathMacroTemplate(token(s, ' ', 0), nargs, type));
+ cur.insert(new MathMacroTemplate(from_utf8(token(s, ' ', 0)), nargs, from_utf8(type)));
//cur.nextInset()->edit(cur, true);
}
break;
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM: {
- cur.insert(new MathHullInset(hullSimple));
+ cur.insert(new InsetMathHull(hullSimple));
cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
cur.dispatch(cmd);
break;
case LFUN_FONT_SIZE: {
LyXFont font(LyXFont::ALL_IGNORE);
- font.setLyXSize(lyx::to_utf8(cmd.argument()));
+ font.setLyXSize(to_utf8(cmd.argument()));
toggleAndShow(cur, this, font);
break;
}
case LFUN_LANGUAGE: {
- Language const * lang = languages.getLanguage(lyx::to_utf8(cmd.argument()));
+ Language const * lang = languages.getLanguage(to_utf8(cmd.argument()));
if (!lang)
break;
LyXFont font(LyXFont::ALL_IGNORE);
case LFUN_FONT_FREE_UPDATE: {
LyXFont font;
bool toggle;
- if (bv_funcs::string2font(lyx::to_utf8(cmd.argument()), font, toggle)) {
+ if (bv_funcs::string2font(to_utf8(cmd.argument()), font, toggle)) {
freefont = font;
toggleall = toggle;
toggleAndShow(cur, this, freefont, toggleall);
string data;
params2string(cur.paragraph(), data);
data = "show\n" + data;
- bv->owner()->getDialogs().show("paragraph", data);
+ bv->showDialogWithData("paragraph", data);
break;
}
case LFUN_PARAGRAPH_UPDATE: {
- if (!bv->owner()->getDialogs().visible("paragraph"))
- break;
string data;
params2string(cur.paragraph(), data);
bool const accept = !cur.inset().forceDefaultParagraphs(cur.idx());
data = "update " + convert<string>(accept) + '\n' + data;
- bv->owner()->getDialogs().update("paragraph", data);
+ bv->updateDialog("paragraph", data);
break;
}
case LFUN_ACCENT_HUNGARIAN_UMLAUT:
case LFUN_ACCENT_CIRCLE:
case LFUN_ACCENT_OGONEK:
- bv->owner()->getLyXFunc().handleKeyFunc(cmd.action);
+ theLyXFunc().handleKeyFunc(cmd.action);
if (!cmd.argument().empty())
// FIXME: Are all these characters encoded in one byte in utf8?
- bv->owner()->getIntl().getTransManager()
- .translateAndInsert(cmd.argument()[0], this);
+ bv->getIntl().getTransManager()
+ .translateAndInsert(cmd.argument()[0], this, cur);
break;
case LFUN_FLOAT_LIST: {
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
- if (tclass.floats().typeExist(lyx::to_utf8(cmd.argument()))) {
+ if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
// not quite sure if we want this...
recordUndo(cur);
cur.clearSelection();
}
setLayout(cur, tclass.defaultLayoutName());
- setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, string(), 0);
- insertInset(cur, new InsetFloatList(lyx::to_utf8(cmd.argument())));
+ setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, docstring(), 0);
+ insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
cur.posRight();
} else {
lyxerr << "Non-existent float type: "
- << lyx::to_utf8(cmd.argument()) << endl;
+ << to_utf8(cmd.argument()) << endl;
}
break;
}
// FIXME
if (arg.size() > 100 || arg.empty()) {
// Get word or selection
- selectWordWhenUnderCursor(cur, lyx::WHOLE_WORD);
+ selectWordWhenUnderCursor(cur, WHOLE_WORD);
arg = cur.selectionAsString(false);
}
}
- bv->owner()->getDialogs().show("thesaurus", lyx::to_utf8(arg));
+ bv->showDialogWithData("thesaurus", to_utf8(arg));
break;
}
// Given data, an encoding of the ParagraphParameters
// generated in the Paragraph dialog, this function sets
// the current paragraph appropriately.
- istringstream is(lyx::to_utf8(cmd.argument()));
+ istringstream is(to_utf8(cmd.argument()));
LyXLex lex(0, 0);
lex.setStream(is);
ParagraphParameters params;
params.read(lex);
setParagraph(cur,
- params.spacing(),
- params.align(),
- params.labelWidthString(),
- params.noindent());
+ params.spacing(),
+ params.align(),
+ params.labelWidthString(),
+ params.noindent());
cur.message(_("Paragraph layout set"));
break;
}
break;
}
+ needsUpdate |= (cur.pos() != cur.lastpos()) && cur.selection();
+
+ // FIXME: The cursor flag is reset two lines below
+ // so we need to check here if some of the LFUN did touch that.
+ // for now only LyXText::erase() and LyXText::backspace() do that.
+ // The plan is to verify all the LFUNs and then to remove this
+ // singleParUpdate boolean altogether.
+ if (cur.result().update() & Update::Force) {
+ singleParUpdate = false;
+ needsUpdate = true;
+ }
+
+ // FIXME: the following code should go in favor of fine grained
+ // update flag treatment.
if (singleParUpdate)
// Inserting characters does not change par height
if (cur.bottom().paragraph().dim().height()
== olddim.height()) {
// if so, update _only_ this paragraph
- cur.bv().update(Update::SinglePar |
- Update::FitCursor |
- Update::MultiParSel);
- cur.noUpdate();
+ cur.updateFlags(Update::SinglePar |
+ Update::FitCursor |
+ Update::MultiParSel);
return;
} else
needsUpdate = true;
+
if (!needsUpdate
&& &oldTopSlice.inset() == &cur.inset()
&& oldTopSlice.idx() == cur.idx()
- && !sel
+ && !sel // sel is a backup of cur.selection() at the biginning of the function.
&& !cur.selection())
cur.noUpdate();
else
- cur.needsUpdate();
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
code = InsetBase::INCLUDE_CODE;
else if (cmd.argument() == "index")
code = InsetBase::INDEX_CODE;
+ else if (cmd.argument() == "nomenclature")
+ code = InsetBase::NOMENCL_CODE;
else if (cmd.argument() == "label")
code = InsetBase::LABEL_CODE;
else if (cmd.argument() == "note")
case LFUN_INDEX_PRINT:
code = InsetBase::INDEX_PRINT_CODE;
break;
+ case LFUN_NOMENCL_INSERT:
+ code = InsetBase::NOMENCL_CODE;
+ break;
+ case LFUN_NOMENCL_PRINT:
+ code = InsetBase::NOMENCL_PRINT_CODE;
+ break;
case LFUN_TOC_INSERT:
code = InsetBase::TOC_CODE;
break;
break;
case LFUN_PASTE:
- enable = lyx::cap::numberOfSelections() > 0;
+ enable = cap::numberOfSelections() > 0;
break;
case LFUN_PARAGRAPH_MOVE_UP:
break;
case LFUN_INSET_DISSOLVE:
- enable = !isMainText() && cur.inset().nargs() == 1;
+ enable = !isMainText(*cur.bv().buffer()) && cur.inset().nargs() == 1;
+ break;
+
+ case LFUN_CHANGE_ACCEPT:
+ case LFUN_CHANGE_REJECT:
+ enable = true; // FIXME: Change tracking (MG)
break;
case LFUN_WORD_DELETE_FORWARD:
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
case LFUN_MATH_MACRO:
- case LFUN_MATH_INSERT:
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM:
case LFUN_ACCENT_HUNGARIAN_UMLAUT:
case LFUN_ACCENT_CIRCLE:
case LFUN_ACCENT_OGONEK:
- case LFUN_CHANGE_ACCEPT:
- case LFUN_CHANGE_REJECT:
case LFUN_THESAURUS_ENTRY:
case LFUN_PARAGRAPH_PARAMS_APPLY:
case LFUN_ESCAPE:
case LFUN_BUFFER_BEGIN:
case LFUN_BUFFER_BEGIN_SELECT:
case LFUN_BUFFER_END_SELECT:
+ case LFUN_UNICODE_INSERT:
// these are handled in our dispatch()
enable = true;
break;
flag.enabled(enable);
return true;
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff