-// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
- * Copyright 1998-2000 The LyX Team.
+ * Copyright 1998-2001 The LyX Team.
*
* ======================================================
*/
#endif
#include "insettext.h"
-#include "lyxparagraph.h"
+#include "paragraph.h"
#include "lyxlex.h"
#include "debug.h"
#include "lyxfont.h"
#include "lyxcursor.h"
#include "CutAndPaste.h"
#include "font.h"
-#include "minibuffer.h"
#include "LColor.h"
#include "support/textutils.h"
#include "support/LAssert.h"
#include "trans_mgr.h"
#include "lyxscreen.h"
#include "WorkArea.h"
+#include "gettext.h"
+#include "lyxfunc.h"
+#include "ParagraphParameters.h"
using std::ostream;
using std::ifstream;
using std::endl;
using std::min;
using std::max;
+using std::make_pair;
extern unsigned char getCurrentTextClass(Buffer *);
extern bool math_insert_greek(BufferView *, char);
InsetText::InsetText()
{
- par = new LyXParagraph();
+ par = new Paragraph;
init();
}
insetDescent = 0;
insetWidth = 0;
the_locking_inset = 0;
-#if 0
- cursor_visible = false;
-#endif
- interline_space = 1;
+ old_max_width = 0;
no_selection = false;
need_update = INIT;
drawTextXOffset = 0;
drawTextYOffset = 0;
autoBreakRows = false;
- drawFrame = NEVER;
+ drawFrame_ = NEVER;
xpos = 0.0;
if (ins) {
- SetParagraphData(ins->par);
- autoBreakRows = ins->autoBreakRows;
- drawFrame = ins->drawFrame;
+ setParagraphData(ins->par);
+ autoBreakRows = ins->autoBreakRows;
+ drawFrame_ = ins->drawFrame_;
}
- par->SetInsetOwner(this);
+ par->setInsetOwner(this);
frame_color = LColor::insetframe;
locked = false;
old_par = 0;
last_drawn_width = -1;
+ frame_is_visible = false;
+ cached_bview = 0;
}
{
// delete all instances of LyXText before deleting the paragraps used
// by it.
- for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
- delete (*cit).second;
- (*cit).second = 0;
- }
-#ifndef NEW_INSETS
- LyXParagraph * p = par->next_;
- delete par;
- while(p) {
- par = p;
- p = p->next_;
- delete par;
+ cached_bview = 0;
+ for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit) {
+ delete (*cit).second;
+ (*cit).second = 0;
}
-#else
- LyXParagraph * p = par->next();
- delete par;
- while(p) {
- par = p;
- p = p->next();
- delete par;
+
+ while (par) {
+ Paragraph * tmp = par->next();
+ delete par;
+ par = tmp;
}
-#endif
}
{
// delete all instances of LyXText before deleting the paragraps used
// by it.
- for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
+ cached_bview = 0;
+ for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit) {
delete (*cit).second;
(*cit).second = 0;
}
-#ifndef NEW_INSETS
- LyXParagraph * p = par->next_;
- delete par;
- while(p) {
- par = p;
- p = p->next_;
- delete par;
- }
-#else
- LyXParagraph * p = par->next();
- delete par;
- while(p) {
- par = p;
- p = p->next();
+
+ while (par) {
+ Paragraph * tmp = par->next();
delete par;
+ par = tmp;
}
-#endif
- par = new LyXParagraph();
+ par = new Paragraph;
}
-Inset * InsetText::Clone(Buffer const &) const
+Inset * InsetText::clone(Buffer const &) const
{
InsetText * t = new InsetText(*this);
return t;
}
-void InsetText::Write(Buffer const * buf, ostream & os) const
+void InsetText::write(Buffer const * buf, ostream & os) const
{
os << "Text\n";
- WriteParagraphData(buf, os);
+ writeParagraphData(buf, os);
}
-void InsetText::WriteParagraphData(Buffer const * buf, ostream & os) const
+void InsetText::writeParagraphData(Buffer const * buf, ostream & os) const
{
- par->writeFile(buf, os, buf->params, 0, 0);
+ par->writeFile(buf, os, buf->params, 0);
}
-void InsetText::Read(Buffer const * buf, LyXLex & lex)
+void InsetText::read(Buffer const * buf, LyXLex & lex)
{
string token;
int pos = 0;
- LyXParagraph * return_par = 0;
- char depth = 0; // signed or unsigned?
-#ifndef NEW_INSETS
- LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
- LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE;
-#endif
+ Paragraph * return_par = 0;
+ Paragraph::depth_type depth = 0;
LyXFont font(LyXFont::ALL_INHERIT);
- // delete all instances of LyXText before deleting the paragraps used
- // by it.
- for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit) {
- delete (*cit).second;
- (*cit).second = 0;
- }
-
-#ifndef NEW_INSETS
- LyXParagraph * p = par->next_;
- delete par;
- while(p) {
- par = p;
- p = p->next_;
- delete par;
- }
-#else
- LyXParagraph * p = par->next();
- delete par;
- while(p) {
- par = p;
- p = p->next();
- delete par;
- }
-#endif
- par = new LyXParagraph;
+ clear();
+
while (lex.IsOK()) {
lex.nextToken();
token = lex.GetString();
if (token == "\\end_inset")
break;
if (const_cast<Buffer*>(buf)->
- parseSingleLyXformat2Token(lex, par, return_par,token, pos, depth,
- font
-#ifndef NEW_INSETS
- , footnoteflag, footnotekind
-#endif
- ))
- {
+ parseSingleLyXformat2Token(lex, par, return_par,
+ token, pos, depth, font)) {
// the_end read this should NEVER happen
lex.printError("\\the_end read in inset! Error in document!");
return;
return_par = par;
par = return_par;
while(return_par) {
- return_par->SetInsetOwner(this);
-#ifndef NEW_INSETS
- return_par = return_par->next_;
-#else
+ return_par->setInsetOwner(this);
return_par = return_par->next();
-#endif
}
if (token != "\\end_inset") {
int InsetText::ascent(BufferView * bv, LyXFont const &) const
{
int y_temp = 0;
- Row * row = TEXT(bv)->GetRowNearY(y_temp);
+ Row * row = getLyXText(bv)->getRowNearY(y_temp);
insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET;
return insetAscent;
}
int InsetText::descent(BufferView * bv, LyXFont const &) const
{
+ LyXText * t = getLyXText(bv);
int y_temp = 0;
- Row * row = TEXT(bv)->GetRowNearY(y_temp);
- insetDescent = TEXT(bv)->height - row->ascent_of_text() +
+ Row * row = t->getRowNearY(y_temp);
+ insetDescent = t->height - row->ascent_of_text() +
TEXT_TO_INSET_OFFSET;
return insetDescent;
}
int InsetText::width(BufferView * bv, LyXFont const &) const
{
insetWidth = max(textWidth(bv),
- (int)TEXT(bv)->width + (2 * TEXT_TO_INSET_OFFSET));
+ (int)getLyXText(bv)->width + (2 * TEXT_TO_INSET_OFFSET));
return insetWidth;
}
void InsetText::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool cleared) const
+ int baseline, float & x, bool cleared) const
{
+ if (nodraw())
+ return;
+
Painter & pain = bv->painter();
// no draw is necessary !!!
- if ((drawFrame == LOCKED) && !locked && !par->size()) {
- if (!cleared && (need_update & CLEAR_FRAME)) {
- pain.rectangle(top_x + 1, baseline - insetAscent + 1,
- width(bv, f) - 1,
- insetAscent + insetDescent - 1,
- LColor::background);
- }
+ if ((drawFrame_ == LOCKED) && !locked && !par->size()) {
top_x = int(x);
top_baseline = baseline;
x += width(bv, f);
+ if (!cleared && (need_update & CLEAR_FRAME))
+ clearFrame(pain, cleared);
+ else if (cleared)
+ frame_is_visible = false;
need_update = NONE;
return;
}
xpos = x;
+#if 0
UpdatableInset::draw(bv, f, baseline, x, cleared);
-
+#else
+ if (!owner())
+ x += static_cast<float>(scroll());
+#endif
+#if 0
// update insetWidth and insetHeight with dummy calls
(void)ascent(bv, f);
(void)descent(bv, f);
(void)width(bv, f);
+#endif
// if top_x differs we have a rule down and we don't have to clear anything
if (!cleared && (top_x == int(x)) &&
- ((need_update==INIT)||(need_update==FULL)||(top_baseline!=baseline) ||
- (last_drawn_width!=insetWidth)))
- {
- int w = insetWidth;
- int h = insetAscent + insetDescent;
- int ty = baseline - insetAscent;
-
- if (ty < 0) {
- h += ty;
- ty = 0;
- }
- if ((ty + h) > pain.paperHeight())
- h = pain.paperHeight();
- if ((top_x + drawTextXOffset + w) > pain.paperWidth())
- w = pain.paperWidth();
- pain.fillRectangle(top_x+drawTextXOffset, ty, w, h);
- cleared = true;
- need_update = FULL;
+ ((need_update&(INIT|FULL)) || (top_baseline!=baseline) ||
+ (last_drawn_width!=insetWidth))) {
+ clearInset(pain, baseline, cleared);
}
+ if (cleared)
+ frame_is_visible = false;
+
if (!cleared && (need_update == NONE))
return;
if (top_x != int(x)) {
- need_update = INIT;
+ if ((getMaxWidth(bv, this) > 0) &&
+ (getLyXText(bv)->width != old_max_width)) {
+ resizeLyXText(bv);
+ need_update |= FULL;
+ old_max_width = getLyXText(bv)->width;
+ bv->text->status = LyXText::CHANGED_IN_DRAW;
+ }
top_x = int(x);
- bv->text->status = LyXText::CHANGED_IN_DRAW;
+#if 1
+ clearInset(pain, baseline, cleared);
+#else
return;
+#endif
}
+
+// lyxerr << "InsetText::draw[" << this << "](" << need_update << ":" << int(x) << ":" << top_x << ")\n";
+
if (cleared || (last_drawn_width != insetWidth)) {
need_update |= FULL;
last_drawn_width = insetWidth;
last_width = width(bv, f);
last_height = ascent(bv, f) + descent(bv, f);
- if (the_locking_inset && (cpar(bv) == inset_par) && (cpos(bv) == inset_pos)) {
+ if (the_locking_inset && (cpar(bv) == inset_par)
+ && (cpos(bv) == inset_pos)) {
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
}
- if (!cleared && (need_update == CURSOR) && !TEXT(bv)->selection) {
- x += width(bv, f);
+ if (!cleared && (need_update == CURSOR)
+ && !getLyXText(bv)->selection.set()) {
+ drawFrame(pain, cleared);
+ x += last_width; // was width(bv, f);
need_update = NONE;
return;
}
x += TEXT_TO_INSET_OFFSET;
- {
+
int y = 0;
- Row * row = TEXT(bv)->GetRowNearY(y);
+ Row * row = getLyXText(bv)->getRowNearY(y);
int y_offset = baseline - row->ascent_of_text();
int ph = pain.paperHeight();
int first = 0;
}
if (y_offset < 0)
y_offset = y;
- TEXT(bv)->first = first;
- if (cleared) { // (need_update&FULL) || (need_update&INIT)
+ getLyXText(bv)->first = first;
+ if (cleared) {
int yf = y_offset;
y = 0;
while ((row != 0) && (yf < ph)) {
- TEXT(bv)->GetVisibleRow(bv, y+y_offset, int(x), row,
- y+first, cleared);
- y += row->height();
- yf += row->height();
- row = row->next();
+ getLyXText(bv)->getVisibleRow(bv, y+y_offset, int(x), row,
+ y+first, cleared);
+ y += row->height();
+ yf += row->height();
+ row = row->next();
}
} else if (!locked) {
if (need_update & CURSOR) {
- bv->screen()->ToggleSelection(TEXT(bv), bv, true, y_offset,int(x));
- TEXT(bv)->ClearSelection(bv);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+ bv->screen()->ToggleSelection(getLyXText(bv), bv, true, y_offset,int(x));
+ getLyXText(bv)->clearSelection(bv);
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
}
- bv->screen()->Update(TEXT(bv), bv, y_offset, int(x));
+ bv->screen()->Update(getLyXText(bv), bv, y_offset, int(x));
} else {
locked = false;
if (need_update & SELECTION)
- bv->screen()->ToggleToggle(TEXT(bv), bv, y_offset, int(x));
+ bv->screen()->ToggleToggle(getLyXText(bv), bv, y_offset, int(x));
else if (need_update & CURSOR) {
- bv->screen()->ToggleSelection(TEXT(bv), bv, true, y_offset,int(x));
- TEXT(bv)->ClearSelection(bv);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+ bv->screen()->ToggleSelection(getLyXText(bv), bv, true, y_offset,int(x));
+ getLyXText(bv)->clearSelection(bv);
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
}
- bv->screen()->Update(TEXT(bv), bv, y_offset, int(x));
+ bv->screen()->Update(getLyXText(bv), bv, y_offset, int(x));
locked = true;
}
- }
- TEXT(bv)->refresh_y = 0;
- TEXT(bv)->status = LyXText::UNCHANGED;
+
+ getLyXText(bv)->refresh_y = 0;
+ getLyXText(bv)->status = LyXText::UNCHANGED;
if ((need_update != CURSOR_PAR) &&
- ((drawFrame == ALWAYS) || ((drawFrame == LOCKED) && locked)))
- {
- pain.rectangle(top_x + 1, baseline - insetAscent + 1,
- width(bv, f) - 1, insetAscent + insetDescent - 1,
- frame_color);
- } else if (need_update & CLEAR_FRAME) {
- pain.rectangle(top_x + 1, baseline - insetAscent + 1,
- width(bv, f) - 1, insetAscent + insetDescent - 1,
- LColor::background);
- }
- x += width(bv, f) - TEXT_TO_INSET_OFFSET;
+ ((drawFrame_ == ALWAYS) || ((drawFrame_ == LOCKED) && locked)))
+ drawFrame(pain, cleared);
+ else if (need_update & CLEAR_FRAME)
+ clearFrame(pain, cleared);
+ x += last_width /* was width(bv, f) */ - TEXT_TO_INSET_OFFSET;
if (bv->text->status==LyXText::CHANGED_IN_DRAW) {
- need_update = INIT;
+ need_update |= INIT;
} else if (need_update != INIT)
need_update = NONE;
}
+void InsetText::drawFrame(Painter & pain, bool cleared) const
+{
+ if (!frame_is_visible || cleared) {
+ pain.rectangle(top_x + 1, top_baseline - insetAscent + 1,
+ insetWidth - 1, insetAscent + insetDescent - 1,
+ frame_color);
+ frame_is_visible = true;
+ }
+}
+
+
+void InsetText::clearFrame(Painter & pain, bool cleared) const
+{
+ if (frame_is_visible) {
+ if (!cleared) {
+ pain.rectangle(top_x + 1, top_baseline - insetAscent + 1,
+ insetWidth - 1, insetAscent + insetDescent - 1,
+ LColor::background);
+ }
+ frame_is_visible = false;
+ }
+}
+
+
void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit)
{
- if (reinit) { // && (need_update != CURSOR)) {
- need_update = INIT;
+ LyXText * t = getLyXText(bv);
+
+#if 0
+ int ww = t->width;
+ t->BreakParagraph(bv);
+ if (ww != t->width)
+ reinit = true;
+#endif
+ if (reinit) {
+ need_update |= INIT;
resizeLyXText(bv);
if (owner())
owner()->update(bv, font, true);
inset_y = cy(bv) + drawTextYOffset;
the_locking_inset->update(bv, font, reinit);
}
+#if 0
if (need_update == INIT) {
resizeLyXText(bv);
- need_update = FULL;
+ need_update |= FULL;
}
- int oldw = insetWidth;
-#if 1
- insetWidth = TEXT(bv)->width + (2 * TEXT_TO_INSET_OFFSET);
- // max(textWidth(bv->painter()),
- // static_cast<int>(TEXT(bv)->width) + drawTextXOffset) +
- // (2 * TEXT_TO_INSET_OFFSET);
-#else
- insetWidth = textWidth(bv);
- if (insetWidth < 0)
- insetWidth = static_cast<int>(TEXT(bv)->width);
#endif
+ int oldw = insetWidth;
+ insetWidth = t->width + (2 * TEXT_TO_INSET_OFFSET);
if (oldw != insetWidth) {
-// printf("TW(%p): %d-%d-%d-%d\n",this,insetWidth, oldw,
-// textWidth(bv->painter()),static_cast<int>(TEXT(bv)->width));
resizeLyXText(bv);
- need_update = FULL;
- update(bv, font, reinit);
+ need_update |= FULL;
+// update(bv, font, reinit);
return;
}
- if ((need_update==CURSOR_PAR) && (TEXT(bv)->status==LyXText::UNCHANGED) &&
- the_locking_inset)
- {
- TEXT(bv)->UpdateInset(bv, the_locking_inset);
+ if ((need_update & CURSOR_PAR) && t->status == LyXText::UNCHANGED &&
+ the_locking_inset) {
+ t->updateInset(bv, the_locking_inset);
}
- if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH)
- need_update = FULL;
-
+ if (t->status == LyXText::NEED_MORE_REFRESH)
+ need_update |= FULL;
+#if 0
int y_temp = 0;
- Row * row = TEXT(bv)->GetRowNearY(y_temp);
+ Row * row = t->GetRowNearY(y_temp);
insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET;
- insetDescent = TEXT(bv)->height - row->ascent_of_text() +
- TEXT_TO_INSET_OFFSET;
+ insetDescent = t->height - row->ascent_of_text() + TEXT_TO_INSET_OFFSET;
+#endif
}
-void InsetText::SetUpdateStatus(BufferView * bv, int what)
+
+void InsetText::setUpdateStatus(BufferView * bv, int what) const
{
+ LyXText * t = getLyXText(bv);
need_update |= what;
- if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH)
+ if (t->status == LyXText::NEED_MORE_REFRESH)
need_update |= FULL;
- else if (TEXT(bv)->status == LyXText::NEED_VERY_LITTLE_REFRESH)
+ else if (t->status == LyXText::NEED_VERY_LITTLE_REFRESH)
need_update |= CURSOR_PAR;
// this to not draw a selection when we redraw all of it!
if ((need_update & (INIT|FULL)) && (need_update & CURSOR))
- TEXT(bv)->ClearSelection(bv);
+ t->clearSelection(bv);
}
-void InsetText::UpdateLocal(BufferView * bv, int what, bool mark_dirty)
+
+void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
{
- TEXT(bv)->FullRebreak(bv);
- SetUpdateStatus(bv, what);
- if ((need_update != CURSOR) || (TEXT(bv)->status != LyXText::UNCHANGED) ||
- TEXT(bv)->selection)
+ LyXText * t = getLyXText(bv);
+ t->fullRebreak(bv);
+ setUpdateStatus(bv, what);
+ if (need_update != CURSOR || t->status != LyXText::UNCHANGED ||
+ t->selection.set())
bv->updateInset(this, mark_dirty);
bv->owner()->showState();
if (old_par != cpar(bv)) {
- bv->owner()->setLayout(cpar(bv)->GetLayout());
+ bv->owner()->setLayout(cpar(bv)->getLayout());
old_par = cpar(bv);
}
}
-string const InsetText::EditMessage() const
+string const InsetText::editMessage() const
{
return _("Opened Text Inset");
}
-void InsetText::Edit(BufferView * bv, int x, int y, unsigned int button)
+void InsetText::edit(BufferView * bv, int x, int y, unsigned int button)
{
// par->SetInsetOwner(this);
- UpdatableInset::Edit(bv, x, y, button);
-
+ UpdatableInset::edit(bv, x, y, button);
+
if (!bv->lockInset(this)) {
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
return;
inset_boundary = false;
inset_par = 0;
old_par = 0;
- if (!checkAndActivateInset(bv, x, y, button))
- TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
- y+insetAscent);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
- bv->text->FinishUndo();
- ShowInsetCursor(bv);
- UpdateLocal(bv, FULL, false);
+ int tmp_y = (y < 0) ? 0 : y;
+ LyXText * t = getLyXText(bv);
+
+ if (!checkAndActivateInset(bv, x, tmp_y, button)) {
+ t->setCursorFromCoordinates(bv, x - drawTextXOffset,
+ y + insetAscent);
+ }
+
+ t->selection.cursor = t->cursor;
+ bv->text->finishUndo();
+ showInsetCursor(bv);
+ updateLocal(bv, CURSOR, false);
// If the inset is empty set the language of the current font to the
- // language to the surronding text.
-#ifndef NEW_INSETS
- if (par->Last() == 0 && !par->next_)
-#else
- if (par->size() == 0 && !par->next())
-#endif
- {
+ // language to the surronding text (if different).
+ if (par->size() == 0 && !par->next() &&
+ bv->getParentLanguage(this) != t->current_font.language()) {
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
- SetFont(bv, font, false);
+ setFont(bv, font, false);
}
}
-void InsetText::InsetUnlock(BufferView * bv)
+void InsetText::insetUnlock(BufferView * bv)
{
if (the_locking_inset) {
- the_locking_inset->InsetUnlock(bv);
+ the_locking_inset->insetUnlock(bv);
the_locking_inset = 0;
}
- HideInsetCursor(bv);
+ hideInsetCursor(bv);
no_selection = false;
locked = false;
- UpdateLocal(bv, CLEAR_FRAME|CURSOR, false);
- if (owner())
+ int code = CURSOR|CLEAR_FRAME;
+ LyXText * t = getLyXText(bv);
+ if (t->selection.set()) {
+ t->clearSelection(bv);
+ code = FULL;
+ } else if (owner()) {
bv->owner()->setLayout(owner()->getLyXText(bv)
- ->cursor.par()->GetLayout());
- else
- bv->owner()->setLayout(bv->text->cursor.par()->GetLayout());
+ ->cursor.par()->getLayout());
+ } else
+ bv->owner()->setLayout(bv->text->cursor.par()->getLayout());
+ updateLocal(bv, code, false);
}
-bool InsetText::LockInsetInInset(BufferView * bv, UpdatableInset * inset)
+bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset)
{
- lyxerr[Debug::INSETS] << "InsetText::LockInsetInInset(" << inset << "): ";
+ lyxerr[Debug::INSETS] << "InsetText::LockInsetInInset("
+ << inset << "): ";
if (!inset)
return false;
- if (inset == cpar(bv)->GetInset(cpos(bv))) {
+ if (inset == cpar(bv)->getInset(cpos(bv))) {
lyxerr[Debug::INSETS] << "OK" << endl;
the_locking_inset = inset;
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_par = cpar(bv);
inset_boundary = cboundary(bv);
#if 0
- TEXT(bv)->ClearSelection(bv);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
- TEXT(bv)->UpdateInset(bv, the_locking_inset);
+ getLyXText(bv)->clearSelection(bv);
+ getLyXText(bv)->sel_cursor = getLyXText(bv)->cursor;
+ getLyXText(bv)->UpdateInset(bv, the_locking_inset);
#else
- UpdateLocal(bv, CURSOR, false);
+ updateLocal(bv, CURSOR, false);
#endif
return true;
} else if (the_locking_inset && (the_locking_inset == inset)) {
}
} else if (the_locking_inset) {
lyxerr[Debug::INSETS] << "MAYBE" << endl;
- return the_locking_inset->LockInsetInInset(bv, inset);
+ return the_locking_inset->lockInsetInInset(bv, inset);
}
lyxerr[Debug::INSETS] << "NOT OK" << endl;
return false;
}
-bool InsetText::UnlockInsetInInset(BufferView * bv, UpdatableInset * inset,
- bool lr)
+bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset,
+ bool lr)
{
if (!the_locking_inset)
return false;
if (the_locking_inset == inset) {
- the_locking_inset->InsetUnlock(bv);
- TEXT(bv)->UpdateInset(bv, inset);
+ the_locking_inset->insetUnlock(bv);
+ getLyXText(bv)->updateInset(bv, inset);
the_locking_inset = 0;
if (lr)
moveRight(bv, false);
old_par = 0; // force layout setting
- UpdateLocal(bv, CURSOR_PAR, false);
+ if (scroll())
+ scroll(bv, 0.0F);
+ else
+ updateLocal(bv, CURSOR, false);
return true;
}
- return the_locking_inset->UnlockInsetInInset(bv, inset, lr);
+ return the_locking_inset->unlockInsetInInset(bv, inset, lr);
}
-bool InsetText::UpdateInsetInInset(BufferView * bv, Inset * inset)
+bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset)
{
if (!the_locking_inset)
return false;
if (the_locking_inset != inset) {
- TEXT(bv)->UpdateInset(bv, the_locking_inset);
- SetUpdateStatus(bv, CURSOR_PAR);
- return the_locking_inset->UpdateInsetInInset(bv, inset);
+ getLyXText(bv)->updateInset(bv, the_locking_inset);
+ setUpdateStatus(bv, CURSOR_PAR);
+ return the_locking_inset->updateInsetInInset(bv, inset);
}
-// UpdateLocal(bv, FULL, false);
- if (TEXT(bv)->UpdateInset(bv, inset))
- UpdateLocal(bv, CURSOR_PAR, false);
+// updateLocal(bv, FULL, false);
+ if (getLyXText(bv)->updateInset(bv, inset))
+ updateLocal(bv, CURSOR_PAR, false);
if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
}
-void InsetText::InsetButtonPress(BufferView * bv, int x, int y, int button)
+void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button)
{
no_selection = true;
int tmp_x = x - drawTextXOffset;
- int tmp_y = y + insetAscent - TEXT(bv)->first;
- Inset * inset = bv->checkInsetHit(TEXT(bv), tmp_x, tmp_y, button);
+ int tmp_y = y + insetAscent - getLyXText(bv)->first;
+ Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y, button);
- HideInsetCursor(bv);
+ hideInsetCursor(bv);
if (the_locking_inset) {
if (the_locking_inset == inset) {
- the_locking_inset->InsetButtonPress(bv,x-inset_x,y-inset_y,button);
+ the_locking_inset->insetButtonPress(bv,x-inset_x,y-inset_y,button);
no_selection = false;
return;
} else if (inset) {
// otherwise unlock the_locking_inset and lock the new inset
- the_locking_inset->InsetUnlock(bv);
+ the_locking_inset->insetUnlock(bv);
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
the_locking_inset = static_cast<UpdatableInset*>(inset);
- inset->InsetButtonPress(bv, x - inset_x, y - inset_y, button);
- inset->Edit(bv, x - inset_x, y - inset_y, button);
+ inset->insetButtonPress(bv, x - inset_x, y - inset_y, button);
+ inset->edit(bv, x - inset_x, y - inset_y, button);
if (the_locking_inset)
- UpdateLocal(bv, CURSOR, false);
+ updateLocal(bv, CURSOR, false);
no_selection = false;
return;
}
// otherwise only unlock the_locking_inset
- the_locking_inset->InsetUnlock(bv);
+ the_locking_inset->insetUnlock(bv);
the_locking_inset = 0;
}
if (bv->theLockingInset()) {
- if (inset && inset->Editable() == Inset::HIGHLY_EDITABLE) {
+ if (inset && inset->editable() == Inset::HIGHLY_EDITABLE) {
UpdatableInset * uinset = static_cast<UpdatableInset*>(inset);
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
inset_par = cpar(bv);
inset_boundary = cboundary(bv);
the_locking_inset = uinset;
- uinset->InsetButtonPress(bv, x - inset_x, y - inset_y, button);
- uinset->Edit(bv, x - inset_x, y - inset_y, 0);
+ uinset->insetButtonPress(bv, x - inset_x, y - inset_y,
+ button);
+ uinset->edit(bv, x - inset_x, y - inset_y, 0);
if (the_locking_inset)
- UpdateLocal(bv, CURSOR, false);
+ updateLocal(bv, CURSOR, false);
no_selection = false;
return;
}
}
- if (!inset && (button == 2)) {
+ if (!inset) { // && (button == 2)) {
bool paste_internally = false;
- if ((button == 2) && TEXT(bv)->selection) {
- LocalDispatch(bv, LFUN_COPY, "");
+ if ((button == 2) && getLyXText(bv)->selection.set()) {
+ localDispatch(bv, LFUN_COPY, "");
paste_internally = true;
}
- TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
- y + insetAscent);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
- UpdateLocal(bv, CURSOR, false);
- bv->owner()->setLayout(cpar(bv)->GetLayout());
+ getLyXText(bv)->setCursorFromCoordinates(bv, x-drawTextXOffset,
+ y + insetAscent);
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
+ updateLocal(bv, CURSOR, false);
+ bv->owner()->setLayout(cpar(bv)->getLayout());
old_par = cpar(bv);
// Insert primary selection with middle mouse
// if there is a local selection in the current buffer,
// insert this
if (button == 2) {
if (paste_internally)
- LocalDispatch(bv, LFUN_PASTE, "");
+ localDispatch(bv, LFUN_PASTE, "");
else
- LocalDispatch(bv, LFUN_PASTESELECTION, "paragraph");
+ localDispatch(bv, LFUN_PASTESELECTION,
+ "paragraph");
}
}
- ShowInsetCursor(bv);
+ showInsetCursor(bv);
no_selection = false;
}
-void InsetText::InsetButtonRelease(BufferView * bv, int x, int y, int button)
+void InsetText::insetButtonRelease(BufferView * bv, int x, int y, int button)
{
UpdatableInset * inset = 0;
if (the_locking_inset) {
- the_locking_inset->InsetButtonRelease(bv,
- x - inset_x, y - inset_y,
- button);
+ the_locking_inset->insetButtonRelease(bv,
+ x - inset_x, y - inset_y,
+ button);
} else {
- if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) {
- inset = static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
- if (inset->Editable() == Inset::HIGHLY_EDITABLE) {
- inset->InsetButtonRelease(bv, x - inset_x, y - inset_y,button);
+ if (cpar(bv)->getChar(cpos(bv)) == Paragraph::META_INSET) {
+ inset = static_cast<UpdatableInset*>(cpar(bv)->getInset(cpos(bv)));
+ if (inset->editable() == Inset::HIGHLY_EDITABLE) {
+ inset->insetButtonRelease(bv,
+ x - inset_x,
+ y - inset_y, button);
} else {
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
- inset->InsetButtonRelease(bv, x - inset_x, y - inset_y,button);
- inset->Edit(bv, x - inset_x, y - inset_y, button);
+ inset->insetButtonRelease(bv,
+ x - inset_x,
+ y - inset_y, button);
+ inset->edit(bv,
+ x - inset_x, y - inset_y, button);
}
- UpdateLocal(bv, CURSOR_PAR, false);
+ updateLocal(bv, CURSOR_PAR, false);
}
}
no_selection = false;
}
-void InsetText::InsetMotionNotify(BufferView * bv, int x, int y, int state)
+void InsetText::insetMotionNotify(BufferView * bv, int x, int y, int state)
{
if (no_selection)
return;
if (the_locking_inset) {
- the_locking_inset->InsetMotionNotify(bv, x - inset_x,
- y - inset_y,state);
+ the_locking_inset->insetMotionNotify(bv, x - inset_x,
+ y - inset_y,state);
return;
}
- HideInsetCursor(bv);
- TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
- y+insetAscent);
- TEXT(bv)->SetSelection(bv);
- if (TEXT(bv)->toggle_cursor.par()!=TEXT(bv)->toggle_end_cursor.par() ||
- TEXT(bv)->toggle_cursor.pos()!=TEXT(bv)->toggle_end_cursor.pos())
- UpdateLocal(bv, SELECTION, false);
- ShowInsetCursor(bv);
+ LyXText * t = getLyXText(bv);
+ hideInsetCursor(bv);
+ t->setCursorFromCoordinates(bv, x - drawTextXOffset, y + insetAscent);
+ t->setSelection(bv);
+ if (t->toggle_cursor.par() != t->toggle_end_cursor.par() ||
+ t->toggle_cursor.pos() != t->toggle_end_cursor.pos())
+ updateLocal(bv, SELECTION, false);
+ showInsetCursor(bv);
}
-void InsetText::InsetKeyPress(XKeyEvent * xke)
+void InsetText::insetKeyPress(XKeyEvent * xke)
{
if (the_locking_inset) {
- the_locking_inset->InsetKeyPress(xke);
+ the_locking_inset->insetKeyPress(xke);
return;
}
}
UpdatableInset::RESULT
-InsetText::LocalDispatch(BufferView * bv,
- kb_action action, string const & arg)
+InsetText::localDispatch(BufferView * bv,
+ kb_action action, string const & arg)
{
no_selection = false;
UpdatableInset::RESULT
- result= UpdatableInset::LocalDispatch(bv, action, arg);
+ result= UpdatableInset::localDispatch(bv, action, arg);
if (result != UNDISPATCHED) {
return DISPATCHED;
}
- result=DISPATCHED;
+ result = DISPATCHED;
if ((action < 0) && arg.empty())
return FINISHED;
if (the_locking_inset) {
- result = the_locking_inset->LocalDispatch(bv, action, arg);
+ result = the_locking_inset->localDispatch(bv, action, arg);
if (result == DISPATCHED_NOUPDATE)
return result;
else if (result == DISPATCHED) {
- UpdateLocal(bv, CURSOR_PAR, false);
+ updateLocal(bv, CURSOR_PAR, false);
return result;
} else if (result == FINISHED) {
bool dispatched = false;
moveRightIntern(bv, false, false);
break;
case LFUN_RIGHT:
- if (!TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+ if (!getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
moveRightIntern(bv, false, false);
dispatched = true;
break;
case LFUN_LEFT:
- if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+ if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
moveRightIntern(bv, false, false);
dispatched = true;
break;
return DISPATCHED;
}
}
- HideInsetCursor(bv);
+ hideInsetCursor(bv);
switch (action) {
// Normal chars
- case LFUN_UNKNOWN_ACTION:
+ case LFUN_SELFINSERT:
if (bv->buffer()->isReadonly()) {
// setErrorMessage(N_("Document is read only"));
break;
* "auto_region_delete", which defaults to
* true (on). */
- bv->text->SetUndo(bv->buffer(), Undo::INSERT,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
+ bv->text->setUndo(bv->buffer(), Undo::INSERT,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
bv->setState();
if (lyxrc.auto_region_delete) {
- if (TEXT(bv)->selection){
- TEXT(bv)->CutSelection(bv, false);
+ if (getLyXText(bv)->selection.set()) {
+ getLyXText(bv)->cutSelection(bv, false);
}
}
- TEXT(bv)->ClearSelection(bv);
+ getLyXText(bv)->clearSelection(bv);
for (string::size_type i = 0; i < arg.length(); ++i) {
if (greek_kb_flag) {
if (!math_insert_greek(bv, arg[i])) {
- bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], TEXT(bv));
+ bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], getLyXText(bv));
} else if (!the_locking_inset) {
(void)moveRight(bv, false);
}
} else {
- bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], TEXT(bv));
+ bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], getLyXText(bv));
}
}
}
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
- UpdateLocal(bv, CURSOR_PAR, true);
- result=DISPATCHED_NOUPDATE;
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
+ updateLocal(bv, CURSOR_PAR, true);
+ result = DISPATCHED_NOUPDATE;
break;
- // --- Cursor Movements ---------------------------------------------
+ // --- Cursor Movements -----------------------------------
case LFUN_RIGHTSEL:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
moveRight(bv, false, true);
- TEXT(bv)->SetSelection(bv);
- UpdateLocal(bv, SELECTION, false);
+ getLyXText(bv)->setSelection(bv);
+ updateLocal(bv, SELECTION, false);
break;
case LFUN_RIGHT:
result = moveRight(bv);
- bv->text->FinishUndo();
- UpdateLocal(bv, CURSOR, false);
+ bv->text->finishUndo();
+ updateLocal(bv, CURSOR, false);
break;
case LFUN_LEFTSEL:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
moveLeft(bv, false, true);
- TEXT(bv)->SetSelection(bv);
- UpdateLocal(bv, SELECTION, false);
+ getLyXText(bv)->setSelection(bv);
+ updateLocal(bv, SELECTION, false);
break;
case LFUN_LEFT:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
result = moveLeft(bv);
- UpdateLocal(bv, CURSOR, false);
+ updateLocal(bv, CURSOR, false);
break;
case LFUN_DOWNSEL:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
moveDown(bv);
- TEXT(bv)->SetSelection(bv);
- UpdateLocal(bv, SELECTION, false);
+ getLyXText(bv)->setSelection(bv);
+ updateLocal(bv, SELECTION, false);
break;
case LFUN_DOWN:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
result = moveDown(bv);
- UpdateLocal(bv, CURSOR, false);
+ updateLocal(bv, CURSOR, false);
break;
case LFUN_UPSEL:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
moveUp(bv);
- TEXT(bv)->SetSelection(bv);
- UpdateLocal(bv, SELECTION, false);
+ getLyXText(bv)->setSelection(bv);
+ updateLocal(bv, SELECTION, false);
break;
case LFUN_UP:
- bv->text->FinishUndo();
+ bv->text->finishUndo();
result = moveUp(bv);
- UpdateLocal(bv, CURSOR, false);
+ updateLocal(bv, CURSOR, false);
break;
case LFUN_HOME:
- bv->text->FinishUndo();
- TEXT(bv)->CursorHome(bv);
- UpdateLocal(bv, CURSOR, false);
+ bv->text->finishUndo();
+ getLyXText(bv)->cursorHome(bv);
+ updateLocal(bv, CURSOR, false);
break;
case LFUN_END:
- TEXT(bv)->CursorEnd(bv);
- UpdateLocal(bv, CURSOR, false);
- break;
- case LFUN_BACKSPACE:
- bv->text->SetUndo(bv->buffer(), Undo::DELETE,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
- if (TEXT(bv)->selection)
- TEXT(bv)->CutSelection(bv);
- else
- TEXT(bv)->Backspace(bv);
- UpdateLocal(bv, CURSOR_PAR, true);
+ getLyXText(bv)->cursorEnd(bv);
+ updateLocal(bv, CURSOR, false);
break;
+ case LFUN_BACKSPACE: {
+ bv->text->setUndo(bv->buffer(), Undo::DELETE,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
+ LyXText * t = getLyXText(bv);
+
+ if (t->selection.set()) {
+ t->cutSelection(bv);
+ } else {
+ t->backspace(bv);
+ }
+
+ updateLocal(bv, CURSOR_PAR, true);
+ }
+ break;
+
case LFUN_DELETE:
- bv->text->SetUndo(bv->buffer(), Undo::DELETE,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
- if (TEXT(bv)->selection)
- TEXT(bv)->CutSelection(bv);
- else
- TEXT(bv)->Delete(bv);
- UpdateLocal(bv, CURSOR_PAR, true);
- break;
+ {
+ bv->text->setUndo(bv->buffer(), Undo::DELETE,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
+ LyXText * t = getLyXText(bv);
+
+ if (t->selection.set()) {
+ t->cutSelection(bv);
+ } else {
+ t->Delete(bv);
+ }
+ updateLocal(bv, CURSOR_PAR, true);
+ }
+ break;
+
case LFUN_CUT:
- bv->text->SetUndo(bv->buffer(), Undo::DELETE,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
- TEXT(bv)->CutSelection(bv);
- UpdateLocal(bv, CURSOR_PAR, true);
+ bv->text->setUndo(bv->buffer(), Undo::DELETE,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
+ getLyXText(bv)->cutSelection(bv);
+ updateLocal(bv, CURSOR_PAR, true);
break;
case LFUN_COPY:
- bv->text->FinishUndo();
- TEXT(bv)->CopySelection(bv);
- UpdateLocal(bv, CURSOR_PAR, false);
+ bv->text->finishUndo();
+ getLyXText(bv)->copySelection(bv);
+ updateLocal(bv, CURSOR_PAR, false);
break;
case LFUN_PASTESELECTION:
{
- string clip(bv->workarea()->getClipboard());
+ string const clip(bv->getClipboard());
if (clip.empty())
break;
if (arg == "paragraph") {
- TEXT(bv)->InsertStringB(bv, clip);
+ getLyXText(bv)->insertStringAsParagraphs(bv, clip);
} else {
- TEXT(bv)->InsertStringA(bv, clip);
+ getLyXText(bv)->insertStringAsLines(bv, clip);
}
- UpdateLocal(bv, CURSOR_PAR, true);
+ updateLocal(bv, CURSOR_PAR, true);
break;
}
case LFUN_PASTE:
break;
}
}
- bv->text->SetUndo(bv->buffer(), Undo::INSERT,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
- TEXT(bv)->PasteSelection(bv);
- UpdateLocal(bv, CURSOR_PAR, true);
+ bv->text->setUndo(bv->buffer(), Undo::INSERT,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
+ getLyXText(bv)->pasteSelection(bv);
+ updateLocal(bv, CURSOR_PAR, true);
break;
case LFUN_BREAKPARAGRAPH:
if (!autoBreakRows)
return DISPATCHED;
- TEXT(bv)->BreakParagraph(bv, 0);
- UpdateLocal(bv, FULL, true);
+ getLyXText(bv)->breakParagraph(bv, 0);
+ updateLocal(bv, FULL, true);
break;
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
if (!autoBreakRows)
return DISPATCHED;
- TEXT(bv)->BreakParagraph(bv, 1);
- UpdateLocal(bv, FULL, true);
+ getLyXText(bv)->breakParagraph(bv, 1);
+ updateLocal(bv, FULL, true);
break;
case LFUN_BREAKLINE:
if (!autoBreakRows)
return DISPATCHED;
- bv->text->SetUndo(bv->buffer(), Undo::INSERT,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
- TEXT(bv)->InsertChar(bv, LyXParagraph::META_NEWLINE);
- UpdateLocal(bv, CURSOR_PAR, true);
+ bv->text->setUndo(bv->buffer(), Undo::INSERT,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
+ getLyXText(bv)->insertChar(bv, Paragraph::META_NEWLINE);
+ updateLocal(bv, CURSOR_PAR, true);
break;
case LFUN_LAYOUT:
// do not set layouts on non breakable textinsets
// see if we found the layout number:
if (!layout.first) {
- string msg = string(N_("Layout ")) + arg + N_(" not known");
-
- bv->owner()->getMiniBuffer()->Set(msg);
+ string const msg = string(N_("Layout ")) + arg + N_(" not known");
+ bv->owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE, msg);
break;
}
if (cur_layout != layout.second) {
cur_layout = layout.second;
- TEXT(bv)->SetLayout(bv, layout.second);
- bv->owner()->setLayout(cpar(bv)->GetLayout());
- UpdateLocal(bv, CURSOR_PAR, true);
+ getLyXText(bv)->setLayout(bv, layout.second);
+ bv->owner()->setLayout(cpar(bv)->getLayout());
+ updateLocal(bv, CURSOR_PAR, true);
}
} else {
// reset the layout box
- bv->owner()->setLayout(cpar(bv)->GetLayout());
+ bv->owner()->setLayout(cpar(bv)->getLayout());
}
break;
case LFUN_PARAGRAPH_SPACING:
// it also seems to me that the paragraphs inside the insettext
// inherit bufferparams/paragraphparams in a strange way. (Lgb)
{
- LyXParagraph * par = TEXT(bv)->cursor.par();
- Spacing::Space cur_spacing = par->params.spacing().getSpace();
+ Paragraph * par = getLyXText(bv)->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();
}
std::istringstream istr(arg.c_str());
<< arg << endl;
}
if (cur_spacing != new_spacing || cur_value != new_value) {
- par->params.spacing(Spacing(new_spacing, new_value));
- //TEXT(bv)->RedoParagraph(owner->view());
- UpdateLocal(bv, CURSOR_PAR, true);
+ par->params().spacing(Spacing(new_spacing, new_value));
+ //getLyXText(bv)->RedoParagraph(owner->view());
+ updateLocal(bv, CURSOR_PAR, true);
//bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
}
}
/// If the action has deleted all text in the inset, we need to change the
// language to the language to the surronding text.
-#ifndef NEW_INSETS
- if (par->Last() == 0 && !par->next_)
-#else
- if (par->size() == 0 && !par->next())
-#endif
- {
+ if (par->size() == 0 && !par->next()) {
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
- SetFont(bv, font, false);
+ setFont(bv, font, false);
}
if (result != FINISHED) {
- ShowInsetCursor(bv);
+ showInsetCursor(bv);
} else
bv->unlockInset(this);
return result;
}
-int InsetText::Latex(Buffer const * buf, ostream & os, bool, bool) const
+int InsetText::latex(Buffer const * buf, ostream & os, bool, bool) const
{
TexRow texrow;
buf->latexParagraphs(os, par, 0, texrow);
}
-int InsetText::Ascii(Buffer const * buf, ostream & os, int linelen) const
+int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const
{
- LyXParagraph * p = par;
+ Paragraph * p = par;
unsigned int lines = 0;
- string tmp;
while (p) {
- tmp = buf->asciiParagraph(p, linelen);
+ string const tmp = buf->asciiParagraph(p, linelen);
lines += countChar(tmp, '\n');
os << tmp;
-#ifndef NEW_INSETS
p = p->next();
-#else
- p = p->next();
-#endif
}
return lines;
}
-int InsetText::DocBook(Buffer const * buf, ostream & os) const
+int InsetText::docBook(Buffer const * buf, ostream & os) const
{
- LyXParagraph * p = par;
+ Paragraph * p = par;
unsigned int lines = 0;
- int desc=0;
+ int desc = 0;
string tmp;
while (p) {
- buf->SimpleDocBookOnePar(os,tmp,p,desc,0);
-#ifndef NEW_INSETS
- p = p->next_;
-#else
+ buf->simpleDocBookOnePar(os, tmp, p, desc, 0);
p = p->next();
-#endif
}
return lines;
}
-void InsetText::Validate(LaTeXFeatures & features) const
+void InsetText::validate(LaTeXFeatures & features) const
{
- LyXParagraph * p = par;
- while(p) {
+ Paragraph * p = par;
+ while (p) {
p->validate(features);
-#ifndef NEW_INSETS
- p = p->next_;
-#else
p = p->next();
-#endif
}
}
-int InsetText::BeginningOfMainBody(Buffer const * buf, LyXParagraph * p) const
+int InsetText::beginningOfMainBody(Buffer const * buf, Paragraph * p) const
{
if (textclasslist.Style(buf->params.textclass,
- p->GetLayout()).labeltype != LABEL_MANUAL)
+ p->getLayout()).labeltype != LABEL_MANUAL)
return 0;
else
- return p->BeginningOfMainBody();
+ return p->beginningOfMainBody();
}
-void InsetText::GetCursorPos(BufferView * bv,
- int & x, int & y) const
+void InsetText::getCursorPos(BufferView * bv,
+ int & x, int & y) const
{
x = cx(bv);
y = cy(bv);
}
-unsigned int InsetText::InsetInInsetY()
+unsigned int InsetText::insetInInsetY()
{
if (!the_locking_inset)
return 0;
- return (inset_y + the_locking_inset->InsetInInsetY());
+ return (inset_y + the_locking_inset->insetInInsetY());
}
-void InsetText::ToggleInsetCursor(BufferView * bv)
+void InsetText::toggleInsetCursor(BufferView * bv)
{
if (the_locking_inset) {
- the_locking_inset->ToggleInsetCursor(bv);
+ the_locking_inset->toggleInsetCursor(bv);
return;
}
- LyXFont const font(TEXT(bv)->GetFont(bv->buffer(), cpar(bv), cpos(bv)));
+ LyXFont const font(getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv)));
int const asc = lyxfont::maxAscent(font);
int const desc = lyxfont::maxDescent(font);
}
-void InsetText::ShowInsetCursor(BufferView * bv, bool show)
+void InsetText::showInsetCursor(BufferView * bv, bool show)
{
if (the_locking_inset) {
- the_locking_inset->ShowInsetCursor(bv);
+ the_locking_inset->showInsetCursor(bv);
return;
}
if (!isCursorVisible()) {
LyXFont const font =
- TEXT(bv)->GetFont(bv->buffer(), cpar(bv), cpos(bv));
+ getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
int const asc = lyxfont::maxAscent(font);
int const desc = lyxfont::maxDescent(font);
}
-void InsetText::HideInsetCursor(BufferView * bv)
+void InsetText::hideInsetCursor(BufferView * bv)
{
if (isCursorVisible()) {
bv->hideLockedInsetCursor();
setCursorVisible(false);
}
if (the_locking_inset)
- the_locking_inset->HideInsetCursor(bv);
+ the_locking_inset->hideInsetCursor(bv);
}
UpdatableInset::RESULT
InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
{
- if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+ if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
return moveLeftIntern(bv, false, activate_inset, selecting);
else
return moveRightIntern(bv, false, activate_inset, selecting);
}
+
UpdatableInset::RESULT
InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
{
- if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+ if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
return moveRightIntern(bv, true, activate_inset, selecting);
else
return moveLeftIntern(bv, true, activate_inset, selecting);
UpdatableInset::RESULT
InsetText::moveRightIntern(BufferView * bv, bool behind,
- bool activate_inset, bool selecting)
+ bool activate_inset, bool selecting)
{
-#ifndef NEW_INSETS
- if (!cpar(bv)->next_ && (cpos(bv) >= cpar(bv)->Last()))
-#else
if (!cpar(bv)->next() && (cpos(bv) >= cpar(bv)->size()))
-#endif
return FINISHED;
if (activate_inset && checkAndActivateInset(bv, behind))
return DISPATCHED;
- TEXT(bv)->CursorRight(bv);
+ getLyXText(bv)->cursorRight(bv);
if (!selecting)
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
return DISPATCHED_NOUPDATE;
}
UpdatableInset::RESULT
InsetText::moveLeftIntern(BufferView * bv, bool behind,
- bool activate_inset, bool selecting)
+ bool activate_inset, bool selecting)
{
-#ifndef NEW_INSETS
- if (!cpar(bv)->previous_ && (cpos(bv) <= 0))
-#else
if (!cpar(bv)->previous() && (cpos(bv) <= 0))
-#endif
return FINISHED;
- TEXT(bv)->CursorLeft(bv);
+ getLyXText(bv)->cursorLeft(bv);
if (!selecting)
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
if (activate_inset && checkAndActivateInset(bv, behind))
return DISPATCHED;
return DISPATCHED_NOUPDATE;
{
if (!crow(bv)->previous())
return FINISHED;
- TEXT(bv)->CursorUp(bv);
+ getLyXText(bv)->cursorUp(bv);
return DISPATCHED_NOUPDATE;
}
{
if (!crow(bv)->next())
return FINISHED;
- TEXT(bv)->CursorDown(bv);
+ getLyXText(bv)->cursorDown(bv);
return DISPATCHED_NOUPDATE;
}
-bool InsetText::InsertInset(BufferView * bv, Inset * inset)
+bool InsetText::insertInset(BufferView * bv, Inset * inset)
{
if (the_locking_inset) {
- if (the_locking_inset->InsertInsetAllowed(inset))
- return the_locking_inset->InsertInset(bv, inset);
+ if (the_locking_inset->insertInsetAllowed(inset))
+ return the_locking_inset->insertInset(bv, inset);
return false;
}
- bv->text->SetUndo(bv->buffer(), Undo::INSERT,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
+ bv->text->setUndo(bv->buffer(), Undo::INSERT,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
inset->setOwner(this);
- HideInsetCursor(bv);
- TEXT(bv)->InsertInset(bv, inset);
+ hideInsetCursor(bv);
+ getLyXText(bv)->insertInset(bv, inset);
#if 0
- if ((cpar(bv)->GetChar(cpos(bv)) != LyXParagraph::META_INSET) ||
+ if ((cpar(bv)->GetChar(cpos(bv)) != Paragraph::META_INSET) ||
(cpar(bv)->GetInset(cpos(bv)) != inset))
- TEXT(bv)->CursorLeft(bv);
+ getLyXText(bv)->CursorLeft(bv);
#endif
- bv->fitCursor(TEXT(bv));
- UpdateLocal(bv, CURSOR_PAR|CURSOR, true);
- ShowInsetCursor(bv);
+ bv->fitCursor(getLyXText(bv));
+ updateLocal(bv, CURSOR_PAR|CURSOR, true);
+ showInsetCursor(bv);
return true;
}
-UpdatableInset * InsetText::GetLockingInset()
+UpdatableInset * InsetText::getLockingInset()
{
- return the_locking_inset ? the_locking_inset->GetLockingInset() : this;
+ return the_locking_inset ? the_locking_inset->getLockingInset() : this;
}
-UpdatableInset * InsetText::GetFirstLockingInsetOfType(Inset::Code c)
+UpdatableInset * InsetText::getFirstLockingInsetOfType(Inset::Code c)
{
- if (c == LyxCode())
+ if (c == lyxCode())
return this;
if (the_locking_inset)
- return the_locking_inset->GetFirstLockingInsetOfType(c);
+ return the_locking_inset->getFirstLockingInsetOfType(c);
return 0;
}
-bool InsetText::ShowInsetDialog(BufferView * bv) const
+bool InsetText::showInsetDialog(BufferView * bv) const
{
if (the_locking_inset)
- return the_locking_inset->ShowInsetDialog(bv);
+ return the_locking_inset->showInsetDialog(bv);
return false;
}
{
std::vector<string> label_list;
- LyXParagraph * tpar = par;
+ Paragraph * tpar = par;
while (tpar) {
- LyXParagraph::inset_iterator beg = tpar->inset_iterator_begin();
- LyXParagraph::inset_iterator end = tpar->inset_iterator_end();
+ Paragraph::inset_iterator beg = tpar->inset_iterator_begin();
+ Paragraph::inset_iterator end = tpar->inset_iterator_end();
for (; beg != end; ++beg) {
std::vector<string> const l = (*beg)->getLabelList();
label_list.insert(label_list.end(), l.begin(), l.end());
}
-void InsetText::SetFont(BufferView * bv, LyXFont const & font, bool toggleall)
+void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall,
+ bool selectall)
{
- if (TEXT(bv)->selection) {
- bv->text->SetUndo(bv->buffer(), Undo::EDIT,
-#ifndef NEW_INSETS
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous_,
- bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next_
-#else
- bv->text->cursor.par()->previous(),
- bv->text->cursor.par()->next()
-#endif
- );
+ if (the_locking_inset) {
+ the_locking_inset->setFont(bv, font, toggleall, selectall);
+ return;
}
- TEXT(bv)->SetFont(bv, font, toggleall);
- bv->fitCursor(TEXT(bv));
- UpdateLocal(bv, CURSOR_PAR, true);
+ if (getLyXText(bv)->selection.set()) {
+ bv->text->setUndo(bv->buffer(), Undo::EDIT,
+ bv->text->cursor.par()->previous(),
+ bv->text->cursor.par()->next());
+ }
+ if (selectall)
+ selectAll(bv);
+ getLyXText(bv)->setFont(bv, font, toggleall);
+ if (selectall)
+ getLyXText(bv)->clearSelection(bv);
+ bv->fitCursor(getLyXText(bv));
+ if (selectall || getLyXText(bv)->selection.set())
+ updateLocal(bv, FULL, true);
+ else
+ updateLocal(bv, CURSOR_PAR, true);
}
bool InsetText::checkAndActivateInset(BufferView * bv, bool behind)
{
- if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) {
+ if (cpar(bv)->getChar(cpos(bv)) == Paragraph::META_INSET) {
unsigned int x;
unsigned int y;
Inset * inset =
- static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
- if (!inset || inset->Editable() != Inset::HIGHLY_EDITABLE)
+ static_cast<UpdatableInset*>(cpar(bv)->getInset(cpos(bv)));
+ if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE)
return false;
LyXFont const font =
- TEXT(bv)->GetFont(bv->buffer(), cpar(bv), cpos(bv));
+ getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
if (behind) {
x = inset->width(bv, font);
y = font.isRightToLeft() ? 0 : inset->descent(bv, font);
}
//inset_x = cx(bv) - top_x + drawTextXOffset;
//inset_y = cy(bv) + drawTextYOffset;
- inset->Edit(bv, x, y, 0);
+ inset->edit(bv, x, y, 0);
if (!the_locking_inset)
return false;
- UpdateLocal(bv, CURSOR_PAR, false);
+ updateLocal(bv, CURSOR, false);
return true;
}
return false;
bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
- int button)
+ int button)
{
- int dummyx, dummyy;
-
- dummyx = x = x - drawTextXOffset;
- dummyy = y + insetAscent;
- Inset * inset = bv->checkInsetHit(TEXT(bv), dummyx, dummyy, button);
+ x -= drawTextXOffset;
+ int dummyx = x;
+ int dummyy = y + insetAscent;
+ Inset * inset = bv->checkInsetHit(getLyXText(bv), dummyx, dummyy, button);
if (inset) {
if (x < 0)
y = insetDescent;
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
- inset->Edit(bv, x - inset_x, y - inset_y, button);
+ inset->edit(bv, x - inset_x, y - inset_y, button);
if (!the_locking_inset)
return false;
- UpdateLocal(bv, CURSOR_PAR, false);
+ updateLocal(bv, CURSOR, false);
return true;
}
return false;
}
-void InsetText::SetParagraphData(LyXParagraph * p)
+void InsetText::setParagraphData(Paragraph * p)
{
// delete all instances of LyXText before deleting the paragraps used
// by it.
+ cached_bview = 0;
for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
delete (*cit).second;
(*cit).second = 0;
}
-#ifndef NEW_INSETS
- LyXParagraph * np;
- if (par) {
- np = par->next_;
- delete par;
- while (np) {
- par = np;
- np = np->next_;
- delete par;
- }
- }
- par = p->Clone();
- par->SetInsetOwner(this);
- np = par;
- while (p->next_) {
- p = p->next_;
- np->next(p->Clone());
- np->next_->previous(np);
- np = np->next_;
- np->SetInsetOwner(this);
- }
-#else
- LyXParagraph * np;
- if (par) {
- np = par->next();
+ while (par) {
+ Paragraph * tmp = par->next();
delete par;
- while(np) {
- par = np;
- np = np->next();
- delete par;
- }
+ par = tmp;
}
- par = p->Clone();
- par->SetInsetOwner(this);
- np = par;
- while(p->next()) {
+
+ par = new Paragraph(*p);
+ par->setInsetOwner(this);
+ Paragraph * np = par;
+ while (p->next()) {
p = p->next();
- np->next(p->Clone());
+ np->next(new Paragraph(*p));
np->next()->previous(np);
np = np->next();
- np->SetInsetOwner(this);
+ np->setInsetOwner(this);
}
-#endif
+
need_update = INIT;
}
-void InsetText::SetText(string const & data)
+void InsetText::setText(string const & data)
{
clear();
LyXFont font(LyXFont::ALL_SANE);
- for(unsigned int i=0; i < data.length(); ++i)
- par->InsertChar(i, data[i], font);
+ for (unsigned int i=0; i < data.length(); ++i)
+ par->insertChar(i, data[i], font);
}
-void InsetText::SetAutoBreakRows(bool flag)
+void InsetText::setAutoBreakRows(bool flag)
{
if (flag != autoBreakRows) {
autoBreakRows = flag;
}
-void InsetText::SetDrawFrame(BufferView * bv, DrawFrame how)
+void InsetText::setDrawFrame(BufferView * bv, DrawFrame how)
{
- if (how != drawFrame) {
- drawFrame = how;
+ if (how != drawFrame_) {
+ drawFrame_ = how;
if (bv)
- UpdateLocal(bv, DRAW_FRAME, false);
+ updateLocal(bv, DRAW_FRAME, false);
}
}
-void InsetText::SetFrameColor(BufferView * bv, LColor::color col)
+void InsetText::setFrameColor(BufferView * bv, LColor::color col)
{
if (frame_color != col) {
frame_color = col;
if (bv)
- UpdateLocal(bv, DRAW_FRAME, false);
+ updateLocal(bv, DRAW_FRAME, false);
}
}
int InsetText::cx(BufferView * bv) const
{
- LyXText * text = TEXT(bv);
+ LyXText * text = getLyXText(bv);
int x = text->cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
if (the_locking_inset) {
- LyXFont font = text->GetFont(bv->buffer(),
- text->cursor.par(), text->cursor.pos());
+ LyXFont font = text->getFont(bv->buffer(),
+ text->cursor.par(),
+ text->cursor.pos());
if (font.isVisibleRightToLeft())
x -= the_locking_inset->width(bv, font);
}
int InsetText::cy(BufferView * bv) const
{
LyXFont font;
- return TEXT(bv)->cursor.y() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
+ return getLyXText(bv)->cursor.y() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
}
-LyXParagraph::size_type InsetText::cpos(BufferView * bv) const
+Paragraph::size_type InsetText::cpos(BufferView * bv) const
{
- return TEXT(bv)->cursor.pos();
+ return getLyXText(bv)->cursor.pos();
}
-LyXParagraph * InsetText::cpar(BufferView * bv) const
+Paragraph * InsetText::cpar(BufferView * bv) const
{
- return TEXT(bv)->cursor.par();
+ return getLyXText(bv)->cursor.par();
}
+
bool InsetText::cboundary(BufferView * bv) const
{
- return TEXT(bv)->cursor.boundary();
+ return getLyXText(bv)->cursor.boundary();
}
Row * InsetText::crow(BufferView * bv) const
{
- return TEXT(bv)->cursor.row();
+ return getLyXText(bv)->cursor.row();
}
-LyXText * InsetText::getLyXText(BufferView const * lbv, bool const recursive) const
+LyXText * InsetText::getLyXText(BufferView const * lbv,
+ bool const recursive) const
{
+ if (!recursive && (cached_bview == lbv))
+ return cached_text;
+
// Super UGLY! (Lgb)
BufferView * bv = const_cast<BufferView *>(lbv);
- if ((cache.find(bv) != cache.end()) && cache[bv]) {
- if (recursive && the_locking_inset)
+ cached_bview = bv;
+ Cache::iterator it = cache.find(bv);
+
+ if (it != cache.end()) {
+ lyx::Assert(it->second);
+
+ cached_text = it->second;
+ if (recursive && the_locking_inset) {
return the_locking_inset->getLyXText(bv);
- return cache[bv];
+ }
+ return cached_text;
}
- LyXText * lt = new LyXText(const_cast<InsetText *>(this));
- lt->init(bv);
- cache[bv] = lt;
+ cached_text = new LyXText(const_cast<InsetText *>(this));
+ cached_text->init(bv);
+
+ cache.insert(make_pair(bv, cached_text));
+
if (the_locking_inset) {
- lt->SetCursor(bv, inset_par, inset_pos, true, inset_boundary);
- if (recursive)
+ cached_text->setCursor(bv, inset_par, inset_pos,
+ true, inset_boundary);
+ if (recursive) {
return the_locking_inset->getLyXText(bv);
+ }
}
- return lt;
+ return cached_text;
}
void InsetText::deleteLyXText(BufferView * bv, bool recursive) const
{
- if ((cache.find(bv) == cache.end()) || !cache[bv])
+ cached_bview = 0;
+
+ Cache::iterator it = cache.find(bv);
+
+ if (it == cache.end()) {
return;
- delete cache[bv];
+ }
+
+ lyx::Assert(it->second);
+
+ delete it->second;
cache.erase(bv);
if (recursive) {
/// then remove all LyXText in text-insets
- LyXParagraph * p = par;
-#ifndef NEW_INSETS
- for (; p; p = p->next_) {
- p->deleteInsetsLyXText(bv);
- }
-#else
+ Paragraph * p = par;
for (; p; p = p->next()) {
p->deleteInsetsLyXText(bv);
}
-#endif
}
}
-void InsetText::resizeLyXText(BufferView * bv) const
+void InsetText::resizeLyXText(BufferView * bv, bool force) const
{
-#ifndef NEW_INSETS
- if (!par->next_ && !par->size()) // resize not neccessary!
-#else
- if (!par->next() && !par->size()) // resize not neccessary!
-#endif
+ if (!par->next() && !par->size()) // no data, resize not neccessary!
return;
- if ((cache.find(bv) == cache.end()) || !cache[bv])
+ // one endless line, resize normally not necessary
+ if (!force && getMaxWidth(bv, this) < 0)
return;
- LyXParagraph * lpar = 0;
- LyXParagraph * selstartpar = 0;
- LyXParagraph * selendpar = 0;
- LyXParagraph::size_type pos = 0;
- LyXParagraph::size_type selstartpos = 0;
- LyXParagraph::size_type selendpos = 0;
+ Cache::iterator it = cache.find(bv);
+ if (it == cache.end()) {
+ return;
+ }
+ lyx::Assert(it->second);
+
+ Paragraph * lpar = 0;
+ Paragraph * selstartpar = 0;
+ Paragraph * selendpar = 0;
+ Paragraph::size_type pos = 0;
+ Paragraph::size_type selstartpos = 0;
+ Paragraph::size_type selendpos = 0;
bool boundary = false;
bool selstartboundary = false;
bool selendboundary = false;
- int selection = 0;
- int mark_set = 0;
+ bool selection = false;
+ bool mark_set = false;
// ProhibitInput(bv);
if (locked) {
- lpar = TEXT(bv)->cursor.par();
- pos = TEXT(bv)->cursor.pos();
- boundary = TEXT(bv)->cursor.boundary();
- selstartpar = TEXT(bv)->sel_start_cursor.par();
- selstartpos = TEXT(bv)->sel_start_cursor.pos();
- selstartboundary = TEXT(bv)->sel_start_cursor.boundary();
- selendpar = TEXT(bv)->sel_end_cursor.par();
- selendpos = TEXT(bv)->sel_end_cursor.pos();
- selendboundary = TEXT(bv)->sel_end_cursor.boundary();
- selection = TEXT(bv)->selection;
- mark_set = TEXT(bv)->mark_set;
- }
- deleteLyXText(bv, (the_locking_inset == 0));
+ LyXText * t = getLyXText(bv);
+ lpar = t->cursor.par();
+ pos = t->cursor.pos();
+ boundary = t->cursor.boundary();
+ selstartpar = t->selection.start.par();
+ selstartpos = t->selection.start.pos();
+ selstartboundary = t->selection.start.boundary();
+ selendpar = t->selection.end.par();
+ selendpos = t->selection.end.pos();
+ selendboundary = t->selection.end.boundary();
+ selection = t->selection.set();
+ mark_set = t->selection.mark();
+ }
+ deleteLyXText(bv, (the_locking_inset == 0) || force);
if (lpar) {
- TEXT(bv)->selection = true;
+ LyXText * t = getLyXText(bv);
+
+ t->selection.set(true);
/* at this point just to avoid the Delete-Empty-Paragraph
* Mechanism when setting the cursor */
- TEXT(bv)->mark_set = mark_set;
+ t->selection.mark(mark_set);
if (selection) {
- TEXT(bv)->SetCursor(bv, selstartpar, selstartpos,true,
- selstartboundary);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
- TEXT(bv)->SetCursor(bv, selendpar, selendpos, true, selendboundary);
- TEXT(bv)->SetSelection(bv);
- TEXT(bv)->SetCursor(bv, lpar, pos);
+ t->setCursor(bv, selstartpar, selstartpos, true, selstartboundary);
+ t->selection.cursor = t->cursor;
+ t->setCursor(bv, selendpar, selendpos, true, selendboundary);
+ t->setSelection(bv);
+ t->setCursor(bv, lpar, pos);
} else {
- TEXT(bv)->SetCursor(bv, lpar, pos, true, boundary);
- TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
- TEXT(bv)->selection = false;
+ t->setCursor(bv, lpar, pos, true, boundary);
+ t->selection.cursor = t->cursor;
+ t->selection.set(false);
}
}
- if (bv->screen())
- TEXT(bv)->first = bv->screen()->TopCursorVisible(TEXT(bv));
+ if (bv->screen()) {
+ LyXText * t = getLyXText(bv);
+ t->first = bv->screen()->TopCursorVisible(t);
+ }
+
// this will scroll the screen such that the cursor becomes visible
bv->updateScrollbar();
// AllowInput(bv);
/// then resize all LyXText in text-insets
inset_x = cx(bv) - top_x + drawTextXOffset;
inset_y = cy(bv) + drawTextYOffset;
-#ifndef NEW_INSETS
- for (LyXParagraph * p = par; p; p = p->next_) {
- p->resizeInsetsLyXText(bv);
- }
-#else
- for (LyXParagraph * p = par; p; p = p->next()) {
+ for (Paragraph * p = par; p; p = p->next()) {
p->resizeInsetsLyXText(bv);
}
-#endif
}
need_update = FULL;
}
void InsetText::removeNewlines()
{
-#ifndef NEW_INSETS
- for (LyXParagraph * p = par; p; p = p->next_) {
- for (int i = 0; i < p->Last(); ++i) {
-#else
- for (LyXParagraph * p = par; p; p = p->next()) {
+ for (Paragraph * p = par; p; p = p->next()) {
for (int i = 0; i < p->size(); ++i) {
-#endif
- if (p->GetChar(i) == LyXParagraph::META_NEWLINE)
- p->Erase(i);
+ if (p->getChar(i) == Paragraph::META_NEWLINE)
+ p->erase(i);
}
}
}
+
+
+bool InsetText::nodraw() const
+{
+ if (the_locking_inset)
+ return the_locking_inset->nodraw();
+ return UpdatableInset::nodraw();
+}
+
+
+int InsetText::scroll(bool recursive) const
+{
+ int sx = UpdatableInset::scroll(false);
+
+ if (recursive && the_locking_inset)
+ sx += the_locking_inset->scroll(recursive);
+
+ return sx;
+}
+
+
+bool InsetText::doClearArea() const
+{
+ return !locked || (need_update & (FULL|INIT));
+}
+
+
+void InsetText::selectAll(BufferView * bv)
+{
+ getLyXText(bv)->cursorTop(bv);
+ getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
+ getLyXText(bv)->cursorBottom(bv);
+ getLyXText(bv)->setSelection(bv);
+}
+
+
+void InsetText::clearSelection(BufferView * bv)
+{
+ getLyXText(bv)->clearSelection(bv);
+}
+
+
+void InsetText::clearInset(Painter & pain, int baseline, bool & cleared) const
+{
+ int w = insetWidth;
+ int h = insetAscent + insetDescent;
+ int ty = baseline - insetAscent;
+
+ if (ty < 0) {
+ h += ty;
+ ty = 0;
+ }
+ if ((ty + h) > pain.paperHeight())
+ h = pain.paperHeight();
+ if ((top_x + drawTextXOffset + w) > pain.paperWidth())
+ w = pain.paperWidth();
+ pain.fillRectangle(top_x+drawTextXOffset, ty, w, h);
+ cleared = true;
+ need_update = FULL;
+}
+/* Emacs:
+ * Local variables:
+ * tab-width: 4
+ * End:
+ * vi:set tabstop=4:
+ */
projects / lyx.git / blobdiff