/* Font back-end driver for the NeXT/Open/GNUstep and MacOSX window system.
See font.h
- Copyright (C) 2006-2013 Free Software Foundation, Inc.
+ Copyright (C) 2006-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
static Lisp_Object Qcondensed, Qexpanded;
extern Lisp_Object Qappend;
extern float ns_antialias_threshold;
-extern int ns_tmp_flags;
-extern struct nsfont_info *ns_tmp_font;
/* font glyph and metrics caching functions, implemented at end */
static void ns_glyph_metrics (struct nsfont_info *font_info,
unsigned char block);
+#define INVALID_GLYPH 0xFFFF
/* ==========================================================================
}
if (NSFONT_TRACE)
- NSLog(@" returning %d families", [families count]);
+ NSLog(@" returning %lu families", (unsigned long)[families count]);
return families;
}
matchingDescs = [fdesc matchingFontDescriptorsWithMandatoryKeys: fkeys];
if (NSFONT_TRACE)
- NSLog(@"Got desc %@ and found %d matching fonts from it: ", fdesc,
- [matchingDescs count]);
+ NSLog(@"Got desc %@ and found %lu matching fonts from it: ", fdesc,
+ (unsigned long)[matchingDescs count]);
for (dEnum = [matchingDescs objectEnumerator]; (desc = [dEnum nextObject]);)
{
static Lisp_Object nsfont_list_family (struct frame *);
static Lisp_Object nsfont_open (struct frame *f, Lisp_Object font_entity,
int pixel_size);
-static void nsfont_close (struct frame *f, struct font *font);
+static void nsfont_close (struct font *font);
static int nsfont_has_char (Lisp_Object entity, int c);
static unsigned int nsfont_encode_char (struct font *font, int c);
static int nsfont_text_extents (struct font *font, unsigned int *code,
static Lisp_Object
nsfont_get_cache (struct frame *frame)
{
- Display_Info *dpyinfo = FRAME_NS_DISPLAY_INFO (frame);
+ Display_Info *dpyinfo = FRAME_DISPLAY_INFO (frame);
return (dpyinfo->name_list_element);
}
font_object = font_make_object (VECSIZE (struct nsfont_info),
font_entity, pixel_size);
+ ASET (font_object, FONT_TYPE_INDEX, nsfont_driver.type);
font_info = (struct nsfont_info *) XFONT_OBJECT (font_object);
font = (struct font *) font_info;
if (!font)
font->vertical_centering = 0;
font->baseline_offset = 0;
font->relative_compose = 0;
- font->font_encoder = NULL;
font->props[FONT_FORMAT_INDEX] = Qns;
font->props[FONT_FILE_INDEX] = Qnil;
font_info->size = font->pixel_size;
/* max bounds */
- font_info->max_bounds.ascent = lrint ([sfont ascender]);
+ font->ascent = font_info->max_bounds.ascent = lrint ([sfont ascender]);
/* Descender is usually negative. Use floor to avoid
clipping descenders. */
- font_info->max_bounds.descent = -lrint (floor(adjusted_descender));
+ font->descent =
+ font_info->max_bounds.descent = -lrint (floor(adjusted_descender));
font_info->height =
font_info->max_bounds.ascent + font_info->max_bounds.descent;
font_info->max_bounds.width = lrint (font_info->width);
}
-/* Close FONT on frame F. */
+/* Close FONT. */
static void
-nsfont_close (struct frame *f, struct font *font)
+nsfont_close (struct font *font)
{
- struct nsfont_info *font_info = (struct nsfont_info *)font;
- int i;
-
- /* FIXME: this occurs apparently due to same failure to detect same font
- that causes need for cache in nsfont_open () */
- if (!font_info)
- return;
+ struct nsfont_info *font_info = (struct nsfont_info *) font;
- for (i =0; i<0x100; i++)
+ /* FIXME: font_info may be NULL due to same failure to detect
+ same font that causes need for cache in nsfont_open. */
+ if (font_info && font_info->name)
{
- xfree (font_info->glyphs[i]);
- xfree (font_info->metrics[i]);
- }
- [font_info->nsfont release];
+ int i;
+
+ for (i = 0; i < 0x100; i++)
+ {
+ xfree (font_info->glyphs[i]);
+ xfree (font_info->metrics[i]);
+ }
+ [font_info->nsfont release];
#ifdef NS_IMPL_COCOA
- CGFontRelease (font_info->cgfont);
+ CGFontRelease (font_info->cgfont);
#endif
- xfree (font_info->name);
- xfree (font_info);
+ xfree (font_info->name);
+ font_info->name = NULL;
+ }
}
ns_uni_to_glyphs (font_info, high);
g = font_info->glyphs[high][low];
- return g == 0xFFFF ? FONT_INVALID_CODE : g;
+ return g == INVALID_GLYPH ? FONT_INVALID_CODE : g;
}
#endif
struct face *face;
NSRect r;
- struct nsfont_info *font = ns_tmp_font;
+ struct nsfont_info *font;
NSColor *col, *bgCol;
unsigned short *t = s->char2b;
- int i, len;
+ int i, len, flags;
char isComposite = s->first_glyph->type == COMPOSITE_GLYPH;
int end = isComposite ? s->cmp_to : s->nchars;
block_input ();
+
+ font = (struct nsfont_info *)s->face->font;
+ if (font == NULL)
+ font = (struct nsfont_info *)FRAME_FONT (s->f);
+
/* Select face based on input flags */
- switch (ns_tmp_flags)
+ flags = s->hl == DRAW_CURSOR ? NS_DUMPGLYPH_CURSOR :
+ (s->hl == DRAW_MOUSE_FACE ? NS_DUMPGLYPH_MOUSEFACE :
+ (s->for_overlaps ? NS_DUMPGLYPH_FOREGROUND :
+ NS_DUMPGLYPH_NORMAL));
+
+ switch (flags)
{
case NS_DUMPGLYPH_CURSOR:
face = s->face;
: FRAME_BACKGROUND_COLOR (s->f)) set];
else
{
- struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (s->f);
+ struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (s->f);
[[dpyinfo->bitmaps[face->stipple-1].img stippleMask] set];
}
NSRectFill (br);
col = (NS_FACE_FOREGROUND (face) != 0
? ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f)
: FRAME_FOREGROUND_COLOR (s->f));
- /* FIXME: find another way to pass this */
- bgCol = (ns_tmp_flags != NS_DUMPGLYPH_FOREGROUND ? nil
+
+ bgCol = (flags != NS_DUMPGLYPH_FOREGROUND ? nil
: (NS_FACE_BACKGROUND (face) != 0
? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f)
: FRAME_BACKGROUND_COLOR (s->f)));
CGContextSaveGState (gcontext);
- fliptf.c = font->synthItal ? Fix2X (kATSItalicQDSkew) : 0.0;
+ // Used to be Fix2X (kATSItalicQDSkew), but Fix2X is deprecated
+ // and kATSItalicQDSkew is 0.25.
+ fliptf.c = font->synthItal ? 0.25 : 0.0;
CGContextSetFont (gcontext, font->cgfont);
CGContextSetFontSize (gcontext, font->size);
CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y);
CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from,
- advances, len);
+ advances, len);
if (face->overstrike)
{
CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y);
CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from,
- advances, len);
+ advances, len);
}
CGContextRestoreGState (gcontext);
}
#endif /* NS_IMPL_COCOA */
- /* Draw underline, overline, strike-through. */
- ns_draw_text_decoration (s, face, col, r.size.width, r.origin.x);
-
unblock_input ();
return to-from;
}
#else
g = glyphStorage->cglyphs[i];
/* TODO: is this a good check? maybe need to use coveredChars.. */
- if (g > numGlyphs)
- g = 0xFFFF; /* hopefully unused... */
+ if (g > numGlyphs || g == NSNullGlyph)
+ g = INVALID_GLYPH; /* hopefully unused... */
#endif
*glyphs = g;
}
characterIndex: (NSUInteger)charIndex
{
len = glyphIndex+length;
- for (i =glyphIndex; i<len; i++)
+ for (i =glyphIndex; i<len; i++)
cglyphs[i] = glyphs[i-glyphIndex];
if (len > maxGlyph)
maxGlyph = len;
HCoop / bpt / emacs.git / blobdiff