/* This file is part of
* ======================================================
- *
+ *
* LyX, The Document Processor
*
* Copyright 1998-2001 The LyX Team.
#include <config.h>
-#include <fstream>
-#include <algorithm>
-
-#include <cstdlib>
-//#include <signal.h>
-
#ifdef __GNUG__
#pragma implementation
#endif
#include "lyxfont.h"
#include "commandtags.h"
#include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
-#include "layout.h"
+#include "lyxtextclasslist.h"
#include "LaTeXFeatures.h"
-#include "Painter.h"
-#include "frontends/Alert.h"
+#include "frontends/Painter.h"
#include "lyxtext.h"
#include "lyxcursor.h"
#include "CutAndPaste.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
#include "LColor.h"
-#include "support/textutils.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
#include "lyxrow.h"
#include "lyxrc.h"
#include "intl.h"
#include "trans_mgr.h"
-#include "lyxscreen.h"
-#include "WorkArea.h"
+#include "frontends/screen.h"
#include "gettext.h"
#include "lyxfunc.h"
#include "ParagraphParameters.h"
#include "undo_funcs.h"
#include "lyxfind.h"
+#include "frontends/Alert.h"
+#include "frontends/Dialogs.h"
+
+#include "support/textutils.h"
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+#include "support/lyxalgo.h" // lyx::count
+
+#include <fstream>
+#include <algorithm>
+#include <cstdlib>
+//#include <csignal>
+
using std::ostream;
using std::ifstream;
using std::endl;
using std::max;
using std::make_pair;
using std::vector;
+using std::pair;
using lyx::pos_type;
-using lyx::layout_type;
using lyx::textclass_type;
extern unsigned char getCurrentTextClass(Buffer *);
break;
p = p->next();
}
-
+
if (p && t->cursor.pos() <= p->size()) {
sstate.lpar = t->cursor.par();
sstate.pos = t->cursor.pos();
t->selection.mark(sstate.mark_set);
if (sstate.selection) {
t->setCursor(bv, sstate.selstartpar, sstate.selstartpos,
- true, sstate.selstartboundary);
+ true, sstate.selstartboundary);
t->selection.cursor = t->cursor;
t->setCursor(bv, sstate.selendpar, sstate.selendpos,
- true, sstate.selendboundary);
+ true, sstate.selendboundary);
t->setSelection(bv);
t->setCursor(bv, sstate.lpar, sstate.pos);
} else {
}
-InsetText::InsetText()
+InsetText::InsetText(BufferParams const & bp)
: UpdatableInset(), lt(0), in_update(false), do_resize(0),
do_reinit(false)
{
par = new Paragraph;
+ par->layout(textclasslist[bp.textclass].defaultLayoutName());
+
init();
}
autoBreakRows = false;
}
top_y = 0;
- last_width = 0;
- last_height = 0;
insetAscent = 0;
insetDescent = 0;
insetWidth = 0;
old_max_width = 0;
- no_selection = false;
+ no_selection = true;
need_update = FULL;
drawTextXOffset = 0;
drawTextYOffset = 0;
cached_bview = 0;
// NOTE
-
+
while (par) {
Paragraph * tmp = par->next();
delete par;
void InsetText::clear()
{
+ // This is a gross hack...
+ string old_layout = par->layout();
+
while (par) {
Paragraph * tmp = par->next();
delete par;
par = tmp;
}
par = new Paragraph;
+ par->setInsetOwner(this);
+ par->layout(old_layout);
+
reinitLyXText();
need_update = INIT;
}
Inset * InsetText::clone(Buffer const &, bool same_id) const
{
- return new InsetText(*this, same_id);
+ return new InsetText(*this, same_id);
}
string token;
int pos = 0;
Paragraph * return_par = 0;
- Paragraph::depth_type depth = 0;
+ Paragraph::depth_type depth = 0;
LyXFont font(LyXFont::ALL_INHERIT);
clear();
-
+
while (lex.isOK()) {
lex.nextToken();
token = lex.getString();
continue;
if (token == "\\end_inset") {
#ifndef NO_COMPABILITY
- const_cast<Buffer*>(buf)->insertErtContents(par, pos, font, false);
+ const_cast<Buffer*>(buf)->insertErtContents(par, pos, false);
#endif
break;
}
-
+
if (const_cast<Buffer*>(buf)->
parseSingleLyXformat2Token(lex, par, return_par,
token, pos, depth, font)) {
return_par->setInsetOwner(this);
return_par = return_par->next();
}
-
+
if (token != "\\end_inset") {
lex.printError("Missing \\end_inset at this point. "
"Read: `$$Token'");
int InsetText::ascent(BufferView * bv, LyXFont const &) const
{
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- insetAscent = lt->firstRow()->ascent_of_text() + TEXT_TO_INSET_OFFSET;
- if (clear)
- lt = 0;
+ 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;
- }
- insetDescent = lt->height - lt->firstRow()->ascent_of_text() +
+ LyXText * llt = getLyXText(bv);
+ insetDescent = llt->height - llt->firstRow()->ascent_of_text() +
TEXT_TO_INSET_OFFSET;
- if (clear)
- lt = 0;
return insetDescent;
}
}
if (fordraw) {
return max(w - (2 * TEXT_TO_INSET_OFFSET),
- (int)getLyXText(bv)->width);
+ (int)getLyXText(bv)->width);
} else if (w < 0) {
return -1;
}
void InsetText::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool cleared) const
+ int baseline, float & x, bool cleared) const
{
if (nodraw())
return;
Painter & pain = bv->painter();
-
+
// 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);
- topx_set = true;
return;
- } else {
- top_x = old_x;
}
}
+ // 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) {
- top_x = int(x);
clearInset(bv, 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 (need_update & CLEAR_FRAME)
x += static_cast<float>(scroll());
// 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))) {
- clearInset(bv, baseline, cleared);
+ 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);
}
- top_x = int(x);
- topx_set = true;
if (cleared)
frame_is_visible = false;
}
top_baseline = baseline;
- top_y = baseline - ascent(bv, f);
- last_width = width(bv, f);
- last_height = ascent(bv, f) + descent(bv, f);
+ top_y = baseline - insetAscent;
if (last_drawn_width != insetWidth) {
- if (!cleared)
+ if (!cleared)
clearInset(bv, baseline, cleared);
need_update |= FULL;
last_drawn_width = insetWidth;
if (the_locking_inset && (cpar(bv) == inset_par)
&& (cpos(bv) == inset_pos)) {
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
}
if (!cleared && (need_update == CURSOR)
&& !getLyXText(bv)->selection.set()) {
drawFrame(pain, cleared);
- x += last_width; // was width(bv, f);
+ x += insetWidth;
need_update = NONE;
return;
}
first += row->height();
row = row->next();
}
- if (y_offset < 0)
- y_offset = y;
- lt->first = first;
+ if (y_offset < 0) {
+ lt->first_y = -y_offset;
+ first = y;
+ y_offset = 0;
+ } else {
+ lt->first_y = first;
+ first = 0;
+ }
if (cleared || (need_update&(INIT|FULL))) {
- int yf = y_offset;
+ int yf = y_offset + first;
y = 0;
while ((row != 0) && (yf < ph)) {
- lt->getVisibleRow(bv, y+y_offset, int(x), row,
- y+first, cleared);
+ lt->getVisibleRow(bv, y + y_offset + first, int(x),
+ row, y + lt->first_y, cleared);
+ if (bv->text->status() == LyXText::CHANGED_IN_DRAW) {
+ lt->need_break_row = row;
+ lt->fullRebreak(bv);
+ lt->setCursor(bv, lt->cursor.par(),
+ lt->cursor.pos());
+ if (lt->selection.set()) {
+ lt->setCursor(bv, lt->selection.start,
+ lt->selection.start.par(),
+ lt->selection.start.pos());
+ lt->setCursor(bv, lt->selection.end,
+ lt->selection.end.par(),
+ lt->selection.end.pos());
+ }
+ break;
+ }
y += row->height();
yf += row->height();
row = row->next();
lt->refresh_y = 0;
lt->status(bv, LyXText::UNCHANGED);
- if ((need_update != CURSOR_PAR) &&
- ((drawFrame_ == ALWAYS) || ((drawFrame_ == LOCKED) && locked))) {
+ if ((drawFrame_ == ALWAYS) ||
+ ((cleared || (need_update != CURSOR_PAR)) &&
+ (drawFrame_ == LOCKED) && locked))
+ {
drawFrame(pain, cleared);
} else if (need_update & CLEAR_FRAME) {
clearFrame(pain, cleared);
}
-
- x += last_width /* was width(bv, f) */ - TEXT_TO_INSET_OFFSET;
-
+
+ x += insetWidth - 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;
}
if (!frame_is_visible || cleared) {
frame_x = top_x + ttoD2;
frame_y = top_baseline - insetAscent + ttoD2;
- frame_w = last_width - TEXT_TO_INSET_OFFSET;
+ 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);
+ pain.rectangle(frame_x, frame_y, frame_w, frame_h,
+ frame_color);
frame_is_visible = true;
}
}
if (frame_is_visible) {
if (!cleared) {
pain.rectangle(frame_x, frame_y, frame_w, frame_h,
- backgroundColor());
+ backgroundColor());
}
frame_is_visible = false;
}
in_update = false;
return;
}
+
+ if (!autoBreakRows && par->next())
+ collapseParagraphs(bv);
+
if (the_locking_inset) {
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
the_locking_inset->update(bv, font, reinit);
}
lt = getLyXText(bv);
clear = true;
}
-#if 0
- int oldw = insetWidth;
- insetWidth = lt->width + (2 * TEXT_TO_INSET_OFFSET);
- if (oldw != insetWidth) {
- resizeLyXText(bv);
- need_update |= FULL;
- if (clear)
- lt = 0;
- in_update = false;
- return;
- }
-#endif
if ((need_update & CURSOR_PAR) && (lt->status() == LyXText::UNCHANGED) &&
the_locking_inset)
{
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;
// 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) ||
+ if ((llt->status() == LyXText::NEED_MORE_REFRESH) ||
(!autoBreakRows &&
- (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH)))
+ (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 & CURSOR && !(need_update & SELECTION)) {
- if (lt->selection.set())
+ if (llt->selection.set())
need_update = FULL;
- lt->clearSelection();
+ llt->clearSelection();
}
- if (clear)
- lt = 0;
}
void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const
{
+ if (!autoBreakRows && par->next())
+ collapseParagraphs(bv);
bool clear = false;
if (!lt) {
lt = getLyXText(bv);
}
lt->fullRebreak(bv);
setUpdateStatus(bv, what);
- if (((need_update != CURSOR) && (need_update != NONE)) ||
- (lt->status() != LyXText::UNCHANGED) || lt->selection.set())
- {
+ bool flag = mark_dirty ||
+ (((need_update != CURSOR) && (need_update != NONE)) ||
+ (lt->status() != LyXText::UNCHANGED) || lt->selection.set());
+ if (!lt->selection.set())
+ lt->selection.cursor = lt->cursor;
+ if (clear)
+ lt = 0;
+#if 0
+ // IMO this is not anymore needed as we do this in fitInsetCursor!
+ // and we always get "true" as returnvalue of this function in the
+ // case of a locking inset (Jug 20020412)
+ if (locked && (need_update & CURSOR) && bv->fitCursor())
+ need_update |= FULL;
+#else
+ bv->fitCursor();
+#endif
+ if (flag)
bv->updateInset(const_cast<InsetText *>(this), mark_dirty);
- }
+
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;
}
}
-void InsetText::edit(BufferView * bv, int x, int y, unsigned int button)
+void InsetText::edit(BufferView * bv, int x, int y, mouse_button::state button)
{
UpdatableInset::edit(bv, x, y, button);
-
+
if (!bv->lockInset(this)) {
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
return;
lt = getLyXText(bv);
clear = true;
}
-
- if (!checkAndActivateInset(bv, x, tmp_y, button))
+ // we put here -1 and not button as now the button in the
+ // edit call should not be needed we will fix this in 1.3.x
+ // cycle hopefully (Jug 20020509)
+ // FIXME: GUII I've changed this to none: probably WRONG
+ if (!checkAndActivateInset(bv, x, tmp_y, mouse_button::none)) {
lt->setCursorFromCoordinates(bv, x - drawTextXOffset,
- y + insetAscent);
+ y + insetAscent);
+ lt->cursor.x_fix(lt->cursor.x());
+ }
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);
}
if (clear)
lt = 0;
+
+ int code = CURSOR;
+ if (drawFrame_ == LOCKED)
+ code = CURSOR|DRAW_FRAME;
+ updateLocal(bv, code, false);
+ showInsetCursor(bv);
+
+ // Tell the paragraph dialog that we've entered an insettext.
+ bv->owner()->getDialogs()->updateParagraph();
}
void InsetText::edit(BufferView * bv, bool front)
{
UpdatableInset::edit(bv, front);
-
+
if (!bv->lockInset(this)) {
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
return;
}
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() &&
}
if (clear)
lt = 0;
+ int code = CURSOR;
+ if (drawFrame_ == LOCKED)
+ code = CURSOR|DRAW_FRAME;
+ updateLocal(bv, code, false);
+ showInsetCursor(bv);
}
if (the_locking_inset) {
the_locking_inset->insetUnlock(bv);
the_locking_inset = 0;
+ updateLocal(bv, CURSOR_PAR, false);
}
hideInsetCursor(bv);
- no_selection = false;
+ no_selection = true;
locked = false;
- int code;
+ int code = NONE;
+#if 0
if (drawFrame_ == LOCKED)
code = CURSOR|CLEAR_FRAME;
- else
+ else
code = CURSOR;
+#else
+ if (drawFrame_ == LOCKED)
+ code = CLEAR_FRAME;
+#endif
bool clear = false;
if (!lt) {
lt = getLyXText(bv);
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());
+ bv->owner()->setLayout(bv->text->cursor.par()->layout());
// hack for deleteEmptyParMech
- lt->setCursor(bv, par, 0);
+ if (par->size()) {
+ lt->setCursor(bv, par, 0);
+ } else if (par->next()) {
+ lt->setCursor(bv, par->next(), 0);
+ }
+ if (clear)
+ lt = 0;
+#if 0
updateLocal(bv, code, false);
+#else
+ if (code != NONE)
+ setUpdateStatus(bv, code);
+#endif
+}
+
+
+void InsetText::lockInset(BufferView * bv)
+{
+ 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;
+ }
+ lt->setCursor(bv, par, 0);
+ lt->clearSelection();
+ finishUndo();
+ // 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;
+ int code = CURSOR;
+ if (drawFrame_ == LOCKED)
+ code = CURSOR|DRAW_FRAME;
+ setUpdateStatus(bv, code);
+}
+
+
+void InsetText::lockInset(BufferView * bv, UpdatableInset * inset)
+{
+ the_locking_inset = inset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
+ inset_pos = cpos(bv);
+ inset_par = cpar(bv);
+ inset_boundary = cboundary(bv);
+ updateLocal(bv, CURSOR, false);
}
<< 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) {
lyxerr[Debug::INSETS] << "OK" << endl;
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset)
{
+ if (!autoBreakRows && par->next())
+ collapseParagraphs(bv);
+ 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 (inset->owner() != this) {
+ int ustat = CURSOR_PAR;
+ bool found = false;
+ UpdatableInset * tl_inset = the_locking_inset;
+ if (tl_inset)
+ found = tl_inset->updateInsetInInset(bv, inset);
+ if (!found) {
+ tl_inset = static_cast<UpdatableInset *>(inset);
+ while(tl_inset->owner() && tl_inset->owner() != this)
+ tl_inset = static_cast<UpdatableInset *>(tl_inset->owner());
+ if (!tl_inset->owner())
+ return false;
+ found = tl_inset->updateInsetInInset(bv, inset);
+ ustat = FULL;
+ }
if (found)
- setUpdateStatus(bv, NONE);
- return found;
- }
- if (the_locking_inset != inset) {
-#if 0
- lt->updateInset(bv, the_locking_inset);
- setUpdateStatus(bv, CURSOR_PAR);
-#endif
- bool found = the_locking_inset->updateInsetInInset(bv, inset);
+ lt->updateInset(bv, tl_inset);
if (clear)
lt = 0;
if (found)
- setUpdateStatus(bv, CURSOR_PAR);
+ setUpdateStatus(bv, ustat);
return found;
}
bool found = lt->updateInset(bv, inset);
lt = 0;
if (found) {
setUpdateStatus(bv, CURSOR_PAR);
-#if 0
- updateLocal(bv, CURSOR_PAR, false);
-#endif
- if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ if (the_locking_inset &&
+ cpar(bv) == inset_par && cpos(bv) == inset_pos)
+ {
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
}
}
return found;
}
-void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button)
+void InsetText::insetButtonPress(BufferView * bv,
+ int x, int y, mouse_button::state button)
{
no_selection = true;
+ // use this to check mouse motion for selection!
+ mouse_x = x;
+ mouse_y = y;
+
+ if (!locked)
+ lockInset(bv);
+
int tmp_x = x - drawTextXOffset;
- int tmp_y = y + insetAscent - getLyXText(bv)->first;
- Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y, button);
+ int tmp_y = y + insetAscent - getLyXText(bv)->first_y;
+ 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);
- no_selection = false;
+ the_locking_inset->insetButtonPress(bv,
+ x - inset_x,
+ y - inset_y,
+ button);
return;
- } else if (inset) {
+ }
+#if 0
+ else if (inset) {
// otherwise unlock the_locking_inset and lock the new inset
the_locking_inset->insetUnlock(bv);
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
- the_locking_inset = static_cast<UpdatableInset*>(inset);
- inset->insetButtonPress(bv, x - inset_x, y - inset_y, button);
- inset->edit(bv, x - inset_x, y - inset_y, button);
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
+ 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);
- no_selection = false;
return;
}
+#endif
// otherwise only unlock the_locking_inset
the_locking_inset->insetUnlock(bv);
the_locking_inset = 0;
}
+ if (!inset)
+ no_selection = false;
+
if (bv->theLockingInset()) {
if (isHighlyEditableInset(inset)) {
+ // We just have to lock the inset before calling a
+ // PressEvent on it!
UpdatableInset * uinset = static_cast<UpdatableInset*>(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);
- the_locking_inset = uinset;
- uinset->insetButtonPress(bv, x - inset_x, y - inset_y,
- button);
- uinset->edit(bv, x - inset_x, y - inset_y, 0);
+ if (!bv->lockInset(uinset)) {
+ lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
+ }
+ inset->insetButtonPress(bv, x - inset_x, y - inset_y, button);
if (the_locking_inset)
updateLocal(bv, CURSOR, false);
- no_selection = false;
return;
}
}
- if (!inset) { // && (button == 2)) {
+ if (!inset) { // && (button == mouse_button::button2)) {
bool paste_internally = false;
- if ((button == 2) && getLyXText(bv)->selection.set()) {
+ if ((button == mouse_button::button2) && getLyXText(bv)->selection.set()) {
localDispatch(bv, LFUN_COPY, "");
paste_internally = true;
}
lt = getLyXText(bv);
clear = true;
}
- lt->setCursorFromCoordinates(bv, x-drawTextXOffset, y + insetAscent);
+ int old_first_y = lt->first_y;
+
+ 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)->getLayout());
+ bv->owner()->setLayout(cpar(bv)->layout());
+ // we moved the view we cannot do mouse selection in this case!
+ if (getLyXText(bv)->first_y != old_first_y)
+ no_selection = true;
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 (button == mouse_button::button2) {
if (paste_internally)
localDispatch(bv, LFUN_PASTE, "");
else
localDispatch(bv, LFUN_PASTESELECTION,
- "paragraph");
+ "paragraph");
}
- if (clear)
- lt = 0;
+ } 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, mouse_button::state button)
{
- UpdatableInset * inset = 0;
-
+ no_selection = true;
if (the_locking_inset) {
- the_locking_inset->insetButtonRelease(bv,
- x - inset_x, y - inset_y,
- button);
- } else {
- if (cpar(bv)->isInset(cpos(bv))) {
- inset = static_cast<UpdatableInset*>(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,
- 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_y;
+ 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 = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(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)
+void InsetText::insetMotionNotify(BufferView * bv, int x, int y, mouse_button::state state)
{
- if (no_selection)
- return;
if (the_locking_inset) {
the_locking_inset->insetMotionNotify(bv, x - inset_x,
y - inset_y,state);
return;
}
+
+ if (no_selection || ((mouse_x == x) && (mouse_y == y)))
+ return;
+
bool clear = false;
if (!lt) {
lt = getLyXText(bv);
clear = true;
}
hideInsetCursor(bv);
+ LyXCursor cur = lt->cursor;
lt->setCursorFromCoordinates(bv, x - drawTextXOffset, y + insetAscent);
- lt->setSelection(bv);
- if (lt->toggle_cursor.par() != lt->toggle_end_cursor.par() ||
- lt->toggle_cursor.pos() != lt->toggle_end_cursor.pos())
- {
- updateLocal(bv, SELECTION, false);
+ lt->cursor.x_fix(lt->cursor.x());
+ if (cur == lt->cursor) {
+ if (clear)
+ lt = 0;
+ return;
}
- showInsetCursor(bv);
+ 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;
-}
-
-
-void InsetText::insetKeyPress(XKeyEvent * xke)
-{
- if (the_locking_inset) {
- the_locking_inset->insetKeyPress(xke);
- return;
+ if (flag) {
+ updateLocal(bv, SELECTION, false);
}
+ showInsetCursor(bv);
}
UpdatableInset::RESULT
InsetText::localDispatch(BufferView * bv,
- kb_action action, string const & arg)
+ kb_action action, string const & arg)
{
bool was_empty = par->size() == 0 && !par->next();
no_selection = false;
updateLocal(bv, CURSOR_PAR, false);
return result;
} else if (result >= FINISHED) {
- switch(result) {
+ switch (result) {
case FINISHED_RIGHT:
moveRightIntern(bv, false, false);
result = DISPATCHED;
#ifdef WITH_WARNINGS
#warning I changed this to always return Dispatched maybe it is wrong (20011001 Jug)
#endif
+ updateLocal(bv, CURSOR, false);
return result;
}
}
lt = getLyXText(bv);
clear = true;
}
+ int updwhat = 0;
+ int updflag = false;
switch (action) {
// Normal chars
case LFUN_SELFINSERT:
* true (on). */
setUndo(bv, Undo::INSERT,
- lt->cursor.par(), lt->cursor.par()->next());
+ lt->cursor.par(), lt->cursor.par()->next());
bv->setState();
if (lyxrc.auto_region_delete) {
if (lt->selection.set()) {
}
}
lt->selection.cursor = lt->cursor;
- updateLocal(bv, CURSOR_PAR, true);
+ updwhat = CURSOR | CURSOR_PAR;
+ updflag = true;
result = DISPATCHED_NOUPDATE;
break;
// --- Cursor Movements -----------------------------------
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,
- lt->cursor.par(), lt->cursor.par()->next());
+ lt->cursor.par(), lt->cursor.par()->next());
if (lt->selection.set())
lt->cutSelection(bv);
else
lt->backspace(bv);
- updateLocal(bv, CURSOR_PAR, true);
+ updwhat = CURSOR_PAR;
+ updflag = true;
}
break;
-
+
case LFUN_DELETE: {
setUndo(bv, Undo::DELETE,
- lt->cursor.par(), lt->cursor.par()->next());
+ lt->cursor.par(), lt->cursor.par()->next());
if (lt->selection.set()) {
lt->cutSelection(bv);
} else {
lt->Delete(bv);
}
- updateLocal(bv, CURSOR_PAR, true);
+ updwhat = CURSOR_PAR;
+ updflag = true;
}
break;
-
+
case LFUN_CUT: {
setUndo(bv, Undo::DELETE,
- lt->cursor.par(), lt->cursor.par()->next());
+ 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:
{
string const clip(bv->getClipboard());
-
+
if (clip.empty())
break;
if (arg == "paragraph") {
} else {
lt->insertStringAsLines(bv, clip);
}
- updateLocal(bv, CURSOR_PAR, true);
+ // bug 393
+ lt->clearSelection();
+
+ updwhat = CURSOR_PAR;
+ updflag = true;
break;
}
case LFUN_PASTE: {
}
}
setUndo(bv, Undo::INSERT,
- lt->cursor.par(), lt->cursor.par()->next());
+ lt->cursor.par(), lt->cursor.par()->next());
lt->pasteSelection(bv);
- updateLocal(bv, CURSOR_PAR, true);
+ // bug 393
+ lt->clearSelection();
+ updwhat = CURSOR_PAR;
+ updflag = true;
}
break;
break;
}
lt->breakParagraph(bv, 0);
- updateLocal(bv, FULL, true);
+ updwhat = CURSOR | FULL;
+ updflag = true;
break;
case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
if (!autoBreakRows) {
break;
}
lt->breakParagraph(bv, 1);
- updateLocal(bv, FULL, true);
+ updwhat = CURSOR | FULL;
+ updflag = true;
break;
case LFUN_BREAKLINE: {
break;
}
setUndo(bv, Undo::INSERT,
- lt->cursor.par(), lt->cursor.par()->next());
+ lt->cursor.par(), lt->cursor.par()->next());
lt->insertChar(bv, Paragraph::META_NEWLINE);
- updateLocal(bv, CURSOR_PAR, true);
+ updwhat = CURSOR | CURSOR_PAR;
+ updflag = true;
}
break;
case LFUN_LAYOUT:
// do not set layouts on non breakable textinsets
if (autoBreakRows) {
- layout_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). */
+ // and current buffer's textclass (number). */
textclass_type tclass = bv->buffer()->params.textclass;
- std::pair <bool, layout_type> layout =
- textclasslist.NumberOfLayout(tclass, arg);
+ string layout = 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);
+ if (!obs.empty())
+ layout = 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:
if (cur_spacing == Spacing::Other) {
cur_value = par->params().spacing().getValue();
}
-
+
istringstream istr(arg.c_str());
string tmp;
istr >> tmp;
}
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;
-
+
default:
if (!bv->Dispatch(action, arg))
result = UNDISPATCHED;
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 (!was_empty && par->size() == 0 && !par->next()) {
setFont(bv, font, false);
}
- if (result < FINISHED) {
- showInsetCursor(bv);
- } else
+ if (result >= FINISHED)
bv->unlockInset(this);
- if (clear)
- lt = 0;
+
+ if (result == DISPATCHED_NOUPDATE && (need_update & FULL))
+ result = DISPATCHED;
return result;
}
-int InsetText::latex(Buffer const * buf, ostream & os, bool, bool) const
+int InsetText::latex(Buffer const * buf, ostream & os, bool moving_arg, bool) const
{
TexRow texrow;
- buf->latexParagraphs(os, par, 0, texrow);
+ buf->latexParagraphs(os, par, 0, texrow, moving_arg);
return texrow.rows();
}
{
Paragraph * p = par;
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();
}
vector<string> environment_stack(10);
vector<string> environment_inner(10);
-
+
int const command_depth = 0;
string item_name;
-
+
Paragraph::depth_type depth = 0; // paragraph depth
while (p) {
int desc_on = 0; // description mode
LyXLayout const & style =
- textclasslist.Style(buf->params.textclass,
- p->layout);
+ textclasslist[buf->params.textclass][p->layout()];
// environment tag closing
for (; depth > p->params().depth(); --depth) {
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) {
}
if (environment_stack[depth] != style.latexname()) {
- if(environment_stack.size() == depth + 1) {
+ if (environment_stack.size() == depth + 1) {
environment_stack.push_back("!-- --");
environment_inner.push_back("!-- --");
}
environment_inner[depth]);
}
}
-
+
if (style.latextype == LATEX_ENVIRONMENT) {
if (!style.latexparam().empty()) {
- if(style.latexparam() == "CDATA")
+ if (style.latexparam() == "CDATA")
os << "<![CDATA[";
else
buf->sgmlOpenTag(os, depth + command_depth,
switch (style.latextype) {
case LATEX_ENVIRONMENT:
if (!style.latexparam().empty()) {
- if(style.latexparam() == "CDATA")
+ if (style.latexparam() == "CDATA")
os << "]]>";
else
buf->sgmlCloseTag(os, depth + command_depth,
item_name = "listitem";
buf->sgmlCloseTag(os, command_depth + depth,
item_name);
- if (environment_inner[depth] == "varlistentry")
+ 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;
}
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();
}
-void InsetText::getCursorPos(BufferView * bv,
- int & x, int & y) const
+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);
+ x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
+ y = cy(bv) - TEXT_TO_INSET_OFFSET;
}
-unsigned int InsetText::insetInInsetY()
+int InsetText::insetInInsetY() const
{
if (!the_locking_inset)
return 0;
LyXFont const font(getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv)));
- int const asc = lyxfont::maxAscent(font);
- int const desc = lyxfont::maxDescent(font);
+ int const asc = font_metrics::maxAscent(font);
+ int const desc = font_metrics::maxDescent(font);
if (isCursorVisible())
bv->hideLockedInsetCursor();
LyXFont const font =
getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
- int const asc = lyxfont::maxAscent(font);
- int const desc = lyxfont::maxDescent(font);
+ int const asc = font_metrics::maxAscent(font);
+ int const desc = font_metrics::maxDescent(font);
bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc);
if (show)
LyXFont const font =
getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
- int const asc = lyxfont::maxAscent(font);
- int const desc = lyxfont::maxDescent(font);
+ int const asc = font_metrics::maxAscent(font);
+ int const desc = font_metrics::maxDescent(font);
- bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc);
+ if (bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc))
+ need_update |= FULL;
}
InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
{
if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
- return moveLeftIntern(bv, false, activate_inset, selecting);
+ return moveLeftIntern(bv, true, activate_inset, selecting);
else
- return moveRightIntern(bv, false, activate_inset, selecting);
+ return moveRightIntern(bv, true, activate_inset, selecting);
}
InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
{
if (getLyXText(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
- return moveRightIntern(bv, true, activate_inset, selecting);
+ return moveRightIntern(bv, false, activate_inset, selecting);
else
- return moveLeftIntern(bv, true, activate_inset, selecting);
+ return moveLeftIntern(bv, false, activate_inset, selecting);
}
UpdatableInset::RESULT
-InsetText::moveRightIntern(BufferView * bv, bool behind,
- bool activate_inset, bool selecting)
+InsetText::moveRightIntern(BufferView * bv, bool front,
+ bool activate_inset, bool selecting)
{
if (!cpar(bv)->next() && (cpos(bv) >= cpar(bv)->size()))
return FINISHED_RIGHT;
- if (activate_inset && checkAndActivateInset(bv, behind))
+ if (activate_inset && checkAndActivateInset(bv, front))
return DISPATCHED;
getLyXText(bv)->cursorRight(bv);
if (!selecting)
UpdatableInset::RESULT
-InsetText::moveLeftIntern(BufferView * bv, bool behind,
- bool activate_inset, bool selecting)
+InsetText::moveLeftIntern(BufferView * bv, bool front,
+ bool activate_inset, bool selecting)
{
if (!cpar(bv)->previous() && (cpos(bv) <= 0))
return FINISHED;
getLyXText(bv)->cursorLeft(bv);
if (!selecting)
getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
- if (activate_inset && checkAndActivateInset(bv, behind))
+ if (activate_inset && checkAndActivateInset(bv, front))
return DISPATCHED;
return DISPATCHED_NOUPDATE;
}
}
inset->setOwner(this);
hideInsetCursor(bv);
-
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
- }
- lt->insertInset(bv, inset);
-#if 0
- if ((!cpar(bv)->isInset(cpos(bv))) ||
- (cpar(bv)->getInset(cpos(bv)) != inset))
- lt->cursorLeft(bv);
-#endif
+ getLyXText(bv)->insertInset(bv, inset);
bv->fitCursor();
updateLocal(bv, CURSOR_PAR|CURSOR, true);
-// showInsetCursor(bv);
- if (clear)
- lt = 0;
return true;
}
}
-std::vector<string> const InsetText::getLabelList() const
+vector<string> const InsetText::getLabelList() const
{
- std::vector<string> label_list;
+ vector<string> 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<string> const l = (*beg)->getLabelList();
+ vector<string> const l = (*beg)->getLabelList();
label_list.insert(label_list.end(), l.begin(), l.end());
}
tpar = tpar->next();
void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall,
- bool selectall)
+ bool selectall)
{
if (the_locking_inset) {
the_locking_inset->setFont(bv, font, toggleall, selectall);
if (selectall)
lt->clearSelection();
bv->fitCursor();
- if (selectall || lt->selection.set())
+ 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)
+bool InsetText::checkAndActivateInset(BufferView * bv, bool front)
{
if (cpar(bv)->isInset(cpos(bv))) {
- unsigned int x;
- unsigned int y;
Inset * inset =
static_cast<UpdatableInset*>(cpar(bv)->getInset(cpos(bv)));
if (!isHighlyEditableInset(inset))
return false;
- LyXFont const font =
- getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
- if (behind) {
- x = inset->width(bv, font);
- y = font.isRightToLeft() ? 0 : inset->descent(bv, font);
- } else {
- x = 0;
- y = font.isRightToLeft() ? inset->descent(bv, font) : 0;
- }
- //inset_x = cx(bv) - top_x + drawTextXOffset;
- //inset_y = cy(bv) + drawTextYOffset;
- inset->edit(bv, x, y, 0);
+ inset->edit(bv, front);
if (!the_locking_inset)
return false;
updateLocal(bv, CURSOR, false);
bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
- int button)
+ mouse_button::state button)
{
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);
+ // we only do the edit() call if the inset was hit by the mouse
+ // or if it is a highly editable inset. So we should call this
+ // function from our own edit with button < 0.
+ // FIXME: GUII jbl. I've changed this to ::none for now which is probably
+ // WRONG
+ if (button == mouse_button::none && !isHighlyEditableInset(inset))
+ return false;
+
if (inset) {
if (x < 0)
x = insetWidth;
if (y < 0)
y = insetDescent;
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
inset->edit(bv, x - inset_x, y - inset_y, button);
if (!the_locking_inset)
return false;
}
-void InsetText::setText(string const & data)
+void InsetText::setText(string const & data, LyXFont const & font)
{
clear();
- LyXFont font(LyXFont::ALL_SANE);
for (unsigned int i=0; i < data.length(); ++i)
par->insertChar(i, data[i], font);
+ reinitLyXText();
}
int InsetText::cx(BufferView * bv) const
{
- bool clear = false;
- if (!lt) {
- lt = getLyXText(bv);
- clear = true;
+ // 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 = llt->getFont(bv->buffer(), llt->cursor.par(),
+ llt->cursor.pos());
+ if (font.isVisibleRightToLeft())
+ x -= the_locking_inset->width(bv, font);
}
- int x = lt->cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
+ return x;
+}
+
+
+int InsetText::cix(BufferView * bv) const
+{
+ // we do nothing dangerous so we use a local cache
+ LyXText * llt = getLyXText(bv);
+ int x = llt->cursor.ix() + 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;
}
}
+int InsetText::ciy(BufferView * bv) const
+{
+ LyXFont font;
+ return getLyXText(bv)->cursor.iy() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
+}
+
+
pos_type InsetText::cpos(BufferView * bv) const
{
return getLyXText(bv)->cursor.pos();
LyXText * InsetText::getLyXText(BufferView const * lbv,
- bool const recursive) const
+ bool const recursive) const
{
- if (!recursive && (cached_bview == lbv)) {
+ if (cached_bview == lbv) {
+ if (recursive && the_locking_inset)
+ return the_locking_inset->getLyXText(lbv, true);
LyXText * lt = cached_text.get();
lyx::Assert(lt && lt->firstRow()->par() == par);
- return cached_text.get();
+ return lt;
}
-
// Super UGLY! (Lgb)
BufferView * bv = const_cast<BufferView *>(lbv);
-
+
cached_bview = bv;
Cache::iterator it = cache.find(bv);
if (it != cache.end()) {
- if (do_reinit)
+ if (do_reinit) {
reinitLyXText();
- else if (do_resize)
+ } 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;
+ } 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 (the_locking_inset && recursive) {
+ return the_locking_inset->getLyXText(bv);
+ }
+ return cached_text.get();
}
-
+ ///
+ // we are here only if we don't have a BufferView * in the cache!!!
+ ///
cached_text.reset(new LyXText(const_cast<InsetText *>(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);
}
cached_bview = 0;
Cache::iterator it = cache.find(bv);
-
+
if (it == cache.end()) {
return;
}
}
do_resize = 0;
// lyxerr << "InsetText::resizeLyXText\n";
- if (!par->next() && !par->size()) // no data, resize not neccessary!
+ 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;
t->init(bv, true);
restoreLyXTextState(bv, t);
if (the_locking_inset) {
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
}
if (bv->screen()) {
- t->first = bv->screen()->topCursorVisible(t);
+ t->first_y = bv->screen()->topCursorVisible(t);
}
if (!owner()) {
updateLocal(bv, FULL, false);
- // this will scroll the screen such that the cursor becomes visible
+ // this will scroll the screen such that the cursor becomes visible
bv->updateScrollbar();
} else {
need_update |= FULL;
t->init(bv, true);
restoreLyXTextState(bv, t);
if (the_locking_inset) {
- inset_x = cx(bv) - top_x + drawTextXOffset;
- inset_y = cy(bv) + drawTextYOffset;
+ inset_x = cix(bv) - top_x + drawTextXOffset;
+ inset_y = ciy(bv) + drawTextYOffset;
}
if (bv->screen()) {
- t->first = bv->screen()->topCursorVisible(t);
+ t->first_y = bv->screen()->topCursorVisible(t);
}
if (!owner()) {
updateLocal(bv, FULL, false);
- // this will scroll the screen such that the cursor becomes visible
+ // 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) {
void InsetText::clearInset(BufferView * bv, int baseline, bool & cleared) const
{
- LyXFont dummy;
Painter & pain = bv->painter();
int w = insetWidth;
- int h = ascent(bv, dummy) + descent(bv, dummy);
+ int h = insetAscent + insetDescent;
int ty = baseline - insetAscent;
-
+
if (ty < 0) {
h += ty;
ty = 0;
if ((top_x + drawTextXOffset + w) > pain.paperWidth())
w = pain.paperWidth();
// w -= TEXT_TO_INSET_OFFSET;
- pain.fillRectangle(top_x, ty, w+1, h+1, backgroundColor());
+ pain.fillRectangle(top_x + 1, ty + 1, w - 1, h - 1, backgroundColor());
cleared = true;
need_update = FULL;
frame_is_visible = false;
void InsetText::paragraph(Paragraph * p)
{
- // first we have to delete the old contents otherwise we'll have a
- // memory leak! But there check that we don't delete the paragraphs
- // the new par is refering to (could happen in LyXText::EmptyParagrapM...)
- // well don't do deletes at all if we come from there. Really stupid
- // thing! (Jug 20011205)
- if (par->next() != p) {
- the_locking_inset = 0;
- while (par && par != p) {
- Paragraph * tmp = par->next();
- delete par;
- par = tmp;
- }
- }
+ // 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;
// set ourself as owner for all the paragraphs inserted!
Paragraph * np = par;
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
+ // we have to go on checking so move cusor to the next char
lt->cursor.pos(lt->cursor.pos() + 1);
}
str = lt->selectNextWordToSpellcheck(bv, value);
}
if (y_offset < 0)
y_offset = y;
-
+
if (need_update & SELECTION)
need_update = NONE;
bv->screen()->toggleSelection(lt, bv, kill_selection, y_offset, x);
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->searchForward(bv, str, cs, mw))
}
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))
return owner()->checkInsertChar(font);
return true;
}
+
+
+void InsetText::collapseParagraphs(BufferView * bv) const
+{
+ BufferParams const & bparams = bv->buffer()->params;
+ LyXText * llt = getLyXText(bv);
+
+ while(par->next()) {
+ if (par->size() && par->next()->size() &&
+ !par->isSeparator(par->size()-1))
+ {
+ par->insertChar(par->size(), ' ');
+ }
+ if (llt->selection.set()) {
+ if (llt->selection.start.par() == par->next()) {
+ llt->selection.start.par(par);
+ llt->selection.start.pos(
+ llt->selection.start.pos() + par->size());
+ }
+ if (llt->selection.end.par() == par->next()) {
+ llt->selection.end.par(par);
+ llt->selection.end.pos(
+ llt->selection.end.pos() + par->size());
+ }
+ }
+ par->pasteParagraph(bparams);
+ }
+ reinitLyXText();
+}
+
+
+void InsetText::getDrawFont(LyXFont & font) const
+{
+ if (!owner())
+ return;
+ owner()->getDrawFont(font);
+}
+
+
+void InsetText::appendParagraphs(BufferParams const & bparams,
+ Paragraph * newpar)
+{
+ Paragraph * buf;
+ Paragraph * tmpbuf = newpar;
+ Paragraph * lastbuffer = buf = new Paragraph(*tmpbuf, false);
+
+ while (tmpbuf->next()) {
+ tmpbuf = tmpbuf->next();
+ lastbuffer->next(new Paragraph(*tmpbuf, false));
+ lastbuffer->next()->previous(lastbuffer);
+ lastbuffer = lastbuffer->next();
+ }
+ lastbuffer = par;
+ while (lastbuffer->next())
+ lastbuffer = lastbuffer->next();
+ if (newpar->size() && lastbuffer->size() &&
+ !lastbuffer->isSeparator(lastbuffer->size()-1))
+ {
+ lastbuffer->insertChar(lastbuffer->size(), ' ');
+ }
+
+ // make the buf exactly the same layout than our last paragraph
+ buf->makeSameLayout(lastbuffer);
+
+ // paste it!
+ lastbuffer->next(buf);
+ buf->previous(lastbuffer);
+ lastbuffer->pasteParagraph(bparams);
+
+ reinitLyXText();
+}
projects / lyx.git / blobdiff