/* Font back-end driver for the NeXT/Open/GNUstep and MacOSX window system.
See font.h
- Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of GNU Emacs.
Author: Adrian Robert (arobert@cogsci.ucsd.edu)
*/
+/* This should be the first include, as it may set up #defines affecting
+ interpretation of even the system includes. */
#include "config.h"
#include "lisp.h"
n = FONT_WEIGHT_NUMERIC (font_spec);
if (n != -1)
- traits |= (n > STYLE_REF) ? NSBoldFontMask : NSUnboldFontMask;
+ traits |= (n > STYLE_REF) ? NSBoldFontMask
+ : (n < STYLE_REF) ? NSUnboldFontMask : 0;
n = FONT_SLANT_NUMERIC (font_spec);
if (n != -1)
- traits |= (n > STYLE_REF) ? NSItalicFontMask : NSUnitalicFontMask;
+ traits |= (n > STYLE_REF) ? NSItalicFontMask
+ : (n < STYLE_REF) ? NSUnitalicFontMask : 0;
n = FONT_WIDTH_NUMERIC (font_spec);
if (n > -1)
- {
- if (n < STYLE_REF - 10)
- traits |= NSCondensedFontMask;
- else if (n > STYLE_REF + 10)
- traits |= NSExpandedFontMask;
- }
+ traits |= (n > STYLE_REF + 10) ? NSExpandedFontMask
+ : (n < STYLE_REF - 10) ? NSExpandedFontMask : 0;
/*fprintf (stderr, " returning traits = %u\n", traits); */
return traits;
{
fprintf (stderr, "created font_entity:\n ");
debug_print (font_entity);
- }
+ }
[suffix release];
free (escapedFamily);
static int
nsfont_trait_distance (unsigned int traits1, unsigned int traits2)
{
- int i, d =0;
- for (i =0; i<sizeof (unsigned int)*8; i++)
+ int i, d = 0;
+ for (i = 0; i < sizeof (unsigned int) * 8; i++)
{
d += (traits1 & 0x1) ^ (traits2 & 0x1);
- traits1 >> 1;
- traits2 >> 1;
+ traits1 >>= 1;
+ traits2 >>= 1;
}
return d;
}
/* List fonts exactly matching with FONT_SPEC on FRAME. The value
- is a vector of font-entities. This is the sole API that
+ is a **list** of font-entities. This is the sole API that
allocates font-entities. */
static Lisp_Object
nsfont_list (Lisp_Object frame, Lisp_Object font_spec)
if (NSFONT_TRACE)
fprintf (stderr, " Returning %d entities.\n", XINT (Flength (list)));
- return (NILP (list) ? Qnil : Fvconcat (1, &list));/* Qnil was null_vector */
+ return list;
}
fprintf (stderr, "adstyle: '%s'\n", SDATA (tem));
#endif
tem = AREF (font_spec, FONT_REGISTRY_INDEX);
- if (!EQ (tem, Qiso10646_1) && !EQ (tem, Qunicode_bmp))
+ if (!NILP (tem) && !EQ (tem, Qiso10646_1) && !EQ (tem, Qunicode_bmp))
return nsfont_fallback_entity ();
family = nsfont_get_family (font_spec);
Lisp_Object font_object;
int i;
int fixLeopardBug;
-#if 0
static NSMutableDictionary *fontCache = nil;
+ NSNumber *cached;
/* 2008/03/08: The same font may end up being requested for different
entities, due to small differences in numeric values or other issues,
or for different copies of the same entity. Therefore we cache to
avoid creating multiple struct font objects (with metrics cache, etc.)
for the same NSFont object.
- 2008/06/01: This is still an issue, but after font backend refactoring
- caching will be more difficult, needs to be reworked before enabling. */
+ 2008/06/01: This is still an issue after font backend refactoring. */
if (fontCache == nil)
fontCache = [[NSMutableDictionary alloc] init];
-#endif
-
- font_object = font_make_object (VECSIZE (struct nsfont_info), font_entity,
- pixel_size);
- font_info = (struct nsfont_info *) XFONT_OBJECT (font_object);
- font = (struct font *)font_info;
- if (!font)
- return Qnil; /* FIXME: this copies w32, but causes a segfault */
if (NSFONT_TRACE)
{
family = nsfont_get_family (font_entity);
if (NSFONT_TRACE)
{
- fprintf (stderr, "family: '%s'\ttraits = %ld\tbold = %d\n",
- [family UTF8String], traits, traits & NSBoldFontMask);
+ fprintf (stderr, "family: '%s'\ttraits = %ld\tbold = %d\titalic = %d\n",
+ [family UTF8String], traits, traits & NSBoldFontMask,
+ traits & NSItalicFontMask);
}
/* see http://cocoadev.com/forums/comments.php?DiscussionID =74 */
}
}
-#if 0
- {
- NSNumber *cached = [fontCache objectForKey: nsfont];
- if (cached != nil && !synthItal)
- {
-fprintf (stderr, "*** CACHE HIT!\n");
- struct font_info *existing =
- (struct nsfont_info *)[cached unsignedLongValue];
- /* ... */
- }
- else
- {
- if (!synthItal)
- [fontCache
- setObject: [NSNumber numberWithUnsignedLong:
- (unsigned long)font_info]
- forKey: nsfont];
- }
- }
-#endif
+ if (NSFONT_TRACE)
+ NSLog (@"%@\n", nsfont);
+
+ /* Check the cache */
+ cached = [fontCache objectForKey: nsfont];
+ if (cached != nil && !synthItal)
+ {
+ if (NSFONT_TRACE)
+ fprintf(stderr, "*** nsfont_open CACHE HIT!\n");
+ return (Lisp_Object)[cached unsignedLongValue];
+ }
+ else
+ {
+ font_object = font_make_object (VECSIZE (struct nsfont_info),
+ font_entity, pixel_size);
+ if (!synthItal)
+ [fontCache
+ setObject: [NSNumber numberWithUnsignedLong:
+ (unsigned long)font_object]
+ forKey: nsfont];
+ }
+
+ font_info = (struct nsfont_info *) XFONT_OBJECT (font_object);
+ font = (struct font *)font_info;
+ if (!font)
+ return Qnil; /* FIXME: other terms do, but return Qnil causes segfault */
font_info->glyphs = (unsigned short **)
xmalloc (0x100 * sizeof (unsigned short *));
bzero (font_info->glyphs, 0x100 * sizeof (unsigned short *));
bzero (font_info->metrics, 0x100 * sizeof (struct font_metrics *));
-
-BLOCK_INPUT;
+ BLOCK_INPUT;
/* for metrics */
sfont = [nsfont screenFont];
XCharStruct *cs;
int cwidth, twidth = 0;
int hi, lo;
- char isComposite = 0; /* s->first_glyph->type == COMPOSITE_GLYPH; */
+ char isComposite = s->first_glyph->type == COMPOSITE_GLYPH;
/* FIXME: composition: no vertical displacement is considered. */
- t+= s->gidx; /* advance into composition */
- for (i =0; i<s->nchars - s->gidx; i++, t++)
+ t += s->cmp_from; /* advance into composition */
+ for (i = s->cmp_from; i < s->nchars; i++, t++)
{
hi = (*t & 0xFF00) >> 8;
lo = *t & 0x00FF;
if (isComposite)
{
- cwidth = s->cmp->offsets[s->gidx++ * 2] - twidth;
+ cwidth = s->cmp->offsets[i * 2] /* (H offset) */ - twidth;
}
else
{
/* do underline */
if (face->underline_p)
{
- if (face->underline_color != nil)
+ if (face->underline_color != 0)
[ns_lookup_indexed_color (face->underline_color, s->f) set];
else
[col set];
DPSmoveto (context, r.origin.x, r.origin.y + font->underpos);
DPSlineto (context, r.origin.x+r.size.width, r.origin.y+font->underpos);
- if (face->underline_color != nil)
+ if (face->underline_color != 0)
[col set];
}
else
[col set];
CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y);
- CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+ CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from,
advances, len);
if (face->overstrike)
{
CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y);
- CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+ CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from,
advances, len);
}
HCoop / bpt / emacs.git / blobdiff