anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 18:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid multiple lookups and simplify slightly

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2168 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-07-03 07:46:50 +00:00
parent 6687595f9c
commit f52893a07d
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/ChangeLog
View File

@ -1,3 +1,10 @@
2001-07-03 Lars Gullik Bjønnes <larsbj@birdstep.com>
* insettext.C (getLyXText): avoid multiple lookups, and simplify
slightly
(deleteLyXText): ditto
(resizeLyXText): ditto
2001-07-02 Juergen Vigna <jug@sad.it> 2001-07-02 Juergen Vigna <jug@sad.it>
* insettext.C (getLyXText): introduce a cache in getLyXText so that * insettext.C (getLyXText): introduce a cache in getLyXText so that

44
src/insets/insettext.C
View File

@ -1617,26 +1617,35 @@ Row * InsetText::crow(BufferView * bv) const
LyXText * InsetText::getLyXText(BufferView const * lbv, LyXText * InsetText::getLyXText(BufferView const * lbv,
bool const recursive) const bool const recursive) const
{ {
if (!recursive && cached_bview && (cached_bview == lbv)) if (!recursive && (cached_bview == lbv))
return cached_text; return cached_text;
// Super UGLY! (Lgb) // Super UGLY! (Lgb)
BufferView * bv = const_cast<BufferView *>(lbv); BufferView * bv = const_cast<BufferView *>(lbv);
cached_bview = bv; cached_bview = bv;
if ((cache.find(bv) != cache.end()) && cache[bv]) { Cache::iterator it = cache.find(bv);
cached_text = cache[bv];
if (recursive && the_locking_inset) if (it != cache.end()) {
lyx::Assert(it->second);
cached_text = it->second;
if (recursive && the_locking_inset) {
return the_locking_inset->getLyXText(bv); return the_locking_inset->getLyXText(bv);
}
return cached_text; return cached_text;
} }
cached_text = new LyXText(const_cast<InsetText *>(this)); cached_text = new LyXText(const_cast<InsetText *>(this));
cached_text->init(bv); cached_text->init(bv);
cache[bv] = cached_text;
cache.insert(make_pair(bv, cached_text));
if (the_locking_inset) { if (the_locking_inset) {
cached_text->setCursor(bv, inset_par, inset_pos, true, inset_boundary); cached_text->setCursor(bv, inset_par, inset_pos,
if (recursive) true, inset_boundary);
if (recursive) {
return the_locking_inset->getLyXText(bv); return the_locking_inset->getLyXText(bv);
}
} }
return cached_text; return cached_text;
} }
@ -1645,9 +1654,16 @@ LyXText * InsetText::getLyXText(BufferView const * lbv,
void InsetText::deleteLyXText(BufferView * bv, bool recursive) const void InsetText::deleteLyXText(BufferView * bv, bool recursive) const
{ {
cached_bview = 0; cached_bview = 0;
if ((cache.find(bv) == cache.end()) || !cache[bv])
Cache::iterator it = cache.find(bv);
if (it == cache.end()) {
return; return;
delete cache[bv]; }
lyx::Assert(it->second);
delete it->second;
cache.erase(bv); cache.erase(bv);
if (recursive) { if (recursive) {
/// then remove all LyXText in text-insets /// then remove all LyXText in text-insets
@ -1666,8 +1682,12 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const
// one endless line, resize normally not necessary // one endless line, resize normally not necessary
if (!force && getMaxWidth(bv, this) < 0) if (!force && getMaxWidth(bv, this) < 0)
return; return;
if ((cache.find(bv) == cache.end()) || !cache[bv])
Cache::iterator it = cache.find(bv);
if (it == cache.end()) {
return; return;
}
lyx::Assert(it->second);
Paragraph * lpar = 0; Paragraph * lpar = 0;
Paragraph * selstartpar = 0; Paragraph * selstartpar = 0;
@ -1684,7 +1704,7 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const
// ProhibitInput(bv); // ProhibitInput(bv);
if (locked) { if (locked) {
LyXText * t = getLyXText(bv); LyXText * t = getLyXText(bv);
lpar = t->cursor.par(); lpar = t->cursor.par();
pos = t->cursor.pos(); pos = t->cursor.pos();
boundary = t->cursor.boundary(); boundary = t->cursor.boundary();
@ -1700,7 +1720,7 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const
deleteLyXText(bv, (the_locking_inset == 0) || force); deleteLyXText(bv, (the_locking_inset == 0) || force);
if (lpar) { if (lpar) {
LyXText * t = getLyXText(bv); LyXText * t = getLyXText(bv);
t->selection.set(true); t->selection.set(true);
/* at this point just to avoid the Delete-Empty-Paragraph /* at this point just to avoid the Delete-Empty-Paragraph