gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 04:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix caching.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14588 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-09-27 08:52:04 +00:00
parent ab43ceed49
commit bbe972eef7
3 changed files with 63 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Source/NSFont.m
View file

@ -30,6 +30,7 @@
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
#include <Foundation/NSSet.h>
#include <Foundation/NSMapTable.h>
#include <AppKit/NSGraphicsContext.h>
#include <AppKit/NSFont.h>
@ -115,9 +116,8 @@ NSArray *_preferredFonts;
/* Class for fonts */
static Class NSFontClass = 0;
/* Store all created fonts for reuse.
ATTENTION: This way a font will never get freed! */
static NSMutableDictionary* globalFontDictionary = nil;
/* Cache all created fonts for reuse. */
static NSMapTable* globalFontMap = 0;
static NSUserDefaults *defaults = nil;
@ -149,7 +149,7 @@ setNSFont(NSString* key, NSFont* font)
userCacheNeedsRecomputing = YES;
userFixedCacheNeedsRecomputing = YES;
/* Don't care about errors*/
/* Don't care about errors */
[defaults synchronize];
}
@ -161,7 +161,8 @@ setNSFont(NSString* key, NSFont* font)
if (self == [NSFont class])
{
NSFontClass = self;
globalFontDictionary = [NSMutableDictionary new];
globalFontMap = NSCreateMapTable(NSObjectMapKeyCallBacks,
NSNonRetainedObjectMapValueCallBacks, 64);
if (defaults == nil)
{
@ -483,19 +484,18 @@ setNSFont(NSString* key, NSFont* font)
NSString *nameWithMatrix;
nameWithMatrix = [NSString stringWithFormat:
@"%@ %.3f %.3f %.3f %.3f %.3f %.3f",
aFontName,
fontMatrix[0], fontMatrix[1], fontMatrix[2],
fontMatrix[3], fontMatrix[4], fontMatrix[5]];
@"%@ %.3f %.3f %.3f %.3f %.3f %.3f", aFontName,
fontMatrix[0], fontMatrix[1], fontMatrix[2],
fontMatrix[3], fontMatrix[4], fontMatrix[5]];
/* Check whether the font is cached */
font = [globalFontDictionary objectForKey: nameWithMatrix];
if(font == nil)
font = (id)NSMapGet(globalFontMap, (void*)nameWithMatrix);
if (font == nil)
{
font = AUTORELEASE([[NSFontClass alloc] initWithName: aFontName
matrix: fontMatrix]);
matrix: fontMatrix]);
/* Cache the font for later use */
[globalFontDictionary setObject: font forKey: nameWithMatrix];
NSMapInsert(globalFontMap, (void*)nameWithMatrix, (void*)font);
}
return font;
@ -555,6 +555,13 @@ setNSFont(NSString* key, NSFont* font)
- (void) dealloc
{
NSString *nameWithMatrix = [NSString alloc];
nameWithMatrix = [nameWithMatrix initWithFormat:
@"%@ %.3f %.3f %.3f %.3f %.3f %.3f", fontName,
matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]];
NSMapRemove(globalFontMap, (void*)nameWithMatrix);
RELEASE(nameWithMatrix);
RELEASE(fontName);
RELEASE(fontInfo);
[super dealloc];