#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/convert.h"
+#include "support/lyxtime.h"
#include "mathed/math_hullinset.h"
#include "mathed/math_macrotemplate.h"
{
recordUndo(cur);
string sel = cur.selectionAsString(false);
- lyxerr << "selection is: '" << sel << "'" << endl;
+ //lyxerr << "selection is: '" << sel << "'" << endl;
if (sel.empty()) {
const int old_pos = cur.pos();
}
-void doInsertInset(LCursor & cur, LyXText * text,
+bool doInsertInset(LCursor & cur, LyXText * text,
FuncRequest const & cmd, bool edit, bool pastesel)
{
InsetBase * inset = createInset(&cur.bv(), cmd);
if (!inset)
- return;
+ return false;
recordUndo(cur);
bool gotsel = false;
if (gotsel && pastesel)
cur.bv().owner()->dispatch(FuncRequest(LFUN_PASTE));
+ return true;
}
{
//we don't call update(true, false) directly to save a metrics call
if (cur.bv().fitCursor())
- cur.bv().update(false, true);
+ cur.bv().update(Update::Force);
}
void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
{
lyxerr[Debug::ACTION] << "LyXText::dispatch: cmd: " << cmd << endl;
- lyxerr << "*** LyXText::dispatch: cmd: " << cmd << endl;
BOOST_ASSERT(cur.text() == this);
BufferView * bv = &cur.bv();
CursorSlice oldTopSlice = cur.top();
+ bool oldBoundary = cur.boundary();
bool sel = cur.selection();
bool needsUpdate = !lyxaction.funcHasFlag(cmd.action, LyXAction::NoUpdate);
case LFUN_RIGHT:
case LFUN_RIGHTSEL:
- lyxerr << BOOST_CURRENT_FUNCTION
- << " LFUN_RIGHT[SEL]:\n" << cur << endl;
+ //lyxerr << BOOST_CURRENT_FUNCTION
+ // << " LFUN_RIGHT[SEL]:\n" << cur << endl;
cur.selHandle(cmd.action == LFUN_RIGHTSEL);
if (isRTL(cur.paragraph()))
needsUpdate = cursorLeft(cur);
else
needsUpdate = cursorRight(cur);
- if (!needsUpdate && oldTopSlice == cur.top()) {
+
+ if (!needsUpdate && oldTopSlice == cur.top() && cur.boundary() == oldBoundary) {
cur.undispatched();
cmd = FuncRequest(LFUN_FINISHED_RIGHT);
}
}
case LFUN_INSET_SETTINGS:
- if (cur.inset().asUpdatableInset())
- cur.inset().asUpdatableInset()->showInsetDialog(bv);
+ cur.inset().showInsetDialog(bv);
break;
case LFUN_NEXT_INSET_TOGGLE: {
break;
case LFUN_GETXY:
- cur.message(convert<string>(cursorX(cur.top())) + ' '
- + convert<string>(cursorY(cur.top())));
+ cur.message(convert<string>(cursorX(cur.top(), cur.boundary())) + ' '
+ + convert<string>(cursorY(cur.top(), cur.boundary())));
break;
case LFUN_SETXY: {
break;
}
- case LFUN_DATE_INSERT: {
- lyx::cap::replaceSelection(cur);
- time_t now_time_t = time(NULL);
- struct tm * now_tm = localtime(&now_time_t);
- setlocale(LC_TIME, "");
- string arg;
- if (!cmd.argument.empty())
- arg = cmd.argument;
+ case LFUN_DATE_INSERT:
+ if (cmd.argument.empty())
+ bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
+ lyx::formatted_time(lyx::current_time())));
else
- arg = lyxrc.date_insert_format;
- char datetmp[32];
- int const datetmp_len =
- ::strftime(datetmp, 32, arg.c_str(), now_tm);
-
- for (int i = 0; i < datetmp_len; i++)
- insertChar(cur, datetmp[i]);
-
- cur.resetAnchor();
- moveCursor(cur, false);
+ bv->owner()->dispatch(FuncRequest(LFUN_SELFINSERT,
+ lyx::formatted_time(lyx::current_time(), cmd.argument)));
break;
- }
case LFUN_MOUSE_TRIPLE:
if (cmd.button() == mouse_button::button1) {
cur.resetAnchor();
cursorEnd(cur);
cur.setSelection();
+ bv->cursor() = cur;
bv->haveSelection(cur.selection());
}
break;
case LFUN_MOUSE_DOUBLE:
if (cmd.button() == mouse_button::button1) {
selectWord(cur, lyx::WHOLE_WORD_STRICT);
+ bv->cursor() = cur;
bv->haveSelection(cur.selection());
}
break;
// don't set anchor_
bvcur.setCursor(cur);
bvcur.selection() = true;
- lyxerr << "MOTION: " << bv->cursor() << endl;
+ //lyxerr << "MOTION: " << bv->cursor() << endl;
}
} else
cur.clearSelection();
LyXFont const old_font = real_current_font;
-
+
// Prevents language turds in new lyxtexts under non-english
- setCurrentFont(cur);
+ BufferParams const & bufparams = cur.buffer().params();
+ Language const * lang = cur.paragraph().getParLanguage(bufparams);
+ current_font.setLanguage(lang);
+ real_current_font.setLanguage(lang);
string::const_iterator cit = cmd.argument.begin();
string::const_iterator end = cmd.argument.end();
cur.resetAnchor();
moveCursor(cur, false);
- // real_current_font.number can change so we need to
- // update the minibuffer
- if (old_font != real_current_font)
+ needsUpdate = redoParagraph(cur.pit());
+ if (!needsUpdate) {
+ // update only this paragraph
+ cur.bv().update(Update::SinglePar | Update::Force);
+ }
+
bv->updateScrollbar();
break;
}
case LFUN_INSET_FOOTNOTE:
case LFUN_INSET_MARGINAL:
case LFUN_INSET_OPTARG:
- case LFUN_TABULAR_INSERT:
case LFUN_ENVIRONMENT_INSERT:
// Open the inset, and move the current selection
// inside it.
cur.posRight();
break;
+ case LFUN_TABULAR_INSERT:
+ // if there were no arguments, just open the dialog
+ if (doInsertInset(cur, this, cmd, false, true))
+ cur.posRight();
+ else
+ bv->owner()->getDialogs().show("tabularcreate");
+
+ break;
+
case LFUN_INSET_FLOAT:
- case LFUN_INSET_WIDE_FLOAT:
+ case LFUN_INSET_WIDE_FLOAT:
case LFUN_INSET_WRAP:
doInsertInset(cur, this, cmd, true, true);
cur.posRight();
case LFUN_APPENDIX:
flag.setOnOff(cur.paragraph().params().startOfAppendix());
+ return true;
+
+ case LFUN_INSERT_BIBITEM:
+ enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO);
break;
#if 0
case LFUN_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
- break;
+ return true;
case LFUN_NOUN:
flag.setOnOff(font.noun() == LyXFont::ON);
- break;
+ return true;
case LFUN_BOLD:
flag.setOnOff(font.series() == LyXFont::BOLD_SERIES);
- break;
+ return true;
case LFUN_SANS:
flag.setOnOff(font.family() == LyXFont::SANS_FAMILY);
- break;
+ return true;
case LFUN_ROMAN:
flag.setOnOff(font.family() == LyXFont::ROMAN_FAMILY);
- break;
+ return true;
case LFUN_CODE:
flag.setOnOff(font.family() == LyXFont::TYPEWRITER_FAMILY);
- break;
+ return true;
case LFUN_DELETE_WORD_FORWARD:
case LFUN_DELETE_WORD_BACKWARD:
case LFUN_INSERT_LABEL:
case LFUN_INSERT_NOTE:
case LFUN_INSERT_CHARSTYLE:
- case LFUN_INSERT_BIBITEM:
case LFUN_INSET_FLOAT:
case LFUN_INSET_FOOTNOTE:
case LFUN_INSET_MARGINAL:
projects / lyx.git / blobdiff