#include "LyXView.h"
#include "commandtags.h"
#include "lyxfunc.h"
+#include "debug.h"
#include "font.h"
#include "bufferview_funcs.h"
#include "TextCache.h"
#include "lyxrc.h"
#include "intl.h"
#include "support/LAssert.h"
+#include "support/lstrings.h"
#include "frontends/Dialogs.h"
#include "insets/insetbib.h"
#include "insets/insettext.h"
#include "insets/insetmarginal.h"
#include "insets/insetminipage.h"
#include "insets/insetfloat.h"
-#include "insets/insetlist.h"
#include "insets/insettabular.h"
+#if 0
#include "insets/insettheorem.h"
+#include "insets/insetlist.h"
+#endif
#include "insets/insetcaption.h"
#include "insets/insetfloatlist.h"
#include "insets/insetspecialchar.h"
#include "mathed/formulabase.h"
extern LyXTextClass::size_type current_layout;
-extern int greek_kb_flag;
using std::vector;
using std::find_if;
extern BufferList bufferlist;
extern char ascii_type;
-extern bool math_insert_greek(BufferView *, char);
extern void sigchldchecker(pid_t pid, int * status);
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
// hidden. This should go here because some dialogs (eg ToC)
// require bv_->text.
owner_->getDialogs()->updateBufferDependent(true);
+ workarea_.show();
redraw();
insetWakeup();
} else {
}
-bool BufferView::Pimpl::fitCursor(LyXText * text)
+bool BufferView::Pimpl::fitCursor()
{
lyx::Assert(screen_.get());
- bv_->owner()->getDialogs()->updateParagraph();
+ bool ret;
- bool const ret = screen_->fitCursor(text, bv_);
+ if (bv_->theLockingInset()) {
+ bv_->theLockingInset()->fitInsetCursor(bv_);
+ ret = true;
+ } else {
+ ret = screen_->fitCursor(bv_->text, bv_);
+ }
+
+ bv_->owner()->getDialogs()->updateParagraph();
if (ret)
updateScrollbar();
return ret;
/// clear the "Formatting Document" message
owner_->message("");
-
- /// get rid of the splash screen if it's not gone already
- owner_->getDialogs()->destroySplash();
-
+
return 0;
}
bv_->text->setSelection(bv_);
screen_->toggleToggle(bv_->text, bv_);
- fitCursor(bv_->text);
+ fitCursor();
+#if 0
screen_->showCursor(bv_->text, bv_);
+#else
+ showCursor();
+#endif
}
// Clear the selection
screen_->toggleSelection(bv_->text, bv_);
- bv_->text->clearSelection(bv_);
+ bv_->text->clearSelection();
bv_->text->fullRebreak(bv_);
+#if 0
screen_->update(bv_->text, bv_);
+#else
+ update();
+#endif
updateScrollbar();
// Single left click in math inset?
bv_->text->cursor.x_fix(bv_->text->cursor.x());
owner_->updateLayoutChoice();
- if (fitCursor(bv_->text)) {
+ if (fitCursor()) {
selection_possible = false;
}
if (text->bv_owner) {
screen_->hideCursor();
screen_->toggleSelection(text, bv_);
- text->selectWord(bv_);
+ text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
screen_->toggleSelection(text, bv_, false);
} else {
- text->selectWord(bv_);
+ text->selectWord(bv_, LyXText::WHOLE_WORD_STRICT);
}
/* This will fit the cursor on the screen
* if necessary */
(cursor.par()->getInset(cursor.pos() - 1)->editable())) {
Inset * tmpinset = cursor.par()->getInset(cursor.pos()-1);
LyXFont font = text->getFont(buffer_, cursor.par(),
- cursor.pos()-1);
+ cursor.pos() - 1);
int const width = tmpinset->width(bv_, font);
int const inset_x = font.isVisibleRightToLeft()
? cursor.x() : cursor.x() - width;
// fitCursor() ensures we don't jump back
// to the start of the document on vertical
// resize
- fitCursor(bv_->text);
+ fitCursor();
// The main window size has changed, repaint most stuff
redraw();
if (screen_.get() &&
(!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
{
+ LyXText::text_status st = bv_->text->status();
screen_->update(bv_->text, bv_);
+ bool fitc = false;
+ while(bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
+ if (bv_->text->fullRebreak(bv_)) {
+ st = LyXText::NEED_MORE_REFRESH;
+ bv_->text->setCursor(bv_, bv_->text->cursor.par(),
+ bv_->text->cursor.pos());
+ fitc = true;
+ }
+ bv_->text->status(bv_, st);
+ screen_->update(bv_->text, bv_);
+ }
+ // do this here instead of in the screen::update because of
+ // the above loop!
+ bv_->text->status(bv_, LyXText::UNCHANGED);
+ if (fitc)
+ fitCursor();
}
}
text->fullRebreak(bv_);
if (text->inset_owner) {
- text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+ text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
updateInset(text->inset_owner, true);
- } else
+ } else {
update();
-
+ }
+
if ((f & FITCUR)) {
- fitCursor(text);
- }
+ fitCursor();
+ }
if ((f & CHANGE)) {
buffer_->markDirty();
}
if (!bv_->theLockingInset()) {
- screen_->cursorToggle(bv_->text, bv_);
+ screen_->cursorToggle(bv_);
} else {
bv_->theLockingInset()->toggleInsetCursor(bv_);
}
void BufferView::Pimpl::beforeChange(LyXText * text)
{
toggleSelection();
- text->clearSelection(bv_);
+ text->clearSelection();
}
return;
LyXText * text = bv_->getLyXText();
- if (text->real_current_font.isRightToLeft()
-#ifndef NO_LATEX
- &&
- text->real_current_font.latex() != LyXFont::ON
-#endif
- ) {
+ if (text->real_current_font.isRightToLeft()) {
if (owner_->getIntl()->keymap == Intl::PRIMARY)
owner_->getIntl()->KeyMapSec();
} else {
void BufferView::Pimpl::showCursor()
{
- if (screen_.get())
- screen_->showCursor(bv_->text, bv_);
+ if (screen_.get()) {
+ if (bv_->theLockingInset())
+ bv_->theLockingInset()->showInsetCursor(bv_);
+ else
+ screen_->showCursor(bv_->text, bv_);
+ }
}
void BufferView::Pimpl::hideCursor()
{
- if (screen_.get())
- screen_->hideCursor();
+ if (screen_.get()) {
+ if (!bv_->theLockingInset())
+// bv_->theLockingInset()->hideInsetCursor(bv_);
+// else
+ screen_->hideCursor();
+ }
}
if (available()) {
string const trypath = owner_->buffer()->filepath;
// If directory is writeable, use this as default.
- if (IsDirWriteable(trypath) == 1)
+ if (IsDirWriteable(trypath))
initpath = trypath;
}
} else {
// this is need because you don't use a inset->Edit()
updateInset(new_inset, true);
- new_inset->edit(bv_, 0, 0, 0);
+ new_inset->edit(bv_);
}
break;
}
specialChar(InsetSpecialChar::HYPHENATION);
break;
- case LFUN_HYPHENATION_BREAK:
- specialChar(InsetSpecialChar::HYPHENATION_BREAK);
+ case LFUN_LIGATURE_BREAK:
+ specialChar(InsetSpecialChar::LIGATURE_BREAK);
break;
case LFUN_LDOTS:
owner_->getDialogs()->setUserFreeFont();
break;
-#ifndef NO_LATEX
- case LFUN_TEX:
- Tex(bv_);
- setState();
- owner_->showState();
- break;
-#endif
-
case LFUN_FILE_INSERT:
{
MenuInsertLyXFile(argument);
break;
case LFUN_LANGUAGE:
- Lang(bv_, argument);
+ lang(bv_, argument);
setState();
owner_->showState();
break;
case LFUN_EMPH:
- Emph(bv_);
+ emph(bv_);
owner_->showState();
break;
case LFUN_BOLD:
- Bold(bv_);
+ bold(bv_);
owner_->showState();
break;
case LFUN_NOUN:
- Noun(bv_);
+ noun(bv_);
owner_->showState();
break;
case LFUN_CODE:
- Code(bv_);
+ code(bv_);
owner_->showState();
break;
case LFUN_SANS:
- Sans(bv_);
+ sans(bv_);
owner_->showState();
break;
case LFUN_ROMAN:
- Roman(bv_);
+ roman(bv_);
owner_->showState();
break;
case LFUN_DEFAULT:
- StyleReset(bv_);
+ styleReset(bv_);
owner_->showState();
break;
case LFUN_UNDERLINE:
- Underline(bv_);
+ underline(bv_);
owner_->showState();
break;
case LFUN_FONT_SIZE:
- FontSize(bv_, argument);
+ fontSize(bv_, argument);
owner_->showState();
break;
case LFUN_FONT_STATE:
- owner_->getLyXFunc()->setMessage(CurrentState(bv_));
+ owner_->getLyXFunc()->setMessage(currentState(bv_));
break;
case LFUN_UPCASE_WORD:
&& lt->cursor.par()->getInset(lt->cursor.pos())->editable() == Inset::HIGHLY_EDITABLE){
Inset * tmpinset = lt->cursor.par()->getInset(lt->cursor.pos());
owner_->getLyXFunc()->setMessage(tmpinset->editMessage());
- int y = 0;
- if (is_rtl) {
- LyXFont const font =
- lt->getFont(buffer_,
- lt->cursor.par(),
- lt->cursor.pos());
- y = tmpinset->descent(bv_,font);
- }
- tmpinset->edit(bv_, 0, y, 0);
+ if (is_rtl)
+ tmpinset->edit(bv_, false);
+ else
+ tmpinset->edit(bv_);
break;
}
if (!is_rtl)
{
Inset * tmpinset = lt->cursor.par()->getInset(lt->cursor.pos());
owner_->getLyXFunc()->setMessage(tmpinset->editMessage());
- LyXFont const font = lt->getFont(buffer_,
- lt->cursor.par(),
- lt->cursor.pos());
- int y = is_rtl ? 0
- : tmpinset->descent(bv_,font);
- tmpinset->edit(bv_,
- tmpinset->x() +
- tmpinset->width(bv_,font),
- y, 0);
+ if (is_rtl)
+ tmpinset->edit(bv_);
+ else
+ tmpinset->edit(bv_, false);
break;
}
if (is_rtl)
// just comment out the line below...
showCursor();
} else {
- bv_->cut();
+ bv_->cut(false);
}
moveCursorUpdate(false);
owner_->showState();
cursor.par()->params().pagebreakBottom(),
VSpace(VSpace::NONE),
cursor.par()->params().spaceBottom(),
+ cursor.par()->params().spacing(),
cursor.par()->params().align(),
cursor.par()->params().labelWidthString(), 0);
lt->cursorLeft(bv_);
| BufferView::CHANGE);
}
} else {
- bv_->cut();
+ bv_->cut(false);
}
}
break;
showCursor();
}
} else {
- bv_->cut();
+ bv_->cut(false);
}
owner_->showState();
setState();
cursor.par()->params().pagebreakTop(),
cursor.par()->params().pagebreakBottom(),
VSpace(VSpace::NONE), cursor.par()->params().spaceBottom(),
+ cursor.par()->params().spacing(),
cursor.par()->params().align(),
cursor.par()->params().labelWidthString(), 0);
update(lt,
| BufferView::CHANGE);
}
} else
- bv_->cut();
+ bv_->cut(false);
}
break;
cursor.par()->params().pagebreakTop(),
cursor.par()->params().pagebreakBottom(),
VSpace(VSpace::DEFSKIP), cursor.par()->params().spaceBottom(),
+ cursor.par()->params().spacing(),
cursor.par()->params().align(),
cursor.par()->params().labelWidthString(), 1);
//update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
break;
case LFUN_QUOTE:
- bv_->insertCorrectQuote();
+ smartQuote();
break;
case LFUN_HTMLURL:
p.setCmdName("htmlurl");
else
p.setCmdName("url");
- owner_->getDialogs()->createUrl( p.getAsString() );
+ owner_->getDialogs()->createUrl(p.getAsString());
}
break;
case LFUN_INSERT_URL:
{
InsetCommandParams p;
- p.setFromString( argument );
+ p.setFromString(argument);
- InsetUrl * inset = new InsetUrl( p );
+ InsetUrl * inset = new InsetUrl(p);
if (!insertInset(inset))
delete inset;
else
- updateInset( inset, true );
+ updateInset(inset, true);
}
break;
case LFUN_INSET_TEXT:
- {
- InsetText * new_inset = new InsetText;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetText);
+ break;
case LFUN_INSET_ERT:
- {
- InsetERT * new_inset = new InsetERT;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetERT);
+ break;
case LFUN_INSET_EXTERNAL:
- {
- InsetExternal * new_inset = new InsetExternal;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetExternal);
+ break;
case LFUN_INSET_FOOTNOTE:
- {
- InsetFoot * new_inset = new InsetFoot;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetFoot);
+ break;
case LFUN_INSET_MARGINAL:
- {
- InsetMarginal * new_inset = new InsetMarginal;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetMarginal);
+ break;
case LFUN_INSET_MINIPAGE:
- {
- InsetMinipage * new_inset = new InsetMinipage;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetMinipage);
+ break;
+
+ case LFUN_INSERT_NOTE:
+ insertAndEditInset(new InsetNote);
+ break;
case LFUN_INSET_FLOAT:
- {
// check if the float type exist
if (floatList.typeExist(argument)) {
- InsetFloat * new_inset = new InsetFloat(argument);
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
+ insertAndEditInset(new InsetFloat(argument));
} else {
- lyxerr << "Non-existant float type: "
+ lyxerr << "Non-existent float type: "
<< argument << endl;
}
-
- }
- break;
+ break;
case LFUN_INSET_WIDE_FLOAT:
{
InsetFloat * new_inset = new InsetFloat(argument);
new_inset->wide(true);
if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
+ new_inset->edit(bv_);
else
delete new_inset;
} else {
- lyxerr << "Non-existant float type: "
+ lyxerr << "Non-existent float type: "
<< argument << endl;
}
}
break;
+#if 0
case LFUN_INSET_LIST:
- {
- InsetList * new_inset = new InsetList;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
+ insertAndEditInset(new InsetList);
+ break;
case LFUN_INSET_THEOREM:
- {
- InsetTheorem * new_inset = new InsetTheorem;
- if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
- else
- delete new_inset;
- }
- break;
-
+ insertAndEditInset(new InsetTheorem);
+ break;
+#endif
+
case LFUN_INSET_CAPTION:
{
// Do we have a locking inset...
new_inset->setDrawFrame(0, InsetText::LOCKED);
new_inset->setFrameColor(0, LColor::captionframe);
if (insertInset(new_inset))
- new_inset->edit(bv_, 0, 0, 0);
+ new_inset->edit(bv_);
else
delete new_inset;
}
}
break;
- case LFUN_GETLATEX:
- {
-#ifndef NO_LATEX
- LyXFont & font = bv_->getLyXText()->current_font;
- if (font.latex() == LyXFont::ON)
- owner_->getLyXFunc()->setMessage("L");
- else
-#endif
- owner_->getLyXFunc()->setMessage("0");
- }
- break;
-
// --- accented characters ---------------------------
case LFUN_UMLAUT:
// The argument can be up to two tokens separated
// by a space. The first one is the bibstyle.
string const db = token(argument, ' ', 0);
- string bibstyle = token(argument, ' ', 1);
- if (bibstyle.empty())
- bibstyle = "plain";
+ string const bibstyle = token(argument, ' ', 1);
InsetCommandParams p( "BibTeX", db, bibstyle );
InsetBibtex * inset = new InsetBibtex(p);
if (insertInset(inset)) {
if (argument.empty())
- inset->edit(bv_, 0, 0, 0);
+ inset->edit(bv_);
} else
delete inset;
}
case LFUN_INDEX_CREATE:
{
InsetCommandParams p("index");
-
if (argument.empty()) {
- // Get word or selection
- bv_->getLyXText()->selectWordWhenUnderCursor(bv_);
-
- string const curstring =
- bv_->getLyXText()->selectionAsString(buffer_);
-
- p.setContents(curstring);
+ string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+ p.setContents(idxstring);
} else {
p.setContents(argument);
}
case LFUN_INDEX_INSERT_LAST:
{
- // Get word or selection
- bv_->getLyXText()->selectWordWhenUnderCursor(bv_);
-
- string const curstring =
- bv_->getLyXText()->selectionAsString(buffer_);
-
- InsetCommandParams p("index", curstring);
- InsetIndex * inset = new InsetIndex(p);
-
- if (!insertInset(inset))
- delete inset;
- else
- updateInset(inset, true);
+ string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+ if (!idxstring.empty()) {
+ owner_->message(_("Word `")
+ + idxstring + _(("' indexed.")));
+ InsetCommandParams p("index", idxstring);
+ InsetIndex * inset = new InsetIndex(p);
+
+ if (!insertInset(inset))
+ delete inset;
+ else
+ updateInset(inset, true);
+ }
}
break;
}
break;
- case LFUN_INSERT_NOTE:
- insertNote();
- break;
+ case LFUN_THESAURUS_ENTRY:
+ {
+ string arg = argument;
+ if (arg.empty()) {
+ arg = bv_->getLyXText()->selectionAsString(buffer_,
+ false);
+
+ // FIXME
+ if (arg.size() > 100 || arg.empty()) {
+ // Get word or selection
+ bv_->getLyXText()->selectWordWhenUnderCursor(bv_, LyXText::WHOLE_WORD);
+ arg = bv_->getLyXText()->selectionAsString(buffer_, false);
+ // FIXME: where is getLyXText()->unselect(bv_) ?
+ }
+ }
+
+ bv_->owner()->getDialogs()->showThesaurus(arg);
+ }
+ break;
+
case LFUN_SELFINSERT:
{
if (argument.empty()) break;
if (lyxrc.auto_region_delete) {
if (lt->selection.set()) {
- lt->cutSelection(bv_, false);
+ lt->cutSelection(bv_, false, false);
bv_->update(lt,
BufferView::SELECT
| BufferView::FITCUR
}
}
- bv_->beforeChange(lt);
+ beforeChange(lt);
LyXFont const old_font(lt->real_current_font);
string::const_iterator cit = argument.begin();
string::const_iterator end = argument.end();
for (; cit != end; ++cit) {
- if (greek_kb_flag) {
- if (!math_insert_greek(bv_, *cit))
- owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
- } else
- owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
+ owner_->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
}
bv_->update(lt,
}
}
+
void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind)
{
if (available()) {
InsetSpecialChar * new_inset =
new InsetSpecialChar(kind);
insertInset(new_inset);
+ // Ok, what happens here if we are unable to insert
+ // the inset? Leak it?
}
}
-void BufferView::Pimpl::insertNote()
+void BufferView::Pimpl::smartQuote()
{
- Inset * inset = new InsetNote;
- insertInset(inset);
- inset->edit(bv_, 0, 0, 0);
+ char c;
+ LyXText * lt = bv_->getLyXText();
+
+ if (lt->cursor.pos())
+ c = lt->cursor.par()->getChar(lt->cursor.pos() - 1);
+ else
+ c = ' ';
+
+ hideCursor();
+
+ LyXLayout const & style = textclasslist.Style(
+ bv_->buffer()->params.textclass,
+ lt->cursor.par()->getLayout());
+
+ if (style.pass_thru ||
+ (!insertInset(new InsetQuotes(c, bv_->buffer()->params))))
+ Dispatch(LFUN_SELFINSERT, "\"");
}
+void BufferView::Pimpl::insertAndEditInset(Inset * inset)
+{
+ if (insertInset(inset))
+ inset->edit(bv_);
+ else
+ delete inset;
+}
+
+
// Open and lock an updatable inset
bool BufferView::Pimpl::open_new_inset(UpdatableInset * new_inset, bool behind)
{
delete new_inset;
return false;
}
- if (behind) {
- LyXFont & font = lt->real_current_font;
- new_inset->edit(bv_, new_inset->width(bv_, font), 0, 0);
- } else
- new_inset->edit(bv_, 0, 0, 0);
+ new_inset->edit(bv_, !behind);
return true;
}
bv_->text->setParagraph(bv_, 0, 0,
0, 0,
VSpace(VSpace::NONE), VSpace(VSpace::NONE),
+ Spacing(),
LYX_ALIGN_LAYOUT,
string(),
0);
update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-#ifndef NO_LATEX
- bv_->text->current_font.setLatex(LyXFont::OFF);
-#endif
}
bv_->text->insertInset(bv_, inset);
}
} else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
if (bv_->text->updateInset(bv_,
- bv_->theLockingInset())) {
+ bv_->theLockingInset())) {
update();
if (mark_dirty){
buffer_->markDirty();
projects / lyx.git / blobdiff