#include "buffer_funcs.h"
#include "bufferparams.h"
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "cursor.h"
#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
+#include "errorlist.h"
#include "factory.h"
#include "funcrequest.h"
#include "gettext.h"
#include "ParagraphParameters.h"
#include "undo.h"
#include "vspace.h"
+#include "pariterator.h"
-#include "frontends/Dialogs.h"
-#include "frontends/LyXView.h"
+#include "frontends/Clipboard.h"
+#include "frontends/Selection.h"
#include "insets/insetcommand.h"
#include "insets/insetfloatlist.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::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::pasteFromStack;
+using cap::pasteClipboard;
+using cap::replaceSelection;
+using cap::saveSelection;
+
+using support::isStrUnsignedInt;
+using support::token;
using std::endl;
using std::string;
using std::istringstream;
+using std::ostringstream;
extern string current_layout;
{
if (selecting || cur.mark())
cur.setSelection();
- if (!cur.selection())
- cur.bv().haveSelection(false);
+ saveSelection(cur);
cur.bv().switchKeyMap();
}
void mathDispatch(LCursor & cur, FuncRequest const & cmd, bool display)
{
recordUndo(cur);
- string sel = cur.selectionAsString(false);
- //lyxerr << "selection is: '" << sel << "'" << endl;
+ docstring sel = cur.selectionAsString(false);
// It may happen that sel is empty but there is a selection
replaceSelection(cur);
if (sel.empty()) {
+#ifdef ENABLE_ASSERTIONS
const int old_pos = cur.pos();
- cur.insert(new MathHullInset("simple"));
+#endif
+ 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
cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
// Avoid an unnecessary undo step if cmd.argument
// is empty
- if (!cmd.argument.empty())
- cur.dispatch(FuncRequest(LFUN_INSERT_MATH,
- cmd.argument));
+ if (!cmd.argument().empty())
+ cur.dispatch(FuncRequest(LFUN_MATH_INSERT,
+ cmd.argument()));
} else {
// create a macro if we see "\\newcommand"
// somewhere, and an ordinary formula
// otherwise
- 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)
{
- cur.insert(new MathHullInset("simple"));
- cur.dispatch(FuncRequest(LFUN_RIGHT));
- cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
+ InsetMathHull * formula = new InsetMathHull;
+ istringstream is(to_utf8(sel));
+ LyXLex lex(0, 0);
+ lex.setStream(is);
+ formula->read(cur.buffer(), lex);
+ if (formula->getType() == hullNone)
+ // Don't create pseudo formulas if
+ // delimiters are left out
+ formula->mutate(hullSimple);
+ cur.insert(formula);
} else {
- istringstream is(sel);
- cur.insert(new MathMacroTemplate(is));
+ 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)
+void 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();
+ setCursorFromCoordinates(cur, x, 0);
+ cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
- bool updated = setCursorFromCoordinates(cur, x, 0);
- if (updated)
- cur.bv().update();
- updated |= cursorUp(cur);
-
- if (cpar == cur.pit() && cpos == cur.pos()) {
+ if (cpar == cur.pit() && cpos == cur.pos())
// we have a row which is taller than the workarea. The
// simplest solution is to move to the previous row instead.
- updated |= cursorUp(cur);
- }
+ cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
- cur.bv().updateScrollbar();
finishUndo();
- return updated;
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
-bool LyXText::cursorNext(LCursor & cur)
+void 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);
- if (updated)
- cur.bv().update();
- updated |= cursorDown(cur);
+ setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+ cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
- if (cpar == cur.pit() && cpos == cur.pos()) {
+ if (cpar == cur.pit() && cpos == cur.pos())
// we have a row which is taller than the workarea. The
// simplest solution is to move to the next row instead.
- updated |= cursorDown(cur);
- }
+ cur.dispatch(
+ FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
- cur.bv().updateScrollbar();
finishUndo();
- return updated;
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
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, "0"));
+ // 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();
bool singleParUpdate = lyxaction.funcHasFlag(cmd.action,
LyXAction::SingleParUpdate);
// Signals that a full-screen update is required
- bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
+ bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action,
LyXAction::NoUpdate) || singleParUpdate);
// Remember the old paragraph metric (_outer_ paragraph!)
- Dimension olddim = cur.bottom().paragraph().dim();
+ ParagraphMetrics const & pm = cur.bv().parMetrics(
+ cur.bottom().text(), cur.bottom().pit());
+ Dimension olddim = pm.dim();
switch (cmd.action) {
+ case LFUN_PARAGRAPH_MOVE_DOWN: {
+ pit_type const pit = cur.pit();
+ recUndo(cur, pit, pit + 1);
+ finishUndo();
+ std::swap(pars_[pit], pars_[pit + 1]);
+
+ ParIterator begin(cur);
+ ++cur.pit();
+ ParIterator end = boost::next(ParIterator(cur));
+ updateLabels(cur.buffer(), begin, end);
+
+ needsUpdate = true;
+ break;
+ }
+
+ case LFUN_PARAGRAPH_MOVE_UP: {
+ pit_type const pit = cur.pit();
+ recUndo(cur, pit - 1, pit);
+ finishUndo();
+ std::swap(pars_[pit], pars_[pit - 1]);
+
+ ParIterator end = boost::next(ParIterator(cur));
+ --cur.pit();
+ ParIterator begin(cur);
+ updateLabels(cur.buffer(), begin, end);
+
+ needsUpdate = true;
+ break;
+ }
+
case LFUN_APPENDIX: {
Paragraph & par = cur.paragraph();
bool start = !par.params().startOfAppendix();
// 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;
}
par.params().startOfAppendix(start);
// we can set the refreshing parameters now
- updateCounters(cur.buffer());
+ updateLabels(cur.buffer());
break;
}
- case LFUN_DELETE_WORD_FORWARD:
+ case LFUN_WORD_DELETE_FORWARD:
cur.clearSelection();
deleteWordForward(cur);
finishChange(cur, false);
break;
- case LFUN_DELETE_WORD_BACKWARD:
+ case LFUN_WORD_DELETE_BACKWARD:
cur.clearSelection();
deleteWordBackward(cur);
finishChange(cur, false);
break;
- case LFUN_DELETE_LINE_FORWARD:
+ case LFUN_LINE_DELETE:
cur.clearSelection();
deleteLineForward(cur);
finishChange(cur, false);
break;
- case LFUN_WORDRIGHT:
- if (!cur.mark())
- cur.clearSelection();
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorLeftOneWord(cur);
- else
- needsUpdate = cursorRightOneWord(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_WORDLEFT:
- if (!cur.mark())
- cur.clearSelection();
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorRightOneWord(cur);
- else
- needsUpdate = cursorLeftOneWord(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_BEGINNINGBUF:
+ case LFUN_BUFFER_BEGIN:
+ case LFUN_BUFFER_BEGIN_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_BEGIN_SELECT);
if (cur.depth() == 1) {
- if (!cur.mark())
- cur.clearSelection();
- cursorTop(cur);
- finishChange(cur, false);
+ needsUpdate |= cursorTop(cur);
} else {
cur.undispatched();
}
break;
- case LFUN_BEGINNINGBUFSEL:
+ case LFUN_BUFFER_END:
+ case LFUN_BUFFER_END_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_BUFFER_END_SELECT);
if (cur.depth() == 1) {
- if (!cur.selection())
- cur.resetAnchor();
- cursorTop(cur);
- finishChange(cur, true);
+ needsUpdate |= cursorBottom(cur);
} else {
cur.undispatched();
}
break;
- case LFUN_ENDBUF:
- if (cur.depth() == 1) {
- if (!cur.mark())
- cur.clearSelection();
- cursorBottom(cur);
- finishChange(cur, false);
- } else {
- cur.undispatched();
- }
- break;
-
- case LFUN_ENDBUFSEL:
- if (cur.depth() == 1) {
- if (!cur.selection())
- cur.resetAnchor();
- cursorBottom(cur);
- finishChange(cur, true);
- } else {
- cur.undispatched();
- }
- break;
-
- case LFUN_RIGHT:
- case LFUN_RIGHTSEL:
+ case LFUN_CHAR_FORWARD:
+ case LFUN_CHAR_FORWARD_SELECT:
//lyxerr << BOOST_CURRENT_FUNCTION
- // << " LFUN_RIGHT[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_RIGHTSEL);
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorLeft(cur);
+ // << " LFUN_CHAR_FORWARD[SEL]:\n" << cur << endl;
+ 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) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
}
+ if (cur.selection())
+ saveSelection(cur);
break;
- case LFUN_LEFT:
- case LFUN_LEFTSEL:
- //lyxerr << "handle LFUN_LEFT[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_LEFTSEL);
- if (isRTL(cur.paragraph()))
- needsUpdate = cursorRight(cur);
+ case LFUN_CHAR_BACKWARD:
+ case LFUN_CHAR_BACKWARD_SELECT:
+ //lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl;
+ 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) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_LEFT);
}
+ if (cur.selection())
+ saveSelection(cur);
break;
case LFUN_UP:
- case LFUN_UPSEL:
- update(cur);
+ case LFUN_UP_SELECT:
//lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_UPSEL);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_UP_SELECT);
+
+ needsUpdate |= cursorUp(cur);
- needsUpdate = cursorUp(cur);
if (!needsUpdate && oldTopSlice == cur.top()
&& cur.boundary() == oldBoundary) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_UP);
}
+ if (cur.selection())
+ saveSelection(cur);
break;
case LFUN_DOWN:
- case LFUN_DOWNSEL:
- update(cur);
+ case LFUN_DOWN_SELECT:
//lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
- cur.selHandle(cmd.action == LFUN_DOWNSEL);
- needsUpdate = cursorDown(cur);
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
+ needsUpdate |= cursorDown(cur);
+
if (!needsUpdate && oldTopSlice == cur.top() &&
cur.boundary() == oldBoundary)
{
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_DOWN);
}
+ if (cur.selection())
+ saveSelection(cur);
break;
- case LFUN_UP_PARAGRAPH:
- if (!cur.mark())
- cur.clearSelection();
- needsUpdate = cursorUpParagraph(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_UP_PARAGRAPHSEL:
- if (!cur.selection())
- cur.resetAnchor();
- cursorUpParagraph(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_DOWN_PARAGRAPH:
- if (!cur.mark())
- cur.clearSelection();
- needsUpdate = cursorDownParagraph(cur);
- finishChange(cur, false);
- break;
-
- case LFUN_DOWN_PARAGRAPHSEL:
- if (!cur.selection())
- cur.resetAnchor();
- cursorDownParagraph(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_PRIORSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- cursorPrevious(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_NEXTSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- cursorNext(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_HOMESEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- cursorHome(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_ENDSEL:
- update(cur);
- if (!cur.selection())
- cur.resetAnchor();
- cursorEnd(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_WORDRIGHTSEL:
- if (!cur.selection())
- cur.resetAnchor();
- if (isRTL(cur.paragraph()))
- cursorLeftOneWord(cur);
- else
- cursorRightOneWord(cur);
- finishChange(cur, true);
- break;
-
- case LFUN_WORDLEFTSEL:
- if (!cur.selection())
- cur.resetAnchor();
- if (isRTL(cur.paragraph()))
- cursorRightOneWord(cur);
- else
- cursorLeftOneWord(cur);
- finishChange(cur, true);
+ case LFUN_PARAGRAPH_UP:
+ case LFUN_PARAGRAPH_UP_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_UP_SELECT);
+ needsUpdate |= cursorUpParagraph(cur);
+ if (cur.selection())
+ saveSelection(cur);
break;
- case LFUN_WORDSEL: {
- selectWord(cur, lyx::WHOLE_WORD);
- finishChange(cur, true);
+ case LFUN_PARAGRAPH_DOWN:
+ case LFUN_PARAGRAPH_DOWN_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_PARAGRAPH_DOWN_SELECT);
+ needsUpdate |= cursorDownParagraph(cur);
+ if (cur.selection())
+ saveSelection(cur);
break;
- }
- case LFUN_PRIOR:
- update(cur);
- if (!cur.mark())
- cur.clearSelection();
- finishChange(cur, false);
+ case LFUN_SCREEN_UP:
+ case 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);
+ cursorPrevious(cur);
}
+ if (cur.selection())
+ saveSelection(cur);
break;
- case LFUN_NEXT:
- update(cur);
- if (!cur.mark())
- cur.clearSelection();
- finishChange(cur, false);
+ case LFUN_SCREEN_DOWN:
+ case 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);
+ cursorNext(cur);
}
+ if (cur.selection())
+ saveSelection(cur);
break;
- case LFUN_HOME:
- if (!cur.mark())
- cur.clearSelection();
- cursorHome(cur);
- finishChange(cur, false);
+ case LFUN_LINE_BEGIN:
+ case LFUN_LINE_BEGIN_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
+ needsUpdate |= cursorHome(cur);
break;
- case LFUN_END:
- if (!cur.mark())
- cur.clearSelection();
- cursorEnd(cur);
- finishChange(cur, false);
+ case LFUN_LINE_END:
+ case LFUN_LINE_END_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
+ needsUpdate |= cursorEnd(cur);
+ if (cur.selection())
+ saveSelection(cur);
+ break;
+
+ case LFUN_WORD_FORWARD:
+ case LFUN_WORD_FORWARD_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_FORWARD_SELECT);
+ if (isRTL(*cur.bv().buffer(), cur.paragraph()))
+ needsUpdate |= cursorLeftOneWord(cur);
+ else
+ needsUpdate |= cursorRightOneWord(cur);
+ if (cur.selection())
+ saveSelection(cur);
+ break;
+
+ case LFUN_WORD_BACKWARD:
+ case LFUN_WORD_BACKWARD_SELECT:
+ needsUpdate |= cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT);
+ if (isRTL(*cur.bv().buffer(), cur.paragraph()))
+ needsUpdate |= cursorRightOneWord(cur);
+ else
+ needsUpdate |= cursorLeftOneWord(cur);
+ if (cur.selection())
+ saveSelection(cur);
break;
- case LFUN_BREAKLINE: {
+ case LFUN_WORD_SELECT: {
+ 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);
+ if (!cur.selection())
+ recordUndo(cur);
+ cap::replaceSelection(cur);
cur.insert(new InsetNewline);
cur.posRight();
moveCursor(cur, false);
break;
}
- case LFUN_DELETE:
+ case LFUN_CHAR_DELETE_FORWARD:
if (!cur.selection()) {
- needsUpdate = Delete(cur);
+ if (cur.pos() == cur.paragraph().size())
+ // Par boundary, force full-screen update
+ singleParUpdate = false;
+ needsUpdate |= erase(cur);
cur.resetAnchor();
// It is possible to make it a lot faster still
// just comment out the line below...
} else {
cutSelection(cur, true, false);
+ singleParUpdate = false;
}
moveCursor(cur, false);
break;
- case LFUN_DELETE_SKIP:
- // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
+ case LFUN_DELETE_FORWARD_SKIP:
+ // Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
if (cur.pos() == cur.lastpos()) {
cursorRight(cur);
cursorLeft(cur);
}
- Delete(cur);
+ erase(cur);
cur.resetAnchor();
} else {
cutSelection(cur, true, false);
break;
- case LFUN_BACKSPACE:
+ case LFUN_CHAR_DELETE_BACKWARD:
if (!cur.selection()) {
- if (bv->owner()->getIntl().getTransManager().backspace()) {
- needsUpdate = backspace(cur);
+ if (bv->getIntl().getTransManager().backspace()) {
+ // Par boundary, full-screen update
+ if (cur.pos() == 0)
+ singleParUpdate = false;
+ needsUpdate |= backspace(cur);
cur.resetAnchor();
// It is possible to make it a lot faster still
// just comment out the line below...
}
} else {
cutSelection(cur, true, false);
+ singleParUpdate = false;
}
bv->switchKeyMap();
break;
- case LFUN_BACKSPACE_SKIP:
- // Reverse the effect of LFUN_BREAKPARAGRAPH_SKIP.
+ case LFUN_DELETE_BACKWARD_SKIP:
+ // Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
#ifdef WITH_WARNINGS
#warning look here
}
break;
- case LFUN_BREAKPARAGRAPH:
- lyx::cap::replaceSelection(cur);
+ case LFUN_BREAK_PARAGRAPH:
+ cap::replaceSelection(cur);
breakParagraph(cur, 0);
cur.resetAnchor();
bv->switchKeyMap();
break;
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- lyx::cap::replaceSelection(cur);
+ case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
+ cap::replaceSelection(cur);
breakParagraph(cur, 1);
cur.resetAnchor();
bv->switchKeyMap();
break;
- case LFUN_BREAKPARAGRAPH_SKIP: {
+ case LFUN_BREAK_PARAGRAPH_SKIP: {
// When at the beginning of a paragraph, remove
- // indentation. Otherwise, do the same as LFUN_BREAKPARAGRAPH.
- lyx::cap::replaceSelection(cur);
+ // indentation. Otherwise, do the same as LFUN_BREAK_PARAGRAPH.
+ 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(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: ")
- << 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));
recordUndo(cur);
InsetBase * inset = createInset(bv, cmd);
if (inset) {
+ // FIXME (Abdel 01/02/2006):
+ // What follows would be a partial fix for bug 2154:
+ // http://bugzilla.lyx.org/show_bug.cgi?id=2154
+ // This automatically put the label inset _after_ a
+ // numbered section. It should be possible to extend the mechanism
+ // to any kind of LateX environement.
+ // The correct way to fix that bug would be at LateX generation.
+ // I'll let the code here for reference as it could be used for some
+ // other feature like "automatic labelling".
+ /*
+ Paragraph & par = pars_[cur.pit()];
+ if (inset->lyxCode() == InsetBase::LABEL_CODE
+ && par.layout()->labeltype == LABEL_COUNTER) {
+ // Go to the end of the paragraph
+ // Warning: Because of Change-Tracking, the last
+ // position is 'size()' and not 'size()-1':
+ cur.pos() = par.size();
+ // Insert a new paragraph
+ FuncRequest fr(LFUN_BREAK_PARAGRAPH);
+ dispatch(cur, fr);
+ }
+ */
insertInset(cur, inset);
cur.posRight();
}
break;
}
+ case LFUN_INSET_DISSOLVE:
+ needsUpdate |= dissolveInset(cur);
+ break;
+
case LFUN_INSET_SETTINGS:
cur.inset().showInsetDialog(bv);
break;
- case LFUN_NEXT_INSET_TOGGLE: {
- InsetBase * inset = cur.nextInset();
- // this is the real function we want to invoke
- cmd = FuncRequest(LFUN_INSET_TOGGLE);
- cur.undispatched();
- // if there is an inset at cursor, see whether it
- // wants to toggle.
- if (inset) {
- LCursor tmpcur = cur;
- tmpcur.pushLeft(*inset);
- inset->dispatch(tmpcur, cmd);
- if (tmpcur.result().dispatched()) {
- cur.clearSelection();
- cur.dispatched();
- }
- }
- // if it did not work, try the underlying inset.
- if (!cur.result().dispatched())
- cur.inset().dispatch(cur, cmd);
- break;
- }
-
case LFUN_SPACE_INSERT:
if (cur.paragraph().layout()->free_spacing)
insertChar(cur, ' ');
moveCursor(cur, false);
break;
- case LFUN_HYPHENATION:
+ case LFUN_HYPHENATION_POINT_INSERT:
specialChar(cur, InsetSpecialChar::HYPHENATION);
break;
- case LFUN_LIGATURE_BREAK:
+ case LFUN_LIGATURE_BREAK_INSERT:
specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
break;
- case LFUN_LDOTS:
+ case LFUN_DOTS_INSERT:
specialChar(cur, InsetSpecialChar::LDOTS);
break;
- case LFUN_END_OF_SENTENCE:
+ case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
specialChar(cur, InsetSpecialChar::END_OF_SENTENCE);
break;
- case LFUN_MENU_SEPARATOR:
+ case LFUN_MENU_SEPARATOR_INSERT:
specialChar(cur, InsetSpecialChar::MENU_SEPARATOR);
break;
- case LFUN_UPCASE_WORD:
+ case LFUN_WORD_UPCASE:
changeCase(cur, LyXText::text_uppercase);
break;
- case LFUN_LOWCASE_WORD:
+ case LFUN_WORD_LOWCASE:
changeCase(cur, LyXText::text_lowercase);
break;
- case LFUN_CAPITALIZE_WORD:
+ case LFUN_WORD_CAPITALIZE:
changeCase(cur, LyXText::text_capitalization);
break;
- case LFUN_TRANSPOSE_CHARS:
- recordUndo(cur);
+ case LFUN_CHARS_TRANSPOSE:
+ charsTranspose(cur);
break;
case LFUN_PASTE:
cur.message(_("Paste"));
- lyx::cap::replaceSelection(cur);
- if (isStrUnsignedInt(cmd.argument))
- pasteSelection(cur, convert<unsigned int>(cmd.argument));
- else
- pasteSelection(cur, 0);
+ cap::replaceSelection(cur);
+ if (cmd.argument().empty() && !theClipboard().isInternal())
+ pasteClipboard(cur, bv->buffer()->errorList("Paste"));
+ else {
+ string const arg(to_utf8(cmd.argument()));
+ pasteFromStack(cur, bv->buffer()->errorList("Paste"),
+ isStrUnsignedInt(arg) ?
+ convert<unsigned int>(arg) :
+ 0);
+ }
+ bv->buffer()->errors("Paste");
cur.clearSelection(); // bug 393
bv->switchKeyMap();
finishUndo();
cur.message(_("Copy"));
break;
- case LFUN_GETXY:
- cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
- + convert<string>(cursorY(cur.top(), cur.boundary())));
+ case LFUN_SERVER_GET_XY:
+ cur.message(from_utf8(
+ convert<string>(cursorX(cur.bv(), cur.top(), cur.boundary()))
+ + ' ' + convert<string>(cursorY(cur.bv(), cur.top(), cur.boundary()))));
break;
- case LFUN_SETXY: {
+ case LFUN_SERVER_SET_XY: {
int x = 0;
int y = 0;
- istringstream is(cmd.argument);
+ istringstream is(to_utf8(cmd.argument()));
is >> x >> y;
if (!is)
lyxerr << "SETXY: Could not parse coordinates in '"
- << cmd.argument << std::endl;
+ << to_utf8(cmd.argument()) << std::endl;
else
setCursorFromCoordinates(cur, x, y);
break;
}
- case LFUN_GETFONT:
+ 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_GETLAYOUT:
- cur.message(cur.paragraph().layout()->name());
+ case LFUN_SERVER_GET_LAYOUT:
+ cur.message(from_utf8(cur.paragraph().layout()->name()));
break;
case LFUN_LAYOUT: {
- lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
- << 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(cmd.argument);
- string layout = 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 ")) + 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_PASTESELECTION: {
+ case LFUN_CLIPBOARD_PASTE:
cur.clearSelection();
- string const clip = bv->getClipboard();
- if (!clip.empty()) {
- recordUndo(cur);
- if (cmd.argument == "paragraph")
- insertStringAsParagraphs(cur, clip);
- else
- insertStringAsLines(cur, clip);
+ pasteClipboard(cur, bv->buffer()->errorList("Paste"),
+ cmd.argument() == "paragraph");
+ bv->buffer()->errors("Paste");
+ break;
+
+ case LFUN_PRIMARY_SELECTION_PASTE:
+ pasteString(cur, theSelection().get(),
+ 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: {
- lyx::cap::replaceSelection(cur);
+
+ case LFUN_QUOTE_INSERT: {
+ cap::replaceSelection(cur);
Paragraph & par = cur.paragraph();
- lyx::pos_type pos = cur.pos();
- char 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 = 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_SELFINSERT, "\""));
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\""));
break;
}
- case LFUN_DATE_INSERT:
- if (cmd.argument.empty())
- bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
- lyx::formatted_time(lyx::current_time())));
+ case LFUN_DATE_INSERT:
+ if (cmd.argument().empty())
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
+ formatted_time(current_time())));
else
- bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
- lyx::formatted_time(lyx::current_time(), 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->haveSelection(cur.selection());
+ saveSelection(cur);
}
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->haveSelection(cur.selection());
}
break;
// Single-click on work area
case LFUN_MOUSE_PRESS: {
// Right click on a footnote flag opens float menu
- if (cmd.button() == mouse_button::button3) {
+ if (cmd.button() == mouse_button::button3)
cur.clearSelection();
- break;
- }
// Middle button press pastes if we have a selection
// We do this here as if the selection was inside an inset
// it could get cleared on the unlocking of the inset so
// we have to check this first
bool paste_internally = false;
- if (cmd.button() == mouse_button::button2 && cur.selection()) {
- bv->owner()->dispatch(FuncRequest(LFUN_COPY));
+ if (cmd.button() == mouse_button::button2 && cap::selection()) {
+ // Copy the selection buffer to the clipboard
+ // stack, because we want it to appear in the
+ // "Edit->Paste recent" menu.
+ cap::copySelectionToStack();
paste_internally = true;
}
- bv->mouseSetCursor(cur);
+ // we have to update after dePM triggered
+ bool update = bv->mouseSetCursor(cur);
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
// insert this
if (cmd.button() == mouse_button::button2) {
- if (paste_internally)
- bv->owner()->dispatch(FuncRequest(LFUN_PASTE));
- else
- bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION, "paragraph"));
+ if (paste_internally) {
+ cap::pasteSelection(cur, bv->buffer()->errorList("Paste"));
+ bv->buffer()->errors("Paste");
+ cur.clearSelection(); // bug 393
+ bv->switchKeyMap();
+ finishUndo();
+ } else
+ lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
+ }
+
+ if (!update && cmd.button() == mouse_button::button1) {
+ needsUpdate = false;
+ cur.noUpdate();
}
break;
setCursorFromCoordinates(cur, cmd.x, y);
cur.x_target() = cmd.x;
if (cmd.y >= wh)
- cursorDown(cur);
+ lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
else if (cmd.y < 0)
- cursorUp(cur);
+ lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
// This is to allow jumping over large insets
if (cur.top() == old) {
if (cmd.y >= wh)
- cursorDown(cur);
+ lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
else if (cmd.y < 0)
- cursorUp(cur);
+ lyx::dispatch(FuncRequest(LFUN_UP_SELECT));
}
if (cur.top() == old)
if (cmd.button() == mouse_button::button2)
break;
- // finish selection
- if (cmd.button() == mouse_button::button1)
- bv->haveSelection(cur.selection());
+ if (cmd.button() == mouse_button::button1) {
+ // if there is new selection, update persistent
+ // selection, otherwise, single click does not
+ // clear persistent selection buffer
+ if (cur.selection()) {
+ // finish selection
+ // if double click, cur is moved to the end of word by selectWord
+ // but bvcur is current mouse position
+ LCursor & bvcur = cur.bv().cursor();
+ bvcur.selection() = true;
+ saveSelection(bvcur);
+ }
+ needsUpdate = false;
+ cur.noUpdate();
+ }
bv->switchKeyMap();
- bv->owner()->updateMenubar();
- bv->owner()->updateToolbars();
break;
}
- case LFUN_SELFINSERT: {
- if (cmd.argument.empty())
+ case LFUN_SELF_INSERT: {
+ if (cmd.argument().empty())
break;
// Automatically delete the currently selected
// "auto_region_delete", which defaults to
// true (on).
- if (lyxrc.auto_region_delete) {
+ if (lyxrc.auto_region_delete)
if (cur.selection())
cutSelection(cur, false, false);
- bv->haveSelection(false);
- }
cur.clearSelection();
LyXFont const old_font = real_current_font;
- string::const_iterator cit = cmd.argument.begin();
- string::const_iterator end = cmd.argument.end();
+ docstring::const_iterator cit = cmd.argument().begin();
+ docstring::const_iterator end = cmd.argument().end();
for (; cit != end; ++cit)
- bv->owner()->getIntl().getTransManager().
- TranslateAndInsert(*cit, this);
+#if 0
+ bv->getIntl().getTransManager().
+ translateAndInsert(*cit, this);
+#else
+ insertChar(bv->cursor(), *cit);
+#endif
cur.resetAnchor();
moveCursor(cur, false);
- bv->updateScrollbar();
break;
}
- case LFUN_URL: {
+ 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_HTMLURL: {
+ 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_INSERT_LABEL: {
+ case LFUN_LABEL_INSERT: {
+ InsetCommandParams p("label");
// Try to generate a valid label
- string const contents = cmd.argument.empty() ?
- cur.getPossibleLabel() : 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);
+ if (cmd.argument().empty()) {
+ bv->showInsetDialog("label", data, 0);
} else {
FuncRequest fr(LFUN_INSET_INSERT, data);
dispatch(cur, fr);
#if 0
- case LFUN_INSET_LIST:
- case LFUN_INSET_THEOREM:
- case LFUN_INSET_CAPTION:
+ case LFUN_LIST_INSERT:
+ case LFUN_THEOREM_INSERT:
#endif
- case LFUN_INSERT_NOTE:
- case LFUN_INSERT_CHARSTYLE:
- case LFUN_INSERT_BOX:
- case LFUN_INSERT_BRANCH:
- case LFUN_INSERT_BIBITEM:
- case LFUN_INSET_ERT:
- case LFUN_INSET_FOOTNOTE:
- case LFUN_INSET_MARGINAL:
- case LFUN_INSET_OPTARG:
+ case LFUN_CAPTION_INSERT:
+ // Open the inset, and move the current selection
+ // inside it.
+ doInsertInset(cur, this, cmd, true, true);
+ cur.posRight();
+ updateLabels(*bv->buffer());
+ break;
+ case LFUN_NOTE_INSERT:
+ case LFUN_CHARSTYLE_INSERT:
+ case LFUN_BOX_INSERT:
+ case LFUN_BRANCH_INSERT:
+ case LFUN_BIBITEM_INSERT:
+ case LFUN_ERT_INSERT:
+ case LFUN_FOOTNOTE_INSERT:
+ case LFUN_MARGINALNOTE_INSERT:
+ case LFUN_OPTIONAL_INSERT:
case LFUN_ENVIRONMENT_INSERT:
// Open the inset, and move the current selection
// inside it.
if (doInsertInset(cur, this, cmd, false, true))
cur.posRight();
else
- bv->owner()->getDialogs().show("tabularcreate");
+ bv->showDialog("tabularcreate");
break;
- case LFUN_INSET_FLOAT:
- case LFUN_INSET_WIDE_FLOAT:
- case LFUN_INSET_WRAP:
+ case LFUN_FLOAT_INSERT:
+ case LFUN_FLOAT_WIDE_INSERT:
+ case LFUN_WRAP_INSERT: {
+ bool content = cur.selection(); // will some text be moved into the inset?
+
doInsertInset(cur, this, cmd, true, true);
cur.posRight();
- // FIXME: the "Caption" name should not be hardcoded,
- // but given by the float definition.
- cur.dispatch(FuncRequest(LFUN_LAYOUT, "Caption"));
+ ParagraphList & pars = cur.text()->paragraphs();
+
+ LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
+
+ // add a separate paragraph for the caption inset
+ pars.push_back(Paragraph());
+ pars.back().setInsetOwner(pars[0].inInset());
+ pars.back().layout(tclass.defaultLayout());
+
+ int cap_pit = pars.size() - 1;
+
+ // if an empty inset was created, we create an additional empty
+ // paragraph at the bottom so that the user can choose where to put
+ // the graphics (or table).
+ if (!content) {
+ pars.push_back(Paragraph());
+ pars.back().setInsetOwner(pars[0].inInset());
+ pars.back().layout(tclass.defaultLayout());
+
+ }
+
+ // reposition the cursor to the caption
+ cur.pit() = cap_pit;
+ cur.pos() = 0;
+ cur.dispatch(FuncRequest(LFUN_CAPTION_INSERT));
+ // FIXME: When leaving the Float (or Wrap) inset we should
+ // delete any empty paragraph left above or below the
+ // 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:
- case LFUN_INSERT_LINE:
- case LFUN_INSERT_PAGEBREAK:
+ case LFUN_HFILL_INSERT:
+ case LFUN_LINE_INSERT:
+ case LFUN_PAGEBREAK_INSERT:
+ case LFUN_CLEARPAGE_INSERT:
+ case LFUN_CLEARDOUBLEPAGE_INSERT:
// do nothing fancy
doInsertInset(cur, this, cmd, false, false);
cur.posRight();
break;
- case LFUN_DEPTH_MIN:
+ case LFUN_DEPTH_DECREMENT:
changeDepth(cur, DEC_DEPTH);
break;
- case LFUN_DEPTH_PLUS:
+ case LFUN_DEPTH_INCREMENT:
changeDepth(cur, INC_DEPTH);
break;
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
- if (cmd.argument == "on")
+ if (cmd.argument() == "on")
// don't pass "on" as argument
mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false);
else
break;
case LFUN_MATH_MACRO:
- if (cmd.argument.empty())
- cur.errorMessage(N_("Missing argument"));
+ if (cmd.argument().empty())
+ cur.errorMessage(from_utf8(N_("Missing argument")));
else {
- string s = 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;
// passthrough hat and underscore outside mathed:
- case LFUN_SUBSCRIPT:
- mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "_"), false);
+ case LFUN_MATH_SUBSCRIPT:
+ mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "_"), false);
break;
- case LFUN_SUPERSCRIPT:
- mathDispatch(cur, FuncRequest(LFUN_SELFINSERT, "^"), false);
+ case LFUN_MATH_SUPERSCRIPT:
+ mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "^"), false);
break;
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
- case LFUN_MATH_DELIM: {
- cur.insert(new MathHullInset("simple"));
- cur.dispatch(FuncRequest(LFUN_RIGHT));
+ case LFUN_MATH_INSERT:
+ case LFUN_MATH_MATRIX:
+ case LFUN_MATH_DELIM:
+ case LFUN_MATH_BIGDELIM: {
+ cur.insert(new InsetMathHull(hullSimple));
+ cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
cur.dispatch(cmd);
break;
}
- case LFUN_EMPH: {
+ case LFUN_FONT_EMPH: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setEmph(LyXFont::TOGGLE);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_BOLD: {
+ case LFUN_FONT_BOLD: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setSeries(LyXFont::BOLD_SERIES);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_NOUN: {
+ case LFUN_FONT_NOUN: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setNoun(LyXFont::TOGGLE);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_CODE: {
+ case LFUN_FONT_CODE: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setFamily(LyXFont::TYPEWRITER_FAMILY); // no good
toggleAndShow(cur, this, font);
break;
}
- case LFUN_SANS: {
+ case LFUN_FONT_SANS: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setFamily(LyXFont::SANS_FAMILY);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_ROMAN: {
+ case LFUN_FONT_ROMAN: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setFamily(LyXFont::ROMAN_FAMILY);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_DEFAULT: {
+ case LFUN_FONT_DEFAULT: {
LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
toggleAndShow(cur, this, font);
break;
}
- case LFUN_UNDERLINE: {
+ case LFUN_FONT_UNDERLINE: {
LyXFont font(LyXFont::ALL_IGNORE);
font.setUnderbar(LyXFont::TOGGLE);
toggleAndShow(cur, this, font);
case LFUN_FONT_SIZE: {
LyXFont font(LyXFont::ALL_IGNORE);
- font.setLyXSize(cmd.argument);
+ font.setLyXSize(to_utf8(cmd.argument()));
toggleAndShow(cur, this, font);
break;
}
case LFUN_LANGUAGE: {
- Language const * lang = languages.getLanguage(cmd.argument);
+ Language const * lang = languages.getLanguage(to_utf8(cmd.argument()));
if (!lang)
break;
LyXFont font(LyXFont::ALL_IGNORE);
break;
}
- case LFUN_FREEFONT_APPLY:
+ case LFUN_FONT_FREE_APPLY:
toggleAndShow(cur, this, freefont, toggleall);
cur.message(_("Character set"));
break;
// Set the freefont using the contents of \param data dispatched from
// the frontends and apply it at the current cursor location.
- case LFUN_FREEFONT_UPDATE: {
+ case LFUN_FONT_FREE_UPDATE: {
LyXFont font;
bool toggle;
- if (bv_funcs::string2font(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_UMLAUT:
- case LFUN_CIRCUMFLEX:
- case LFUN_GRAVE:
- case LFUN_ACUTE:
- case LFUN_TILDE:
- case LFUN_CEDILLA:
- case LFUN_MACRON:
- case LFUN_DOT:
- case LFUN_UNDERDOT:
- case LFUN_UNDERBAR:
- case LFUN_CARON:
- case LFUN_SPECIAL_CARON:
- case LFUN_BREVE:
- case LFUN_TIE:
- case LFUN_HUNG_UMLAUT:
- case LFUN_CIRCLE:
- case LFUN_OGONEK:
- bv->owner()->getLyXFunc().handleKeyFunc(cmd.action);
- if (!cmd.argument.empty())
- bv->owner()->getIntl().getTransManager()
- .TranslateAndInsert(cmd.argument[0], this);
+ case LFUN_ACCENT_UMLAUT:
+ case LFUN_ACCENT_CIRCUMFLEX:
+ case LFUN_ACCENT_GRAVE:
+ case LFUN_ACCENT_ACUTE:
+ case LFUN_ACCENT_TILDE:
+ case LFUN_ACCENT_CEDILLA:
+ case LFUN_ACCENT_MACRON:
+ case LFUN_ACCENT_DOT:
+ case LFUN_ACCENT_UNDERDOT:
+ case LFUN_ACCENT_UNDERBAR:
+ case LFUN_ACCENT_CARON:
+ case LFUN_ACCENT_SPECIAL_CARON:
+ case LFUN_ACCENT_BREVE:
+ case LFUN_ACCENT_TIE:
+ case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+ case LFUN_ACCENT_CIRCLE:
+ case LFUN_ACCENT_OGONEK:
+ theLyXFunc().handleKeyFunc(cmd.action);
+ if (!cmd.argument().empty())
+ // FIXME: Are all these characters encoded in one byte in utf8?
+ 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(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(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: "
- << cmd.argument << endl;
+ << to_utf8(cmd.argument()) << endl;
}
break;
}
- case LFUN_ACCEPT_CHANGE: {
- acceptChange(cur);
+ case LFUN_CHANGE_ACCEPT: {
+ acceptOrRejectChanges(cur, ACCEPT);
break;
}
- case LFUN_REJECT_CHANGE: {
- rejectChange(cur);
+ case LFUN_CHANGE_REJECT: {
+ acceptOrRejectChanges(cur, REJECT);
break;
}
case LFUN_THESAURUS_ENTRY: {
- string arg = cmd.argument;
+ docstring arg = cmd.argument();
if (arg.empty()) {
arg = cur.selectionAsString(false);
// 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", arg);
+ bv->showDialogWithData("thesaurus", to_utf8(arg));
break;
}
- case LFUN_PARAGRAPH_APPLY: {
+ case LFUN_PARAGRAPH_PARAMS_APPLY: {
// Given data, an encoding of the ParagraphParameters
// generated in the Paragraph dialog, this function sets
// the current paragraph appropriately.
- istringstream is(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;
}
- case LFUN_INSET_DIALOG_SHOW: {
- InsetBase * inset = cur.nextInset();
- if (inset) {
- FuncRequest fr(LFUN_INSET_DIALOG_SHOW);
- inset->dispatch(cur, fr);
- }
- break;
- }
-
case LFUN_ESCAPE:
if (cur.selection()) {
cur.selection() = false;
+ saveSelection(cur);
} else {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
break;
default:
- lyxerr[Debug::ACTION]
+ lyxerr[Debug::ACTION]
<< BOOST_CURRENT_FUNCTION
- << ": Command " << cmd
+ << ": Command " << cmd
<< " not DISPATCHED by LyXText" << endl;
cur.undispatched();
break;
}
- if (singleParUpdate)
+ 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()
+ ParagraphMetrics const & pms
+ = cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit());
+ if (pms.dim().height()
== olddim.height()) {
// if so, update _only_ this paragraph
- cur.bv().update(Update::SinglePar | Update::Force);
+ 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();
+ // FIXME: it would be better if we could just do this
+ //
+ //if (cur.result().update() != Update::FitCursor)
+ // cur.noUpdate();
+ //
+ // But some LFUNs do not set Update::FitCursor when needed, so we
+ // do it for all. This is not very harmfull as FitCursor will provoke
+ // a full redraw only if needed but still, a proper review of all LFUN
+ // should be done and this needsUpdate boolean can then be removed.
+ cur.updateFlags(Update::FitCursor);
else
- cur.needsUpdate();
+ cur.updateFlags(Update::Force | Update::FitCursor);
}
switch (cmd.action) {
- case LFUN_DEPTH_MIN:
+ case LFUN_DEPTH_DECREMENT:
enable = changeDepthAllowed(cur, DEC_DEPTH);
break;
- case LFUN_DEPTH_PLUS:
+ case LFUN_DEPTH_INCREMENT:
enable = changeDepthAllowed(cur, INC_DEPTH);
break;
flag.setOnOff(cur.paragraph().params().startOfAppendix());
return true;
- case LFUN_INSERT_BIBITEM:
+ case LFUN_BIBITEM_INSERT:
enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO);
break;
case LFUN_DIALOG_SHOW_NEW_INSET:
- if (cmd.argument == "bibitem")
+ if (cmd.argument() == "bibitem")
code = InsetBase::BIBITEM_CODE;
- else if (cmd.argument == "bibtex")
+ else if (cmd.argument() == "bibtex")
code = InsetBase::BIBTEX_CODE;
- else if (cmd.argument == "box")
+ else if (cmd.argument() == "box")
code = InsetBase::BOX_CODE;
- else if (cmd.argument == "branch")
+ else if (cmd.argument() == "branch")
code = InsetBase::BRANCH_CODE;
- else if (cmd.argument == "citation")
+ else if (cmd.argument() == "citation")
code = InsetBase::CITE_CODE;
- else if (cmd.argument == "ert")
+ else if (cmd.argument() == "ert")
code = InsetBase::ERT_CODE;
- else if (cmd.argument == "external")
+ else if (cmd.argument() == "external")
code = InsetBase::EXTERNAL_CODE;
- else if (cmd.argument == "float")
+ else if (cmd.argument() == "float")
code = InsetBase::FLOAT_CODE;
- else if (cmd.argument == "graphics")
+ else if (cmd.argument() == "graphics")
code = InsetBase::GRAPHICS_CODE;
- else if (cmd.argument == "include")
+ else if (cmd.argument() == "include")
code = InsetBase::INCLUDE_CODE;
- else if (cmd.argument == "index")
+ else if (cmd.argument() == "index")
code = InsetBase::INDEX_CODE;
- else if (cmd.argument == "label")
+ else if (cmd.argument() == "nomenclature")
+ code = InsetBase::NOMENCL_CODE;
+ else if (cmd.argument() == "label")
code = InsetBase::LABEL_CODE;
- else if (cmd.argument == "note")
+ else if (cmd.argument() == "note")
code = InsetBase::NOTE_CODE;
- else if (cmd.argument == "ref")
+ else if (cmd.argument() == "ref")
code = InsetBase::REF_CODE;
- else if (cmd.argument == "toc")
+ else if (cmd.argument() == "toc")
code = InsetBase::TOC_CODE;
- else if (cmd.argument == "url")
+ else if (cmd.argument() == "url")
code = InsetBase::URL_CODE;
- else if (cmd.argument == "vspace")
+ else if (cmd.argument() == "vspace")
code = InsetBase::VSPACE_CODE;
- else if (cmd.argument == "wrap")
+ else if (cmd.argument() == "wrap")
code = InsetBase::WRAP_CODE;
break;
- case LFUN_INSET_ERT:
+ case LFUN_ERT_INSERT:
code = InsetBase::ERT_CODE;
break;
- case LFUN_INSET_FOOTNOTE:
+ case LFUN_FOOTNOTE_INSERT:
code = InsetBase::FOOT_CODE;
break;
case LFUN_TABULAR_INSERT:
code = InsetBase::TABULAR_CODE;
break;
- case LFUN_INSET_MARGINAL:
+ case LFUN_MARGINALNOTE_INSERT:
code = InsetBase::MARGIN_CODE;
break;
- case LFUN_INSET_FLOAT:
- case LFUN_INSET_WIDE_FLOAT:
+ case LFUN_FLOAT_INSERT:
+ case LFUN_FLOAT_WIDE_INSERT:
code = InsetBase::FLOAT_CODE;
break;
- case LFUN_INSET_WRAP:
+ case LFUN_WRAP_INSERT:
code = InsetBase::WRAP_CODE;
break;
case LFUN_FLOAT_LIST:
code = InsetBase::FLOAT_LIST_CODE;
break;
#if 0
- case LFUN_INSET_LIST:
+ case LFUN_LIST_INSERT:
code = InsetBase::LIST_CODE;
break;
- case LFUN_INSET_THEOREM:
+ case LFUN_THEOREM_INSERT:
code = InsetBase::THEOREM_CODE;
break;
#endif
- case LFUN_INSET_CAPTION:
+ case LFUN_CAPTION_INSERT:
code = InsetBase::CAPTION_CODE;
break;
- case LFUN_INSERT_NOTE:
+ case LFUN_NOTE_INSERT:
code = InsetBase::NOTE_CODE;
break;
- case LFUN_INSERT_CHARSTYLE:
+ case LFUN_CHARSTYLE_INSERT:
code = InsetBase::CHARSTYLE_CODE;
if (cur.buffer().params().getLyXTextClass().charstyles().empty())
enable = false;
break;
- case LFUN_INSERT_BOX:
+ case LFUN_BOX_INSERT:
code = InsetBase::BOX_CODE;
break;
- case LFUN_INSERT_BRANCH:
+ case LFUN_BRANCH_INSERT:
code = InsetBase::BRANCH_CODE;
if (cur.buffer().getMasterBuffer()->params().branchlist().empty())
enable = false;
break;
- case LFUN_INSERT_LABEL:
+ case LFUN_LABEL_INSERT:
code = InsetBase::LABEL_CODE;
break;
- case LFUN_INSET_OPTARG:
+ case LFUN_OPTIONAL_INSERT:
code = InsetBase::OPTARG_CODE;
enable = numberOfOptArgs(cur.paragraph())
< cur.paragraph().layout()->optionalargs;
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;
- case LFUN_HTMLURL:
- case LFUN_URL:
+ case LFUN_HTML_INSERT:
+ case LFUN_URL_INSERT:
code = InsetBase::URL_CODE;
break;
- case LFUN_QUOTE:
+ case LFUN_QUOTE_INSERT:
// always allow this, since we will inset a raw quote
// if an inset is not allowed.
break;
- case LFUN_HYPHENATION:
- case LFUN_LIGATURE_BREAK:
- case LFUN_HFILL:
- case LFUN_MENU_SEPARATOR:
- case LFUN_LDOTS:
- case LFUN_END_OF_SENTENCE:
+ case LFUN_HYPHENATION_POINT_INSERT:
+ case LFUN_LIGATURE_BREAK_INSERT:
+ case LFUN_HFILL_INSERT:
+ case LFUN_MENU_SEPARATOR_INSERT:
+ case LFUN_DOTS_INSERT:
+ case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
code = InsetBase::SPECIALCHAR_CODE;
break;
case LFUN_SPACE_INSERT:
code = InsetBase::SPACE_CODE;
break;
-#ifdef WITH_WARNINGS
-#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005)
-#endif
-#if 0
- case LFUN_INSET_DIALOG_SHOW: {
- InsetBase * inset = cur.nextInset();
- enable = inset;
- if (inset) {
- code = inset->lyxCode();
- if (!(code == InsetBase::INCLUDE_CODE
- || code == InsetBase::BIBTEX_CODE
- || code == InsetBase::FLOAT_LIST_CODE
- || code == InsetBase::TOC_CODE))
- enable = false;
- }
- break;
- }
-#endif
-
case LFUN_INSET_MODIFY:
// We need to disable this, because we may get called for a
// tabular cell via
enable = false;
break;
- case LFUN_EMPH:
+ case LFUN_FONT_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
return true;
- case LFUN_NOUN:
+ case LFUN_FONT_NOUN:
flag.setOnOff(font.noun() == LyXFont::ON);
return true;
- case LFUN_BOLD:
+ case LFUN_FONT_BOLD:
flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
return true;
- case LFUN_SANS:
+ case LFUN_FONT_SANS:
flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
return true;
- case LFUN_ROMAN:
+ case LFUN_FONT_ROMAN:
flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
return true;
- case LFUN_CODE:
+ case LFUN_FONT_CODE:
flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
return true;
break;
case LFUN_PASTE:
- enable = lyx::cap::numberOfSelections() > 0;
- break;
-
- case LFUN_DELETE_WORD_FORWARD:
- case LFUN_DELETE_WORD_BACKWARD:
- case LFUN_DELETE_LINE_FORWARD:
- case LFUN_WORDRIGHT:
- case LFUN_WORDLEFT:
- case LFUN_RIGHT:
- case LFUN_RIGHTSEL:
- case LFUN_LEFT:
- case LFUN_LEFTSEL:
+ if (cmd.argument().empty()) {
+ if (theClipboard().isInternal())
+ enable = cap::numberOfSelections() > 0;
+ else
+ enable = !theClipboard().empty();
+ } else {
+ string const arg = to_utf8(cmd.argument());
+ if (isStrUnsignedInt(arg)) {
+ unsigned int n = convert<unsigned int>(arg);
+ enable = cap::numberOfSelections() > n;
+ } else
+ // unknown argument
+ enable = false;
+ }
+ break;
+
+ case LFUN_CLIPBOARD_PASTE:
+ enable = !theClipboard().empty();
+ break;
+
+ case LFUN_PRIMARY_SELECTION_PASTE:
+ enable = cur.selection() || !theSelection().empty();
+ break;
+
+ case LFUN_PARAGRAPH_MOVE_UP:
+ enable = cur.pit() > 0 && !cur.selection();
+ break;
+
+ case LFUN_PARAGRAPH_MOVE_DOWN:
+ enable = cur.pit() < cur.lastpit() && !cur.selection();
+ break;
+
+ case LFUN_INSET_DISSOLVE:
+ enable = !isMainText(*cur.bv().buffer()) && cur.inset().nargs() == 1;
+ break;
+
+ case LFUN_CHANGE_ACCEPT:
+ case LFUN_CHANGE_REJECT:
+ // TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
+ // In principle, these LFUNs should only be enabled if there
+ // is a change at the current position/in the current selection.
+ // However, without proper optimizations, this will inevitably
+ // result in unacceptable performance - just imagine a user who
+ // wants to select the complete content of a long document.
+ enable = true;
+ break;
+
+ case LFUN_WORD_DELETE_FORWARD:
+ case LFUN_WORD_DELETE_BACKWARD:
+ case LFUN_LINE_DELETE:
+ case LFUN_WORD_FORWARD:
+ case LFUN_WORD_BACKWARD:
+ case LFUN_CHAR_FORWARD:
+ case LFUN_CHAR_FORWARD_SELECT:
+ case LFUN_CHAR_BACKWARD:
+ case LFUN_CHAR_BACKWARD_SELECT:
case LFUN_UP:
- case LFUN_UPSEL:
+ case LFUN_UP_SELECT:
case LFUN_DOWN:
- case LFUN_DOWNSEL:
- case LFUN_UP_PARAGRAPHSEL:
- case LFUN_DOWN_PARAGRAPHSEL:
- case LFUN_PRIORSEL:
- case LFUN_NEXTSEL:
- case LFUN_HOMESEL:
- case LFUN_ENDSEL:
- case LFUN_WORDRIGHTSEL:
- case LFUN_WORDLEFTSEL:
- case LFUN_WORDSEL:
- case LFUN_UP_PARAGRAPH:
- case LFUN_DOWN_PARAGRAPH:
- case LFUN_PRIOR:
- case LFUN_NEXT:
- case LFUN_HOME:
- case LFUN_END:
- case LFUN_BREAKLINE:
- case LFUN_DELETE:
- case LFUN_DELETE_SKIP:
- case LFUN_BACKSPACE:
- case LFUN_BACKSPACE_SKIP:
- case LFUN_BREAKPARAGRAPH:
- case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
- case LFUN_BREAKPARAGRAPH_SKIP:
+ case LFUN_DOWN_SELECT:
+ case LFUN_PARAGRAPH_UP_SELECT:
+ case LFUN_PARAGRAPH_DOWN_SELECT:
+ case LFUN_SCREEN_UP_SELECT:
+ case LFUN_SCREEN_DOWN_SELECT:
+ case LFUN_LINE_BEGIN_SELECT:
+ case LFUN_LINE_END_SELECT:
+ case LFUN_WORD_FORWARD_SELECT:
+ case LFUN_WORD_BACKWARD_SELECT:
+ case LFUN_WORD_SELECT:
+ case LFUN_PARAGRAPH_UP:
+ case LFUN_PARAGRAPH_DOWN:
+ case LFUN_SCREEN_UP:
+ case LFUN_SCREEN_DOWN:
+ case LFUN_LINE_BEGIN:
+ case LFUN_LINE_END:
+ case LFUN_BREAK_LINE:
+ case LFUN_CHAR_DELETE_FORWARD:
+ case LFUN_DELETE_FORWARD_SKIP:
+ case LFUN_CHAR_DELETE_BACKWARD:
+ case LFUN_DELETE_BACKWARD_SKIP:
+ case LFUN_BREAK_PARAGRAPH:
+ case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
+ case LFUN_BREAK_PARAGRAPH_SKIP:
case LFUN_PARAGRAPH_SPACING:
case LFUN_INSET_INSERT:
- case LFUN_NEXT_INSET_TOGGLE:
- case LFUN_UPCASE_WORD:
- case LFUN_LOWCASE_WORD:
- case LFUN_CAPITALIZE_WORD:
- case LFUN_TRANSPOSE_CHARS:
- case LFUN_GETXY:
- case LFUN_SETXY:
- case LFUN_GETFONT:
- case LFUN_GETLAYOUT:
+ case LFUN_WORD_UPCASE:
+ case LFUN_WORD_LOWCASE:
+ case LFUN_WORD_CAPITALIZE:
+ case LFUN_CHARS_TRANSPOSE:
+ case LFUN_SERVER_GET_XY:
+ case LFUN_SERVER_SET_XY:
+ case LFUN_SERVER_GET_FONT:
+ case LFUN_SERVER_GET_LAYOUT:
case LFUN_LAYOUT:
- case LFUN_PASTESELECTION:
case LFUN_DATE_INSERT:
- case LFUN_SELFINSERT:
- case LFUN_INSERT_LINE:
- case LFUN_INSERT_PAGEBREAK:
+ case LFUN_SELF_INSERT:
+ case LFUN_LINE_INSERT:
+ case LFUN_PAGEBREAK_INSERT:
+ case LFUN_CLEARPAGE_INSERT:
+ case LFUN_CLEARDOUBLEPAGE_INSERT:
case LFUN_MATH_DISPLAY:
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
case LFUN_MATH_MACRO:
- case LFUN_INSERT_MATH:
- case LFUN_INSERT_MATRIX:
+ case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
- case LFUN_SUBSCRIPT:
- case LFUN_SUPERSCRIPT:
- case LFUN_DEFAULT:
- case LFUN_UNDERLINE:
+ case LFUN_MATH_BIGDELIM:
+ case LFUN_MATH_SUBSCRIPT:
+ case LFUN_MATH_SUPERSCRIPT:
+ case LFUN_FONT_DEFAULT:
+ case LFUN_FONT_UNDERLINE:
case LFUN_FONT_SIZE:
case LFUN_LANGUAGE:
- case LFUN_FREEFONT_APPLY:
- case LFUN_FREEFONT_UPDATE:
+ case LFUN_FONT_FREE_APPLY:
+ case LFUN_FONT_FREE_UPDATE:
case LFUN_LAYOUT_PARAGRAPH:
case LFUN_PARAGRAPH_UPDATE:
- case LFUN_UMLAUT:
- case LFUN_CIRCUMFLEX:
- case LFUN_GRAVE:
- case LFUN_ACUTE:
- case LFUN_TILDE:
- case LFUN_CEDILLA:
- case LFUN_MACRON:
- case LFUN_DOT:
- case LFUN_UNDERDOT:
- case LFUN_UNDERBAR:
- case LFUN_CARON:
- case LFUN_SPECIAL_CARON:
- case LFUN_BREVE:
- case LFUN_TIE:
- case LFUN_HUNG_UMLAUT:
- case LFUN_CIRCLE:
- case LFUN_OGONEK:
- case LFUN_ACCEPT_CHANGE:
- case LFUN_REJECT_CHANGE:
+ case LFUN_ACCENT_UMLAUT:
+ case LFUN_ACCENT_CIRCUMFLEX:
+ case LFUN_ACCENT_GRAVE:
+ case LFUN_ACCENT_ACUTE:
+ case LFUN_ACCENT_TILDE:
+ case LFUN_ACCENT_CEDILLA:
+ case LFUN_ACCENT_MACRON:
+ case LFUN_ACCENT_DOT:
+ case LFUN_ACCENT_UNDERDOT:
+ case LFUN_ACCENT_UNDERBAR:
+ case LFUN_ACCENT_CARON:
+ case LFUN_ACCENT_SPECIAL_CARON:
+ case LFUN_ACCENT_BREVE:
+ case LFUN_ACCENT_TIE:
+ case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+ case LFUN_ACCENT_CIRCLE:
+ case LFUN_ACCENT_OGONEK:
case LFUN_THESAURUS_ENTRY:
- case LFUN_PARAGRAPH_APPLY:
+ case LFUN_PARAGRAPH_PARAMS_APPLY:
case LFUN_ESCAPE:
- case LFUN_ENDBUF:
- case LFUN_BEGINNINGBUF:
- case LFUN_BEGINNINGBUFSEL:
- case LFUN_ENDBUFSEL:
+ case LFUN_BUFFER_END:
+ 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;
}
+
+
+void LyXText::pasteString(LCursor & cur, docstring const & clip,
+ bool asParagraphs)
+{
+ cur.clearSelection();
+ if (!clip.empty()) {
+ recordUndo(cur);
+ if (asParagraphs)
+ insertStringAsParagraphs(cur, clip);
+ else
+ insertStringAsLines(cur, clip);
+ }
+}
+
+} // namespace lyx
projects / lyx.git / blobdiff