X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.C;h=c85c6be95f6b7667c69f05453e023ce78bb2e8dd;hb=4ec1fe07fed17fafde2b7cf38221c0ddbb6393a8;hp=f47764bcb56f73d55638998e32484cb126bc7c80;hpb=31b56dac8042735f75229ad480b3e98531c181ff;p=lyx.git diff --git a/src/insets/insettext.C b/src/insets/insettext.C index f47764bcb5..c85c6be95f 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -14,13 +14,14 @@ #include #include +//#include #ifdef __GNUG__ #pragma implementation #endif #include "insettext.h" -#include "lyxparagraph.h" +#include "paragraph.h" #include "lyxlex.h" #include "debug.h" #include "lyxfont.h" @@ -31,7 +32,7 @@ #include "layout.h" #include "LaTeXFeatures.h" #include "Painter.h" -#include "lyx_gui_misc.h" +#include "frontends/Alert.h" #include "lyxtext.h" #include "lyxcursor.h" #include "CutAndPaste.h" @@ -39,6 +40,7 @@ #include "LColor.h" #include "support/textutils.h" #include "support/LAssert.h" +#include "support/lstrings.h" #include "lyxrow.h" #include "lyxrc.h" #include "intl.h" @@ -47,83 +49,162 @@ #include "WorkArea.h" #include "gettext.h" #include "lyxfunc.h" +#include "ParagraphParameters.h" +#include "undo_funcs.h" +#include "lyxfind.h" using std::ostream; using std::ifstream; using std::endl; using std::min; using std::max; +using std::make_pair; +using std::vector; + +using lyx::pos_type; extern unsigned char getCurrentTextClass(Buffer *); extern bool math_insert_greek(BufferView *, char); extern int greek_kb_flag; + +// These functions should probably go into bufferview_funcs somehow (Jug) + +void InsetText::saveLyXTextState(LyXText * t) const +{ + // check if my paragraphs are still valid + Paragraph * p = par; + while(p) { + if (p == t->cursor.par()) + break; + p = p->next(); + } + + if (p && t->cursor.pos() <= p->size()) { + sstate.lpar = t->cursor.par(); + sstate.pos = t->cursor.pos(); + sstate.boundary = t->cursor.boundary(); + sstate.selstartpar = t->selection.start.par(); + sstate.selstartpos = t->selection.start.pos(); + sstate.selstartboundary = t->selection.start.boundary(); + sstate.selendpar = t->selection.end.par(); + sstate.selendpos = t->selection.end.pos(); + sstate.selendboundary = t->selection.end.boundary(); + sstate.selection = t->selection.set(); + sstate.mark_set = t->selection.mark(); + sstate.refresh = t->refresh_row != 0; + } else { + sstate.lpar = 0; + } +} + +void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const +{ + if (sstate.lpar) { + t->selection.set(true); + /* at this point just to avoid the Delete-Empty-Paragraph + * Mechanism when setting the cursor */ + t->selection.mark(sstate.mark_set); + if (sstate.selection) { + t->setCursor(bv, sstate.selstartpar, sstate.selstartpos, + true, sstate.selstartboundary); + t->selection.cursor = t->cursor; + t->setCursor(bv, sstate.selendpar, sstate.selendpos, + true, sstate.selendboundary); + t->setSelection(bv); + t->setCursor(bv, sstate.lpar, sstate.pos); + } else { + t->setCursor(bv, sstate.lpar, sstate.pos, true, sstate.boundary); + t->selection.cursor = t->cursor; + t->selection.set(false); + } + if (sstate.refresh) { + } + } +} + + +InsetText::InnerCache::InnerCache(boost::shared_ptr t) +{ + text = t; + remove = false; +} + + InsetText::InsetText() + : UpdatableInset(), lt(0), in_update(false), do_resize(0), + do_reinit(false) { - par = new LyXParagraph; + par = new Paragraph; init(); } -InsetText::InsetText(InsetText const & ins) - : UpdatableInset() +InsetText::InsetText(InsetText const & in, bool same_id) + : UpdatableInset(in, same_id), lt(0), in_update(false), do_resize(0), + do_reinit(false) { par = 0; - init(&ins); - autoBreakRows = ins.autoBreakRows; + init(&in, same_id); } InsetText & InsetText::operator=(InsetText const & it) { init(&it); - autoBreakRows = it.autoBreakRows; return * this; } -void InsetText::init(InsetText const * ins) +void InsetText::init(InsetText const * ins, bool same_id) { + if (ins) { + setParagraphData(ins->par); + autoBreakRows = ins->autoBreakRows; + drawFrame_ = ins->drawFrame_; + frame_color = ins->frame_color; + if (same_id) + id_ = ins->id_; + } else { + Paragraph * p = par; + while(p) { + p->setInsetOwner(this); + p = p->next(); + } + the_locking_inset = 0; + drawFrame_ = NEVER; + frame_color = LColor::insetframe; + autoBreakRows = false; + } top_y = 0; last_width = 0; last_height = 0; insetAscent = 0; insetDescent = 0; insetWidth = 0; - the_locking_inset = 0; old_max_width = 0; no_selection = false; - need_update = INIT; + need_update = FULL; drawTextXOffset = 0; drawTextYOffset = 0; - autoBreakRows = false; - drawFrame_ = NEVER; xpos = 0.0; - if (ins) { - SetParagraphData(ins->par); - autoBreakRows = ins->autoBreakRows; - drawFrame_ = ins->drawFrame_; - } - par->SetInsetOwner(this); - frame_color = LColor::insetframe; locked = false; old_par = 0; last_drawn_width = -1; frame_is_visible = false; + cached_bview = 0; + sstate.lpar = 0; } InsetText::~InsetText() { - // 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; - } + cached_bview = 0; + // NOTE + while (par) { - LyXParagraph * tmp = par->next(); + Paragraph * tmp = par->next(); delete par; par = tmp; } @@ -132,59 +213,58 @@ InsetText::~InsetText() void InsetText::clear() { - // 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; - } - while (par) { - LyXParagraph * tmp = par->next(); + Paragraph * tmp = par->next(); delete par; par = tmp; } - par = new LyXParagraph; + par = new Paragraph; + reinitLyXText(); + need_update = INIT; } -Inset * InsetText::Clone(Buffer const &) const +Inset * InsetText::clone(Buffer const &, bool same_id) const { - InsetText * t = new InsetText(*this); - return t; + return new InsetText(*this, same_id); } -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); } -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? + Paragraph * return_par = 0; + Paragraph::depth_type depth = 0; LyXFont font(LyXFont::ALL_INHERIT); clear(); - while (lex.IsOK()) { + while (lex.isOK()) { lex.nextToken(); - token = lex.GetString(); + token = lex.getString(); if (token.empty()) continue; - if (token == "\\end_inset") + if (token == "\\end_inset") { +#ifndef NO_COMPABILITY + const_cast(buf)->insertErtContents(par, pos, font, false); +#endif break; + } + if (const_cast(buf)-> parseSingleLyXformat2Token(lex, par, return_par, token, pos, depth, font)) { @@ -197,7 +277,7 @@ void InsetText::Read(Buffer const * buf, LyXLex & lex) return_par = par; par = return_par; while(return_par) { - return_par->SetInsetOwner(this); + return_par->setInsetOwner(this); return_par = return_par->next(); } @@ -205,41 +285,63 @@ void InsetText::Read(Buffer const * buf, LyXLex & lex) lex.printError("Missing \\end_inset at this point. " "Read: `$$Token'"); } - need_update = INIT; + need_update = FULL; } int InsetText::ascent(BufferView * bv, LyXFont const &) const { - int y_temp = 0; - Row * row = TEXT(bv)->GetRowNearY(y_temp); - insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + insetAscent = lt->firstRow()->ascent_of_text() + TEXT_TO_INSET_OFFSET; + if (clear) + lt = 0; return insetAscent; } int InsetText::descent(BufferView * bv, LyXFont const &) const { - int y_temp = 0; - Row * row = TEXT(bv)->GetRowNearY(y_temp); - insetDescent = TEXT(bv)->height - row->ascent_of_text() + - TEXT_TO_INSET_OFFSET; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + insetDescent = lt->height - lt->firstRow()->ascent_of_text() + + TEXT_TO_INSET_OFFSET; + if (clear) + lt = 0; return insetDescent; } int InsetText::width(BufferView * bv, LyXFont const &) const { - insetWidth = max(textWidth(bv), - (int)TEXT(bv)->width + (2 * TEXT_TO_INSET_OFFSET)); + insetWidth = max(textWidth(bv), (int)getLyXText(bv)->width) + + (2 * TEXT_TO_INSET_OFFSET); + insetWidth = max(insetWidth, 10); return insetWidth; } -int InsetText::textWidth(BufferView * bv) const +int InsetText::textWidth(BufferView * bv, bool fordraw) const { - int const w = getMaxWidth(bv, this); - return w; + int w; + if (!autoBreakRows) { + w = -1; + } else { + w = getMaxWidth(bv, this); + } + if (fordraw) { + return max(w - (2 * TEXT_TO_INSET_OFFSET), + (int)getLyXText(bv)->width); + } else if (w < 0) { + return -1; + } + return w - (2 * TEXT_TO_INSET_OFFSET); } @@ -250,98 +352,102 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, return; Painter & pain = bv->painter(); + + // this is the first thing we have to ask because if the x pos + // changed we have to do a complete rebreak of the text as we + // may have few space to draw in. Well we should check on this too + int old_x = top_x; + if (top_x != int(x)) { + top_x = int(x); + int nw = getMaxWidth(bv, this); + if (nw > 0 && old_max_width != nw) { + need_update = INIT; + old_max_width = nw; + bv->text->status(bv, LyXText::CHANGED_IN_DRAW); + topx_set = true; + return; + } else { + top_x = old_x; + } + } + + // repaint the background if needed + if (cleared && backgroundColor() != LColor::background) { + top_x = int(x); + clearInset(pain, baseline, cleared); + top_x = old_x; + } // no draw is necessary !!! if ((drawFrame_ == LOCKED) && !locked && !par->size()) { top_x = int(x); + topx_set = true; top_baseline = baseline; x += width(bv, f); - if (!cleared && (need_update & CLEAR_FRAME)) + if (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(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 top_x differs we did it already if (!cleared && (top_x == int(x)) && ((need_update&(INIT|FULL)) || (top_baseline!=baseline) || - (last_drawn_width!=insetWidth))) - { + (last_drawn_width!=insetWidth))) { clearInset(pain, baseline, cleared); } + + top_x = int(x); + topx_set = true; if (cleared) frame_is_visible = false; - if (!cleared && (need_update == NONE)) - return; - - if (top_x != int(x)) { - if ((getMaxWidth(bv, this) > 0) && (TEXT(bv)->width != old_max_width)){ - resizeLyXText(bv); - need_update |= FULL; - old_max_width = TEXT(bv)->width; - bv->text->status = LyXText::CHANGED_IN_DRAW; - } - top_x = int(x); -#if 1 - clearInset(pain, baseline, cleared); -#else + if (!cleared && (need_update == NONE)) { + if (locked) + drawFrame(pain, cleared); return; -#endif } -// lyxerr << "InsetText::draw[" << this << "](" << need_update << ":" << int(x) << ":" << top_x << ")\n"; + top_baseline = baseline; + top_y = baseline - ascent(bv, f); + last_width = width(bv, f); + last_height = ascent(bv, f) + descent(bv, f); if (cleared || (last_drawn_width != insetWidth)) { + if (!cleared) + clearInset(pain, baseline, cleared); need_update |= FULL; last_drawn_width = insetWidth; } - top_baseline = baseline; - top_y = baseline - ascent(bv, f); - 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.set()) { + if (!cleared && (need_update == CURSOR) + && !getLyXText(bv)->selection.set()) { drawFrame(pain, cleared); - x += width(bv, f); + x += last_width; // was width(bv, f); need_update = NONE; return; } + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } x += TEXT_TO_INSET_OFFSET; -#ifdef WITH_WARNINGS -#warning Jürgen, why is this a block of its own? (Lgb) -#warning because you told me to define variables only in local context (Jug)! -#warning then make it a function/method of its own. (Lgb) -#endif - { - int y = 0; - Row * row = TEXT(bv)->GetRowNearY(y); + Row * row = lt->firstRow(); int y_offset = baseline - row->ascent_of_text(); int ph = pain.paperHeight(); int first = 0; - y = y_offset; + int y = y_offset; while ((row != 0) && ((y+row->height()) <= 0)) { y += row->height(); first += row->height(); @@ -349,12 +455,12 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, } if (y_offset < 0) y_offset = y; - TEXT(bv)->first = first; - if (cleared) { + lt->first = first; + if (cleared || (need_update&(INIT|FULL))) { int yf = y_offset; y = 0; while ((row != 0) && (yf < ph)) { - TEXT(bv)->GetVisibleRow(bv, y+y_offset, int(x), row, + lt->getVisibleRow(bv, y+y_offset, int(x), row, y+first, cleared); y += row->height(); yf += row->height(); @@ -362,44 +468,56 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, } } else if (!locked) { if (need_update & CURSOR) { - bv->screen()->ToggleSelection(TEXT(bv), bv, true, y_offset,int(x)); - TEXT(bv)->ClearSelection(bv); - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; + bv->screen()->toggleSelection(lt, bv, true, y_offset,int(x)); + lt->clearSelection(); + lt->selection.cursor = lt->cursor; } - bv->screen()->Update(TEXT(bv), bv, y_offset, int(x)); + bv->screen()->update(lt, bv, y_offset, int(x)); } else { locked = false; - if (need_update & SELECTION) - bv->screen()->ToggleToggle(TEXT(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)->selection.cursor = TEXT(bv)->cursor; + if (need_update & SELECTION) { + bv->screen()->toggleToggle(lt, bv, y_offset, int(x)); + } else if (need_update & CURSOR) { + bv->screen()->toggleSelection(lt, bv, true, y_offset,int(x)); + lt->clearSelection(); + lt->selection.cursor = lt->cursor; } - bv->screen()->Update(TEXT(bv), bv, y_offset, int(x)); + bv->screen()->update(lt, bv, y_offset, int(x)); locked = true; } - } - TEXT(bv)->refresh_y = 0; - TEXT(bv)->status = LyXText::UNCHANGED; + + lt->refresh_y = 0; + lt->status(bv, LyXText::UNCHANGED); if ((need_update != CURSOR_PAR) && - ((drawFrame_ == ALWAYS) || ((drawFrame_ == LOCKED) && locked))) + ((drawFrame_ == ALWAYS) || ((drawFrame_ == LOCKED) && locked))) { drawFrame(pain, cleared); - else if (need_update & CLEAR_FRAME) + } else if (need_update & CLEAR_FRAME) { clearFrame(pain, cleared); - x += width(bv, f) - TEXT_TO_INSET_OFFSET; - if (bv->text->status==LyXText::CHANGED_IN_DRAW) { - need_update |= INIT; - } else if (need_update != INIT) + } + + x += last_width /* was width(bv, f) */ - TEXT_TO_INSET_OFFSET; + + if (bv->text->status() == LyXText::CHANGED_IN_DRAW) { + need_update |= FULL; + } else if (need_update != INIT) { need_update = NONE; + } + + if (clear) + lt = 0; } void InsetText::drawFrame(Painter & pain, bool cleared) const { + static int const ttoD2 = TEXT_TO_INSET_OFFSET / 2; if (!frame_is_visible || cleared) { - pain.rectangle(top_x + 1, top_baseline - insetAscent + 1, - insetWidth - 1, insetAscent + insetDescent - 1, + frame_x = top_x + ttoD2; + frame_y = top_baseline - insetAscent + ttoD2; + frame_w = last_width - TEXT_TO_INSET_OFFSET; + frame_h = insetAscent + insetDescent - TEXT_TO_INSET_OFFSET; + pain.rectangle(frame_x, frame_y, + frame_w, frame_h, frame_color); frame_is_visible = true; } @@ -410,9 +528,8 @@ 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); + pain.rectangle(frame_x, frame_y, frame_w, frame_h, + backgroundColor()); } frame_is_visible = false; } @@ -421,17 +538,21 @@ void InsetText::clearFrame(Painter & pain, bool cleared) const void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) { -#if 0 - int ww = TEXT(bv)->width; - TEXT(bv)->BreakParagraph(bv); - if (ww != TEXT(bv)->width) - reinit = true; -#endif - if (reinit) { - need_update |= INIT; - resizeLyXText(bv); + if (in_update) { + if (reinit && owner()) { + reinitLyXText(); + owner()->update(bv, font, true); + } + return; + } + in_update = true; + if (reinit || need_update == INIT) { + need_update = FULL; + // we should put this call where we set need_update to INIT! + reinitLyXText(); if (owner()) owner()->update(bv, font, true); + in_update = false; return; } if (the_locking_inset) { @@ -439,78 +560,103 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) inset_y = cy(bv) + drawTextYOffset; the_locking_inset->update(bv, font, reinit); } -#if 0 - if (need_update == INIT) { - resizeLyXText(bv); - need_update |= FULL; + + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; } -#endif +#if 0 int oldw = insetWidth; - insetWidth = TEXT(bv)->width + (2 * TEXT_TO_INSET_OFFSET); + insetWidth = lt->width + (2 * TEXT_TO_INSET_OFFSET); if (oldw != insetWidth) { resizeLyXText(bv); need_update |= FULL; -// update(bv, font, reinit); + if (clear) + lt = 0; + in_update = false; return; } - if ((need_update&CURSOR_PAR) && (TEXT(bv)->status==LyXText::UNCHANGED) && +#endif + if ((need_update & CURSOR_PAR) && (lt->status() == LyXText::UNCHANGED) && the_locking_inset) { - TEXT(bv)->UpdateInset(bv, the_locking_inset); + lt->updateInset(bv, the_locking_inset); } - - if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH) + if (lt->status() == LyXText::NEED_MORE_REFRESH) need_update |= FULL; -#if 0 - int y_temp = 0; - Row * row = TEXT(bv)->GetRowNearY(y_temp); - insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET; - insetDescent = TEXT(bv)->height - row->ascent_of_text() + - TEXT_TO_INSET_OFFSET; -#endif + if (clear) + lt = 0; + in_update = false; } -void InsetText::SetUpdateStatus(BufferView * bv, int what) const +void InsetText::setUpdateStatus(BufferView * bv, int what) const { + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } need_update |= what; - if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH) + // we have to redraw us full if our LyXText NEEDS_MORE_REFRES or + // if we don't break row so that we only have one row to update! + if ((lt->status() == LyXText::NEED_MORE_REFRESH) || + (!autoBreakRows && + (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH))) + { need_update |= FULL; - else if (TEXT(bv)->status == LyXText::NEED_VERY_LITTLE_REFRESH) + } else if (lt->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); + if (need_update & CURSOR && !(need_update & SELECTION)) { + if (lt->selection.set()) + need_update = FULL; + lt->clearSelection(); + } + if (clear) + lt = 0; } -void InsetText::UpdateLocal(BufferView * bv, int what, bool mark_dirty) +void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const { - TEXT(bv)->FullRebreak(bv); - SetUpdateStatus(bv, what); - if ((need_update != CURSOR) || (TEXT(bv)->status != LyXText::UNCHANGED) || - TEXT(bv)->selection.set()) - bv->updateInset(this, mark_dirty); + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + lt->fullRebreak(bv); + setUpdateStatus(bv, what); + if (((need_update != CURSOR) && (need_update != NONE)) || + (lt->status() != LyXText::UNCHANGED) || lt->selection.set()) + { + bv->updateInset(const_cast(this), mark_dirty); + } + if (need_update == CURSOR) + need_update = NONE; bv->owner()->showState(); if (old_par != cpar(bv)) { - bv->owner()->setLayout(cpar(bv)->GetLayout()); + bv->owner()->setLayout(cpar(bv)->getLayout()); old_par = cpar(bv); } + if (clear) + lt = 0; } -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; @@ -521,56 +667,122 @@ void InsetText::Edit(BufferView * bv, int x, int y, unsigned int button) inset_boundary = false; inset_par = 0; old_par = 0; - int tmp_y = (y < 0)?0:y; + int tmp_y = (y < 0) ? 0 : y; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + if (!checkAndActivateInset(bv, x, tmp_y, button)) - TEXT(bv)->SetCursorFromCoordinates(bv, x - drawTextXOffset, - y + insetAscent); - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; - bv->text->FinishUndo(); - ShowInsetCursor(bv); - UpdateLocal(bv, CURSOR, false); + lt->setCursorFromCoordinates(bv, x - drawTextXOffset, + y + insetAscent); + lt->clearSelection(); + 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 (if different). if (par->size() == 0 && !par->next() && - bv->getParentLanguage(this) != TEXT(bv)->current_font.language()) - { + bv->getParentLanguage(this) != lt->current_font.language()) { LyXFont font(LyXFont::ALL_IGNORE); font.setLanguage(bv->getParentLanguage(this)); - SetFont(bv, font, false); + setFont(bv, font, false); } + if (clear) + lt = 0; } -void InsetText::InsetUnlock(BufferView * bv) +void InsetText::edit(BufferView * bv, bool front) +{ + UpdatableInset::edit(bv, front); + + if (!bv->lockInset(this)) { + lyxerr[Debug::INSETS] << "Cannot lock inset" << endl; + return; + } + locked = true; + the_locking_inset = 0; + inset_pos = inset_x = inset_y = 0; + inset_boundary = false; + inset_par = 0; + old_par = 0; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + if (front) + lt->setCursor(bv, par, 0); + else { + Paragraph * p = par; + while(p->next()) + p = p->next(); +// int const pos = (p->size() ? p->size()-1 : p->size()); + lt->setCursor(bv, p, p->size()); + } + lt->clearSelection(); + 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 (if different). + if (par->size() == 0 && !par->next() && + bv->getParentLanguage(this) != lt->current_font.language()) { + LyXFont font(LyXFont::ALL_IGNORE); + font.setLanguage(bv->getParentLanguage(this)); + setFont(bv, font, false); + } + if (clear) + lt = 0; +} + + +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; - int code = CURSOR|CLEAR_FRAME; - if (TEXT(bv)->selection.set()) { - TEXT(bv)->ClearSelection(bv); + int code; + if (drawFrame_ == LOCKED) + code = CURSOR|CLEAR_FRAME; + else + code = CURSOR; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + if (lt->selection.set()) { + lt->clearSelection(); code = FULL; - } else if (owner()) + } else if (owner()) { bv->owner()->setLayout(owner()->getLyXText(bv) - ->cursor.par()->GetLayout()); - else - bv->owner()->setLayout(bv->text->cursor.par()->GetLayout()); - UpdateLocal(bv, code, false); + ->cursor.par()->getLayout()); + } else + bv->owner()->setLayout(bv->text->cursor.par()->getLayout()); + // hack for deleteEmptyParMech + lt->setCursor(bv, par, 0); + updateLocal(bv, code, false); + if (clear) + lt = 0; } -bool InsetText::LockInsetInInset(BufferView * bv, UpdatableInset * inset) +bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * 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; @@ -578,13 +790,7 @@ bool InsetText::LockInsetInInset(BufferView * bv, UpdatableInset * inset) inset_pos = cpos(bv); 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); -#else - UpdateLocal(bv, CURSOR, false); -#endif + updateLocal(bv, CURSOR, false); return true; } else if (the_locking_inset && (the_locking_inset == inset)) { if (cpar(bv) == inset_par && cpos(bv) == inset_pos) { @@ -596,21 +802,21 @@ bool InsetText::LockInsetInInset(BufferView * bv, UpdatableInset * 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 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); @@ -618,25 +824,24 @@ bool InsetText::UnlockInsetInInset(BufferView * bv, UpdatableInset * inset, if (scroll()) scroll(bv, 0.0F); else - UpdateLocal(bv, CURSOR, false); + 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); + 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; @@ -645,39 +850,39 @@ bool InsetText::UpdateInsetInInset(BufferView * bv, Inset * inset) } -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(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 (isHighlyEditableInset(inset)) { UpdatableInset * uinset = static_cast(inset); inset_x = cx(bv) - top_x + drawTextXOffset; inset_y = cy(bv) + drawTextYOffset; @@ -685,110 +890,121 @@ void InsetText::InsetButtonPress(BufferView * bv, int x, int y, int button) 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)) { bool paste_internally = false; - if ((button == 2) && TEXT(bv)->selection.set()) { - 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)->selection.cursor = TEXT(bv)->cursor; - UpdateLocal(bv, CURSOR, false); - bv->owner()->setLayout(cpar(bv)->GetLayout()); + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + lt->setCursorFromCoordinates(bv, x-drawTextXOffset, y + insetAscent); + if (lt->selection.set()) { + lt->clearSelection(); + updateLocal(bv, FULL, false); + } else { + lt->clearSelection(); + } + 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"); } + if (clear) + lt = 0; } - 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, + 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(cpar(bv)->GetInset(cpos(bv))); - if (inset->Editable() == Inset::HIGHLY_EDITABLE) { - inset->InsetButtonRelease(bv, + if (cpar(bv)->isInset(cpos(bv))) { + inset = static_cast(cpar(bv)->getInset(cpos(bv))); + if (isHighlyEditableInset(inset)) { + 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, + inset->insetButtonRelease(bv, x - inset_x, y - inset_y, button); - inset->Edit(bv, + 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, + 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) { + bool was_empty = par->size() == 0 && !par->next(); no_selection = false; UpdatableInset::RESULT - result= UpdatableInset::LocalDispatch(bv, action, arg); + result= UpdatableInset::localDispatch(bv, action, arg); if (result != UNDISPATCHED) { return DISPATCHED; } @@ -798,42 +1014,50 @@ InsetText::LocalDispatch(BufferView * bv, 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; - switch (action) { - case LFUN_UNKNOWN_ACTION: - case LFUN_BREAKPARAGRAPH: - case LFUN_BREAKLINE: + } else if (result >= FINISHED) { + switch(result) { + case FINISHED_RIGHT: moveRightIntern(bv, false, false); + result = DISPATCHED; break; - case LFUN_RIGHT: - if (!TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params)) - moveRightIntern(bv, false, false); - dispatched = true; + case FINISHED_UP: + if ((result = moveUp(bv)) >= FINISHED) { + updateLocal(bv, CURSOR, false); + bv->unlockInset(this); + } break; - case LFUN_LEFT: - if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params)) - moveRightIntern(bv, false, false); - dispatched = true; + case FINISHED_DOWN: + if ((result = moveDown(bv)) >= FINISHED) { + updateLocal(bv, CURSOR, false); + bv->unlockInset(this); + } break; default: + result = DISPATCHED; break; } the_locking_inset = 0; - if (dispatched) - return DISPATCHED; +#ifdef WITH_WARNINGS +#warning I changed this to always return Dispatched maybe it is wrong (20011001 Jug) +#endif + return result; } } - HideInsetCursor(bv); + hideInsetCursor(bv); + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } switch (action) { // Normal chars - case LFUN_UNKNOWN_ACTION: + case LFUN_SELFINSERT: if (bv->buffer()->isReadonly()) { // setErrorMessage(N_("Document is read only")); break; @@ -845,117 +1069,112 @@ InsetText::LocalDispatch(BufferView * bv, * "auto_region_delete", which defaults to * true (on). */ - bv->text->SetUndo(bv->buffer(), Undo::INSERT, - bv->text->cursor.par()->previous(), - bv->text->cursor.par()->next()); + setUndo(bv, Undo::INSERT, + lt->cursor.par(), lt->cursor.par()->next()); bv->setState(); if (lyxrc.auto_region_delete) { - if (TEXT(bv)->selection.set()) { - TEXT(bv)->CutSelection(bv, false); + if (lt->selection.set()) { + lt->cutSelection(bv, false); } } - TEXT(bv)->ClearSelection(bv); + lt->clearSelection(); 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)); - } 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], lt); } } - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; - UpdateLocal(bv, CURSOR_PAR, true); - result=DISPATCHED_NOUPDATE; + lt->selection.cursor = lt->cursor; + updateLocal(bv, CURSOR_PAR, true); + result = DISPATCHED_NOUPDATE; break; // --- Cursor Movements ----------------------------------- case LFUN_RIGHTSEL: - bv->text->FinishUndo(); + finishUndo(); moveRight(bv, false, true); - TEXT(bv)->SetSelection(bv); - UpdateLocal(bv, SELECTION, false); + lt->setSelection(bv); + updateLocal(bv, SELECTION, false); break; case LFUN_RIGHT: result = moveRight(bv); - bv->text->FinishUndo(); - UpdateLocal(bv, CURSOR, false); + finishUndo(); + updateLocal(bv, CURSOR, false); break; case LFUN_LEFTSEL: - bv->text->FinishUndo(); + finishUndo(); moveLeft(bv, false, true); - TEXT(bv)->SetSelection(bv); - UpdateLocal(bv, SELECTION, false); + lt->setSelection(bv); + updateLocal(bv, SELECTION, false); break; case LFUN_LEFT: - bv->text->FinishUndo(); + finishUndo(); result = moveLeft(bv); - UpdateLocal(bv, CURSOR, false); + updateLocal(bv, CURSOR, false); break; case LFUN_DOWNSEL: - bv->text->FinishUndo(); + finishUndo(); moveDown(bv); - TEXT(bv)->SetSelection(bv); - UpdateLocal(bv, SELECTION, false); + lt->setSelection(bv); + updateLocal(bv, SELECTION, false); break; case LFUN_DOWN: - bv->text->FinishUndo(); + finishUndo(); result = moveDown(bv); - UpdateLocal(bv, CURSOR, false); + updateLocal(bv, CURSOR, false); break; case LFUN_UPSEL: - bv->text->FinishUndo(); + finishUndo(); moveUp(bv); - TEXT(bv)->SetSelection(bv); - UpdateLocal(bv, SELECTION, false); + lt->setSelection(bv); + updateLocal(bv, SELECTION, false); break; case LFUN_UP: - bv->text->FinishUndo(); + 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); + finishUndo(); + lt->cursorHome(bv); + updateLocal(bv, CURSOR, false); break; case LFUN_END: - TEXT(bv)->CursorEnd(bv); - UpdateLocal(bv, CURSOR, false); + lt->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()); - if (TEXT(bv)->selection.set()) - TEXT(bv)->CutSelection(bv); + case LFUN_BACKSPACE: { + setUndo(bv, Undo::DELETE, + lt->cursor.par(), lt->cursor.par()->next()); + if (lt->selection.set()) + lt->cutSelection(bv); else - TEXT(bv)->Backspace(bv); - UpdateLocal(bv, CURSOR_PAR, true); - break; - case LFUN_DELETE: - bv->text->SetUndo(bv->buffer(), Undo::DELETE, - bv->text->cursor.par()->previous(), - bv->text->cursor.par()->next()); - if (TEXT(bv)->selection.set()) - TEXT(bv)->CutSelection(bv); - else - TEXT(bv)->Delete(bv); - UpdateLocal(bv, CURSOR_PAR, true); - break; - case LFUN_CUT: - bv->text->SetUndo(bv->buffer(), Undo::DELETE, - bv->text->cursor.par()->previous(), - bv->text->cursor.par()->next()); - TEXT(bv)->CutSelection(bv); - UpdateLocal(bv, CURSOR_PAR, true); - break; + lt->backspace(bv); + updateLocal(bv, CURSOR_PAR, true); + } + break; + + case LFUN_DELETE: { + setUndo(bv, Undo::DELETE, + lt->cursor.par(), lt->cursor.par()->next()); + if (lt->selection.set()) { + lt->cutSelection(bv); + } else { + lt->Delete(bv); + } + updateLocal(bv, CURSOR_PAR, true); + } + break; + + case LFUN_CUT: { + setUndo(bv, Undo::DELETE, + lt->cursor.par(), lt->cursor.par()->next()); + lt->cutSelection(bv); + updateLocal(bv, CURSOR_PAR, true); + } + break; + case LFUN_COPY: - bv->text->FinishUndo(); - TEXT(bv)->CopySelection(bv); - UpdateLocal(bv, CURSOR_PAR, false); + finishUndo(); + lt->copySelection(bv); + updateLocal(bv, CURSOR_PAR, false); break; case LFUN_PASTESELECTION: { @@ -964,51 +1183,59 @@ InsetText::LocalDispatch(BufferView * bv, if (clip.empty()) break; if (arg == "paragraph") { - TEXT(bv)->InsertStringB(bv, clip); + lt->insertStringAsParagraphs(bv, clip); } else { - TEXT(bv)->InsertStringA(bv, clip); + lt->insertStringAsLines(bv, clip); } - UpdateLocal(bv, CURSOR_PAR, true); + updateLocal(bv, CURSOR_PAR, true); break; } - case LFUN_PASTE: + case LFUN_PASTE: { if (!autoBreakRows) { - CutAndPaste cap; - if (cap.nrOfParagraphs() > 1) { - WriteAlert(_("Impossible operation"), + if (CutAndPaste::nrOfParagraphs() > 1) { + Alert::alert(_("Impossible operation"), _("Cannot include more than one paragraph!"), _("Sorry.")); break; } } - bv->text->SetUndo(bv->buffer(), Undo::INSERT, - bv->text->cursor.par()->previous(), - bv->text->cursor.par()->next()); - TEXT(bv)->PasteSelection(bv); - UpdateLocal(bv, CURSOR_PAR, true); - break; + setUndo(bv, Undo::INSERT, + lt->cursor.par(), lt->cursor.par()->next()); + lt->pasteSelection(bv); + updateLocal(bv, CURSOR_PAR, true); + } + break; + case LFUN_BREAKPARAGRAPH: - if (!autoBreakRows) - return DISPATCHED; - TEXT(bv)->BreakParagraph(bv, 0); - UpdateLocal(bv, FULL, true); + if (!autoBreakRows) { + result = DISPATCHED; + break; + } + lt->breakParagraph(bv, 0); + updateLocal(bv, FULL, true); break; case LFUN_BREAKPARAGRAPHKEEPLAYOUT: - if (!autoBreakRows) - return DISPATCHED; - TEXT(bv)->BreakParagraph(bv, 1); - UpdateLocal(bv, FULL, true); - break; - case LFUN_BREAKLINE: - if (!autoBreakRows) - return DISPATCHED; - bv->text->SetUndo(bv->buffer(), Undo::INSERT, - bv->text->cursor.par()->previous(), - bv->text->cursor.par()->next()); - TEXT(bv)->InsertChar(bv, LyXParagraph::META_NEWLINE); - UpdateLocal(bv, CURSOR_PAR, true); + if (!autoBreakRows) { + result = DISPATCHED; + break; + } + lt->breakParagraph(bv, 1); + updateLocal(bv, FULL, true); break; + + case LFUN_BREAKLINE: { + if (!autoBreakRows) { + result = DISPATCHED; + break; + } + setUndo(bv, Undo::INSERT, + lt->cursor.par(), lt->cursor.par()->next()); + lt->insertChar(bv, Paragraph::META_NEWLINE); + updateLocal(bv, CURSOR_PAR, true); + } + break; + case LFUN_LAYOUT: // do not set layouts on non breakable textinsets if (autoBreakRows) { @@ -1032,19 +1259,19 @@ InsetText::LocalDispatch(BufferView * bv, // see if we found the layout number: if (!layout.first) { string const msg = string(N_("Layout ")) + arg + N_(" not known"); - bv->owner()->getLyXFunc()->Dispatch(LFUN_MESSAGE, msg); + 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); + lt->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: @@ -1052,14 +1279,14 @@ InsetText::LocalDispatch(BufferView * bv, // 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 = 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(); } - std::istringstream istr(arg.c_str()); + istringstream istr(arg.c_str()); string tmp; istr >> tmp; Spacing::Space new_spacing = cur_spacing; @@ -1087,10 +1314,8 @@ InsetText::LocalDispatch(BufferView * bv, << 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); - //bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); + par->params().spacing(Spacing(new_spacing, new_value)); + updateLocal(bv, CURSOR_PAR, true); } } break; @@ -1102,22 +1327,24 @@ InsetText::LocalDispatch(BufferView * bv, } /// If the action has deleted all text in the inset, we need to change the - // language to the language to the surronding text. - if (par->size() == 0 && !par->next()) { + // language to the language of the surronding text. + if (!was_empty && 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); + if (result < FINISHED) { + showInsetCursor(bv); } else bv->unlockInset(this); + if (clear) + lt = 0; 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); @@ -1125,9 +1352,9 @@ int InsetText::Latex(Buffer const * buf, ostream & os, bool, bool) const } -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; while (p) { @@ -1140,25 +1367,196 @@ int InsetText::Ascii(Buffer const * buf, ostream & os, int linelen) const } -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; + + vector environment_stack(10); + vector environment_inner(10); + + int const command_depth = 0; + string item_name; - string tmp; + Paragraph::depth_type depth = 0; // paragraph depth + while (p) { - buf->SimpleDocBookOnePar(os, tmp, p, desc, 0); + string sgmlparam; + int desc_on = 0; // description mode + + LyXLayout const & style = + textclasslist.Style(buf->params.textclass, + p->layout); + + // environment tag closing + for (; depth > p->params().depth(); --depth) { + if (environment_inner[depth] != "!-- --") { + item_name = "listitem"; + buf->sgmlCloseTag(os, command_depth + depth, + item_name); + if (environment_inner[depth] == "varlistentry") + buf->sgmlCloseTag(os, depth+command_depth, + environment_inner[depth]); + } + buf->sgmlCloseTag(os, depth + command_depth, + environment_stack[depth]); + environment_stack[depth].erase(); + environment_inner[depth].erase(); + } + + if (depth == p->params().depth() + && environment_stack[depth] != style.latexname() + && !environment_stack[depth].empty()) { + if (environment_inner[depth] != "!-- --") { + item_name= "listitem"; + buf->sgmlCloseTag(os, command_depth+depth, + item_name); + if (environment_inner[depth] == "varlistentry") + buf->sgmlCloseTag(os, + depth + command_depth, + environment_inner[depth]); + } + + buf->sgmlCloseTag(os, depth + command_depth, + environment_stack[depth]); + + environment_stack[depth].erase(); + environment_inner[depth].erase(); + } + + // Write opening SGML tags. + switch (style.latextype) { + case LATEX_PARAGRAPH: + buf->sgmlOpenTag(os, depth + command_depth, + style.latexname()); + break; + + case LATEX_COMMAND: + buf->sgmlError(p, 0, + _("Error : LatexType Command not allowed here.\n")); + return -1; + break; + + case LATEX_ENVIRONMENT: + case LATEX_ITEM_ENVIRONMENT: + if (depth < p->params().depth()) { + depth = p->params().depth(); + environment_stack[depth].erase(); + } + + if (environment_stack[depth] != style.latexname()) { + if(environment_stack.size() == depth + 1) { + environment_stack.push_back("!-- --"); + environment_inner.push_back("!-- --"); + } + environment_stack[depth] = style.latexname(); + environment_inner[depth] = "!-- --"; + buf->sgmlOpenTag(os, depth + command_depth, + environment_stack[depth]); + } else { + if (environment_inner[depth] != "!-- --") { + item_name= "listitem"; + buf->sgmlCloseTag(os, + command_depth + depth, + item_name); + if (environment_inner[depth] == "varlistentry") + buf->sgmlCloseTag(os, + depth + command_depth, + environment_inner[depth]); + } + } + + if (style.latextype == LATEX_ENVIRONMENT) { + if (!style.latexparam().empty()) { + if(style.latexparam() == "CDATA") + os << "sgmlOpenTag(os, depth + command_depth, + style.latexparam()); + } + break; + } + + desc_on = (style.labeltype == LABEL_MANUAL); + + if (desc_on) + environment_inner[depth]= "varlistentry"; + else + environment_inner[depth]= "listitem"; + + buf->sgmlOpenTag(os, depth + 1 + command_depth, + environment_inner[depth]); + + if (desc_on) { + item_name= "term"; + buf->sgmlOpenTag(os, depth + 1 + command_depth, + item_name); + } else { + item_name= "para"; + buf->sgmlOpenTag(os, depth + 1 + command_depth, + item_name); + } + break; + default: + buf->sgmlOpenTag(os, depth + command_depth, + style.latexname()); + break; + } + + buf->simpleDocBookOnePar(os, p, desc_on, + depth + 1 + command_depth); p = p->next(); + + string end_tag; + // write closing SGML tags + switch (style.latextype) { + case LATEX_ENVIRONMENT: + if (!style.latexparam().empty()) { + if(style.latexparam() == "CDATA") + os << "]]>"; + else + buf->sgmlCloseTag(os, depth + command_depth, + style.latexparam()); + } + break; + case LATEX_ITEM_ENVIRONMENT: + if (desc_on == 1) break; + end_tag= "para"; + buf->sgmlCloseTag(os, depth + 1 + command_depth, end_tag); + break; + case LATEX_PARAGRAPH: + buf->sgmlCloseTag(os, depth + command_depth, style.latexname()); + break; + default: + buf->sgmlCloseTag(os, depth + command_depth, style.latexname()); + break; + } + } + + // Close open tags + for (int d = depth; d >= 0; --d) { + if (!environment_stack[depth].empty()) { + if (environment_inner[depth] != "!-- --") { + item_name = "listitem"; + buf->sgmlCloseTag(os, command_depth + depth, + item_name); + if (environment_inner[depth] == "varlistentry") + buf->sgmlCloseTag(os, depth + command_depth, + environment_inner[depth]); + } + + buf->sgmlCloseTag(os, depth + command_depth, + environment_stack[depth]); + } } return lines; } -void InsetText::Validate(LaTeXFeatures & features) const +void InsetText::validate(LaTeXFeatures & features) const { - LyXParagraph * p = par; + Paragraph * p = par; while (p) { p->validate(features); p = p->next(); @@ -1166,41 +1564,45 @@ void InsetText::Validate(LaTeXFeatures & features) const } -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, +void InsetText::getCursorPos(BufferView * bv, int & x, int & y) const { + if (the_locking_inset) { + the_locking_inset->getCursorPos(bv, x, y); + return; + } 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); @@ -1213,15 +1615,15 @@ void InsetText::ToggleInsetCursor(BufferView * bv) } -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, show); 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); @@ -1234,21 +1636,37 @@ void InsetText::ShowInsetCursor(BufferView * bv, bool show) } -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); +} + + +void InsetText::fitInsetCursor(BufferView * bv) const +{ + if (the_locking_inset) { + the_locking_inset->fitInsetCursor(bv); + return; + } + LyXFont const font = + getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv)); + + int const asc = lyxfont::maxAscent(font); + int const desc = lyxfont::maxDescent(font); + + bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc); } 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); @@ -1258,7 +1676,7 @@ InsetText::moveRight(BufferView * bv, bool activate_inset, bool 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); @@ -1267,28 +1685,28 @@ InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting) UpdatableInset::RESULT InsetText::moveRightIntern(BufferView * bv, bool behind, - bool activate_inset, bool selecting) + bool activate_inset, bool selecting) { if (!cpar(bv)->next() && (cpos(bv) >= cpar(bv)->size())) - return FINISHED; + return FINISHED_RIGHT; if (activate_inset && checkAndActivateInset(bv, behind)) return DISPATCHED; - TEXT(bv)->CursorRight(bv); + getLyXText(bv)->cursorRight(bv); if (!selecting) - TEXT(bv)->selection.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) { if (!cpar(bv)->previous() && (cpos(bv) <= 0)) return FINISHED; - TEXT(bv)->CursorLeft(bv); + getLyXText(bv)->cursorLeft(bv); if (!selecting) - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; + getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor; if (activate_inset && checkAndActivateInset(bv, behind)) return DISPATCHED; return DISPATCHED_NOUPDATE; @@ -1299,8 +1717,8 @@ UpdatableInset::RESULT InsetText::moveUp(BufferView * bv) { if (!crow(bv)->previous()) - return FINISHED; - TEXT(bv)->CursorUp(bv); + return FINISHED_UP; + getLyXText(bv)->cursorUp(bv); return DISPATCHED_NOUPDATE; } @@ -1309,57 +1727,71 @@ UpdatableInset::RESULT InsetText::moveDown(BufferView * bv) { if (!crow(bv)->next()) - return FINISHED; - TEXT(bv)->CursorDown(bv); + return FINISHED_DOWN; + 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->insetAllowed(inset)) + return the_locking_inset->insertInset(bv, inset); return false; } - 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); + + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + lt->insertInset(bv, inset); #if 0 - if ((cpar(bv)->GetChar(cpos(bv)) != LyXParagraph::META_INSET) || - (cpar(bv)->GetInset(cpos(bv)) != inset)) - TEXT(bv)->CursorLeft(bv); + if ((!cpar(bv)->isInset(cpos(bv))) || + (cpar(bv)->getInset(cpos(bv)) != inset)) + lt->cursorLeft(bv); #endif - bv->fitCursor(TEXT(bv)); - UpdateLocal(bv, CURSOR_PAR|CURSOR, true); - ShowInsetCursor(bv); + bv->fitCursor(); + updateLocal(bv, CURSOR_PAR|CURSOR, true); + showInsetCursor(bv); + if (clear) + lt = 0; return true; } -UpdatableInset * InsetText::GetLockingInset() +bool InsetText::insetAllowed(Inset::Code code) const { - return the_locking_inset ? the_locking_inset->GetLockingInset() : this; + if (the_locking_inset) + return the_locking_inset->insetAllowed(code); + return true; } -UpdatableInset * InsetText::GetFirstLockingInsetOfType(Inset::Code c) +UpdatableInset * InsetText::getLockingInset() const { - if (c == LyxCode()) + return the_locking_inset ? the_locking_inset->getLockingInset() : + const_cast(this); +} + + +UpdatableInset * InsetText::getFirstLockingInsetOfType(Inset::Code c) +{ + 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; } @@ -1368,10 +1800,10 @@ std::vector const InsetText::getLabelList() const { std::vector 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 const l = (*beg)->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); @@ -1382,42 +1814,51 @@ std::vector const InsetText::getLabelList() const } -void InsetText::SetFont(BufferView * bv, LyXFont const & font, bool toggleall, +void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall, bool selectall) { if (the_locking_inset) { - the_locking_inset->SetFont(bv, font, toggleall, selectall); + the_locking_inset->setFont(bv, font, toggleall, selectall); return; } - if (TEXT(bv)->selection.set()) { - bv->text->SetUndo(bv->buffer(), Undo::EDIT, - bv->text->cursor.par()->previous(), - bv->text->cursor.par()->next()); + if ((!par->next() && !par->size()) || !cpar(bv)->size()) { + getLyXText(bv)->setFont(bv, font, toggleall); + return; + } + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + if (lt->selection.set()) { + setUndo(bv, Undo::EDIT, lt->cursor.par(), lt->cursor.par()->next()); } if (selectall) selectAll(bv); - TEXT(bv)->SetFont(bv, font, toggleall); + lt->toggleFree(bv, font, toggleall); if (selectall) - TEXT(bv)->ClearSelection(bv); - bv->fitCursor(TEXT(bv)); - if (selectall || TEXT(bv)->selection.set()) - UpdateLocal(bv, FULL, true); + lt->clearSelection(); + bv->fitCursor(); + if (selectall || lt->selection.set()) + updateLocal(bv, FULL, true); else - UpdateLocal(bv, CURSOR_PAR, true); + updateLocal(bv, CURSOR_PAR, true); + if (clear) + lt = 0; } bool InsetText::checkAndActivateInset(BufferView * bv, bool behind) { - if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) { + if (cpar(bv)->isInset(cpos(bv))) { unsigned int x; unsigned int y; Inset * inset = - static_cast(cpar(bv)->GetInset(cpos(bv))); - if (!inset || inset->Editable() != Inset::HIGHLY_EDITABLE) + static_cast(cpar(bv)->getInset(cpos(bv))); + if (!isHighlyEditableInset(inset)) 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); @@ -1427,10 +1868,10 @@ bool InsetText::checkAndActivateInset(BufferView * bv, bool behind) } //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, false); + updateLocal(bv, CURSOR, false); return true; } return false; @@ -1440,11 +1881,10 @@ bool InsetText::checkAndActivateInset(BufferView * bv, bool behind) bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y, 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) @@ -1453,10 +1893,10 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y, 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, false); + updateLocal(bv, CURSOR, false); return true; } return false; @@ -1465,9 +1905,10 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y, int InsetText::getMaxWidth(BufferView * bv, UpdatableInset const * inset) const { +#if 0 int w = UpdatableInset::getMaxWidth(bv, inset); if (w < 0) { - return w; + return -1; } if (owner()) { w = w - top_x + owner()->x(); @@ -1475,91 +1916,94 @@ int InsetText::getMaxWidth(BufferView * bv, UpdatableInset const * inset) const } w -= (2 * TEXT_TO_INSET_OFFSET); return w - top_x; -// return w - (2*TEXT_TO_INSET_OFFSET); +#else + return UpdatableInset::getMaxWidth(bv, inset); +#endif } -void InsetText::SetParagraphData(LyXParagraph * p) +void InsetText::setParagraphData(Paragraph * p) { - // 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; - } - + // we have to unlock any locked inset otherwise we're in troubles + the_locking_inset = 0; while (par) { - LyXParagraph * tmp = par->next(); + Paragraph * tmp = par->next(); delete par; par = tmp; } - par = new LyXParagraph(*p); - par->SetInsetOwner(this); - LyXParagraph * np = par; + par = new Paragraph(*p, false); + par->setInsetOwner(this); + Paragraph * np = par; while (p->next()) { p = p->next(); - np->next(new LyXParagraph(*p)); + np->next(new Paragraph(*p, false)); np->next()->previous(np); np = np->next(); - np->SetInsetOwner(this); + np->setInsetOwner(this); } - + reinitLyXText(); 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); + par->insertChar(i, data[i], font); } -void InsetText::SetAutoBreakRows(bool flag) +void InsetText::setAutoBreakRows(bool flag) { if (flag != autoBreakRows) { autoBreakRows = flag; - need_update = FULL; if (!flag) removeNewlines(); + need_update = INIT; } } -void InsetText::SetDrawFrame(BufferView * bv, DrawFrame how) +void InsetText::setDrawFrame(BufferView * bv, 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); - int x = text->cursor.x() + top_x + TEXT_TO_INSET_OFFSET; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + int x = lt->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 = lt->getFont(bv->buffer(), + lt->cursor.par(), + lt->cursor.pos()); if (font.isVisibleRightToLeft()) x -= the_locking_inset->width(bv, font); } + if (clear) + lt = 0; return x; } @@ -1567,66 +2011,99 @@ int InsetText::cx(BufferView * bv) const 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 +pos_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 + bool const recursive) const { + if (!recursive && (cached_bview == lbv)) { + LyXText * lt = cached_text.get(); + lyx::Assert(lt && lt->firstRow()->par() == par); + return cached_text.get(); + } + // Super UGLY! (Lgb) BufferView * bv = const_cast(lbv); - if ((cache.find(bv) != cache.end()) && cache[bv]) { - if (recursive && the_locking_inset) - return the_locking_inset->getLyXText(bv); - return cache[bv]; - } - LyXText * lt = new LyXText(const_cast(this)); - lt->init(bv); - cache[bv] = lt; - if (the_locking_inset) { - lt->SetCursor(bv, inset_par, inset_pos, true, inset_boundary); - if (recursive) - return the_locking_inset->getLyXText(bv); + cached_bview = bv; + Cache::iterator it = cache.find(bv); + + if (it != cache.end()) { + if (do_reinit) + reinitLyXText(); + else if (do_resize) + resizeLyXText(do_resize); + if (lt || !it->second.remove) { + lyx::Assert(it->second.text.get()); + cached_text = it->second.text; + if (recursive && the_locking_inset) { + return the_locking_inset->getLyXText(bv, true); + } + return cached_text.get(); + } else if (it->second.remove) { + if (locked) { + saveLyXTextState(it->second.text.get()); + } else { + sstate.lpar = 0; + } + } + } + + cached_text.reset(new LyXText(const_cast(this))); + cached_text->init(bv); + restoreLyXTextState(bv, cached_text.get()); + + cache.insert(make_pair(bv, cached_text)); + + if (the_locking_inset && recursive) { + return the_locking_inset->getLyXText(bv); } - return lt; + return cached_text.get(); } 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]; - cache.erase(bv); + } + + lyx::Assert(it->second.text.get()); + + it->second.remove = true; if (recursive) { /// then remove all LyXText in text-insets - LyXParagraph * p = par; + Paragraph * p = par; for (; p; p = p->next()) { p->deleteInsetsLyXText(bv); } @@ -1636,85 +2113,98 @@ void InsetText::deleteLyXText(BufferView * bv, bool recursive) const void InsetText::resizeLyXText(BufferView * bv, bool force) const { + if (lt) { + // we cannot resize this because we are in use! + // so do this on the next possible getLyXText() + do_resize = bv; + return; + } + do_resize = 0; +// lyxerr << "InsetText::resizeLyXText\n"; if (!par->next() && !par->size()) // no data, resize not neccessary! return; // one endless line, resize normally not necessary if (!force && getMaxWidth(bv, this) < 0) return; - if ((cache.find(bv) == cache.end()) || !cache[bv]) + + Cache::iterator it = cache.find(bv); + if (it == cache.end()) { return; + } + lyx::Assert(it->second.text.get()); - LyXParagraph * lpar = 0; - LyXParagraph * selstartpar = 0; - LyXParagraph * selendpar = 0; - LyXParagraph::size_type pos = 0; - LyXParagraph::size_type selstartpos = 0; - LyXParagraph::size_type selendpos = 0; - bool boundary = false; - bool selstartboundary = false; - bool selendboundary = false; - 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)->selection.start.par(); - selstartpos = TEXT(bv)->selection.start.pos(); - selstartboundary = TEXT(bv)->selection.start.boundary(); - selendpar = TEXT(bv)->selection.end.par(); - selendpos = TEXT(bv)->selection.end.pos(); - selendboundary = TEXT(bv)->selection.end.boundary(); - selection = TEXT(bv)->selection.set(); - mark_set = TEXT(bv)->selection.mark(); - } - deleteLyXText(bv, (the_locking_inset == 0) || force); - - if (lpar) { - TEXT(bv)->selection.set(true); - /* at this point just to avoid the Delete-Empty-Paragraph - * Mechanism when setting the cursor */ - TEXT(bv)->selection.mark(mark_set); - if (selection) { - TEXT(bv)->SetCursor(bv, selstartpar, selstartpos, - true, selstartboundary); - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; - TEXT(bv)->SetCursor(bv, selendpar, selendpos, - true, selendboundary); - TEXT(bv)->SetSelection(bv); - TEXT(bv)->SetCursor(bv, lpar, pos); - } else { - TEXT(bv)->SetCursor(bv, lpar, pos, true, boundary); - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; - TEXT(bv)->selection.set(false); - } + LyXText * t = it->second.text.get(); + saveLyXTextState(t); + for (Paragraph * p = par; p; p = p->next()) { + p->resizeInsetsLyXText(bv); } - if (bv->screen()) - TEXT(bv)->first = bv->screen()->TopCursorVisible(TEXT(bv)); - // this will scroll the screen such that the cursor becomes visible - bv->updateScrollbar(); -// AllowInput(bv); + t->init(bv, true); + restoreLyXTextState(bv, t); if (the_locking_inset) { - /// then resize all LyXText in text-insets inset_x = cx(bv) - top_x + drawTextXOffset; inset_y = cy(bv) + drawTextYOffset; - for (LyXParagraph * p = par; p; p = p->next()) { + } + + if (bv->screen()) { + t->first = bv->screen()->topCursorVisible(t); + } + if (!owner()) { + updateLocal(bv, FULL, false); + // this will scroll the screen such that the cursor becomes visible + bv->updateScrollbar(); + } else { + need_update |= FULL; + } +} + + +void InsetText::reinitLyXText() const +{ + if (lt) { + // we cannot resize this because we are in use! + // so do this on the next possible getLyXText() + do_reinit = true; + return; + } + do_reinit = false; + do_resize = 0; +// lyxerr << "InsetText::reinitLyXText\n"; + for(Cache::iterator it = cache.begin(); it != cache.end(); ++it) { + lyx::Assert(it->second.text.get()); + + LyXText * t = it->second.text.get(); + BufferView * bv = it->first; + + saveLyXTextState(t); + for (Paragraph * p = par; p; p = p->next()) { p->resizeInsetsLyXText(bv); } + t->init(bv, true); + restoreLyXTextState(bv, t); + if (the_locking_inset) { + inset_x = cx(bv) - top_x + drawTextXOffset; + inset_y = cy(bv) + drawTextYOffset; + } + if (bv->screen()) { + t->first = bv->screen()->topCursorVisible(t); + } + if (!owner()) { + updateLocal(bv, FULL, false); + // this will scroll the screen such that the cursor becomes visible + bv->updateScrollbar(); + } else { + need_update = FULL; + } } - need_update = FULL; } void InsetText::removeNewlines() { - for (LyXParagraph * p = par; p; p = p->next()) { + for (Paragraph * p = par; p; p = p->next()) { for (int i = 0; i < p->size(); ++i) { - if (p->GetChar(i) == LyXParagraph::META_NEWLINE) - p->Erase(i); + if (p->getChar(i) == Paragraph::META_NEWLINE) + p->erase(i); } } } @@ -1744,22 +2234,25 @@ bool InsetText::doClearArea() const return !locked || (need_update & (FULL|INIT)); } + void InsetText::selectAll(BufferView * bv) { - TEXT(bv)->CursorTop(bv); - TEXT(bv)->selection.cursor = TEXT(bv)->cursor; - TEXT(bv)->CursorBottom(bv); - TEXT(bv)->SetSelection(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) { - TEXT(bv)->ClearSelection(bv); + getLyXText(bv)->clearSelection(); } + void InsetText::clearInset(Painter & pain, int baseline, bool & cleared) const { - int w = insetWidth; + int w = insetWidth; int h = insetAscent + insetDescent; int ty = baseline - insetAscent; @@ -1771,13 +2264,238 @@ void InsetText::clearInset(Painter & pain, int baseline, bool & cleared) const h = pain.paperHeight(); if ((top_x + drawTextXOffset + w) > pain.paperWidth()) w = pain.paperWidth(); - pain.fillRectangle(top_x+drawTextXOffset, ty, w, h); +// w -= TEXT_TO_INSET_OFFSET; + pain.fillRectangle(top_x, ty, w+1, h+1, backgroundColor()); cleared = true; need_update = FULL; + frame_is_visible = false; +} + + +Paragraph * InsetText::getParFromID(int id) const +{ +#if 0 + Paragraph * result = par; + Paragraph * ires = 0; + while (result && result->id() != id) { + if ((ires = result->getParFromID(id))) + return ires; + result = result->next(); + } + return result; +#else + Paragraph * tmp = par; + while (tmp) { + int tmp_id = tmp->id(); + lyxerr << "Looking at paragraph: " << tmp_id << endl; + if (tmp->id() == id) { + return tmp; + } + Paragraph * tmp2 = tmp->getParFromID(id); + if (tmp2 != 0) { + return tmp2; + } + tmp = tmp->next(); + } + return 0; +#endif +} + + +Paragraph * InsetText::firstParagraph() const +{ + Paragraph * result; + if (the_locking_inset) + if ((result = the_locking_inset->firstParagraph())) + return result; + return par; +} + + +Paragraph * InsetText::getFirstParagraph(int i) const +{ + return (i == 0) ? par : 0; +} + + +LyXCursor const & InsetText::cursor(BufferView * bv) const +{ + if (the_locking_inset) + return the_locking_inset->cursor(bv); + return getLyXText(bv)->cursor; +} + + +Paragraph * InsetText::paragraph() const +{ + return par; +} + + +void InsetText::paragraph(Paragraph * p) +{ + par = p; + reinitLyXText(); + // redraw myself when asked for + need_update = INIT; +} + + +Inset * InsetText::getInsetFromID(int id_arg) const +{ + if (id_arg == id()) + return const_cast(this); + + Paragraph * lp = par; + + while(lp) { + for (Paragraph::inset_iterator it = lp->inset_iterator_begin(), + en = lp->inset_iterator_end(); + it != en; ++it) + { + if ((*it)->id() == id_arg) + return *it; + Inset * in = (*it)->getInsetFromID(id_arg); + if (in) + return in; + } + lp = lp->next(); + } + return 0; +} + + +string const InsetText::selectNextWordToSpellcheck(BufferView * bv, float & value) const +{ + bool clear = false; + string str; + + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + if (the_locking_inset) { + str = the_locking_inset->selectNextWordToSpellcheck(bv, value); + if (!str.empty()) { + value += cy(bv); + if (clear) + lt = 0; + return str; + } +#warning Dekel please have a look on this one RTL? (Jug) +#warning DEKEL! + // we have to go on checking so move cusor to the right + lt->cursor.pos(lt->cursor.pos() + 1); + } + str = lt->selectNextWordToSpellcheck(bv, value); + if (str.empty()) + bv->unlockInset(const_cast(this)); + else + value = cy(bv); + if (clear) + lt = 0; + return str; +} + + +void InsetText::selectSelectedWord(BufferView * bv) +{ + if (the_locking_inset) { + the_locking_inset->selectSelectedWord(bv); + return; + } + getLyXText(bv)->selectSelectedWord(bv); + updateLocal(bv, SELECTION, false); +} + + +void InsetText::toggleSelection(BufferView * bv, bool kill_selection) +{ + if (the_locking_inset) { + the_locking_inset->toggleSelection(bv, kill_selection); + } + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + + int x = top_x + TEXT_TO_INSET_OFFSET; + + Row * row = lt->firstRow(); + int y_offset = top_baseline - row->ascent_of_text(); + int y = y_offset; + while ((row != 0) && ((y+row->height()) <= 0)) { + y += row->height(); + row = row->next(); + } + if (y_offset < 0) + y_offset = y; + + if (need_update & SELECTION) + need_update = NONE; + bv->screen()->toggleSelection(lt, bv, kill_selection, y_offset, x); + if (clear) + lt = 0; +} + + +bool InsetText::searchForward(BufferView * bv, string const & str, + bool const & cs, bool const & mw) +{ + if (the_locking_inset) { + if (the_locking_inset->searchForward(bv, str, cs, mw)) + return true; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + Paragraph * lpar = lt->cursor.par(); + pos_type pos = lt->cursor.pos(); + if (pos < lpar->size() - 1) + ++pos; + else { + pos = 0; + lpar = lpar->next(); + } + if (!lpar) { + if (clear) + lt = 0; + // we have to unlock ourself in this function by default! + bv->unlockInset(const_cast(this)); + return false; + } + lt->setCursor(bv, lpar, pos); + if (clear) + lt = 0; + } + if (LyXFind(bv, str, true, true, cs , mw)) { + return true; + } + // we have to unlock ourself in this function by default! + bv->unlockInset(const_cast(this)); + return false; +} + +bool InsetText::searchBackward(BufferView * bv, string const & str, + bool const & cs, bool const & mw) +{ + if (the_locking_inset) + if (the_locking_inset->searchBackward(bv, str, cs, mw)) + return true; + if (LyXFind(bv, str, false, true, cs, mw)) { + return true; + } + // we have to unlock ourself in this function by default! + bv->unlockInset(const_cast(this)); + return false; +} + + +bool InsetText::checkInsertChar(LyXFont & font) +{ + if (owner()) + return owner()->checkInsertChar(font); + return true; } -/* Emacs: - * Local variables: - * tab-width: 4 - * End: - * vi:set tabstop=4: - */