#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/insetref.h"
#include "insets/insetparent.h"
#include "insets/insetindex.h"
-#include "insets/insetinfo.h"
+#include "insets/insetnote.h"
#include "insets/insetinclude.h"
#include "insets/insetcite.h"
#include "insets/insetert.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/formulamacro.h"
-#include "mathed/formula.h"
#include "gettext.h"
#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+#include "mathed/formulabase.h"
extern LyXTextClass::size_type current_layout;
extern int greek_kb_flag;
extern char ascii_type;
extern bool math_insert_greek(BufferView *, char);
-extern void sigchldhandler(pid_t pid, int * status);
+extern void sigchldchecker(pid_t pid, int * status);
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
+
namespace {
const unsigned int saved_positions_num = 20;
updateScreen();
updateScrollbar();
}
- bv_->text->first = screen_->TopCursorVisible(bv_->text);
+ bv_->text->first = screen_->topCursorVisible(bv_->text);
owner_->updateMenubar();
owner_->updateToolbar();
// Similarly, buffer-dependent dialogs should be updated or
{
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(text, bv_);
+ }
+
+ bv_->owner()->getDialogs()->updateParagraph();
if (ret)
updateScrollbar();
return ret;
bool selection = false;
bool mark_set = false;
- ProhibitInput(bv_);
+ owner_->prohibitInput();
owner_->message(_("Formatting document..."));
the_locking_inset = bv_->theLockingInset();
delete bv_->text;
bv_->text = new LyXText(bv_);
+ bv_->text->init(bv_);
} else {
// See if we have a text in TextCache that fits
// the new buffer_ with the correct width.
textcache.show(lyxerr, "resizeCurrentBuffer");
} else {
bv_->text = new LyXText(bv_);
+ bv_->text->init(bv_);
}
}
updateScreen();
// remake the inset locking
bv_->theLockingInset(the_locking_inset);
}
- bv_->text->first = screen_->TopCursorVisible(bv_->text);
+ bv_->text->first = screen_->topCursorVisible(bv_->text);
buffer_->resizeInsets(bv_);
// this will scroll the screen such that the cursor becomes visible
updateScrollbar();
redraw();
setState();
- AllowInput(bv_);
+ owner_->allowInput();
/// clear the "Formatting Document" message
owner_->message("");
/* If the text is smaller than the working area, the scrollbar
* maximum must be the working area height. No scrolling will
* be possible */
-
if (!bv_->text) {
workarea_.setScrollbar(0, 1.0);
return;
}
- static unsigned long text_height;
- static unsigned long work_height;
-
- unsigned long const tmp_text_height = bv_->text->height;
- long const tmp_scrollbar_value = bv_->text->first;
-
- // check if anything has changed.
- if (text_height == tmp_text_height
- && work_height == workarea_.height()
- && current_scrollbar_value == tmp_scrollbar_value)
- return; // no
+ long const text_height = bv_->text->height;
- // update values
- text_height = tmp_text_height;
- work_height = workarea_.height();
- current_scrollbar_value = tmp_scrollbar_value;
+ double const lineh = bv_->text->defaultHeight();
+ double const slider_size =
+ (text_height == 0) ? 1.0 : 1.0 / double(text_height);
- long const height_diff = text_height - work_height;
+ static long old_text_height = 0;
+ static double old_lineh = 0;
+ static double old_slider_size = 0;
- if (height_diff <= 0) {
- workarea_.setScrollbar(0, 1.0);
- return;
+ if (text_height != old_text_height) {
+ workarea_.setScrollbarBounds(0, text_height - workarea_.height());
+ old_text_height = text_height;
+ }
+ if (lineh != old_lineh) {
+ workarea_.setScrollbarIncrements(lineh);
+ old_lineh = lineh;
+ }
+ if (current_scrollbar_value != bv_->text->first
+ || slider_size != old_slider_size) {
+ current_scrollbar_value = bv_->text->first;
+ workarea_.setScrollbar(current_scrollbar_value, slider_size);
+ old_slider_size = slider_size;
}
-
- workarea_.setScrollbarBounds(0, height_diff);
- double const lineh = bv_->text->defaultHeight();
- workarea_.setScrollbarIncrements(lineh);
- double const slider_size = 1.0 / (double(height_diff) + work_height);
- workarea_.setScrollbar(current_scrollbar_value, slider_size);
}
if (!screen_.get())
return;
- screen_->Draw(bv_->text, bv_, current_scrollbar_value);
+ screen_->draw(bv_->text, bv_, current_scrollbar_value);
if (!lyxrc.cursor_follows_scrollbar) {
waitForX();
if (!selection_possible)
return;
- screen_->HideCursor();
+ screen_->hideCursor();
bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first);
update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
bv_->text->setSelection(bv_);
- screen_->ToggleToggle(bv_->text, bv_);
+ screen_->toggleToggle(bv_->text, bv_);
fitCursor(bv_->text);
- screen_->ShowCursor(bv_->text, bv_);
+ screen_->showCursor(bv_->text, bv_);
}
if (!inset_hit)
selection_possible = true;
- screen_->HideCursor();
+ screen_->hideCursor();
int const screen_first = bv_->text->first;
bool paste_internally = false;
if (button == 2
&& bv_->text->selection.set()) {
- owner_->getLyXFunc()->Dispatch(LFUN_COPY);
+ owner_->getLyXFunc()->dispatch(LFUN_COPY);
paste_internally = true;
}
// Clear the selection
- screen_->ToggleSelection(bv_->text, bv_);
+ screen_->toggleSelection(bv_->text, bv_);
bv_->text->clearSelection(bv_);
bv_->text->fullRebreak(bv_);
- screen_->Update(bv_->text, bv_);
+ screen_->update(bv_->text, bv_);
updateScrollbar();
// Single left click in math inset?
if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
bv_->text->setCursorFromCoordinates(bv_, xpos, ypos + screen_first);
- bv_->text->finishUndo();
+ finishUndo();
bv_->text->selection.cursor = bv_->text->cursor;
bv_->text->cursor.x_fix(bv_->text->cursor.x());
// insert this
if (button == 2) {
if (paste_internally)
- owner_->getLyXFunc()->Dispatch(LFUN_PASTE);
+ owner_->getLyXFunc()->dispatch(LFUN_PASTE);
else
- owner_->getLyXFunc()->Dispatch(LFUN_PASTESELECTION,
+ owner_->getLyXFunc()->dispatch(LFUN_PASTESELECTION,
"paragraph");
selection_possible = false;
return;
if (screen_.get() && button == 1) {
if (text->bv_owner) {
- screen_->HideCursor();
- screen_->ToggleSelection(text, bv_);
- text->selectWord(bv_);
- screen_->ToggleSelection(text, bv_, false);
+ screen_->hideCursor();
+ screen_->toggleSelection(text, 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 */
return;
if (screen_.get() && (button == 1)) {
- screen_->HideCursor();
- screen_->ToggleSelection(text, bv_);
+ screen_->hideCursor();
+ screen_->toggleSelection(text, bv_);
text->cursorHome(bv_);
text->selection.cursor = text->cursor;
text->cursorEnd(bv_);
text->setSelection(bv_);
- screen_->ToggleSelection(text, bv_, false);
+ screen_->toggleSelection(text, bv_, false);
/* This will fit the cursor on the screen
* if necessary */
update(text, BufferView::SELECT|BufferView::FITCUR);
// ...or maybe the SetCursorParUndo()
// below isn't necessary at all anylonger?
if (inset_hit->lyxCode() == Inset::REF_CODE) {
- bv_->text->setCursorParUndo(buffer_);
+ setCursorParUndo(bv_);
}
owner_->message(inset_hit->editMessage());
// The main window size has changed, repaint most stuff
redraw();
} else if (screen_.get())
- screen_->Redraw(bv_->text, bv_);
+ screen_->redraw(bv_->text, bv_);
} else {
// Grey box when we don't have a buffer
workarea_.greyOut();
if (screen_.get() &&
(!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
{
- screen_->Update(bv_->text, bv_);
+ screen_->update(bv_->text, bv_);
}
}
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);
- }
+ }
if ((f & CHANGE)) {
buffer_->markDirty();
if (pid == -1) // error find out what is wrong
; // ignore it for now.
else if (pid > 0)
- sigchldhandler(pid, &status);
+ sigchldchecker(pid, &status);
updatelist.update(bv_);
}
if (!bv_->theLockingInset()) {
- screen_->CursorToggle(bv_->text, bv_);
+ screen_->cursorToggle(bv_->text, bv_);
} else {
bv_->theLockingInset()->toggleInsetCursor(bv_);
}
y += bv_->text->first;
Row * cursorrow = text->cursor.row();
text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
- bv_->text->finishUndo();
+ finishUndo();
// This is to allow jumping over large insets
if ((cursorrow == text->cursor.row()))
text->cursorUp(bv_);
if (text->inset_owner ||
text->cursor.row()->height() < workarea_.height())
- screen_->Draw(bv_->text, bv_,
+ screen_->draw(bv_->text, bv_,
text->cursor.y()
- text->cursor.row()->baseline()
+ text->cursor.row()->height()
Row * cursorrow = text->cursor.row();
text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
- bv_->text->finishUndo();
+ finishUndo();
// This is to allow jumping over large insets
if ((cursorrow == bv_->text->cursor.row()))
text->cursorDown(bv_);
if (text->inset_owner ||
text->cursor.row()->height() < workarea_.height())
- screen_->Draw(bv_->text, bv_, text->cursor.y() -
+ screen_->draw(bv_->text, bv_, text->cursor.y() -
text->cursor.row()->baseline());
updateScrollbar();
}
if (b != 0 ) buffer(b);
}
- Paragraph * par = bv_->text->getParFromID(saved_positions[i].par_id);
+ Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id);
if (!par)
return;
if (!inset_slept)
bv_->theLockingInset()->insetUnlock(bv_);
bv_->theLockingInset(0);
- bv_->text->finishUndo();
+ finishUndo();
inset_slept = false;
}
}
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();
+ }
}
void BufferView::Pimpl::toggleSelection(bool b)
{
- if (screen_.get())
- screen_->ToggleSelection(bv_->text, bv_, b);
+ if (screen_.get()) {
+ if (bv_->theLockingInset())
+ bv_->theLockingInset()->toggleSelection(bv_, b);
+ screen_->toggleSelection(bv_->text, bv_, b);
+ }
}
void BufferView::Pimpl::toggleToggle()
{
if (screen_.get())
- screen_->ToggleToggle(bv_->text, bv_);
+ screen_->toggleToggle(bv_->text, bv_);
}
{
beforeChange(bv_->text);
if (bv_->text->cursor.y() > static_cast<int>((workarea_.height() / 2))) {
- screen_->Draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
+ screen_->draw(bv_->text, bv_, bv_->text->cursor.y() - workarea_.height() / 2);
} else {
- screen_->Draw(bv_->text, bv_, 0);
+ screen_->draw(bv_->text, bv_, 0);
}
update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
redraw();
{
if (!buffer_) return;
- screen_->HideCursor();
+ screen_->hideCursor();
beforeChange(bv_->text);
string const clip(workarea_.getClipboard());
} 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;
}
}
case LFUN_HYPHENATION:
- hyphenationPoint();
+ specialChar(InsetSpecialChar::HYPHENATION);
+ break;
+
+ case LFUN_LIGATURE_BREAK:
+ specialChar(InsetSpecialChar::LIGATURE_BREAK);
break;
case LFUN_LDOTS:
- ldots();
+ specialChar(InsetSpecialChar::LDOTS);
break;
case LFUN_END_OF_SENTENCE:
- endOfSentenceDot();
+ specialChar(InsetSpecialChar::END_OF_SENTENCE);
break;
case LFUN_MENU_SEPARATOR:
- menuSeparator();
+ specialChar(InsetSpecialChar::MENU_SEPARATOR);
break;
case LFUN_HFILL:
&& 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)
lt->cursorRight(bv_, false);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
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)
lt->cursorRight(bv_, false);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorUp(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorDown(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorUpParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
lt->cursorDownParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
cursorPrevious(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::UPDATE);
cursorNext(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorHome(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorEnd(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorTab(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
lt->cursorLeftOneWord(bv_);
else
lt->cursorRightOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
lt->cursorRightOneWord(bv_);
else
lt->cursorLeftOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorTop(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorBottom(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
lt->cursorLeft(bv_);
else
lt->cursorRight(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
lt->cursorRight(bv_);
else
lt->cursorLeft(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorUp(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorDown(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorUpParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorDownParagraph(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
cursorPrevious(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
cursorNext(lt);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorHome(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorEnd(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
lt->cursorLeftOneWord(bv_);
else
lt->cursorRightOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
lt->cursorRightOneWord(bv_);
else
lt->cursorLeftOneWord(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
break;
update(lt, BufferView::SELECT|BufferView::FITCUR);
lt->cursorTop(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
lt->cursorBottom(bv_);
- lt->finishUndo();
+ finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
}
break;
+ case LFUN_INSET_TOGGLE:
+ {
+ LyXText * lt = bv_->getLyXText();
+ hideCursor();
+ beforeChange(lt);
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ lt->toggleInset(bv_);
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ setState();
+ }
+ 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: "
<< 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 {
}
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;
- // --- insert characters ----------------------------------------
-
+ case LFUN_MATH_MACRO:
+ mathDispatchMathMacro(bv_, argument);
+ break;
+
case LFUN_MATH_DELIM:
+ mathDispatchMathDelim(bv_, argument);
+ break;
+
case LFUN_INSERT_MATRIX:
- {
- if (available()) {
- if (open_new_inset(new InsetFormula, false)) {
- bv_->theLockingInset()
- ->localDispatch(bv_, action, argument);
- }
- }
- }
- break;
-
+ mathDispatchInsertMatrix(bv_, argument);
+ break;
+
case LFUN_INSERT_MATH:
- {
- if (!available())
- break;
-
- InsetFormula * f = new InsetFormula(LM_OT_EQUATION);
- open_new_inset(f);
- f->localDispatch(bv_, LFUN_INSERT_MATH, argument);
- }
- break;
-
- case LFUN_MATH_DISPLAY:
- {
- if (available())
- open_new_inset(new InsetFormula(LM_OT_EQUATION), false);
+ mathDispatchInsertMath(bv_, argument);
break;
- }
-
- case LFUN_MATH_MACRO:
- {
- if (available()) {
- string s(argument);
- if (s.empty())
- owner_->getLyXFunc()->setErrorMessage(N_("Missing argument"));
- else {
- string const s1 = token(s, ' ', 1);
- int const na = s1.empty() ? 0 : lyx::atoi(s1);
- open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na), false);
- }
- }
- }
- break;
- case LFUN_MATH_MODE: // Open or create a math inset
- {
- if (available())
- open_new_inset(new InsetFormula, false);
- owner_->getLyXFunc()->setMessage(N_("Math editor mode"));
- }
- break;
-
+ case LFUN_MATH_IMPORT_SELECTION: // Imports LaTeX from the X selection
+ mathDispatchMathImportSelection(bv_, argument);
+ break;
+
+ case LFUN_MATH_DISPLAY: // Open or create a displayed math inset
+ mathDispatchMathDisplay(bv_, argument);
+ break;
+
+ case LFUN_MATH_MODE: // Open or create an inlined math inset
+ mathDispatchMathMode(bv_, argument);
+ break;
+
case LFUN_CITATION_INSERT:
{
InsetCommandParams 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" );
+ InsetCommandParams p("index");
+ LyXText * lt = bv_->getLyXText();
if (argument.empty()) {
- // Get the word immediately preceding the cursor
- Paragraph::size_type curpos =
- bv_->getLyXText()->cursor.pos() - 1;
-
- string curstring;
- if (curpos >= 0 )
- curstring = bv_->getLyXText()
- ->cursor.par()->getWord(curpos);
-
- p.setContents( curstring );
+ string const idxstring(bv_->getLyXText()->getStringToIndex(bv_));
+ if (!idxstring.empty())
+ p.setContents(idxstring);
+ else
+ break;
} else {
- p.setContents( argument );
+ p.setContents(argument);
}
- owner_->getDialogs()->createIndex( p.getAsString() );
+ owner_->getDialogs()->createIndex(p.getAsString());
}
break;
case LFUN_INDEX_INSERT_LAST:
{
- // Get word immediately preceding the cursor
- Paragraph::size_type curpos =
- bv_->getLyXText()->cursor.pos() - 1;
- // Can't do that at the beginning of a paragraph
- if (curpos < 0) break;
-
- string const curstring(bv_->getLyXText()
- ->cursor.par()->getWord(curpos));
-
- 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_);
+
+ // FIXME
+ if (arg.size() > 100 || arg.empty()) {
+ // Get word or selection
+ bv_->getLyXText()->selectWordWhenUnderCursor(bv_, LyXText::WHOLE_WORD);
+ arg = bv_->getLyXText()->selectionAsString(buffer_);
+ // FIXME: where is getLyXText()->unselect(bv_) ?
+ }
+ }
+
+ bv_->owner()->getDialogs()->showThesaurus(arg);
+ }
+ break;
+
case LFUN_SELFINSERT:
{
if (argument.empty()) break;
}
}
- bv_->beforeChange(lt);
+ beforeChange(lt);
LyXFont const old_font(lt->real_current_font);
string::const_iterator cit = argument.begin();
update(lt, BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+#ifdef WITH_WARNINGS
+#warning Why is this code different from specialChar() below? (JMarc)
+// the code in specialChar is a generic version of what used to exist
+// for other special chars. I did not merge this case because of the
+// call to updateInset(), but what does it do?
+#endif
if (!insertInset(new_inset))
delete new_inset;
else
}
-void BufferView::Pimpl::menuSeparator()
+void BufferView::Pimpl::specialChar(InsetSpecialChar::Kind kind)
{
if (available()) {
LyXText * lt = bv_->getLyXText();
hideCursor();
update(lt, BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
+ new InsetSpecialChar(kind);
insertInset(new_inset);
}
}
-void BufferView::Pimpl::endOfSentenceDot()
+void BufferView::Pimpl::smartQuote()
{
- if (available()) {
- hideCursor();
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
- insertInset(new_inset);
- }
-}
-
-
-void BufferView::Pimpl::ldots()
-{
- if (available()) {
- hideCursor();
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::LDOTS);
- insertInset(new_inset);
- }
-}
+ char c;
+ LyXText * lt = bv_->getLyXText();
+ if (lt->cursor.pos())
+ c = lt->cursor.par()->getChar(lt->cursor.pos() - 1);
+ else
+ c = ' ';
-void BufferView::Pimpl::hyphenationPoint()
-{
- if (available()) {
- hideCursor();
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- InsetSpecialChar * new_inset =
- new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
- insertInset(new_inset);
- }
+ hideCursor();
+ if (!insertInset(new InsetQuotes(c, bv_->buffer()->params)))
+ Dispatch(LFUN_SELFINSERT, "\"");
}
-void BufferView::Pimpl::insertNote()
+void BufferView::Pimpl::insertAndEditInset(Inset * inset)
{
- InsetInfo * new_inset = new InsetInfo();
- insertInset(new_inset);
- new_inset->edit(bv_, 0, 0, 0);
+ 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)
{
LyXText * lt = bv_->getLyXText();
beforeChange(lt);
- lt->finishUndo();
+ finishUndo();
if (!insertInset(new_inset)) {
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;
}
// if we are in a locking inset we should try to insert the
// inset there otherwise this is a illegal function now
if (bv_->theLockingInset()) {
- if (bv_->theLockingInset()->insertInsetAllowed(inset))
+ if (bv_->theLockingInset()->insetAllowed(inset))
return bv_->theLockingInset()->insertInset(bv_, inset);
return false;
}
// not quite sure if we want this...
- bv_->text->setCursorParUndo(buffer_);
- bv_->text->freezeUndo();
+ setCursorParUndo(bv_);
+ freezeUndo();
beforeChange(bv_->text);
if (!lout.empty()) {
bv_->text->insertInset(bv_, inset);
update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- bv_->text->unFreezeUndo();
+ unFreezeUndo();
return true;
}
projects / lyx.git / blobdiff