gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 10:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimizations.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16010 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-02-19 14:12:16 +00:00
parent 6f8966e716
commit 85c5580808
3 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2003-02-19 15:06 Alexander Malmberg <alexander@malmberg.org>
* Headers/gnustep/gui/GSLayoutManager_internal.h,
Source/GSLayoutManager.m: Optimize run_for_glyph_index() by
caching the last run. Optimize allocation of line frags.
* Source/NSLayoutManager.m
(-textStorage:edited:range:changeInLength:invalidatedRange:): Fix
clearing of soft-invalidated information if there's an invalidation
and we don't have layout past the invalidated range.
2003-02-19 03:09 Alexander Malmberg <alexander@malmberg.org>
* Source/GSLayoutManager.m (-_glyphForCharacter:index:positions::):

11
Headers/gnustep/gui/GSLayoutManager_internal.h
View file

@ -192,6 +192,7 @@ typedef struct GSLayoutManager_textcontainer_s
linefrag_t *linefrags;
int num_linefrags;
int num_soft;
int size_linefrags;
} textcontainer_t;
@ -214,6 +215,11 @@ typedef struct GSLayoutManager_textcontainer_s
-(glyph_run_t *) _glyphForCharacter: (unsigned int)target
index: (unsigned int *)rindex
positions: (unsigned int *)rpos : (unsigned int *)rcpos;
-(glyph_run_t *)run_for_glyph_index: (unsigned int)glyphIndex
: (unsigned int *)glyph_pos
: (unsigned int *)char_pos;
@end
@ -299,9 +305,8 @@ and i==-1. */
} \
}
glyph_run_t *GSLayoutManager_run_for_glyph_index(unsigned int glyphIndex,
glyph_run_head_t *glyphs, unsigned int *glyph_pos, unsigned int *char_pos);
#define run_for_glyph_index GSLayoutManager_run_for_glyph_index
#define run_for_glyph_index(a,b,c,d) [self run_for_glyph_index: a : c : d]
#endif

45
Source/GSLayoutManager.m
View file

@ -193,11 +193,9 @@ static int random_level(void)
}
/* NSLayoutManager uses this is, so it can't be static (and since it isn't,
it needs a reasonably unique name). */
glyph_run_t *GSLayoutManager_run_for_glyph_index(unsigned int glyphIndex,
glyph_run_head_t *glyphs, unsigned int *glyph_pos,
unsigned int *char_pos)
-(glyph_run_t *)run_for_glyph_index: (unsigned int)glyphIndex
: (unsigned int *)glyph_pos
: (unsigned int *)char_pos
{
int level;
glyph_run_head_t *h;
@ -206,7 +204,6 @@ glyph_run_t *GSLayoutManager_run_for_glyph_index(unsigned int glyphIndex,
if (glyphs->glyph_length <= glyphIndex)
return NULL;
#if 0
if (cached_run)
{
if (glyphIndex >= cached_pos &&
@ -219,7 +216,6 @@ glyph_run_t *GSLayoutManager_run_for_glyph_index(unsigned int glyphIndex,
return cached_run;
}
}
#endif
pos = cpos = 0;
level = SKIP_LIST_DEPTH;
@ -254,11 +250,9 @@ glyph_run_t *GSLayoutManager_run_for_glyph_index(unsigned int glyphIndex,
if (char_pos)
*char_pos = cpos;
#if 0
cached_run = (glyph_run_t *)h;
cached_pos = pos;
cached_cpos = cpos;
#endif
return (glyph_run_t *)h;
}
@ -1468,6 +1462,7 @@ places where we switch.
}
tc->linefrags = NULL;
tc->num_linefrags = tc->num_soft = 0;
tc->size_linefrags = 0;
tc->pos = tc->length = 0;
tc->was_invalidated = YES;
}
@ -1707,6 +1702,12 @@ by calling this incorrectly.
glyph++;
}
}
layout_glyph = tc->pos + tc->length;
if (layout_glyph == glyphs->glyph_length)
layout_char = glyphs->char_length;
else
layout_char = [self characterIndexForGlyphAtIndex: layout_glyph];
}
- (void) setLineFragmentRect: (NSRect)fragmentRect
@ -1758,14 +1759,22 @@ by calling this incorrectly.
if (!(tc->num_linefrags + tc->num_soft))
{
tc->linefrags = malloc(sizeof(linefrag_t));
if (!tc->size_linefrags)
{
tc->size_linefrags = 16;
tc->linefrags = malloc(sizeof(linefrag_t) * tc->size_linefrags);
}
tc->num_linefrags = 1;
lf = tc->linefrags;
}
else if (!tc->num_soft)
{
if (tc->size_linefrags <= tc->num_linefrags)
{
tc->size_linefrags += tc->size_linefrags / 2;
tc->linefrags = realloc(tc->linefrags, sizeof(linefrag_t) * tc->size_linefrags);
}
tc->num_linefrags++;
tc->linefrags = realloc(tc->linefrags, sizeof(linefrag_t) * tc->num_linefrags);
lf = &tc->linefrags[tc->num_linefrags - 1];
}
else
@ -1793,7 +1802,11 @@ by calling this incorrectly.
If we should keep all soft frags, we need to enlarge the array
to fit the new line frag.
*/
tc->linefrags = realloc(tc->linefrags, sizeof(linefrag_t) * (tc->num_linefrags + tc->num_soft + 1));
if (tc->size_linefrags <= tc->num_linefrags + tc->num_soft)
{
tc->size_linefrags += tc->size_linefrags / 2;
tc->linefrags = realloc(tc->linefrags, sizeof(linefrag_t) * tc->size_linefrags);
}
memmove(&tc->linefrags[tc->num_linefrags + 1], &tc->linefrags[tc->num_linefrags], tc->num_soft * sizeof(linefrag_t));
}
else if (i > tc->num_linefrags + 1)
@ -1851,7 +1864,7 @@ forStartOfGlyphRange: (NSRange)glyphRange
lf->pos + lf->length >= glyphRange.location + glyphRange.length)
break;
}
if (i == tc->num_linefrags)
if (i < 0)
{
[NSException raise: NSRangeException
format: @"%s: glyph range not consistent with existing layout",
@ -1888,12 +1901,6 @@ forStartOfGlyphRange: (NSRange)glyphRange
lp->pos = glyphRange.location;
lp->length = glyphRange.length;
lp->p = location;
layout_glyph = lp->pos + lp->length;
if (layout_glyph == glyphs->glyph_length)
layout_char = glyphs->char_length;
else
layout_char = [self characterIndexForGlyphAtIndex: layout_glyph];
}