#include "BufferView.h"
#include "bufferview_funcs.h"
#include "Cursor.h"
-#include "CoordCache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "DispatchResult.h"
#include "LyXFunc.h"
#include "Lexer.h"
#include "LyXRC.h"
-#include "Row.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include <clocale>
#include <sstream>
+using std::endl;
+using std::string;
+using std::istringstream;
+using std::ostringstream;
namespace lyx {
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;
-
+namespace frontend {
+extern docstring current_layout;
+}
namespace {
Font freefont(Font::ALL_IGNORE);
bool toggleall = false;
-
void toggleAndShow(Cursor & cur, Text * text,
Font const & font, bool toggleall = true)
{
if (font.language() != ignore_language ||
font.number() != Font::IGNORE) {
- Paragraph & par = cur.paragraph();
- text->bidi.computeTables(par, cur.buffer(), cur.textRow());
- if (cur.boundary() !=
- text->bidi.isBoundary(cur.buffer(), par,
- cur.pos(),
- text->real_current_font))
+ TextMetrics const & tm = cur.bv().textMetrics(text);
+ if (cur.boundary() != tm.isRTLBoundary(cur.pit(),
+ cur.pos(), cur.real_current_font))
text->setCursor(cur, cur.pit(), cur.pos(),
- false, !cur.boundary());
+ false, !cur.boundary());
}
}
{
if (selecting || cur.mark())
cur.setSelection();
- saveSelection(cur);
- cur.bv().switchKeyMap();
}
}
-void Text::cursorPrevious(Cursor & cur)
-{
- pos_type cpos = cur.pos();
- pit_type cpar = cur.pit();
-
- int x = cur.x_target();
- setCursorFromCoordinates(cur, x, 0);
- cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
-
- 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.
- cur.dispatch(FuncRequest(cur.selection()? LFUN_UP_SELECT: LFUN_UP));
-
- finishUndo();
- cur.updateFlags(Update::Force | Update::FitCursor);
-}
-
-
-void Text::cursorNext(Cursor & cur)
-{
- pos_type cpos = cur.pos();
- pit_type cpar = cur.pit();
-
- int x = cur.x_target();
- setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
- cur.dispatch(FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
-
- 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.
- cur.dispatch(
- FuncRequest(cur.selection()? LFUN_DOWN_SELECT: LFUN_DOWN));
-
- finishUndo();
- cur.updateFlags(Update::Force | Update::FitCursor);
-}
-
namespace {
lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
// reset first par to default
if (cur.lastpit() != 0 || cur.lastpos() != 0) {
- Layout_ptr const layout =
+ LayoutPtr const layout =
cur.buffer().params().getTextClass().defaultLayout();
cur.text()->paragraphs().begin()->layout(layout);
}
bool Text::isRTL(Buffer const & buffer, Paragraph const & par) const
{
- return par.isRightToLeftPar(buffer.params());
+ return par.isRTL(buffer.params());
}
BOOST_ASSERT(cur.text() == this);
BufferView * bv = &cur.bv();
+ TextMetrics & tm = cur.bv().textMetrics(this);
CursorSlice oldTopSlice = cur.top();
bool oldBoundary = cur.boundary();
bool sel = cur.selection();
recUndo(cur, pit, pit + 1);
finishUndo();
std::swap(pars_[pit], pars_[pit + 1]);
-
- ParIterator begin(cur);
- // begin.pos() (== cur.pos()) may point beyond the end of the
- // paragraph referenced by begin. This would cause a crash
- // in updateLabels()
- begin.pos() = 0;
- ++cur.pit();
- ParIterator end = boost::next(ParIterator(cur));
- updateLabels(cur.buffer(), begin, end);
-
+ updateLabels(cur.buffer());
needsUpdate = true;
+ ++cur.pit();
break;
}
recUndo(cur, pit - 1, pit);
finishUndo();
std::swap(pars_[pit], pars_[pit - 1]);
-
- ParIterator end = ParIterator(cur);
- // end.pos() (== cur.pos()) may point beyond the end of the
- // paragraph referenced by end. This would cause a crash
- // in boost::next()
- end.pos() = 0;
- end = boost::next(end);
+ updateLabels(cur.buffer());
--cur.pit();
- ParIterator begin(cur);
- updateLabels(cur.buffer(), begin, end);
-
needsUpdate = true;
break;
}
Paragraph & par = cur.paragraph();
bool start = !par.params().startOfAppendix();
-#ifdef WITH_WARNINGS
-#warning The code below only makes sense at top level.
+// FIXME: The code below only makes sense at top level.
// Should LFUN_APPENDIX be restricted to top-level paragraphs?
-#endif
// ensure that we have only one start_of_appendix in this document
+ // FIXME: this don't work for multipart document!
for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) {
if (pars_[tmp].params().startOfAppendix()) {
recUndo(cur, tmp);
}
case LFUN_WORD_DELETE_FORWARD:
- cur.clearSelection();
- deleteWordForward(cur);
+ if (cur.selection()) {
+ cutSelection(cur, true, false);
+ } else
+ deleteWordForward(cur);
finishChange(cur, false);
break;
case LFUN_WORD_DELETE_BACKWARD:
- cur.clearSelection();
- deleteWordBackward(cur);
+ if (cur.selection()) {
+ cutSelection(cur, true, false);
+ } else
+ deleteWordBackward(cur);
finishChange(cur, false);
break;
case LFUN_LINE_DELETE:
- cur.clearSelection();
- deleteLineForward(cur);
+ if (cur.selection()) {
+ cutSelection(cur, true, false);
+ } else
+ tm.deleteLineForward(cur);
finishChange(cur, false);
break;
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
}
- if (cur.selection())
- saveSelection(cur);
break;
case LFUN_CHAR_BACKWARD:
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_LEFT);
}
- if (cur.selection())
- saveSelection(cur);
break;
- case LFUN_UP:
case LFUN_UP_SELECT:
- //lyxerr << "handle LFUN_UP[SEL]:\n" << cur << endl;
- needsUpdate |= cur.selHandle(cmd.action == LFUN_UP_SELECT);
-
- 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_DOWN_SELECT:
- //lyxerr << "handle LFUN_DOWN[SEL]:\n" << cur << endl;
- needsUpdate |= cur.selHandle(cmd.action == LFUN_DOWN_SELECT);
- needsUpdate |= cursorDown(cur);
-
- if (!needsUpdate && oldTopSlice == cur.top() &&
- cur.boundary() == oldBoundary)
- {
+ case LFUN_UP:
+ case LFUN_DOWN: {
+ // stop/start the selection
+ bool select = cmd.action == LFUN_DOWN_SELECT ||
+ cmd.action == LFUN_UP_SELECT;
+ cur.selHandle(select);
+
+ // move cursor up/down
+ bool up = cmd.action == LFUN_UP_SELECT || cmd.action == LFUN_UP;
+ bool const successful = cur.upDownInText(up, needsUpdate);
+ if (successful) {
+ // notify insets which were left and get their update flags
+ notifyCursorLeaves(cur.beforeDispatchCursor(), cur);
+ cur.fixIfBroken();
+
+ // redraw if you leave mathed (for the decorations)
+ needsUpdate |= cur.beforeDispatchCursor().inMathed();
+ } else
cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_DOWN);
- }
- if (cur.selection())
- saveSelection(cur);
+
break;
+ }
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_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_SCREEN_UP:
case LFUN_SCREEN_UP_SELECT:
- needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_UP_SELECT);
- if (cur.pit() == 0 && cur.textRow().pos() == 0) {
+ needsUpdate |= cur.selHandle(true);
+ if (cur.pit() == 0 && cur.textRow().pos() == 0)
cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_UP);
- } else {
- cursorPrevious(cur);
+ else {
+ tm.cursorPrevious(cur);
}
- if (cur.selection())
- saveSelection(cur);
break;
- case LFUN_SCREEN_DOWN:
case LFUN_SCREEN_DOWN_SELECT:
- needsUpdate |= cur.selHandle(cmd.action == LFUN_SCREEN_DOWN_SELECT);
+ needsUpdate |= cur.selHandle(true);
if (cur.pit() == cur.lastpit()
- && cur.textRow().endpos() == cur.lastpos()) {
+ && cur.textRow().endpos() == cur.lastpos())
cur.undispatched();
- cmd = FuncRequest(LFUN_FINISHED_DOWN);
- } else {
- cursorNext(cur);
+ else {
+ tm.cursorNext(cur);
}
- if (cur.selection())
- saveSelection(cur);
break;
case LFUN_LINE_BEGIN:
case LFUN_LINE_BEGIN_SELECT:
needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
- needsUpdate |= cursorHome(cur);
+ needsUpdate |= tm.cursorHome(cur);
break;
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);
+ needsUpdate |= tm.cursorEnd(cur);
break;
case LFUN_WORD_FORWARD:
needsUpdate |= cursorLeftOneWord(cur);
else
needsUpdate |= cursorRightOneWord(cur);
- if (cur.selection())
- saveSelection(cur);
break;
case LFUN_WORD_BACKWARD:
needsUpdate |= cursorRightOneWord(cur);
else
needsUpdate |= cursorLeftOneWord(cur);
- if (cur.selection())
- saveSelection(cur);
break;
case LFUN_WORD_SELECT: {
cutSelection(cur, true, false);
singleParUpdate = false;
}
- bv->switchKeyMap();
break;
case LFUN_DELETE_BACKWARD_SKIP:
// Reverse the effect of LFUN_BREAK_PARAGRAPH_SKIP.
if (!cur.selection()) {
-#ifdef WITH_WARNINGS
-#warning look here
-#endif
+ // FIXME: look here
//CursorSlice cur = cursor();
backspace(cur);
//anchor() = cur;
case LFUN_BREAK_PARAGRAPH:
cap::replaceSelection(cur);
- breakParagraph(cur, 0);
+ breakParagraph(cur, false);
cur.resetAnchor();
- bv->switchKeyMap();
break;
case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
cap::replaceSelection(cur);
- breakParagraph(cur, 1);
+ breakParagraph(cur, true);
cur.resetAnchor();
- bv->switchKeyMap();
break;
case LFUN_BREAK_PARAGRAPH_SKIP: {
if (cur.pos() == 0)
cur.paragraph().params().labelWidthString(docstring());
else
- breakParagraph(cur, 0);
+ breakParagraph(cur, false);
cur.resetAnchor();
- bv->switchKeyMap();
break;
}
+ // TODO
+ // With the creation of LFUN_PARAGRAPH_PARAMS, this is now redundant,
+ // as its duties can be performed there. Should it be removed??
+ // FIXME For now, it can just dispatch LFUN_PARAGRAPH_PARAMS...
case LFUN_PARAGRAPH_SPACING: {
Paragraph & par = cur.paragraph();
Spacing::Space cur_spacing = par.params().spacing().getSpace();
// 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
+ // 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.
dispatch(cur, fr);
}
*/
+ if (cur.selection())
+ cutSelection(cur, true, false);
insertInset(cur, inset);
cur.posRight();
}
break;
case LFUN_CHARS_TRANSPOSE:
- charsTranspose(cur);
+ charsTranspose(cur);
break;
case LFUN_PASTE:
cur.message(_("Paste"));
cap::replaceSelection(cur);
if (cmd.argument().empty() && !theClipboard().isInternal())
- pasteClipboard(cur, bv->buffer()->errorList("Paste"));
+ pasteClipboard(cur, bv->buffer().errorList("Paste"));
else {
string const arg(to_utf8(cmd.argument()));
- pasteFromStack(cur, bv->buffer()->errorList("Paste"),
+ pasteFromStack(cur, bv->buffer().errorList("Paste"),
isStrUnsignedInt(arg) ?
convert<unsigned int>(arg) :
0);
}
- bv->buffer()->errors("Paste");
+ bv->buffer().errors("Paste");
cur.clearSelection(); // bug 393
- bv->switchKeyMap();
finishUndo();
break;
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()))));
+ convert<string>(tm.cursorX(cur.top(), cur.boundary()))
+ + ' ' + convert<string>(tm.cursorY(cur.top(), cur.boundary()))));
break;
case LFUN_SERVER_SET_XY: {
lyxerr << "SETXY: Could not parse coordinates in '"
<< to_utf8(cmd.argument()) << std::endl;
else
- setCursorFromCoordinates(cur, x, y);
+ tm.setCursorFromCoordinates(cur, x, y);
break;
}
case LFUN_SERVER_GET_FONT:
- if (current_font.shape() == Font::ITALIC_SHAPE)
+ if (cur.current_font.shape() == Font::ITALIC_SHAPE)
cur.message(from_ascii("E"));
- else if (current_font.shape() == Font::SMALLCAPS_SHAPE)
+ else if (cur.current_font.shape() == Font::SMALLCAPS_SHAPE)
cur.message(from_ascii("N"));
else
cur.message(from_ascii("0"));
break;
case LFUN_SERVER_GET_LAYOUT:
- cur.message(from_utf8(cur.paragraph().layout()->name()));
+ cur.message(cur.paragraph().layout()->name());
break;
case LFUN_LAYOUT: {
- string layout = to_ascii(cmd.argument());
- LYXERR(Debug::INFO) << "LFUN_LAYOUT: (arg) " << layout << endl;
+ docstring layout = cmd.argument();
+ LYXERR(Debug::INFO) << "LFUN_LAYOUT: (arg) " << to_utf8(layout) << endl;
// Derive layout number from given argument (string)
// and current buffer's textclass (number)
- TextClass const & tclass = bv->buffer()->params().getTextClass();
+ TextClass const & tclass = bv->buffer().params().getTextClass();
if (layout.empty())
layout = tclass.defaultLayoutName();
bool hasLayout = tclass.hasLayout(layout);
// If the entry is obsolete, use the new one instead.
if (hasLayout) {
- string const & obs = tclass[layout]->obsoleted_by();
+ docstring const & obs = tclass[layout]->obsoleted_by();
if (!obs.empty())
layout = obs;
}
break;
}
- bool change_layout = (current_layout != layout);
+ bool change_layout = (frontend::current_layout != layout);
if (!change_layout && cur.selection() &&
cur.selBegin().pit() != cur.selEnd().pit())
pit_type spit = cur.selBegin().pit();
pit_type epit = cur.selEnd().pit() + 1;
while (spit != epit) {
- if (pars_[spit].layout()->name() != current_layout) {
+ if (pars_[spit].layout()->name() != frontend::current_layout) {
change_layout = true;
break;
}
}
if (change_layout) {
- current_layout = layout;
setLayout(cur, layout);
// inform the GUI that the layout has changed.
bv->layoutChanged(layout);
- bv->switchKeyMap();
}
break;
}
case LFUN_CLIPBOARD_PASTE:
cur.clearSelection();
- pasteClipboard(cur, bv->buffer()->errorList("Paste"),
- cmd.argument() == "paragraph");
- bv->buffer()->errors("Paste");
+ 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");
+ cmd.argument() == "paragraph");
break;
case LFUN_UNICODE_INSERT: {
docstring hexstring = cmd.argument();
if (lyx::support::isHex(hexstring)) {
char_type c = lyx::support::hexToInt(hexstring);
- if (c > 32 && c < 0x10ffff) {
+ 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: {
Paragraph & par = cur.paragraph();
pos_type pos = cur.pos();
- BufferParams const & bufparams = bv->buffer()->params();
- Layout_ptr const & style = par.layout();
+ BufferParams const & bufparams = bv->buffer().params();
+ LayoutPtr const & style = par.layout();
if (!style->pass_thru
&& par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") {
// this avoids a double undo
break;
}
- case LFUN_DATE_INSERT:
- if (cmd.argument().empty())
- lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
- formatted_time(current_time())));
- else
- lyx::dispatch(FuncRequest(LFUN_SELF_INSERT,
- formatted_time(current_time(), to_utf8(cmd.argument()))));
+ case LFUN_DATE_INSERT: {
+ string const format = cmd.argument().empty()
+ ? lyxrc.date_insert_format : to_utf8(cmd.argument());
+ string const time = formatted_time(current_time(), format);
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, time));
break;
+ }
case LFUN_MOUSE_TRIPLE:
if (cmd.button() == mouse_button::button1) {
- cursorHome(cur);
+ tm.cursorHome(cur);
cur.resetAnchor();
- cursorEnd(cur);
+ tm.cursorEnd(cur);
cur.setSelection();
bv->cursor() = cur;
- saveSelection(cur);
}
break;
if (cmd.button() == mouse_button::button3)
cur.clearSelection();
- // 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 && 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;
- }
-
- // we have to update after dePM triggered
+ // Set the cursor
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) {
- cap::pasteSelection(cur, bv->buffer()->errorList("Paste"));
- bv->buffer()->errors("Paste");
- cur.clearSelection(); // bug 393
- bv->switchKeyMap();
+ if (cap::selection()) {
+ // Copy the selection buffer to the clipboard
+ // stack, because we want it to appear in the
+ // "Edit->Paste recent" menu.
+ cap::copySelectionToStack();
+
+ cap::pasteSelection(bv->cursor(),
+ bv->buffer().errorList("Paste"));
+ bv->buffer().errors("Paste");
+ bv->buffer().markDirty();
finishUndo();
- } else
+ } else {
lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
+ }
}
+ // we have to update after dEPM triggered
if (!update && cmd.button() == mouse_button::button1) {
needsUpdate = false;
cur.noUpdate();
int const wh = bv->workHeight();
int const y = std::max(0, std::min(wh - 1, cmd.y));
- setCursorFromCoordinates(cur, cmd.x, y);
- cur.x_target() = cmd.x;
+ tm.setCursorFromCoordinates(cur, cmd.x, y);
+ cur.setTargetX(cmd.x);
if (cmd.y >= wh)
lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
else if (cmd.y < 0)
// but bvcur is current mouse position
Cursor & bvcur = cur.bv().cursor();
bvcur.selection() = true;
- saveSelection(bvcur);
}
needsUpdate = false;
cur.noUpdate();
}
- bv->switchKeyMap();
break;
}
// "auto_region_delete", which defaults to
// true (on).
- if (lyxrc.auto_region_delete)
- if (cur.selection())
- cutSelection(cur, false, false);
+ if (lyxrc.auto_region_delete && cur.selection()) {
+ cutSelection(cur, false, false);
+ // When change tracking is set to off, the metrics update
+ // mechanism correctly detects if a full update is needed or not.
+ // This detection fails when a selection spans multiple rows and
+ // change tracking is enabled because the paragraph metrics stays
+ // the same. In this case, we force the full update:
+ // (see http://bugzilla.lyx.org/show_bug.cgi?id=3992)
+ if (cur.buffer().params().trackChanges)
+ cur.updateFlags(Update::Force);
+ }
cur.clearSelection();
- Font const old_font = real_current_font;
+ Font const old_font = cur.real_current_font;
docstring::const_iterator cit = cmd.argument().begin();
docstring::const_iterator end = cmd.argument().end();
for (; cit != end; ++cit)
- bv->getIntl().getTransManager().
- translateAndInsert(*cit, this, cur);
+ bv->translateAndInsert(*cit, this, cur);
cur.resetAnchor();
moveCursor(cur, false);
case LFUN_URL_INSERT: {
InsetCommandParams p("url");
+ docstring content;
+ if (cur.selection()) {
+ content = cur.selectionAsString(false);
+ cutSelection(cur, true, false);
+ }
+ p["target"] = (cmd.argument().empty()) ?
+ content : cmd.argument();
string const data = InsetCommandMailer::params2string("url", p);
- bv->showInsetDialog("url", data, 0);
+ if (p["target"].empty()) {
+ bv->showInsetDialog("url", data, 0);
+ } else {
+ FuncRequest fr(LFUN_INSET_INSERT, data);
+ dispatch(cur, fr);
+ }
break;
}
case LFUN_HTML_INSERT: {
InsetCommandParams p("htmlurl");
+ docstring content;
+ if (cur.selection()) {
+ content = cur.selectionAsString(false);
+ cutSelection(cur, true, false);
+ }
+ p["target"] = (cmd.argument().empty()) ?
+ content : cmd.argument();
string const data = InsetCommandMailer::params2string("url", p);
- bv->showInsetDialog("url", data, 0);
+ if (p["target"].empty()) {
+ bv->showInsetDialog("url", data, 0);
+ } else {
+ FuncRequest fr(LFUN_INSET_INSERT, data);
+ dispatch(cur, fr);
+ }
break;
}
// inside it.
doInsertInset(cur, this, cmd, true, true);
cur.posRight();
- updateLabels(*bv->buffer());
+ updateLabels(bv->buffer());
break;
case LFUN_NOTE_INSERT:
- case LFUN_CHARSTYLE_INSERT:
+ case LFUN_FLEX_INSERT:
case LFUN_BOX_INSERT:
case LFUN_BRANCH_INSERT:
case LFUN_BIBITEM_INSERT:
cur.posRight();
ParagraphList & pars = cur.text()->paragraphs();
- TextClass const & tclass = bv->buffer()->params().getTextClass();
+ TextClass const & tclass = bv->buffer().params().getTextClass();
// add a separate paragraph for the caption inset
pars.push_back(Paragraph());
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: This Text/Cursor dispatch handling is a mess!
+ // We cannot use Cursor::dispatch here it needs access to up to
+ // date metrics.
+ FuncRequest cmd_caption(LFUN_CAPTION_INSERT);
+ cur.text()->dispatch(cur, cmd_caption);
+ cur.updateFlags(Update::Force);
// FIXME: When leaving the Float (or Wrap) inset we should
// delete any empty paragraph left above or below the
// caption.
recordUndo(cur);
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());
+ inset->edit(cur, true);
cur.posRight();
break;
}
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM: {
+ if (cur.selection())
+ cur.clearSelection();
+ // FIXME: instead of the above, this one
+ // should be used (but it asserts with Bidi enabled)
+ // cf. http://bugzilla.lyx.org/show_bug.cgi?id=4055
+ // cap::replaceSelection(cur);
cur.insert(new InsetMathHull(hullSimple));
- cur.dispatch(FuncRequest(LFUN_CHAR_FORWARD));
+ checkAndActivateInset(cur, true);
BOOST_ASSERT(cur.inMathed());
cur.dispatch(cmd);
break;
Font font(Font::ALL_IGNORE);
font.setLanguage(lang);
toggleAndShow(cur, this, font);
- bv->switchKeyMap();
break;
}
++cur.pos();
break;
- case LFUN_FINISHED_UP:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_UP:\n" << cur << endl;
- cursorUp(cur);
- break;
-
- case LFUN_FINISHED_DOWN:
- LYXERR(Debug::DEBUG) << "handle LFUN_FINISHED_DOWN:\n" << cur << endl;
- cursorDown(cur);
- break;
-
case LFUN_LAYOUT_PARAGRAPH: {
string data;
params2string(cur.paragraph(), data);
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);
+ bv->translateAndInsert(cmd.argument()[0], this, cur);
break;
case LFUN_FLOAT_LIST: {
- TextClass const & tclass = bv->buffer()->params().getTextClass();
+ TextClass const & tclass = bv->buffer().params().getTextClass();
if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
- // not quite sure if we want this...
recordUndo(cur);
- cur.clearSelection();
+ if (cur.selection())
+ cutSelection(cur, true, false);
breakParagraph(cur);
if (cur.lastpos() != 0) {
}
setLayout(cur, tclass.defaultLayoutName());
- setParagraph(cur, Spacing(), LYX_ALIGN_LAYOUT, docstring(), 0);
+ ParagraphParameters p;
+ setParagraphs(cur, p);
insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
cur.posRight();
} else {
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(to_utf8(cmd.argument()));
- Lexer lex(0, 0);
- lex.setStream(is);
- ParagraphParameters params;
- params.read(lex);
- setParagraph(cur,
- params.spacing(),
- params.align(),
- params.labelWidthString(),
- params.noindent());
+ // the current paragraph, or currently selected paragraphs,
+ // appropriately.
+ // NOTE: This function overrides all existing settings.
+ setParagraphs(cur, cmd.argument());
+ cur.message(_("Paragraph layout set"));
+ break;
+ }
+
+ case LFUN_PARAGRAPH_PARAMS: {
+ // Given data, an encoding of the ParagraphParameters as we'd
+ // find them in a LyX file, this function modifies the current paragraph,
+ // or currently selected paragraphs.
+ // NOTE: This function only modifies, and does not override, existing
+ // settings.
+ setParagraphs(cur, cmd.argument(), true);
cur.message(_("Paragraph layout set"));
break;
}
case LFUN_ESCAPE:
if (cur.selection()) {
cur.selection() = false;
- saveSelection(cur);
} else {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
// update flag treatment.
if (singleParUpdate) {
// Inserting characters does not change par height
- ParagraphMetrics const & pms
+ ParagraphMetrics const & pms
= cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit());
if (pms.dim().height()
== olddim.height()) {
//
//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
{
BOOST_ASSERT(cur.text() == this);
- Font const & font = real_current_font;
+ Font const & font = cur.real_current_font;
bool enable = true;
Inset::Code code = Inset::NO_CODE;
case LFUN_NOTE_INSERT:
code = Inset::NOTE_CODE;
break;
- case LFUN_CHARSTYLE_INSERT:
- code = Inset::CHARSTYLE_CODE;
- if (cur.buffer().params().getTextClass().charstyles().empty())
+ case LFUN_FLEX_INSERT: {
+ code = Inset::FLEX_CODE;
+ string s = cmd.getArg(0);
+ InsetLayout il = cur.buffer().params().getTextClass().insetlayout(from_utf8(s));
+ if (il.lyxtype != "charstyle" &&
+ il.lyxtype != "custom" &&
+ il.lyxtype != "element")
enable = false;
break;
+ }
case LFUN_BOX_INSERT:
code = Inset::BOX_CODE;
break;
break;
case LFUN_INSET_DISSOLVE:
- enable = !isMainText(*cur.bv().buffer()) && cur.inset().nargs() == 1;
+ enable = !isMainText(cur.bv().buffer()) && cur.inset().nargs() == 1;
break;
case LFUN_CHANGE_ACCEPT:
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_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM:
+ case LFUN_MATH_INSERT:
case LFUN_MATH_SUBSCRIPT:
case LFUN_MATH_SUPERSCRIPT:
case LFUN_FONT_DEFAULT:
case LFUN_ACCENT_OGONEK:
case LFUN_THESAURUS_ENTRY:
case LFUN_PARAGRAPH_PARAMS_APPLY:
+ case LFUN_PARAGRAPH_PARAMS:
case LFUN_ESCAPE:
case LFUN_BUFFER_END:
case LFUN_BUFFER_BEGIN:
projects / lyx.git / blobdiff