X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.C;h=f22c7cf84ed01192d1363747486308be32f285e3;hb=dbd7a961fc46bb10c85bdd8c7fb6626477ae63d8;hp=536851c07478f78d1acd7e2b73f3d7a9dfc1b6ba;hpb=d32d0cbb9552186e0d69ee2320baf2570402fc72;p=lyx.git diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 536851c074..f22c7cf84e 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -10,12 +10,6 @@ #include -#include -#include - -#include -//#include - #ifdef __GNUG__ #pragma implementation #endif @@ -29,17 +23,14 @@ #include "buffer.h" #include "LyXView.h" #include "BufferView.h" -#include "layout.h" +#include "lyxtextclasslist.h" #include "LaTeXFeatures.h" #include "Painter.h" -#include "lyx_gui_misc.h" #include "lyxtext.h" #include "lyxcursor.h" #include "CutAndPaste.h" #include "font.h" #include "LColor.h" -#include "support/textutils.h" -#include "support/LAssert.h" #include "lyxrow.h" #include "lyxrc.h" #include "intl.h" @@ -52,33 +43,63 @@ #include "undo_funcs.h" #include "lyxfind.h" +#include "frontends/Alert.h" + +#include "support/textutils.h" +#include "support/LAssert.h" +#include "support/lstrings.h" +#include "support/lyxalgo.h" // lyx::count + +#include +#include +#include +//#include + using std::ostream; using std::ifstream; using std::endl; using std::min; using std::max; using std::make_pair; +using std::vector; +using std::pair; + +using lyx::pos_type; +using lyx::textclass_type; extern unsigned char getCurrentTextClass(Buffer *); extern bool math_insert_greek(BufferView *, char); extern int greek_kb_flag; -#warning this functions should probably go into bufferview_funcs somehow (Jug) +// These functions should probably go into bufferview_funcs somehow (Jug) void InsetText::saveLyXTextState(LyXText * t) const { - 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(); + // 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 @@ -101,6 +122,8 @@ void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const t->selection.cursor = t->cursor; t->selection.set(false); } + if (sstate.refresh) { + } } } @@ -113,63 +136,67 @@ InsetText::InnerCache::InnerCache(boost::shared_ptr t) InsetText::InsetText() + : UpdatableInset(), lt(0), in_update(false), do_resize(0), + do_reinit(false) { par = new Paragraph; init(); } -InsetText::InsetText(InsetText const & ins, bool same_id) - : 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, same_id); - 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, bool same_id) { + if (ins) { + setParagraphData(ins->par, same_id); + 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; - frame_color = LColor::insetframe; - if (ins) { - setParagraphData(ins->par); - autoBreakRows = ins->autoBreakRows; - drawFrame_ = ins->drawFrame_; - frame_color = ins->frame_color; - if (same_id) - id_ = ins->id_; - } - par->setInsetOwner(this); locked = false; old_par = 0; last_drawn_width = -1; frame_is_visible = false; cached_bview = 0; sstate.lpar = 0; - lt = 0; + in_insetAllowed = false; } @@ -189,17 +216,14 @@ InsetText::~InsetText() void InsetText::clear() { - cached_bview = 0; - - // now also delete all caches this should be safe, hopefully - cache.clear(); - while (par) { Paragraph * tmp = par->next(); delete par; par = tmp; } par = new Paragraph; + reinitLyXText(); + need_update = INIT; } @@ -232,14 +256,14 @@ void InsetText::read(Buffer const * buf, LyXLex & lex) clear(); - while (lex.IsOK()) { + while (lex.isOK()) { lex.nextToken(); - token = lex.GetString(); + token = lex.getString(); if (token.empty()) continue; if (token == "\\end_inset") { -#ifdef NO_LATEX - const_cast(buf)->insertErtContents(par, pos, font, false); +#ifndef NO_COMPABILITY + const_cast(buf)->insertErtContents(par, pos, false); #endif break; } @@ -255,7 +279,7 @@ void InsetText::read(Buffer const * buf, LyXLex & lex) if (!return_par) return_par = par; par = return_par; - while(return_par) { + while (return_par) { return_par->setInsetOwner(this); return_par = return_par->next(); } @@ -264,48 +288,51 @@ 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 = getLyXText(bv)->getRowNearY(y_temp); - insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET; + insetAscent = getLyXText(bv)->firstRow()->ascent_of_text() + + TEXT_TO_INSET_OFFSET; return insetAscent; } int InsetText::descent(BufferView * bv, LyXFont const &) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } - int y_temp = 0; - Row * row = lt->getRowNearY(y_temp); - insetDescent = lt->height - row->ascent_of_text() + - TEXT_TO_INSET_OFFSET; - if (clear) - lt = 0; + LyXText * llt = getLyXText(bv); + insetDescent = llt->height - llt->firstRow()->ascent_of_text() + + TEXT_TO_INSET_OFFSET; return insetDescent; } int InsetText::width(BufferView * bv, LyXFont const &) const { - insetWidth = max(textWidth(bv), - (int)getLyXText(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); } @@ -316,79 +343,86 @@ 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); + topx_set = true; + 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); + return; + } + } + + // call these methods so that insetWidth, insetAscent and + // insetDescent have the right values. + width(bv, f); + ascent(bv, f); + descent(bv, f); + + // repaint the background if needed + if (cleared && backgroundColor() != LColor::background) { + clearInset(bv, baseline, cleared); + } // no draw is necessary !!! if ((drawFrame_ == LOCKED) && !locked && !par->size()) { - top_x = int(x); 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 (!cleared && (top_x == int(x)) && - ((need_update&(INIT|FULL)) || (top_baseline!=baseline) || - (last_drawn_width!=insetWidth))) { - clearInset(pain, baseline, cleared); + // if top_x differs we did it already + if (!cleared && (old_x == int(x)) + && ((need_update&(INIT|FULL)) || (top_baseline != baseline) + ||(last_drawn_width != insetWidth))) + { + // Condition necessary to eliminate bug 59 attachment 37 + if (baseline > 0) + clearInset(bv, baseline, cleared); } + if (cleared) frame_is_visible = false; - if (!cleared && (need_update == NONE)) + if (!cleared && (need_update == NONE)) { + if (locked) + drawFrame(pain, cleared); return; - - if (top_x != int(x)) { - 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(bv, LyXText::CHANGED_IN_DRAW); - } - top_x = int(x); - clearInset(pain, baseline, cleared); } -// lyxerr << "InsetText::draw[" << this << "](" << need_update << ":" << int(x) << ":" << top_x << ")\n"; + top_baseline = baseline; + top_y = baseline - insetAscent; - if (cleared || (last_drawn_width != insetWidth)) { + if (last_drawn_width != insetWidth) { + if (!cleared) + clearInset(bv, 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)) { inset_x = cx(bv) - top_x + drawTextXOffset; inset_y = cy(bv) + drawTextYOffset; } if (!cleared && (need_update == CURSOR) - && !getLyXText(bv)->selection.set()) { + && !getLyXText(bv)->selection.set()) { drawFrame(pain, cleared); - x += last_width; // was width(bv, f); + x += insetWidth; need_update = NONE; return; } @@ -399,12 +433,11 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, } x += TEXT_TO_INSET_OFFSET; - int y = 0; - Row * row = lt->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(); @@ -413,7 +446,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, if (y_offset < 0) y_offset = y; lt->first = first; - if (cleared) { + if (cleared || (need_update&(INIT|FULL))) { int yf = y_offset; y = 0; while ((row != 0) && (yf < ph)) { @@ -426,17 +459,17 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, } else if (!locked) { if (need_update & CURSOR) { bv->screen()->toggleSelection(lt, bv, true, y_offset,int(x)); - lt->clearSelection(bv); + lt->clearSelection(); lt->selection.cursor = lt->cursor; } bv->screen()->update(lt, bv, y_offset, int(x)); } else { locked = false; - if (need_update & SELECTION) + if (need_update & SELECTION) { bv->screen()->toggleToggle(lt, bv, y_offset, int(x)); - else if (need_update & CURSOR) { + } else if (need_update & CURSOR) { bv->screen()->toggleSelection(lt, bv, true, y_offset,int(x)); - lt->clearSelection(bv); + lt->clearSelection(); lt->selection.cursor = lt->cursor; } bv->screen()->update(lt, bv, y_offset, int(x)); @@ -446,15 +479,19 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, 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 += last_width /* was width(bv, f) */ - TEXT_TO_INSET_OFFSET; + } + + x += insetWidth - TEXT_TO_INSET_OFFSET; + if (bv->text->status() == LyXText::CHANGED_IN_DRAW) { - need_update |= INIT; - } else if (need_update != INIT) + need_update |= FULL; + } else if (need_update != INIT) { need_update = NONE; + } if (clear) lt = 0; } @@ -462,9 +499,13 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, 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 = insetWidth - 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; } @@ -475,8 +516,7 @@ 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, + pain.rectangle(frame_x, frame_y, frame_w, frame_h, backgroundColor()); } frame_is_visible = false; @@ -486,11 +526,21 @@ void InsetText::clearFrame(Painter & pain, bool cleared) const void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) { - 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) { @@ -504,15 +554,6 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) lt = getLyXText(bv); clear = true; } - int oldw = insetWidth; - insetWidth = lt->width + (2 * TEXT_TO_INSET_OFFSET); - if (oldw != insetWidth) { - resizeLyXText(bv); - need_update |= FULL; - if (clear) - lt = 0; - return; - } if ((need_update & CURSOR_PAR) && (lt->status() == LyXText::UNCHANGED) && the_locking_inset) { @@ -522,32 +563,40 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) need_update |= FULL; if (clear) lt = 0; + in_update = false; } void InsetText::setUpdateStatus(BufferView * bv, int what) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } + // this does nothing dangerous so use only a localized buffer + LyXText * llt = getLyXText(bv); + need_update |= what; - if (lt->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 ((llt->status() == LyXText::NEED_MORE_REFRESH) || + (!autoBreakRows && + (llt->status() == LyXText::NEED_VERY_LITTLE_REFRESH))) + { need_update |= FULL; - else if (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH) + } else if (llt->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)) - lt->clearSelection(bv); - if (clear) - lt = 0; + if (need_update & CURSOR && !(need_update & SELECTION)) { + if (llt->selection.set()) + need_update = FULL; + llt->clearSelection(); + } } void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const { + if (!autoBreakRows && par->next()) + collapseParagraphs(bv->buffer()->params); bool clear = false; if (!lt) { lt = getLyXText(bv); @@ -555,18 +604,24 @@ void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const } lt->fullRebreak(bv); setUpdateStatus(bv, what); - if ((need_update != CURSOR) || (lt->status() != LyXText::UNCHANGED) || - lt->selection.set()) - { + bool flag = (((need_update != CURSOR) && (need_update != NONE)) || + (lt->status() != LyXText::UNCHANGED) || lt->selection.set()); + if (clear) + lt = 0; + if (flag) bv->updateInset(const_cast(this), mark_dirty); - } + else + bv->fitCursor(); + + if (need_update == CURSOR) + need_update = NONE; bv->owner()->showState(); + bv->owner()->updateMenubar(); + bv->owner()->updateToolbar(); if (old_par != cpar(bv)) { - bv->owner()->setLayout(cpar(bv)->getLayout()); + bv->owner()->setLayout(cpar(bv)->layout()); old_par = cpar(bv); } - if (clear) - lt = 0; } @@ -596,25 +651,28 @@ void InsetText::edit(BufferView * bv, int x, int y, unsigned int button) lt = getLyXText(bv); clear = true; } - if (!checkAndActivateInset(bv, x, tmp_y, button)) lt->setCursorFromCoordinates(bv, x - drawTextXOffset, y + insetAscent); - lt->clearSelection(bv); + 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()) { + bv->getParentLanguage(this) != lt->current_font.language()) + { LyXFont font(LyXFont::ALL_IGNORE); font.setLanguage(bv->getParentLanguage(this)); setFont(bv, font, false); } + showInsetCursor(bv); if (clear) lt = 0; + + int code = CURSOR; + if (drawFrame_ == LOCKED) + code = CURSOR|DRAW_FRAME; + updateLocal(bv, code, false); } @@ -641,15 +699,13 @@ void InsetText::edit(BufferView * bv, bool front) lt->setCursor(bv, par, 0); else { Paragraph * p = par; - while(p->next()) + while (p->next()) p = p->next(); - lt->setCursor(bv, p, p->size()-1); +// int const pos = (p->size() ? p->size()-1 : p->size()); + lt->setCursor(bv, p, p->size()); } - lt->clearSelection(bv); + 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() && @@ -658,8 +714,13 @@ void InsetText::edit(BufferView * bv, bool front) font.setLanguage(bv->getParentLanguage(this)); setFont(bv, font, false); } + showInsetCursor(bv); if (clear) lt = 0; + int code = CURSOR; + if (drawFrame_ == LOCKED) + code = CURSOR|DRAW_FRAME; + updateLocal(bv, code, false); } @@ -683,16 +744,33 @@ void InsetText::insetUnlock(BufferView * bv) clear = true; } if (lt->selection.set()) { - lt->clearSelection(bv); + lt->clearSelection(); code = FULL; } else if (owner()) { bv->owner()->setLayout(owner()->getLyXText(bv) - ->cursor.par()->getLayout()); + ->cursor.par()->layout()); } else - bv->owner()->setLayout(bv->text->cursor.par()->getLayout()); - updateLocal(bv, code, false); + bv->owner()->setLayout(bv->text->cursor.par()->layout()); + // hack for deleteEmptyParMech + if (par->size()) { + lt->setCursor(bv, par, 0); + } else if (par->next()) { + lt->setCursor(bv, par->next(), 0); + } if (clear) lt = 0; + updateLocal(bv, code, false); +} + +void InsetText::lockInset(BufferView * bv, UpdatableInset * inset) +{ + the_locking_inset = inset; + inset_x = cx(bv) - top_x + drawTextXOffset; + inset_y = cy(bv) + drawTextYOffset; + inset_pos = cpos(bv); + inset_par = cpar(bv); + inset_boundary = cboundary(bv); + updateLocal(bv, CURSOR, false); } @@ -702,15 +780,33 @@ bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset) << inset << "): "; if (!inset) return false; + if (!the_locking_inset) { + Paragraph * p = par; + int const id = inset->id(); + while(p) { + Paragraph::inset_iterator it = + p->inset_iterator_begin(); + Paragraph::inset_iterator const end = + p->inset_iterator_end(); + for (; it != end; ++it) { + if ((*it) == inset) { + getLyXText(bv)->setCursorIntern(bv, p, it.getPos()); + lockInset(bv, inset); + return true; + } + if ((*it)->getInsetFromID(id)) { + getLyXText(bv)->setCursorIntern(bv, p, it.getPos()); + (*it)->edit(bv); + return the_locking_inset->lockInsetInInset(bv, inset); + } + } + p = p->next(); + } + return false; + } if (inset == cpar(bv)->getInset(cpos(bv))) { lyxerr[Debug::INSETS] << "OK" << endl; - the_locking_inset = inset; - inset_x = cx(bv) - top_x + drawTextXOffset; - inset_y = cy(bv) + drawTextYOffset; - inset_pos = cpos(bv); - inset_par = cpar(bv); - inset_boundary = cboundary(bv); - updateLocal(bv, CURSOR, false); + lockInset(bv, inset); return true; } else if (the_locking_inset && (the_locking_inset == inset)) { if (cpar(bv) == inset_par && cpos(bv) == inset_pos) { @@ -730,7 +826,7 @@ bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset) bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset, - bool lr) + bool lr) { if (!the_locking_inset) return false; @@ -753,21 +849,42 @@ bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset, bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset) { - if (!the_locking_inset) - return false; + if (!autoBreakRows && par->next()) + collapseParagraphs(bv->buffer()->params); + if (inset == this) + return true; + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + if (!the_locking_inset) { + bool found = lt->updateInset(bv, inset); + if (clear) + lt = 0; + if (found) + setUpdateStatus(bv, NONE); + return found; + } if (the_locking_inset != inset) { - getLyXText(bv)->updateInset(bv, the_locking_inset); - setUpdateStatus(bv, CURSOR_PAR); - return the_locking_inset->updateInsetInInset(bv, inset); + bool found = the_locking_inset->updateInsetInInset(bv, inset); + if (clear) + lt = 0; + if (found) + setUpdateStatus(bv, CURSOR_PAR); + return found; } -// 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; + bool found = lt->updateInset(bv, inset); + if (clear) + lt = 0; + if (found) { + setUpdateStatus(bv, CURSOR_PAR); + if (cpar(bv) == inset_par && cpos(bv) == inset_pos) { + inset_x = cx(bv) - top_x + drawTextXOffset; + inset_y = cy(bv) + drawTextYOffset; + } } - return true; + return found; } @@ -775,14 +892,21 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) { no_selection = true; + // use this to check mouse motion for selection! + mouse_x = x; + mouse_y = y; + int tmp_x = x - drawTextXOffset; int tmp_y = y + insetAscent - getLyXText(bv)->first; - Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y, button); + Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y); 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) { @@ -790,8 +914,9 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) 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); + the_locking_inset = 0; + 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); @@ -803,7 +928,7 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) 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; @@ -812,7 +937,7 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) inset_boundary = cboundary(bv); the_locking_inset = uinset; uinset->insetButtonPress(bv, x - inset_x, y - inset_y, - button); + button); uinset->edit(bv, x - inset_x, y - inset_y, 0); if (the_locking_inset) updateLocal(bv, CURSOR, false); @@ -826,11 +951,30 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) localDispatch(bv, LFUN_COPY, ""); paste_internally = true; } - 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()); + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } + + lt->setCursorFromCoordinates(bv, x - drawTextXOffset, + y + insetAscent); + // set the selection cursor! + lt->selection.cursor = lt->cursor; + lt->cursor.x_fix(lt->cursor.x()); + + if (lt->selection.set()) { + lt->clearSelection(); + if (clear) + lt = 0; + updateLocal(bv, FULL, false); + } else { + lt->clearSelection(); + if (clear) + lt = 0; + updateLocal(bv, CURSOR, false); + } + bv->owner()->setLayout(cpar(bv)->layout()); old_par = cpar(bv); // Insert primary selection with middle mouse // if there is a local selection in the current buffer, @@ -840,61 +984,75 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) localDispatch(bv, LFUN_PASTE, ""); else localDispatch(bv, LFUN_PASTESELECTION, - "paragraph"); + "paragraph"); } + } else { + getLyXText(bv)->clearSelection(); } showInsetCursor(bv); no_selection = false; } -void InsetText::insetButtonRelease(BufferView * bv, int x, int y, int button) +bool 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); - } else { - if (cpar(bv)->getChar(cpos(bv)) == Paragraph::META_INSET) { - inset = static_cast(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); - } - updateLocal(bv, CURSOR_PAR, false); + return the_locking_inset->insetButtonRelease(bv, + x - inset_x, y - inset_y, + button); + } + int tmp_x = x - drawTextXOffset; + int tmp_y = y + insetAscent - getLyXText(bv)->first; + Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y); + bool ret = false; + if (inset) { + if (isHighlyEditableInset(inset)) { + ret = inset->insetButtonRelease(bv, x - inset_x, + y - inset_y, button); + } else { + inset_x = cx(bv) - top_x + drawTextXOffset; + inset_y = cy(bv) + drawTextYOffset; + ret = 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); } - no_selection = false; + return ret; } void InsetText::insetMotionNotify(BufferView * bv, int x, int y, int state) { - if (no_selection) + if (no_selection || ((mouse_x == x) && (mouse_y == y))) return; if (the_locking_inset) { the_locking_inset->insetMotionNotify(bv, x - inset_x, - y - inset_y,state); + y - inset_y,state); return; } - LyXText * t = getLyXText(bv); + bool clear = false; + if (!lt) { + lt = getLyXText(bv); + clear = true; + } 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()) + LyXCursor cur = lt->cursor; + lt->setCursorFromCoordinates(bv, x - drawTextXOffset, y + insetAscent); + if (cur == lt->cursor) { + if (clear) + lt = 0; + return; + } + lt->setSelection(bv); + bool flag = (lt->toggle_cursor.par() != lt->toggle_end_cursor.par() || + lt->toggle_cursor.pos() != lt->toggle_end_cursor.pos()); + if (clear) + lt = 0; + if (flag) { updateLocal(bv, SELECTION, false); + } showInsetCursor(bv); } @@ -912,6 +1070,7 @@ UpdatableInset::RESULT 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); @@ -930,30 +1089,33 @@ InsetText::localDispatch(BufferView * bv, else if (result == DISPATCHED) { 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 (!getLyXText(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 (getLyXText(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); @@ -962,6 +1124,8 @@ InsetText::localDispatch(BufferView * bv, lt = getLyXText(bv); clear = true; } + int updwhat = 0; + int updflag = false; switch (action) { // Normal chars case LFUN_SELFINSERT: @@ -984,21 +1148,14 @@ InsetText::localDispatch(BufferView * bv, lt->cutSelection(bv, false); } } - lt->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], lt); - } else if (!the_locking_inset) { - (void)moveRight(bv, false); - } - } else { - bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], lt); - } + bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], lt); } } lt->selection.cursor = lt->cursor; - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; result = DISPATCHED_NOUPDATE; break; // --- Cursor Movements ----------------------------------- @@ -1006,54 +1163,54 @@ InsetText::localDispatch(BufferView * bv, finishUndo(); moveRight(bv, false, true); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_RIGHT: result = moveRight(bv); finishUndo(); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_LEFTSEL: finishUndo(); moveLeft(bv, false, true); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_LEFT: finishUndo(); result = moveLeft(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_DOWNSEL: finishUndo(); moveDown(bv); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_DOWN: finishUndo(); result = moveDown(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_UPSEL: finishUndo(); moveUp(bv); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_UP: finishUndo(); result = moveUp(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_HOME: finishUndo(); lt->cursorHome(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_END: lt->cursorEnd(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_BACKSPACE: { setUndo(bv, Undo::DELETE, @@ -1062,7 +1219,8 @@ InsetText::localDispatch(BufferView * bv, lt->cutSelection(bv); else lt->backspace(bv); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1074,7 +1232,8 @@ InsetText::localDispatch(BufferView * bv, } else { lt->Delete(bv); } - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1082,14 +1241,15 @@ InsetText::localDispatch(BufferView * bv, setUndo(bv, Undo::DELETE, lt->cursor.par(), lt->cursor.par()->next()); lt->cutSelection(bv); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; case LFUN_COPY: finishUndo(); lt->copySelection(bv); - updateLocal(bv, CURSOR_PAR, false); + updwhat = CURSOR_PAR; break; case LFUN_PASTESELECTION: { @@ -1102,14 +1262,15 @@ InsetText::localDispatch(BufferView * bv, } else { lt->insertStringAsLines(bv, clip); } - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; break; } case LFUN_PASTE: { if (!autoBreakRows) { if (CutAndPaste::nrOfParagraphs() > 1) { - WriteAlert(_("Impossible operation"), + Alert::alert(_("Impossible operation"), _("Cannot include more than one paragraph!"), _("Sorry.")); break; @@ -1118,7 +1279,8 @@ InsetText::localDispatch(BufferView * bv, setUndo(bv, Undo::INSERT, lt->cursor.par(), lt->cursor.par()->next()); lt->pasteSelection(bv); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1128,7 +1290,8 @@ InsetText::localDispatch(BufferView * bv, break; } lt->breakParagraph(bv, 0); - updateLocal(bv, FULL, true); + updwhat = FULL; + updflag = true; break; case LFUN_BREAKPARAGRAPHKEEPLAYOUT: if (!autoBreakRows) { @@ -1136,7 +1299,8 @@ InsetText::localDispatch(BufferView * bv, break; } lt->breakParagraph(bv, 1); - updateLocal(bv, FULL, true); + updwhat = FULL; + updflag = true; break; case LFUN_BREAKLINE: { @@ -1147,46 +1311,48 @@ InsetText::localDispatch(BufferView * bv, setUndo(bv, Undo::INSERT, lt->cursor.par(), lt->cursor.par()->next()); lt->insertChar(bv, Paragraph::META_NEWLINE); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; case LFUN_LAYOUT: // do not set layouts on non breakable textinsets if (autoBreakRows) { - LyXTextClass::size_type cur_layout = cpar(bv)->layout; + string cur_layout = cpar(bv)->layout(); // Derive layout number from given argument (string) // and current buffer's textclass (number). */ - LyXTextClassList::ClassList::size_type tclass = - bv->buffer()->params.textclass; - std::pair layout = - textclasslist.NumberOfLayout(tclass, arg); + textclass_type tclass = bv->buffer()->params.textclass; + string layout = lowercase(arg); + bool hasLayout = textclasslist[tclass].hasLayout(layout); // If the entry is obsolete, use the new one instead. - if (layout.first) { - string obs = textclasslist.Style(tclass,layout.second). + if (hasLayout) { + string const & obs = + textclasslist[tclass][layout]. obsoleted_by(); if (!obs.empty()) - layout = textclasslist.NumberOfLayout(tclass, obs); + layout = lowercase(obs); } // see if we found the layout number: - if (!layout.first) { + if (!hasLayout) { 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; - lt->setLayout(bv, layout.second); - bv->owner()->setLayout(cpar(bv)->getLayout()); - updateLocal(bv, CURSOR_PAR, true); + if (cur_layout != layout) { + cur_layout = layout; + lt->setLayout(bv, layout); + bv->owner()->setLayout(cpar(bv)->layout()); + updwhat = CURSOR_PAR; + updflag = true; } } else { // reset the layout box - bv->owner()->setLayout(cpar(bv)->getLayout()); + bv->owner()->setLayout(cpar(bv)->layout()); } break; case LFUN_PARAGRAPH_SPACING: @@ -1230,7 +1396,8 @@ InsetText::localDispatch(BufferView * bv, } if (cur_spacing != new_spacing || cur_value != new_value) { par->params().spacing(Spacing(new_spacing, new_value)); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } } break; @@ -1241,20 +1408,22 @@ InsetText::localDispatch(BufferView * bv, break; } + if (clear) + lt = 0; + if (updwhat > 0) + updateLocal(bv, updwhat, updflag); /// If the action has deleted all text in the inset, we need to change the // language to the language of the surronding text. - if (par->size() == 0 && !par->next()) { + if (!was_empty && par->size() == 0 && !par->next()) { LyXFont font(LyXFont::ALL_IGNORE); font.setLanguage(bv->getParentLanguage(this)); setFont(bv, font, false); } - if (result != FINISHED) { + if (result < FINISHED) { showInsetCursor(bv); } else bv->unlockInset(this); - if (clear) - lt = 0; return result; } @@ -1273,8 +1442,8 @@ int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const unsigned int lines = 0; while (p) { - string const tmp = buf->asciiParagraph(p, linelen); - lines += countChar(tmp, '\n'); + string const tmp = buf->asciiParagraph(p, linelen, p->previous()==0); + lines += lyx::count(tmp.begin(), tmp.end(), '\n'); os << tmp; p = p->next(); } @@ -1282,16 +1451,186 @@ 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 { Paragraph * p = par; unsigned int lines = 0; - int desc = 0; + + vector environment_stack(10); + vector environment_inner(10); - string tmp; + int const command_depth = 0; + string item_name; + + 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[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; @@ -1310,8 +1649,7 @@ void InsetText::validate(LaTeXFeatures & features) const int InsetText::beginningOfMainBody(Buffer const * buf, Paragraph * p) const { - if (textclasslist.Style(buf->params.textclass, - p->getLayout()).labeltype != LABEL_MANUAL) + if (textclasslist[buf->params.textclass][p->layout()].labeltype != LABEL_MANUAL) return 0; else return p->beginningOfMainBody(); @@ -1429,10 +1767,10 @@ 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; getLyXText(bv)->cursorRight(bv); @@ -1444,7 +1782,7 @@ InsetText::moveRightIntern(BufferView * bv, bool behind, 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; @@ -1461,7 +1799,7 @@ UpdatableInset::RESULT InsetText::moveUp(BufferView * bv) { if (!crow(bv)->previous()) - return FINISHED; + return FINISHED_UP; getLyXText(bv)->cursorUp(bv); return DISPATCHED_NOUPDATE; } @@ -1471,7 +1809,7 @@ UpdatableInset::RESULT InsetText::moveDown(BufferView * bv) { if (!crow(bv)->next()) - return FINISHED; + return FINISHED_DOWN; getLyXText(bv)->cursorDown(bv); return DISPATCHED_NOUPDATE; } @@ -1484,32 +1822,41 @@ bool InsetText::insertInset(BufferView * bv, Inset * inset) return the_locking_inset->insertInset(bv, inset); return false; } - inset->setOwner(this); - hideInsetCursor(bv); - bool clear = false; if (!lt) { lt = getLyXText(bv); clear = true; } + setUndo(bv, Undo::FINISH, lt->cursor.par(), lt->cursor.par()->next()); + freezeUndo(); + inset->setOwner(this); + hideInsetCursor(bv); lt->insertInset(bv, inset); - if ((cpar(bv)->getChar(cpos(bv)) != Paragraph::META_INSET) || - (cpar(bv)->getInset(cpos(bv)) != inset)) - lt->cursorLeft(bv); - bv->fitCursor(lt); - updateLocal(bv, CURSOR_PAR|CURSOR, true); - showInsetCursor(bv); + bv->fitCursor(); if (clear) lt = 0; + updateLocal(bv, CURSOR_PAR|CURSOR, true); + unFreezeUndo(); return true; } bool InsetText::insetAllowed(Inset::Code code) const { + // in_insetAllowed is a really gross hack, + // to allow us to call the owner's insetAllowed + // without stack overflow, which can happen + // when the owner uses InsetCollapsable::insetAllowed() + bool ret = true; + if (in_insetAllowed) + return ret; + in_insetAllowed = true; if (the_locking_inset) - return the_locking_inset->insetAllowed(code); - return true; + ret = the_locking_inset->insetAllowed(code); + else if (owner()) + ret = owner()->insetAllowed(code); + in_insetAllowed = false; + return ret; } @@ -1538,16 +1885,16 @@ bool InsetText::showInsetDialog(BufferView * bv) const } -std::vector const InsetText::getLabelList() const +vector const InsetText::getLabelList() const { - std::vector label_list; + vector label_list; Paragraph * tpar = par; while (tpar) { 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(); + vector const l = (*beg)->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); } tpar = tpar->next(); @@ -1563,6 +1910,10 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall, the_locking_inset->setFont(bv, font, toggleall, selectall); return; } + if ((!par->next() && !par->size()) || !cpar(bv)->size()) { + getLyXText(bv)->setFont(bv, font, toggleall); + return; + } bool clear = false; if (!lt) { lt = getLyXText(bv); @@ -1573,31 +1924,28 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall, } if (selectall) selectAll(bv); -#if 1 lt->toggleFree(bv, font, toggleall); -#else - lt->setFont(bv, font, toggleall); -#endif if (selectall) - lt->clearSelection(bv); - bv->fitCursor(lt); - if (selectall || lt->selection.set()) + lt->clearSelection(); + bv->fitCursor(); + bool flag = (selectall || lt->selection.set()); + if (clear) + lt = 0; + if (flag) updateLocal(bv, FULL, true); else updateLocal(bv, CURSOR_PAR, true); - if (clear) - lt = 0; } bool InsetText::checkAndActivateInset(BufferView * bv, bool behind) { - if (cpar(bv)->getChar(cpos(bv)) == Paragraph::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) + if (!isHighlyEditableInset(inset)) return false; LyXFont const font = getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv)); @@ -1626,7 +1974,7 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y, x -= drawTextXOffset; int dummyx = x; int dummyy = y + insetAscent; - Inset * inset = bv->checkInsetHit(getLyXText(bv), dummyx, dummyy, button); + Inset * inset = bv->checkInsetHit(getLyXText(bv), dummyx, dummyy); if (inset) { if (x < 0) @@ -1647,9 +1995,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(); @@ -1657,34 +2006,33 @@ 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(Paragraph * p) +void InsetText::setParagraphData(Paragraph * p, bool same_id) { - cached_bview = 0; - - // now also delete all caches this should be safe, hopefully - cache.clear(); - + // we have to unlock any locked inset otherwise we're in troubles + the_locking_inset = 0; while (par) { Paragraph * tmp = par->next(); delete par; par = tmp; } - par = new Paragraph(*p); + par = new Paragraph(*p, same_id); par->setInsetOwner(this); Paragraph * np = par; while (p->next()) { p = p->next(); - np->next(new Paragraph(*p)); + np->next(new Paragraph(*p, same_id)); np->next()->previous(np); np = np->next(); np->setInsetOwner(this); } - + reinitLyXText(); need_update = INIT; } @@ -1702,9 +2050,9 @@ void InsetText::setAutoBreakRows(bool flag) { if (flag != autoBreakRows) { autoBreakRows = flag; - need_update = FULL; if (!flag) removeNewlines(); + need_update = INIT; } } @@ -1731,21 +2079,15 @@ void InsetText::setFrameColor(BufferView * bv, LColor::color col) int InsetText::cx(BufferView * bv) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } - int x = lt->cursor.x() + top_x + TEXT_TO_INSET_OFFSET; + // we do nothing dangerous so we use a local cache + LyXText * llt = getLyXText(bv); + int x = llt->cursor.x() + top_x + TEXT_TO_INSET_OFFSET; if (the_locking_inset) { - LyXFont font = lt->getFont(bv->buffer(), - lt->cursor.par(), - lt->cursor.pos()); + LyXFont font = llt->getFont(bv->buffer(), llt->cursor.par(), + llt->cursor.pos()); if (font.isVisibleRightToLeft()) x -= the_locking_inset->width(bv, font); } - if (clear) - lt = 0; return x; } @@ -1757,7 +2099,7 @@ int InsetText::cy(BufferView * bv) const } -Paragraph::size_type InsetText::cpos(BufferView * bv) const +pos_type InsetText::cpos(BufferView * bv) const { return getLyXText(bv)->cursor.pos(); } @@ -1782,35 +2124,56 @@ Row * InsetText::crow(BufferView * bv) const LyXText * InsetText::getLyXText(BufferView const * lbv, - bool const recursive) const + bool const recursive) const { - if (!recursive && (cached_bview == lbv)) - return cached_text.get(); + if (!recursive && (cached_bview == lbv)) { + LyXText * lt = cached_text.get(); + lyx::Assert(lt && lt->firstRow()->par() == par); + return lt; + } // Super UGLY! (Lgb) BufferView * bv = const_cast(lbv); cached_bview = bv; Cache::iterator it = cache.find(bv); - - if (it != cache.end() && (lt || !it->second.remove)) { - lyx::Assert(it->second.text.get()); - + + if (it != cache.end()) { + if (do_reinit) { + reinitLyXText(); + } else if (do_resize) { + resizeLyXText(do_resize); + } else { + 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; + } + } + // + // when we have to reinit the existing LyXText! + // + it->second.text->init(bv); + restoreLyXTextState(bv, it->second.text.get()); + it->second.remove = false; + } cached_text = it->second.text; - if (recursive && the_locking_inset) { + if (the_locking_inset && recursive) { return the_locking_inset->getLyXText(bv); } return cached_text.get(); - } else if (it != cache.end() && it->second.remove) { - if (locked) { - saveLyXTextState(it->second.text.get()); - } else { - sstate.lpar = 0; - } - cache.erase(bv); -// raise(SIGSTOP); } - + /// + // we are here only if we don't have a BufferView * in the cache!!! + /// cached_text.reset(new LyXText(const_cast(this))); cached_text->init(bv); restoreLyXTextState(bv, cached_text.get()); @@ -1849,8 +2212,22 @@ void InsetText::deleteLyXText(BufferView * bv, bool recursive) const void InsetText::resizeLyXText(BufferView * bv, bool force) const { - if (!par->next() && !par->size()) // no data, resize not neccessary! + 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! + // we have to do this as a fixed width may have changed! + LyXText * t = getLyXText(bv); + saveLyXTextState(t); + t->init(bv, true); + restoreLyXTextState(bv, t); return; + } // one endless line, resize normally not necessary if (!force && getMaxWidth(bv, this) < 0) return; @@ -1874,25 +2251,73 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const } if (bv->screen()) { - t->first = bv->screen()->topCursorVisible(t); + t->first = bv->screen()->topCursorVisible(t); } - if (!owner()) + if (!owner()) { updateLocal(bv, FULL, false); - else - need_update = FULL; - // this will scroll the screen such that the cursor becomes visible - bv->updateScrollbar(); + // 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; + } + } } void InsetText::removeNewlines() { + bool changed = false; + for (Paragraph * p = par; p; p = p->next()) { for (int i = 0; i < p->size(); ++i) { - if (p->getChar(i) == Paragraph::META_NEWLINE) + if (p->getChar(i) == Paragraph::META_NEWLINE) { + changed = true; p->erase(i); + } } } + if (changed) + reinitLyXText(); } @@ -1932,13 +2357,14 @@ void InsetText::selectAll(BufferView * bv) void InsetText::clearSelection(BufferView * bv) { - getLyXText(bv)->clearSelection(bv); + getLyXText(bv)->clearSelection(); } -void InsetText::clearInset(Painter & pain, int baseline, bool & cleared) const +void InsetText::clearInset(BufferView * bv, int baseline, bool & cleared) const { - int w = insetWidth; + Painter & pain = bv->painter(); + int w = insetWidth; int h = insetAscent + insetDescent; int ty = baseline - insetAscent; @@ -1950,15 +2376,17 @@ 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, - backgroundColor()); +// 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) { @@ -1967,6 +2395,20 @@ Paragraph * InsetText::getParFromID(int id) const result = result->next(); } return result; +#else + Paragraph * tmp = par; + while (tmp) { + if (tmp->id() == id) { + return tmp; + } + Paragraph * tmp2 = tmp->getParFromID(id); + if (tmp2 != 0) { + return tmp2; + } + tmp = tmp->next(); + } + return 0; +#endif } @@ -1980,6 +2422,12 @@ Paragraph * InsetText::firstParagraph() const } +Paragraph * InsetText::getFirstParagraph(int i) const +{ + return (i == 0) ? par : 0; +} + + LyXCursor const & InsetText::cursor(BufferView * bv) const { if (the_locking_inset) @@ -1996,16 +2444,21 @@ Paragraph * InsetText::paragraph() const void InsetText::paragraph(Paragraph * p) { + // GENERAL COMMENT: We don't have to free the old paragraphs as the + // caller of this function has to take care of it. This IS important + // as we could have to insert a paragraph before this one and just + // link the actual to a new ones next and set it with this function + // and are done! par = p; -#if 0 - // we now have to update/redraw all instances - for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit) { - delete cit->second; - cit->second = 0; + // set ourself as owner for all the paragraphs inserted! + Paragraph * np = par; + while (np) { + np->setInsetOwner(this); + np = np->next(); } -#endif + reinitLyXText(); // redraw myself when asked for - need_update |= INIT; + need_update = INIT; } @@ -2016,7 +2469,7 @@ Inset * InsetText::getInsetFromID(int id_arg) const Paragraph * lp = par; - while(lp) { + while (lp) { for (Paragraph::inset_iterator it = lp->inset_iterator_begin(), en = lp->inset_iterator_end(); it != en; ++it) @@ -2033,7 +2486,7 @@ Inset * InsetText::getInsetFromID(int id_arg) const } -string const InsetText::selectNextWord(BufferView * bv, float & value) const +string const InsetText::selectNextWordToSpellcheck(BufferView * bv, float & value) const { bool clear = false; string str; @@ -2043,18 +2496,17 @@ string const InsetText::selectNextWord(BufferView * bv, float & value) const clear = true; } if (the_locking_inset) { - str = the_locking_inset->selectNextWord(bv, value); + 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) - // we have to go on checking so move cusor to the right + // we have to go on checking so move cusor to the next char lt->cursor.pos(lt->cursor.pos() + 1); } - str = lt->selectNextWord(bv, value); + str = lt->selectNextWordToSpellcheck(bv, value); if (str.empty()) bv->unlockInset(const_cast(this)); else @@ -2089,10 +2541,9 @@ void InsetText::toggleSelection(BufferView * bv, bool kill_selection) int x = top_x + TEXT_TO_INSET_OFFSET; - int y = 0; - Row * row = lt->getRowNearY(y); + Row * row = lt->firstRow(); int y_offset = top_baseline - row->ascent_of_text(); - y = y_offset; + int y = y_offset; while ((row != 0) && ((y+row->height()) <= 0)) { y += row->height(); row = row->next(); @@ -2109,11 +2560,35 @@ void InsetText::toggleSelection(BufferView * bv, bool kill_selection) bool InsetText::searchForward(BufferView * bv, string const & str, - bool const & cs, bool const & mw) + bool cs, bool mw) { - if (the_locking_inset) + 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; } @@ -2123,7 +2598,7 @@ bool InsetText::searchForward(BufferView * bv, string const & str, } bool InsetText::searchBackward(BufferView * bv, string const & str, - bool const & cs, bool const & mw) + bool cs, bool mw) { if (the_locking_inset) if (the_locking_inset->searchBackward(bv, str, cs, mw)) @@ -2135,3 +2610,30 @@ bool InsetText::searchBackward(BufferView * bv, string const & str, bv->unlockInset(const_cast(this)); return false; } + + +bool InsetText::checkInsertChar(LyXFont & font) +{ + if (owner()) + return owner()->checkInsertChar(font); + return true; +} + + +void InsetText::collapseParagraphs(BufferParams const & bparams) const +{ + while(par->next()) { + if (!par->isSeparator(par->size()-1)) + par->insertChar(par->size()-1, ' '); + par->pasteParagraph(bparams); + } + reinitLyXText(); +} + + +void InsetText::getDrawFont(LyXFont & font) const +{ + if (!owner()) + return; + owner()->getDrawFont(font); +}