#include "lyxrow.h"
#include "LyXView.h"
#include "commandtags.h"
+#include "lyxfunc.h"
#include "font.h"
#include "bufferview_funcs.h"
#include "TextCache.h"
#include "insets/insetfloatlist.h"
#include "insets/insetspecialchar.h"
#include "mathed/formulamacro.h"
+#include "mathed/formula.h"
#include "gettext.h"
+#include "ParagraphParameters.h"
extern LyXTextClass::size_type current_layout;
extern int greek_kb_flag;
using std::vector;
using std::find_if;
+using std::find;
using std::pair;
using std::endl;
using std::make_pair;
extern void sigchldhandler(pid_t pid, int * status);
extern int bibitemMaxWidth(BufferView *, LyXFont const &);
-const unsigned int saved_positions_num = 20;
-
namespace {
+const unsigned int saved_positions_num = 20;
+
inline
void waitForX()
{
int xpos, int ypos, int width, int height)
: bv_(b), owner_(o), buffer_(0),
current_scrollbar_value(0), cursor_timeout(400),
- workarea_(xpos, ypos, width, height), using_xterm_cursor(false)
+ workarea_(xpos, ypos, width, height), using_xterm_cursor(false),
+ inset_slept(false)
{
// Setup the signals
workarea_.scrollCB.connect(slot(this, &BufferView::Pimpl::scrollCB));
cursor_timeout.timeout.connect(slot(this,
&BufferView::Pimpl::cursorToggle));
- //current_scrollbar_value = 0;
cursor_timeout.start();
workarea_.setFocus();
- //using_xterm_cursor = false;
saved_positions.resize(saved_positions_num);
}
lyxerr[Debug::INFO] << "Setting buffer in BufferView ("
<< b << ")" << endl;
if (buffer_) {
- bv_->insetSleep();
+ insetSleep();
buffer_->delUser(bv_);
// Put the old text into the TextCache, but
// require bv_->text.
owner_->getDialogs()->updateBufferDependent(true);
redraw();
- bv_->insetWakeup();
+ insetWakeup();
} else {
lyxerr[Debug::INFO] << " No Buffer!" << endl;
owner_->updateMenubar();
bool BufferView::Pimpl::fitCursor(LyXText * text)
{
lyx::Assert(screen_.get());
-
+
+ bv_->owner()->getDialogs()->updateParagraph();
+
bool const ret = screen_->FitCursor(text, bv_);
if (ret)
updateScrollbar();
{
lyxerr[Debug::INFO] << "resizeCurrentBuffer" << endl;
- LyXParagraph * par = 0;
- LyXParagraph * selstartpar = 0;
- LyXParagraph * selendpar = 0;
+ Paragraph * par = 0;
+ Paragraph * selstartpar = 0;
+ Paragraph * selendpar = 0;
UpdatableInset * the_locking_inset = 0;
- LyXParagraph::size_type pos = 0;
- LyXParagraph::size_type selstartpos = 0;
- LyXParagraph::size_type selendpos = 0;
+ Paragraph::size_type pos = 0;
+ Paragraph::size_type selstartpos = 0;
+ Paragraph::size_type selendpos = 0;
bool selection = false;
bool mark_set = false;
if (bv_->text) {
par = bv_->text->cursor.par();
pos = bv_->text->cursor.pos();
- selstartpar = bv_->text->sel_start_cursor.par();
- selstartpos = bv_->text->sel_start_cursor.pos();
- selendpar = bv_->text->sel_end_cursor.par();
- selendpos = bv_->text->sel_end_cursor.pos();
- selection = bv_->text->selection;
- mark_set = bv_->text->mark_set;
- the_locking_inset = bv_->text->the_locking_inset;
+ selstartpar = bv_->text->selection.start.par();
+ selstartpos = bv_->text->selection.start.pos();
+ selendpar = bv_->text->selection.end.par();
+ selendpos = bv_->text->selection.end.pos();
+ selection = bv_->text->selection.set();
+ mark_set = bv_->text->selection.mark();
+ the_locking_inset = bv_->theLockingInset();
delete bv_->text;
bv_->text = new LyXText(bv_);
} else {
updateScreen();
if (par) {
- bv_->text->selection = true;
+ bv_->text->selection.set(true);
/* at this point just to avoid the Delete-Empty-Paragraph
* Mechanism when setting the cursor */
- bv_->text->mark_set = mark_set;
+ bv_->text->selection.mark(mark_set);
if (selection) {
- bv_->text->SetCursor(bv_, selstartpar, selstartpos);
- bv_->text->sel_cursor = bv_->text->cursor;
- bv_->text->SetCursor(bv_, selendpar, selendpos);
- bv_->text->SetSelection(bv_);
- bv_->text->SetCursor(bv_, par, pos);
+ bv_->text->setCursor(bv_, selstartpar, selstartpos);
+ bv_->text->selection.cursor = bv_->text->cursor;
+ bv_->text->setCursor(bv_, selendpar, selendpos);
+ bv_->text->setSelection(bv_);
+ bv_->text->setCursor(bv_, par, pos);
} else {
- bv_->text->SetCursor(bv_, par, pos);
- bv_->text->sel_cursor = bv_->text->cursor;
- bv_->text->selection = false;
+ bv_->text->setCursor(bv_, par, pos);
+ bv_->text->selection.cursor = bv_->text->cursor;
+ bv_->text->selection.set(false);
}
// remake the inset locking
- bv_->text->the_locking_inset = the_locking_inset;
+ bv_->theLockingInset(the_locking_inset);
}
bv_->text->first = screen_->TopCursorVisible(bv_->text);
buffer_->resizeInsets(bv_);
updateScrollbar();
redraw();
- bv_->setState();
+ setState();
AllowInput(bv_);
+ /// clear the "Formatting Document" message
+ owner_->message("");
+
/// get rid of the splash screen if it's not gone already
owner_->getDialogs()->destroySplash();
* maximum must be the working area height. No scrolling will
* be possible */
- if (!buffer_) {
+ if (!bv_->text) {
workarea_.setScrollbar(0, 1.0);
return;
}
-
- static unsigned long max2 = 0;
- static unsigned long height2 = 0;
-
- unsigned long cbth = 0;
- long cbsf = 0;
- if (bv_->text) {
- cbth = bv_->text->height;
- cbsf = bv_->text->first;
- }
+ 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 (max2 == cbth &&
- height2 == workarea_.height() &&
- current_scrollbar_value == cbsf)
+ if (text_height == tmp_text_height
+ && work_height == workarea_.height()
+ && current_scrollbar_value == tmp_scrollbar_value)
return; // no
- max2 = cbth;
- height2 = workarea_.height();
- current_scrollbar_value = cbsf;
-
- if (cbth <= height2) { // text is smaller than screen
- workarea_.setScrollbar(0, 1.0); // right?
- return;
- }
- long maximum_height = workarea_.height() * 3 / 4 + cbth;
- long value = cbsf;
+ // update values
+ text_height = tmp_text_height;
+ work_height = workarea_.height();
+ current_scrollbar_value = tmp_scrollbar_value;
- // set the scrollbar
- double hfloat = workarea_.height();
- double maxfloat = maximum_height;
+ long const height_diff = text_height - work_height;
- float slider_size = 0.0;
- int slider_value = value;
-
- workarea_.setScrollbarBounds(0, bv_->text->height - workarea_.height());
- double const lineh = bv_->text->DefaultHeight();
+ if (height_diff <= 0) {
+ workarea_.setScrollbar(0, 1.0);
+ return;
+ }
+
+ workarea_.setScrollbarBounds(0, height_diff);
+ double const lineh = bv_->text->defaultHeight();
workarea_.setScrollbarIncrements(lineh);
- if (maxfloat > 0.0) {
- if ((hfloat / maxfloat) * float(height2) < 3)
- slider_size = 3.0/float(height2);
- else
- slider_size = hfloat / maxfloat;
- } else
- slider_size = hfloat;
-
- workarea_.setScrollbar(slider_value, slider_size / workarea_.height());
+ double const slider_size = 1.0 / (double(height_diff) + work_height);
+ workarea_.setScrollbar(current_scrollbar_value, slider_size);
}
LyXText * vbt = bv_->text;
- int const height = vbt->DefaultHeight();
+ int const height = vbt->defaultHeight();
int const first = static_cast<int>((bv_->text->first + height));
int const last = static_cast<int>((bv_->text->first + workarea_.height() - height));
if (vbt->cursor.y() < first)
- vbt->SetCursorFromCoordinates(bv_, 0, first);
+ vbt->setCursorFromCoordinates(bv_, 0, first);
else if (vbt->cursor.y() > last)
- vbt->SetCursorFromCoordinates(bv_, 0, last);
+ vbt->setCursorFromCoordinates(bv_, 0, last);
waitForX();
}
if (value == 0) return 0;
- float add_value = (bv_->text->DefaultHeight()
+ float add_value = (bv_->text->defaultHeight()
+ float(time) * float(time) * 0.125);
if (add_value > workarea_.height())
add_value = float(workarea_.height() -
- bv_->text->DefaultHeight());
+ bv_->text->defaultHeight());
value -= add_value;
double value = workarea_.getScrollbarValue();
pair<float, float> p = workarea_.getScrollbarBounds();
- double max = p.second;
+ double const max = p.second;
if (value == max) return 0;
- float add_value = (bv_->text->DefaultHeight()
+ float add_value = (bv_->text->defaultHeight()
+ float(time) * float(time) * 0.125);
if (add_value > workarea_.height())
add_value = float(workarea_.height() -
- bv_->text->DefaultHeight());
+ bv_->text->defaultHeight());
value += add_value;
// Check for inset locking
if (bv_->theLockingInset()) {
LyXCursor cursor = bv_->text->cursor;
- LyXFont font = bv_->text->GetFont(bv_->buffer(),
+ LyXFont font = bv_->text->getFont(buffer_,
cursor.par(), cursor.pos());
int width = bv_->theLockingInset()->width(bv_, font);
int inset_x = font.isVisibleRightToLeft()
? cursor.x() - width : cursor.x();
int start_x = inset_x + bv_->theLockingInset()->scroll();
bv_->theLockingInset()->
- InsetMotionNotify(bv_,
+ insetMotionNotify(bv_,
x - start_x,
y - cursor.y() + bv_->text->first,
state);
return;
}
- /* The test for not selection possible is needed, that only motion events are
- * used, where the bottom press event was on the drawing area too */
+ /* The test for not selection possible is needed, that only motion
+ events are used, where the bottom press event was on
+ the drawing area too */
if (!selection_possible)
return;
screen_->HideCursor();
- bv_->text->SetCursorFromCoordinates(bv_, x, y + bv_->text->first);
+ bv_->text->setCursorFromCoordinates(bv_, x, y + bv_->text->first);
- if (!bv_->text->selection)
+ if (!bv_->text->selection.set())
update(bv_->text, BufferView::UPDATE); // Maybe an empty line was deleted
- bv_->text->SetSelection(bv_);
+ bv_->text->setSelection(bv_);
screen_->ToggleToggle(bv_->text, bv_);
fitCursor(bv_->text);
screen_->ShowCursor(bv_->text, bv_);
void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
unsigned int button)
{
- last_click_x = -1;
- last_click_y = -1;
-
if (!buffer_ || !screen_.get()) return;
Inset * inset_hit = checkInsetHit(bv_->text, xpos, ypos, button);
otherwise give the event to the inset */
if (inset_hit == bv_->theLockingInset()) {
bv_->theLockingInset()->
- InsetButtonPress(bv_,
+ insetButtonPress(bv_,
xpos, ypos,
button);
return;
// Middle button press pastes if we have a selection
bool paste_internally = false;
if (button == 2
- && bv_->text->selection) {
+ && bv_->text->selection.set()) {
owner_->getLyXFunc()->Dispatch(LFUN_COPY);
paste_internally = true;
}
// Clear the selection
screen_->ToggleSelection(bv_->text, bv_);
- bv_->text->ClearSelection(bv_);
- bv_->text->FullRebreak(bv_);
+ bv_->text->clearSelection(bv_);
+ bv_->text->fullRebreak(bv_);
screen_->Update(bv_->text, bv_);
updateScrollbar();
// Single left click in math inset?
if ((inset_hit != 0) &&
- (inset_hit->Editable()==Inset::HIGHLY_EDITABLE)) {
+ (inset_hit->editable()==Inset::HIGHLY_EDITABLE)) {
// Highly editable inset, like math
UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
selection_possible = false;
owner_->updateLayoutChoice();
- owner_->message(inset->EditMessage());
- inset->InsetButtonPress(bv_, xpos, ypos, button);
- inset->Edit(bv_, xpos, ypos, button);
+ owner_->message(inset->editMessage());
+ inset->insetButtonPress(bv_, xpos, ypos, button);
+ inset->edit(bv_, xpos, ypos, button);
return;
}
}
if (!inset_hit) // otherwise it was already set in checkInsetHit(...)
- bv_->text->SetCursorFromCoordinates(bv_, xpos, ypos + screen_first);
- bv_->text->FinishUndo();
- bv_->text->sel_cursor = bv_->text->cursor;
+ bv_->text->setCursorFromCoordinates(bv_, xpos, ypos + screen_first);
+ bv_->text->finishUndo();
+ bv_->text->selection.cursor = bv_->text->cursor;
bv_->text->cursor.x_fix(bv_->text->cursor.x());
owner_->updateLayoutChoice();
if (text->bv_owner) {
screen_->HideCursor();
screen_->ToggleSelection(text, bv_);
- text->SelectWord(bv_);
+ text->selectWord(bv_);
screen_->ToggleSelection(text, bv_, false);
} else {
- text->SelectWord(bv_);
+ text->selectWord(bv_);
}
/* This will fit the cursor on the screen
* if necessary */
if (screen_.get() && (button == 1)) {
screen_->HideCursor();
screen_->ToggleSelection(text, bv_);
- text->CursorHome(bv_);
- text->sel_cursor = text->cursor;
- text->CursorEnd(bv_);
- text->SetSelection(bv_);
+ text->cursorHome(bv_);
+ text->selection.cursor = text->cursor;
+ text->cursorEnd(bv_);
+ text->setSelection(bv_);
screen_->ToggleSelection(text, bv_, false);
/* This will fit the cursor on the screen
* if necessary */
/* LyX does a kind of work-area grabbing for insets.
Only a ButtonPress Event outside the inset will
- force a InsetUnlock. */
+ force a insetUnlock. */
bv_->theLockingInset()->
- InsetButtonRelease(bv_, x, y, button);
+ insetButtonRelease(bv_, x, y, button);
return;
}
if (button == 2)
return;
- bv_->setState();
+ setState();
owner_->showState();
// Did we hit an editable inset?
// (Joacim)
// ...or maybe the SetCursorParUndo()
// below isn't necessary at all anylonger?
- if (inset_hit->LyxCode() == Inset::REF_CODE) {
- bv_->text->SetCursorParUndo(bv_->buffer());
+ if (inset_hit->lyxCode() == Inset::REF_CODE) {
+ bv_->text->setCursorParUndo(buffer_);
}
- owner_->message(inset_hit->EditMessage());
+ owner_->message(inset_hit->editMessage());
- if (inset_hit->Editable()==Inset::HIGHLY_EDITABLE) {
+ if (inset_hit->editable()==Inset::HIGHLY_EDITABLE) {
// Highly editable inset, like math
UpdatableInset *inset = (UpdatableInset *)inset_hit;
- inset->InsetButtonRelease(bv_, x, y, button);
+ inset->insetButtonRelease(bv_, x, y, button);
} else {
- inset_hit->InsetButtonRelease(bv_, x, y, button);
- inset_hit->Edit(bv_, x, y, button);
+ inset_hit->insetButtonRelease(bv_, x, y, button);
+ inset_hit->edit(bv_, x, y, button);
}
return;
}
if (bv_->text->cursor.pos() <
bv_->text->cursor.par()->size()) {
c = bv_->text->cursor.par()->
- GetChar(bv_->text->cursor.pos());
+ getChar(bv_->text->cursor.pos());
}
if (bv_->text->cursor.pos() - 1 >= 0) {
c = bv_->text->cursor.par()->
- GetChar(bv_->text->cursor.pos() - 1);
+ getChar(bv_->text->cursor.pos() - 1);
}
if (hit == true) {
selection_possible = false;
bibitemMaxWidth(bv_, textclasslist.
TextClass(buffer_->
params.textclass).defaultfont())) {
- bv_->text->cursor.par()->bibkey->Edit(bv_, 0, 0, 0);
+ bv_->text->cursor.par()->bibkey->edit(bv_, 0, 0, 0);
}
return;
int y_tmp = y + text->first;
LyXCursor cursor;
- text->SetCursorFromCoordinates(bv_, cursor, x, y_tmp);
- text->SetCursor(bv_, cursor, cursor.par(),cursor.pos(),true);
+ text->setCursorFromCoordinates(bv_, cursor, x, y_tmp);
+ text->setCursor(bv_, cursor, cursor.par(),cursor.pos(),true);
if (cursor.pos() < cursor.par()->size()
- && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
- && cursor.par()->GetInset(cursor.pos())
- && cursor.par()->GetInset(cursor.pos())->Editable()) {
+ && cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET
+ && cursor.par()->getInset(cursor.pos())
+ && cursor.par()->getInset(cursor.pos())->editable()) {
// Check whether the inset really was hit
- Inset * tmpinset = cursor.par()->GetInset(cursor.pos());
- LyXFont font = text->GetFont(bv_->buffer(),
+ Inset * tmpinset = cursor.par()->getInset(cursor.pos());
+ LyXFont font = text->getFont(buffer_,
cursor.par(), cursor.pos());
int const width = tmpinset->width(bv_, font);
int const inset_x = font.isVisibleRightToLeft()
if (x > start_x && x < end_x
&& y_tmp > cursor.y() - tmpinset->ascent(bv_, font)
&& y_tmp < cursor.y() + tmpinset->descent(bv_, font)) {
- text->SetCursor(bv_, cursor.par(),cursor.pos(), true);
+ text->setCursor(bv_, cursor.par(),cursor.pos(), true);
x = x - start_x;
// The origin of an inset is on the baseline
y = y_tmp - (text->cursor.y());
}
if ((cursor.pos() - 1 >= 0) &&
- (cursor.par()->GetChar(cursor.pos()-1) == LyXParagraph::META_INSET) &&
- (cursor.par()->GetInset(cursor.pos() - 1)) &&
- (cursor.par()->GetInset(cursor.pos() - 1)->Editable())) {
- Inset * tmpinset = cursor.par()->GetInset(cursor.pos()-1);
- LyXFont font = text->GetFont(bv_->buffer(), cursor.par(),
+ (cursor.par()->getChar(cursor.pos()-1) == Paragraph::META_INSET) &&
+ (cursor.par()->getInset(cursor.pos() - 1)) &&
+ (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);
int const width = tmpinset->width(bv_, font);
int const inset_x = font.isVisibleRightToLeft()
#if 0
if (move_cursor && (tmpinset != bv_->theLockingInset()))
#endif
- text->SetCursor(bv_, cursor.par(),
+ text->setCursor(bv_, cursor.par(),
cursor.pos() - 1, true);
x = x - start_x;
// The origin of an inset is on the baseline
void BufferView::Pimpl::workAreaExpose()
{
- static int work_area_width = 0;
- static unsigned int work_area_height = 0;
+ static int work_area_width;
+ static unsigned int work_area_height;
bool const widthChange = workarea_.workWidth() != work_area_width;
bool const heightChange = workarea_.height() != work_area_height;
work_area_height = workarea_.height();
if (buffer_ != 0) {
if (widthChange) {
- // All buffers need a resize
- bufferlist.resize();
+ // The visible LyXView need a resize
+ owner_->resize();
// Remove all texts from the textcache
// This is not _really_ what we want to do. What
void BufferView::Pimpl::update()
{
- if (screen_.get()) screen_->Update(bv_->text, bv_);
+ if (screen_.get() &&
+ (!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
+ {
+ screen_->Update(bv_->text, bv_);
+ }
}
// Values used when calling update:
{
owner_->updateLayoutChoice();
- if (!text->selection && (f & SELECT)) {
- text->sel_cursor = text->cursor;
+ if (!text->selection.set() && (f & SELECT)) {
+ text->selection.cursor = text->cursor;
}
- text->FullRebreak(bv_);
+ text->fullRebreak(bv_);
if (text->inset_owner) {
- text->inset_owner->SetUpdateStatus(bv_, InsetText::NONE);
- bv_->updateInset(text->inset_owner, true);
+ text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+ updateInset(text->inset_owner, true);
} else
update();
}
int status = 1;
- int pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
+ int
const pid = waitpid(static_cast<pid_t>(0), &status, WNOHANG);
if (pid == -1) // error find out what is wrong
; // ignore it for now.
else if (pid > 0)
if (!bv_->theLockingInset()) {
screen_->CursorToggle(bv_->text, bv_);
} else {
- bv_->theLockingInset()->ToggleInsetCursor(bv_);
+ bv_->theLockingInset()->toggleInsetCursor(bv_);
}
cursor_timeout.restart();
if (text->inset_owner)
y += bv_->text->first;
Row * cursorrow = text->cursor.row();
- text->SetCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
- bv_->text->FinishUndo();
+ text->setCursorFromCoordinates(bv_, bv_->text->cursor.x_fix(), y);
+ bv_->text->finishUndo();
// This is to allow jumping over large insets
if ((cursorrow == text->cursor.row()))
- text->CursorUp(bv_);
+ text->cursorUp(bv_);
if (text->inset_owner ||
text->cursor.row()->height() < workarea_.height())
int y = text->first + workarea_.height();
// if (text->inset_owner)
// y += bv_->text->first;
- text->GetRowNearY(y);
+ text->getRowNearY(y);
Row * cursorrow = text->cursor.row();
- text->SetCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
- bv_->text->FinishUndo();
+ text->setCursorFromCoordinates(bv_, text->cursor.x_fix(), y); // + workarea_->height());
+ bv_->text->finishUndo();
// This is to allow jumping over large insets
if ((cursorrow == bv_->text->cursor.row()))
- text->CursorDown(bv_);
+ text->cursorDown(bv_);
if (text->inset_owner ||
text->cursor.row()->height() < workarea_.height())
void BufferView::Pimpl::beforeChange(LyXText * text)
{
toggleSelection();
- text->ClearSelection(bv_);
+ text->clearSelection(bv_);
}
bv_->text->cursor.par()->id(),
bv_->text->cursor.pos());
if (i > 0) {
- string const str = _("Saved bookmark") + ' ' + tostr(i);
- owner_->message(str);
+ ostringstream str;
+ str << _("Saved bookmark") << ' ' << i;
+ owner_->message(str.str().c_str());
}
}
if (b != 0 ) buffer(b);
}
- LyXParagraph * par = bv_->text->GetParFromID(saved_positions[i].par_id);
+ Paragraph * par = bv_->text->getParFromID(saved_positions[i].par_id);
if (!par)
return;
- bv_->text->SetCursor(bv_, par,
+ bv_->text->setCursor(bv_, par,
min(par->size(), saved_positions[i].par_pos));
update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
if (i > 0) {
- string const str = _("Moved to bookmark") + ' ' + tostr(i);
- owner_->message(str);
+ ostringstream str;
+ str << _("Moved to bookmark") << ' ' << i;
+ owner_->message(str.str().c_str());
}
}
return;
LyXText * text = bv_->getLyXText();
- if (text->real_current_font.isRightToLeft() &&
- text->real_current_font.latex() != LyXFont::ON) {
+ if (text->real_current_font.isRightToLeft()
+#ifndef NO_LATEX
+ &&
+ text->real_current_font.latex() != LyXFont::ON
+#endif
+ ) {
if (owner_->getIntl()->keymap == Intl::PRIMARY)
owner_->getIntl()->KeyMapSec();
} else {
void BufferView::Pimpl::insetSleep()
{
- if (bv_->theLockingInset() && !bv_->inset_slept) {
- bv_->theLockingInset()->GetCursorPos(bv_, bv_->slx, bv_->sly);
- bv_->theLockingInset()->InsetUnlock(bv_);
- bv_->inset_slept = true;
+ if (bv_->theLockingInset() && !inset_slept) {
+ bv_->theLockingInset()->getCursorPos(bv_, bv_->slx, bv_->sly);
+ bv_->theLockingInset()->insetUnlock(bv_);
+ inset_slept = true;
}
}
void BufferView::Pimpl::insetWakeup()
{
- if (bv_->theLockingInset() && bv_->inset_slept) {
- bv_->theLockingInset()->Edit(bv_, bv_->slx, bv_->sly, 0);
- bv_->inset_slept = false;
+ if (bv_->theLockingInset() && inset_slept) {
+ bv_->theLockingInset()->edit(bv_, bv_->slx, bv_->sly, 0);
+ inset_slept = false;
}
}
void BufferView::Pimpl::insetUnlock()
{
if (bv_->theLockingInset()) {
- if (!bv_->inset_slept)
- bv_->theLockingInset()->InsetUnlock(bv_);
+ if (!inset_slept)
+ bv_->theLockingInset()->insetUnlock(bv_);
bv_->theLockingInset(0);
- bv_->text->FinishUndo();
- bv_->inset_slept = false;
+ bv_->text->finishUndo();
+ inset_slept = false;
}
}
if (clip.empty()) return;
if (asPara) {
- bv_->text->InsertStringB(bv_, clip);
+ bv_->text->insertStringAsParagraphs(bv_, clip);
} else {
- bv_->text->InsertStringA(bv_, clip);
+ bv_->text->insertStringAsLines(bv_, clip);
}
update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
{
LyXText * lt = bv_->getLyXText();
- if (selecting || lt->mark_set) {
- lt->SetSelection(bv_);
+ if (selecting || lt->selection.mark()) {
+ lt->setSelection(bv_);
if (lt->bv_owner)
- bv_->toggleToggle();
+ toggleToggle();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
showCursor();
/* ---> Everytime the cursor is moved, show the current font state. */
// should this too me moved out of this func?
//owner->showState();
- bv_->setState();
+ setState();
}
find_if(Buffer::inset_iterator(
cursor.par(), cursor.pos()),
buffer_->inset_iterator_end(),
- lyx::compare_memfun(&Inset::LyxCode, code)
- );
+ lyx::compare_memfun(&Inset::lyxCode, code));
return it != buffer_->inset_iterator_end() ? (*it) : 0;
}
}
}
- // get absolute path of file and make sure the filename ends
- // with .lyx
- filename = MakeAbsPath(filename);
- if (!IsLyXFilename(filename))
- filename += ".lyx";
+ // get absolute path of file and add ".lyx" to the filename if
+ // necessary
+ filename = FileSearch(string(), filename, "lyx");
- // Inserts document
- string const s1 = _("Inserting document") + ' '
- + MakeDisplayPath(filename) + " ...";
- owner_->message(s1);
+ string const disp_fn(MakeDisplayPath(filename));
+
+ ostringstream s1;
+ s1 << _("Inserting document") << ' '
+ << disp_fn << " ...";
+ owner_->message(s1.str().c_str());
bool const res = bv_->insertLyXFile(filename);
if (res) {
- string const str = _("Document") + ' '
- + MakeDisplayPath(filename) + ' ' + _("inserted.");
- owner_->message(str);
+ ostringstream str;
+ str << _("Document") << ' ' << disp_fn
+ << ' ' << _("inserted.");
+ owner_->message(str.str().c_str());
} else {
- string const str = _("Could not insert document") + ' '
- + MakeDisplayPath(filename);
- owner_->message(str);
+ ostringstream str;
+ str << _("Could not insert document") << ' '
+ << disp_fn;
+ owner_->message(str.str().c_str());
}
}
bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
{
+ lyxerr[Debug::ACTION] << "BufferView::Pimpl::Dispatch: action["
+ << action <<"] arg[" << argument << "]" << endl;
+
switch (action) {
// --- Misc -------------------------------------------
case LFUN_APPENDIX:
InsetCommandParams p;
p.setCmdName("tableofcontents");
Inset * inset = new InsetTOC(p);
- if (!bv_->insertInset(inset, "Standard", true))
+ if (!insertInset(inset, "Standard"))
delete inset;
break;
}
case LFUN_INSET_GRAPHICS:
{
Inset * new_inset = new InsetGraphics;
- if (!bv_->insertInset(new_inset)) {
+ if (!insertInset(new_inset)) {
delete new_inset;
} else {
// this is need because you don't use a inset->Edit()
- bv_->updateInset(new_inset, true);
- new_inset->Edit(bv_, 0, 0, 0);
+ updateInset(new_inset, true);
+ new_inset->edit(bv_, 0, 0, 0);
}
break;
}
break;
case LFUN_GOTOERROR:
- bv_->gotoInset(Inset::ERROR_CODE, false);
+ gotoInset(Inset::ERROR_CODE, false);
break;
case LFUN_GOTONOTE:
- bv_->gotoInset(Inset::IGNORE_CODE, false);
+ gotoInset(Inset::IGNORE_CODE, false);
break;
case LFUN_REFERENCE_GOTO:
vector<Inset::Code> tmp;
tmp.push_back(Inset::LABEL_CODE);
tmp.push_back(Inset::REF_CODE);
- bv_->gotoInset(tmp, true);
+ gotoInset(tmp, true);
break;
}
case LFUN_FREE:
owner_->getDialogs()->setUserFreeFont();
break;
-
+
+#ifndef NO_LATEX
case LFUN_TEX:
Tex(bv_);
setState();
owner_->showState();
break;
-
+#endif
+
case LFUN_FILE_INSERT:
{
MenuInsertLyXFile(argument);
case LFUN_LAYOUT:
{
- lyxerr.debug() << "LFUN_LAYOUT: (arg) "
- << argument << endl;
+ lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
+ << argument << endl;
// Derive layout number from given argument (string)
// and current buffer's textclass (number). */
update(lt,
BufferView::SELECT
| BufferView::FITCUR);
- lt->SetLayout(bv_, layout.second);
+ lt->setLayout(bv_, layout.second);
owner_->setLayout(layout.second);
update(lt,
BufferView::SELECT
update(lt,
BufferView::SELECT
| BufferView::FITCUR);
- lt->ChangeWordCase(bv_, LyXText::text_uppercase);
+ lt->changeCase(bv_, LyXText::text_uppercase);
if (lt->inset_owner)
- bv_->updateInset(lt->inset_owner, true);
+ updateInset(lt->inset_owner, true);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXText * lt = bv_->getLyXText();
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->ChangeWordCase(bv_, LyXText::text_lowercase);
+ lt->changeCase(bv_, LyXText::text_lowercase);
if (lt->inset_owner)
- bv_->updateInset(lt->inset_owner, true);
+ updateInset(lt->inset_owner, true);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXText * lt = bv_->getLyXText();
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->ChangeWordCase(bv_,
- LyXText::text_capitalization);
+ lt->changeCase(bv_, LyXText::text_capitalization);
if (lt->inset_owner)
- bv_->updateInset(lt->inset_owner, true);
+ updateInset(lt->inset_owner, true);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXText * lt = bv_->getLyXText();
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->TransposeChars(*bv_);
+ lt->transposeChars(*bv_);
if (lt->inset_owner)
- bv_->updateInset(lt->inset_owner, true);
+ updateInset(lt->inset_owner, true);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
p.setFromString(argument);
InsetRef * inset = new InsetRef(p, *buffer_);
- if (!bv_->insertInset(inset))
+ if (!insertInset(inset))
delete inset;
else
- bv_->updateInset(inset, true);
+ updateInset(inset, true);
}
break;
LyXText * lt = bv_->getLyXText();
bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
if (is_rtl)
- lt->CursorLeft(bv_, false);
+ lt->cursorLeft(bv_, false);
if (lt->cursor.pos() < lt->cursor.par()->size()
- && lt->cursor.par()->GetChar(lt->cursor.pos())
- == LyXParagraph::META_INSET
- && lt->cursor.par()->GetInset(lt->cursor.pos())
- && 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());
+ && lt->cursor.par()->getChar(lt->cursor.pos())
+ == Paragraph::META_INSET
+ && lt->cursor.par()->getInset(lt->cursor.pos())
+ && 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->getFont(buffer_,
lt->cursor.par(),
lt->cursor.pos());
y = tmpinset->descent(bv_,font);
}
- tmpinset->Edit(bv_, 0, y, 0);
+ tmpinset->edit(bv_, 0, y, 0);
break;
}
if (!is_rtl)
- lt->CursorRight(bv_, false);
- lt->FinishUndo();
+ lt->cursorRight(bv_, false);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
// it simpler? (Lgb)
LyXText * lt = bv_->getLyXText();
bool is_rtl = lt->cursor.par()->isRightToLeftPar(buffer_->params);
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
- LyXCursor const & cur = lt->cursor;
+ LyXCursor const cur = lt->cursor;
if (!is_rtl)
- lt->CursorLeft(bv_, false);
+ lt->cursorLeft(bv_, false);
if ((is_rtl || cur != lt->cursor) && // only if really moved!
lt->cursor.pos() < lt->cursor.par()->size() &&
- (lt->cursor.par()->GetChar(lt->cursor.pos()) ==
- LyXParagraph::META_INSET) &&
- lt->cursor.par()->GetInset(lt->cursor.pos()) &&
- (lt->cursor.par()->GetInset(lt->cursor.pos())->Editable()
+ (lt->cursor.par()->getChar(lt->cursor.pos()) ==
+ Paragraph::META_INSET) &&
+ lt->cursor.par()->getInset(lt->cursor.pos()) &&
+ (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());
- LyXFont const font = lt->GetFont(buffer_,
+ 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->edit(bv_,
tmpinset->x() +
tmpinset->width(bv_,font),
y, 0);
break;
}
if (is_rtl)
- lt->CursorRight(bv_, false);
+ lt->cursorRight(bv_, false);
- lt->FinishUndo();
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::UPDATE);
- lt->CursorUp(bv_);
- lt->FinishUndo();
+ lt->cursorUp(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::UPDATE);
- lt->CursorDown(bv_);
- lt->FinishUndo();
+ lt->cursorDown(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::UPDATE);
- lt->CursorUpParagraph(bv_);
- lt->FinishUndo();
+ lt->cursorUpParagraph(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::UPDATE);
- lt->CursorDownParagraph(bv_);
- lt->FinishUndo();
+ lt->cursorDownParagraph(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::UPDATE);
cursorPrevious(lt);
- lt->FinishUndo();
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::UPDATE);
cursorNext(lt);
- lt->FinishUndo();
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->CursorHome(bv_);
- lt->FinishUndo();
+ lt->cursorHome(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorEnd(bv_);
- lt->FinishUndo();
+ lt->cursorEnd(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorTab(bv_);
- lt->FinishUndo();
+ lt->cursorTab(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
- lt->CursorLeftOneWord(bv_);
+ lt->cursorLeftOneWord(bv_);
else
- lt->CursorRightOneWord(bv_);
- lt->FinishUndo();
+ lt->cursorRightOneWord(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt, BufferView::SELECT|BufferView::FITCUR);
if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
- lt->CursorRightOneWord(bv_);
+ lt->cursorRightOneWord(bv_);
else
- lt->CursorLeftOneWord(bv_);
- lt->FinishUndo();
+ lt->cursorLeftOneWord(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorTop(bv_);
- lt->FinishUndo();
+ lt->cursorTop(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- if (!lt->mark_set)
+ if (!lt->selection.mark())
beforeChange(lt);
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorBottom(bv_);
- lt->FinishUndo();
+ lt->cursorBottom(bv_);
+ lt->finishUndo();
moveCursorUpdate(false);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
- lt->CursorLeft(bv_);
+ lt->cursorLeft(bv_);
else
- lt->CursorRight(bv_);
- lt->FinishUndo();
+ lt->cursorRight(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
- lt->CursorRight(bv_);
+ lt->cursorRight(bv_);
else
- lt->CursorLeft(bv_);
- lt->FinishUndo();
+ lt->cursorLeft(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorUp(bv_);
- lt->FinishUndo();
+ lt->cursorUp(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorDown(bv_);
- lt->FinishUndo();
+ lt->cursorDown(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorUpParagraph(bv_);
- lt->FinishUndo();
+ lt->cursorUpParagraph(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorDownParagraph(bv_);
- lt->FinishUndo();
+ lt->cursorDownParagraph(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
cursorPrevious(lt);
- lt->FinishUndo();
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
cursorNext(lt);
- lt->FinishUndo();
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
LyXText * lt = bv_->getLyXText();
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->CursorHome(bv_);
- lt->FinishUndo();
+ lt->cursorHome(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
LyXText * lt = bv_->getLyXText();
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->CursorEnd(bv_);
- lt->FinishUndo();
+ lt->cursorEnd(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
- lt->CursorLeftOneWord(bv_);
+ lt->cursorLeftOneWord(bv_);
else
- lt->CursorRightOneWord(bv_);
- lt->FinishUndo();
+ lt->cursorRightOneWord(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
if (lt->cursor.par()->isRightToLeftPar(buffer_->params))
- lt->CursorRightOneWord(bv_);
+ lt->cursorRightOneWord(bv_);
else
- lt->CursorLeftOneWord(bv_);
- lt->FinishUndo();
+ lt->cursorLeftOneWord(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
if (lt->inset_owner)
break;
update(lt, BufferView::SELECT|BufferView::FITCUR);
- lt->CursorTop(bv_);
- lt->FinishUndo();
+ lt->cursorTop(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
break;
update(lt,
BufferView::SELECT|BufferView::FITCUR);
- lt->CursorBottom(bv_);
- lt->FinishUndo();
+ lt->cursorBottom(bv_);
+ lt->finishUndo();
moveCursorUpdate(true);
owner_->showState();
}
LyXText * lt = bv_->getLyXText();
beforeChange(lt);
- lt->InsertChar(bv_, LyXParagraph::META_NEWLINE);
+ lt->insertChar(bv_, Paragraph::META_NEWLINE);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXLayout const & style = textclasslist
.Style(buffer_->params.textclass,
- lt->cursor.par()->GetLayout());
+ lt->cursor.par()->getLayout());
if (style.free_spacing) {
- lt->InsertChar(bv_, ' ');
+ lt->insertChar(bv_, ' ');
update(lt,
BufferView::SELECT
| BufferView::FITCUR
{
LyXText * lt = bv_->getLyXText();
- if (lt->mark_set) {
+ if (lt->selection.mark()) {
beforeChange(lt);
update(lt,
BufferView::SELECT
owner_->getLyXFunc()->setMessage(N_("Mark removed"));
} else {
beforeChange(lt);
- lt->mark_set = 1;
+ lt->selection.mark(true);
update(lt,
BufferView::SELECT
| BufferView::FITCUR);
owner_->getLyXFunc()->setMessage(N_("Mark set"));
}
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
}
break;
{
LyXText * lt = bv_->getLyXText();
- if (!lt->selection) {
+ if (!lt->selection.set()) {
lt->Delete(bv_);
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXCursor cursor = lt->cursor;
- if (!lt->selection) {
+ if (!lt->selection.set()) {
if (cursor.pos() == cursor.par()->size()) {
- lt->CursorRight(bv_);
+ lt->cursorRight(bv_);
cursor = lt->cursor;
if (cursor.pos() == 0
- && !(cursor.par()->params.spaceTop()
+ && !(cursor.par()->params().spaceTop()
== VSpace (VSpace::NONE))) {
- lt->SetParagraph
+ lt->setParagraph
(bv_,
- cursor.par()->params.lineTop(),
- cursor.par()->params.lineBottom(),
- cursor.par()->params.pagebreakTop(),
- cursor.par()->params.pagebreakBottom(),
+ cursor.par()->params().lineTop(),
+ cursor.par()->params().lineBottom(),
+ cursor.par()->params().pagebreakTop(),
+ cursor.par()->params().pagebreakBottom(),
VSpace(VSpace::NONE),
- cursor.par()->params.spaceBottom(),
- cursor.par()->params.align(),
- cursor.par()->params.labelWidthString(), 0);
- lt->CursorLeft(bv_);
+ cursor.par()->params().spaceBottom(),
+ cursor.par()->params().align(),
+ cursor.par()->params().labelWidthString(), 0);
+ lt->cursorLeft(bv_);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
| BufferView::CHANGE);
} else {
- lt->CursorLeft(bv_);
+ lt->cursorLeft(bv_);
lt->Delete(bv_);
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
update(lt,
BufferView::SELECT
| BufferView::FITCUR
}
} else {
lt->Delete(bv_);
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
update(lt,
BufferView::SELECT
| BufferView::FITCUR
/* -------> Delete word forward. */
case LFUN_DELETE_WORD_FORWARD:
update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- bv_->getLyXText()->DeleteWordForward(bv_);
+ bv_->getLyXText()->deleteWordForward(bv_);
update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
moveCursorUpdate(false);
owner_->showState();
/* -------> Delete word backward. */
case LFUN_DELETE_WORD_BACKWARD:
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- bv_->getLyXText()->DeleteWordBackward(bv_);
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ {
+ LyXText * lt = bv_->getLyXText();
+
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ lt->deleteWordBackward(bv_);
+ update(lt,
+ BufferView::SELECT
+ | BufferView::FITCUR
+ | BufferView::CHANGE);
moveCursorUpdate(false);
owner_->showState();
- break;
+ }
+ break;
/* -------> Kill to end of line. */
case LFUN_DELETE_LINE_FORWARD:
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- bv_->getLyXText()->DeleteLineForward(bv_);
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ {
+ LyXText * lt = bv_->getLyXText();
+
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ lt->deleteLineForward(bv_);
+ update(lt,
+ BufferView::SELECT
+ | BufferView::FITCUR
+ | BufferView::CHANGE);
moveCursorUpdate(false);
- break;
+ }
+ break;
/* -------> Set mark off. */
case LFUN_MARK_OFF:
- beforeChange(bv_->getLyXText());
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- bv_->getLyXText()->sel_cursor = bv_->getLyXText()->cursor;
+ {
+ LyXText * lt = bv_->getLyXText();
+
+ beforeChange(lt);
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ lt->selection.cursor = lt->cursor;
owner_->getLyXFunc()->setMessage(N_("Mark off"));
- break;
+ }
+ break;
/* -------> Set mark on. */
case LFUN_MARK_ON:
- beforeChange(bv_->getLyXText());
- bv_->getLyXText()->mark_set = 1;
- update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
- bv_->getLyXText()->sel_cursor = bv_->getLyXText()->cursor;
+ {
+ LyXText * lt = bv_->getLyXText();
+
+ beforeChange(lt);
+ lt->selection.mark(true);
+ update(lt, BufferView::SELECT|BufferView::FITCUR);
+ lt->selection.cursor = lt->cursor;
owner_->getLyXFunc()->setMessage(N_("Mark on"));
- break;
+ }
+ break;
case LFUN_BACKSPACE:
{
LyXText * lt = bv_->getLyXText();
- if (!lt->selection) {
+ if (!lt->selection.set()) {
if (owner_->getIntl()->getTrans().backspace()) {
- lt->Backspace(bv_);
- lt->sel_cursor = lt->cursor;
+ lt->backspace(bv_);
+ lt->selection.cursor = lt->cursor;
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXCursor cursor = lt->cursor;
- if (!lt->selection) {
+ if (!lt->selection.set()) {
if (cursor.pos() == 0
- && !(cursor.par()->params.spaceTop()
+ && !(cursor.par()->params().spaceTop()
== VSpace (VSpace::NONE))) {
- lt->SetParagraph
+ lt->setParagraph
(bv_,
- cursor.par()->params.lineTop(),
- cursor.par()->params.lineBottom(),
- cursor.par()->params.pagebreakTop(),
- cursor.par()->params.pagebreakBottom(),
- VSpace(VSpace::NONE), cursor.par()->params.spaceBottom(),
- cursor.par()->params.align(),
- cursor.par()->params.labelWidthString(), 0);
+ cursor.par()->params().lineTop(),
+ cursor.par()->params().lineBottom(),
+ cursor.par()->params().pagebreakTop(),
+ cursor.par()->params().pagebreakBottom(),
+ VSpace(VSpace::NONE), cursor.par()->params().spaceBottom(),
+ cursor.par()->params().align(),
+ cursor.par()->params().labelWidthString(), 0);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
| BufferView::CHANGE);
} else {
- lt->Backspace(bv_);
- lt->sel_cursor = cursor;
+ lt->backspace(bv_);
+ lt->selection.cursor = cursor;
update(lt,
BufferView::SELECT
| BufferView::FITCUR
LyXText * lt = bv_->getLyXText();
beforeChange(lt);
- lt->BreakParagraph(bv_, 0);
+ lt->breakParagraph(bv_, 0);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
| BufferView::CHANGE);
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
setState();
owner_->showState();
break;
LyXText * lt = bv_->getLyXText();
beforeChange(lt);
- lt->BreakParagraph(bv_, 1);
+ lt->breakParagraph(bv_, 1);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
| BufferView::CHANGE);
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
setState();
owner_->showState();
break;
beforeChange(lt);
if (cursor.pos() == 0) {
- if (cursor.par()->params.spaceTop() == VSpace(VSpace::NONE)) {
- lt->SetParagraph
+ if (cursor.par()->params().spaceTop() == VSpace(VSpace::NONE)) {
+ lt->setParagraph
(bv_,
- cursor.par()->params.lineTop(),
- cursor.par()->params.lineBottom(),
- cursor.par()->params.pagebreakTop(),
- cursor.par()->params.pagebreakBottom(),
- VSpace(VSpace::DEFSKIP), cursor.par()->params.spaceBottom(),
- cursor.par()->params.align(),
- cursor.par()->params.labelWidthString(), 1);
+ cursor.par()->params().lineTop(),
+ cursor.par()->params().lineBottom(),
+ cursor.par()->params().pagebreakTop(),
+ cursor.par()->params().pagebreakBottom(),
+ VSpace(VSpace::DEFSKIP), cursor.par()->params().spaceBottom(),
+ cursor.par()->params().align(),
+ cursor.par()->params().labelWidthString(), 1);
//update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
}
else {
- lt->BreakParagraph(bv_, 0);
+ lt->breakParagraph(bv_, 0);
//update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
BufferView::SELECT
| BufferView::FITCUR
| BufferView::CHANGE);
- lt->sel_cursor = cursor;
+ lt->selection.cursor = cursor;
setState();
owner_->showState();
}
{
LyXText * lt = bv_->getLyXText();
- LyXParagraph * par = lt->cursor.par();
- Spacing::Space cur_spacing = par->params.spacing().getSpace();
+ Paragraph * par = lt->cursor.par();
+ Spacing::Space cur_spacing = par->params().spacing().getSpace();
float cur_value = 1.0;
if (cur_spacing == Spacing::Other) {
- cur_value = par->params.spacing().getValue();
+ cur_value = par->params().spacing().getValue();
}
istringstream istr(argument.c_str());
<< argument << endl;
}
if (cur_spacing != new_spacing || cur_value != new_value) {
- par->params.spacing(Spacing(new_spacing, new_value));
- lt->RedoParagraph(bv_);
+ par->params().spacing(Spacing(new_spacing, new_value));
+ lt->redoParagraph(bv_);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
p.setFromString( argument );
InsetUrl * inset = new InsetUrl( p );
- if (!bv_->insertInset(inset))
+ if (!insertInset(inset))
delete inset;
else
- bv_->updateInset( inset, true );
+ updateInset( inset, true );
}
break;
case LFUN_INSET_TEXT:
{
InsetText * new_inset = new InsetText;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_ERT:
{
InsetERT * new_inset = new InsetERT;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_EXTERNAL:
{
InsetExternal * new_inset = new InsetExternal;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_FOOTNOTE:
{
InsetFoot * new_inset = new InsetFoot;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_MARGINAL:
{
InsetMarginal * new_inset = new InsetMarginal;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_MINIPAGE:
{
InsetMinipage * new_inset = new InsetMinipage;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
// check if the float type exist
if (floatList.typeExist(argument)) {
InsetFloat * new_inset = new InsetFloat(argument);
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
+ else
+ delete new_inset;
+ } else {
+ lyxerr << "Non-existant float type: "
+ << argument << endl;
+ }
+
+ }
+ break;
+
+ case LFUN_INSET_WIDE_FLOAT:
+ {
+ // check if the float type exist
+ if (floatList.typeExist(argument)) {
+ InsetFloat * new_inset = new InsetFloat(argument);
+ new_inset->wide(true);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
} else {
case LFUN_INSET_LIST:
{
InsetList * new_inset = new InsetList;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_THEOREM:
{
InsetTheorem * new_inset = new InsetTheorem;
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
// Do we have a locking inset...
if (bv_->theLockingInset()) {
lyxerr << "Locking inset code: "
- << static_cast<int>(bv_->theLockingInset()->LyxCode());
+ << static_cast<int>(bv_->theLockingInset()->lyxCode());
InsetCaption * new_inset = new InsetCaption;
new_inset->setOwner(bv_->theLockingInset());
- new_inset->SetAutoBreakRows(true);
- new_inset->SetDrawFrame(0, InsetText::LOCKED);
- new_inset->SetFrameColor(0, LColor::footnoteframe);
- if (bv_->insertInset(new_inset))
- new_inset->Edit(bv_, 0, 0, 0);
+ new_inset->setAutoBreakRows(true);
+ new_inset->setDrawFrame(0, InsetText::LOCKED);
+ new_inset->setFrameColor(0, LColor::captionframe);
+ if (insertInset(new_inset))
+ new_inset->edit(bv_, 0, 0, 0);
else
delete new_inset;
}
case LFUN_INSET_TABULAR:
{
- int r = 2, c = 2;
+ int r = 2;
+ int c = 2;
if (!argument.empty())
::sscanf(argument.c_str(),"%d%d", &r, &c);
InsetTabular * new_inset =
new InsetTabular(*buffer_, r, c);
- bool rtl =
+ bool const rtl =
bv_->getLyXText()->real_current_font.isRightToLeft();
if (!open_new_inset(new_inset, rtl))
delete new_inset;
case LFUN_CHARATCURSOR:
{
- LyXParagraph::size_type pos = bv_->getLyXText()->cursor.pos();
+ Paragraph::size_type pos = bv_->getLyXText()->cursor.pos();
if (pos < bv_->getLyXText()->cursor.par()->size())
owner_->getLyXFunc()->setMessage(
- tostr(bv_->getLyXText()->cursor.par()->GetChar(pos)));
+ tostr(bv_->getLyXText()->cursor.par()->getChar(pos)));
else
owner_->getLyXFunc()->setMessage("EOF");
}
case LFUN_SETXY:
{
- int x;
- int y;
- ::sscanf(argument.c_str(), " %d %d", &x, &y);
- bv_->getLyXText()->SetCursorFromCoordinates(bv_, x, y);
+ int x = 0;
+ int y = 0;
+ if (::sscanf(argument.c_str(), " %d %d", &x, &y) != 2) {
+ lyxerr << "SETXY: Could not parse coordinates in '"
+ << argument << std::endl;
+ }
+ bv_->getLyXText()->setCursorFromCoordinates(bv_, x, y);
}
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;
case LFUN_INSERT_MATRIX:
{
if (available()) {
- if (open_new_inset(new InsetFormula(false))) {
+ if (open_new_inset(new InsetFormula, false)) {
bv_->theLockingInset()
- ->LocalDispatch(bv_, action, argument);
+ ->localDispatch(bv_, action, argument);
}
}
}
if (!available())
break;
- InsetFormula * f = new InsetFormula(true);
+ InsetFormula * f = new InsetFormula(LM_OT_EQUATION);
open_new_inset(f);
- f->LocalDispatch(bv_, LFUN_INSERT_MATH, argument);
+ f->localDispatch(bv_, LFUN_INSERT_MATH, argument);
}
break;
case LFUN_MATH_DISPLAY:
- {
+ {
if (available())
- open_new_inset(new InsetFormula(true));
+ open_new_inset(new InsetFormula(LM_OT_EQUATION), false);
break;
}
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));
+ open_new_inset(new InsetFormulaMacro(token(s, ' ', 0), na), false);
}
}
}
case LFUN_MATH_MODE: // Open or create a math inset
{
if (available())
- open_new_inset(new InsetFormula);
+ open_new_inset(new InsetFormula, false);
owner_->getLyXFunc()->setMessage(N_("Math editor mode"));
}
break;
p.setFromString( argument );
InsetCitation * inset = new InsetCitation( p );
- if (!bv_->insertInset(inset))
+ if (!insertInset(inset))
delete inset;
else
- bv_->updateInset( inset, true );
+ updateInset( inset, true );
}
break;
InsetCommandParams p( "BibTeX", db, bibstyle );
InsetBibtex * inset = new InsetBibtex(p);
- if (bv_->insertInset(inset)) {
+ if (insertInset(inset)) {
if (argument.empty())
- inset->Edit(bv_, 0, 0, 0);
+ inset->edit(bv_, 0, 0, 0);
} else
delete inset;
}
if (argument.empty()) {
// Get the word immediately preceding the cursor
- LyXParagraph::size_type curpos =
+ Paragraph::size_type curpos =
bv_->getLyXText()->cursor.pos() - 1;
string curstring;
if (curpos >= 0 )
curstring = bv_->getLyXText()
- ->cursor.par()->GetWord(curpos);
+ ->cursor.par()->getWord(curpos);
p.setContents( curstring );
} else {
p.setFromString(argument);
InsetIndex * inset = new InsetIndex(p);
- if (!bv_->insertInset(inset))
+ if (!insertInset(inset))
delete inset;
else
- bv_->updateInset(inset, true);
+ updateInset(inset, true);
}
break;
case LFUN_INDEX_INSERT_LAST:
{
// Get word immediately preceding the cursor
- LyXParagraph::size_type curpos =
+ 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));
+ ->cursor.par()->getWord(curpos));
InsetCommandParams p("index", curstring);
InsetIndex * inset = new InsetIndex(p);
- if (!bv_->insertInset(inset))
+ if (!insertInset(inset))
delete inset;
else
- bv_->updateInset(inset, true);
+ updateInset(inset, true);
}
break;
{
InsetCommandParams p("printindex");
Inset * inset = new InsetPrintIndex(p);
- if (!bv_->insertInset(inset, "Standard", true))
+ if (!insertInset(inset, "Standard"))
delete inset;
}
break;
lyxerr << "arg " << argument << endl;
InsetCommandParams p( "lyxparent", argument );
Inset * inset = new InsetParent(p, *buffer_);
- if (!bv_->insertInset(inset, "Standard", true))
+ if (!insertInset(inset, "Standard"))
delete inset;
}
p.masterFilename_ = buffer_->fileName();
InsetInclude * inset = new InsetInclude(p);
- if (!bv_->insertInset(inset))
+ if (!insertInset(inset))
delete inset;
else {
- bv_->updateInset(inset, true);
+ updateInset(inset, true);
bv_->owner()->getDialogs()->showInclude(inset);
}
}
{
// We should check the argument for validity. (Lgb)
Inset * inset = new InsetFloatList(argument);
- if (!bv_->insertInset(inset, "Standard", true))
+ if (!insertInset(inset, "Standard"))
delete inset;
}
break;
LyXText * lt = bv_->getLyXText();
if (lyxrc.auto_region_delete) {
- if (lt->selection){
- lt->CutSelection(bv_, false);
+ if (lt->selection.set()) {
+ lt->cutSelection(bv_, false);
bv_->update(lt,
BufferView::SELECT
| BufferView::FITCUR
| BufferView::FITCUR
| BufferView::CHANGE);
- lt->sel_cursor = lt->cursor;
+ lt->selection.cursor = lt->cursor;
moveCursorUpdate(false);
// real_current_font.number can change so we need to
char datetmp[32];
int const datetmp_len =
::strftime(datetmp, 32, arg.c_str(), now_tm);
+
+ LyXText * lt = bv_->getLyXText();
+
for (int i = 0; i < datetmp_len; i++) {
- bv_->getLyXText()->InsertChar(bv_, datetmp[i]);
- update(bv_->getLyXText(),
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ lt->insertChar(bv_, datetmp[i]);
+ update(lt,
+ BufferView::SELECT
+ | BufferView::FITCUR
+ | BufferView::CHANGE);
}
- bv_->getLyXText()->sel_cursor = bv_->getLyXText()->cursor;
+ lt->selection.cursor = lt->cursor;
moveCursorUpdate(false);
}
break;
case LFUN_UNKNOWN_ACTION:
- owner_->getLyXFunc()->setErrorMessage(N_("Unknow function!"));
+ owner_->getLyXFunc()->setErrorMessage(N_("Unknown function!"));
break;
default:
update(lt,
BufferView::SELECT
| BufferView::FITCUR);
- lt->InsertChar(bv_, LyXParagraph::META_NEWLINE);
+ lt->insertChar(bv_, Paragraph::META_NEWLINE);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
update(lt,
BufferView::SELECT
| BufferView::FITCUR);
- lt->InsertChar(bv_, LyXParagraph::META_HFILL);
+ lt->insertChar(bv_, Paragraph::META_HFILL);
update(lt,
BufferView::SELECT
| BufferView::FITCUR
update(lt, BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
- if (!bv_->insertInset(new_inset))
+ if (!insertInset(new_inset))
delete new_inset;
else
- bv_->updateInset(new_inset, true);
+ updateInset(new_inset, true);
}
}
update(lt, BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR);
- bv_->insertInset(new_inset);
+ insertInset(new_inset);
}
}
update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
- bv_->insertInset(new_inset);
+ insertInset(new_inset);
}
}
update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
new InsetSpecialChar(InsetSpecialChar::LDOTS);
- bv_->insertInset(new_inset);
+ insertInset(new_inset);
}
}
update(bv_->getLyXText(), BufferView::SELECT|BufferView::FITCUR);
InsetSpecialChar * new_inset =
new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
- bv_->insertInset(new_inset);
+ insertInset(new_inset);
}
}
void BufferView::Pimpl::insertNote()
{
InsetInfo * new_inset = new InsetInfo();
- bv_->insertInset(new_inset);
- new_inset->Edit(bv_, 0, 0, 0);
+ insertInset(new_inset);
+ new_inset->edit(bv_, 0, 0, 0);
}
LyXText * lt = bv_->getLyXText();
beforeChange(lt);
- lt->FinishUndo();
- if (!bv_->insertInset(new_inset)) {
+ lt->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);
+ new_inset->edit(bv_, new_inset->width(bv_, font), 0, 0);
} else
- new_inset->Edit(bv_, 0, 0, 0);
+ new_inset->edit(bv_, 0, 0, 0);
+ return true;
+}
+
+
+bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
+{
+ // 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))
+ return bv_->theLockingInset()->insertInset(bv_, inset);
+ return false;
+ }
+
+ // not quite sure if we want this...
+ bv_->text->setCursorParUndo(buffer_);
+ bv_->text->freezeUndo();
+
+ beforeChange(bv_->text);
+ if (!lout.empty()) {
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+ bv_->text->breakParagraph(bv_);
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ if (bv_->text->cursor.par()->size()) {
+ bv_->text->cursorLeft(bv_);
+
+ bv_->text->breakParagraph(bv_);
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+ }
+
+ pair<bool, LyXTextClass::size_type> lres =
+ textclasslist.NumberOfLayout(buffer_->params
+ .textclass, lout);
+ LyXTextClass::size_type lay;
+ if (lres.first != false) {
+ // layout found
+ lay = lres.second;
+ } else {
+ // layout not fount using default "Standard" (0)
+ lay = 0;
+ }
+
+ bv_->text->setLayout(bv_, lay);
+
+ bv_->text->setParagraph(bv_, 0, 0,
+ 0, 0,
+ VSpace(VSpace::NONE), VSpace(VSpace::NONE),
+ 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);
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+
+ bv_->text->unFreezeUndo();
return true;
}
+
+
+void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
+{
+ if (!inset)
+ return;
+
+ // first check for locking insets
+ if (bv_->theLockingInset()) {
+ if (bv_->theLockingInset() == inset) {
+ if (bv_->text->updateInset(bv_, inset)) {
+ update();
+ if (mark_dirty) {
+ buffer_->markDirty();
+ }
+ updateScrollbar();
+ return;
+ }
+ } else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
+ if (bv_->text->updateInset(bv_,
+ bv_->theLockingInset())) {
+ update();
+ if (mark_dirty){
+ buffer_->markDirty();
+ }
+ updateScrollbar();
+ return;
+ }
+ }
+ }
+
+ // then check the current buffer
+ if (available()) {
+ hideCursor();
+ update(bv_->text, BufferView::UPDATE);
+ if (bv_->text->updateInset(bv_, inset)) {
+ if (mark_dirty) {
+ update(bv_->text,
+ BufferView::SELECT
+ | BufferView::FITCUR
+ | BufferView::CHANGE);
+ } else {
+ update(bv_->text, SELECT);
+ }
+ return;
+ }
+ }
+}
+
+
+void BufferView::Pimpl::gotoInset(vector<Inset::Code> const & codes,
+ bool same_content)
+{
+ if (!available()) return;
+
+ hideCursor();
+ beforeChange(bv_->text);
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+
+ string contents;
+ if (same_content &&
+ bv_->text->cursor.par()->getChar(bv_->text->cursor.pos()) == Paragraph::META_INSET) {
+ Inset const * inset = bv_->text->cursor.par()->getInset(bv_->text->cursor.pos());
+ if (find(codes.begin(), codes.end(), inset->lyxCode())
+ != codes.end())
+ contents =
+ static_cast<InsetCommand const *>(inset)->getContents();
+ }
+
+ if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
+ if (bv_->text->cursor.pos()
+ || bv_->text->cursor.par() != bv_->text->firstParagraph()) {
+ LyXCursor tmp = bv_->text->cursor;
+ bv_->text->cursor.par(bv_->text->firstParagraph());
+ bv_->text->cursor.pos(0);
+ if (!bv_->text->gotoNextInset(bv_, codes, contents)) {
+ bv_->text->cursor = tmp;
+ bv_->owner()->message(_("No more insets"));
+ }
+ } else {
+ bv_->owner()->message(_("No more insets"));
+ }
+ }
+ update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
+ bv_->text->selection.cursor = bv_->text->cursor;
+}
+
+
+void BufferView::Pimpl::gotoInset(Inset::Code code, bool same_content)
+{
+ gotoInset(vector<Inset::Code>(1, code), same_content);
+}
projects / lyx.git / blobdiff