X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a51e9ff76cc887e0e6df95ff2895d80e0c00e9b9..4e36a6a6e2ce2367d0c049c45c91a7ae48ae1e77:/src/nsfont.m diff --git a/src/nsfont.m b/src/nsfont.m index ebee363651..58663804a2 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -33,7 +33,6 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu) #include "window.h" #include "fontset.h" #include "nsterm.h" -#include "frame.h" #include "character.h" #include "font.h" #include "termchar.h" @@ -52,8 +51,6 @@ static Lisp_Object Qapple, Qroman, Qmedium; 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 */ @@ -62,6 +59,7 @@ static void ns_uni_to_glyphs (struct nsfont_info *font_info, static void ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block); +#define INVALID_GLYPH 0xFFFF /* ========================================================================== @@ -119,7 +117,7 @@ ns_attribute_fvalue (NSFontDescriptor *fdesc, NSString *trait) { NSDictionary *tdict = [fdesc objectForKey: NSFontTraitsAttribute]; NSNumber *val = [tdict objectForKey: trait]; - return val == nil ? 0.0 : [val floatValue]; + return val == nil ? 0.0F : [val floatValue]; } @@ -138,23 +136,26 @@ ns_spec_to_descriptor (Lisp_Object font_spec) /* add each attr in font_spec to fdAttrs.. */ n = min (FONT_WEIGHT_NUMERIC (font_spec), 200); if (n != -1 && n != STYLE_REF) - [tdict setObject: [NSNumber numberWithFloat: (n - 100.0) / 100.0] + [tdict setObject: [NSNumber numberWithFloat: (n - 100.0F) / 100.0F] forKey: NSFontWeightTrait]; n = min (FONT_SLANT_NUMERIC (font_spec), 200); if (n != -1 && n != STYLE_REF) - [tdict setObject: [NSNumber numberWithFloat: (n - 100.0) / 100.0] + [tdict setObject: [NSNumber numberWithFloat: (n - 100.0F) / 100.0F] forKey: NSFontSlantTrait]; n = min (FONT_WIDTH_NUMERIC (font_spec), 200); if (n > -1 && (n > STYLE_REF + 10 || n < STYLE_REF - 10)) - [tdict setObject: [NSNumber numberWithFloat: (n - 100.0) / 100.0] + [tdict setObject: [NSNumber numberWithFloat: (n - 100.0F) / 100.0F] forKey: NSFontWidthTrait]; if ([tdict count] > 0) [fdAttrs setObject: tdict forKey: NSFontTraitsAttribute]; - fdesc = [NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs]; + fdesc = [[[NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs] + retain] autorelease]; + if (family != nil) { - fdesc = [fdesc fontDescriptorWithFamily: family]; + NSFontDescriptor *fdesc2 = [fdesc fontDescriptorWithFamily: family]; + fdesc = [[fdesc2 retain] autorelease]; } [fdAttrs release]; @@ -237,10 +238,10 @@ ns_fallback_entity (void) /* Utility: get width of a char c in screen font SFONT */ -static float +static CGFloat ns_char_width (NSFont *sfont, int c) { - float w = -1.0; + CGFloat w = -1.0; NSString *cstr = [NSString stringWithFormat: @"%c", c]; #ifdef NS_IMPL_COCOA @@ -266,7 +267,7 @@ static NSString *ascii_printable; static int ns_ascii_average_width (NSFont *sfont) { - float w = -1.0; + CGFloat w = -1.0; if (!ascii_printable) { @@ -285,14 +286,14 @@ ns_ascii_average_width (NSFont *sfont) w = [sfont advancementForGlyph: glyph].width; #endif - if (w < 0.0) + if (w < (CGFloat) 0.0) { NSDictionary *attrsDictionary = [NSDictionary dictionaryWithObject: sfont forKey: NSFontAttributeName]; w = [ascii_printable sizeWithAttributes: attrsDictionary].width; } - return lrint (w / 95.0); + return lrint (w / (CGFloat) 95.0); } @@ -320,7 +321,7 @@ ns_charset_covers(NSCharacterSet *set1, NSCharacterSet *set2, float pct) off++; } //fprintf(stderr, "off = %d\ttot = %d\n", off,tot); - return (float)off / tot < 1.0 - pct; + return (float)off / tot < 1.0F - pct; } @@ -359,7 +360,7 @@ static NSString *ns_registry_to_script (char *reg) { Lisp_Object script, r, rts = Vns_reg_to_script; - while CONSP (rts) + while (CONSP (rts)) { r = XCAR (XCAR (rts)); if (!strncmp (SSDATA (r), reg, SBYTES (r))) @@ -444,7 +445,7 @@ static NSCharacterSet { Lisp_Object ranges, range_list; - ranges = Fcons (script, Qnil); + ranges = list1 (script); map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, ranges); range_list = Fnreverse (XCDR (ranges)); @@ -511,8 +512,8 @@ static NSSet if (ns_charset_covers(fset, charset, pct)) [families addObject: family]; } - pct -= 0.2; - if ([families count] > 0 || pct < 0.05) + pct -= 0.2F; + if ([families count] > 0 || pct < 0.05F) break; } [charset release]; @@ -525,7 +526,7 @@ static NSSet } if (NSFONT_TRACE) - NSLog(@" returning %d families", [families count]); + NSLog(@" returning %lu families", (unsigned long)[families count]); return families; } @@ -563,8 +564,8 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch) 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]);) { @@ -617,13 +618,13 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch) ========================================================================== */ -static Lisp_Object nsfont_get_cache (FRAME_PTR frame); -static Lisp_Object nsfont_list (Lisp_Object frame, Lisp_Object font_spec); -static Lisp_Object nsfont_match (Lisp_Object frame, Lisp_Object font_spec); -static Lisp_Object nsfont_list_family (Lisp_Object frame); -static Lisp_Object nsfont_open (FRAME_PTR f, Lisp_Object font_entity, +static Lisp_Object nsfont_get_cache (struct frame *frame); +static Lisp_Object nsfont_list (struct frame *, Lisp_Object); +static Lisp_Object nsfont_match (struct frame *, Lisp_Object); +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 (FRAME_PTR 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, @@ -657,9 +658,9 @@ struct font_driver nsfont_driver = /* Return a cache of font-entities on FRAME. The cache must be a cons whose cdr part is the actual cache area. */ static Lisp_Object -nsfont_get_cache (FRAME_PTR frame) +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); } @@ -677,9 +678,9 @@ nsfont_get_cache (FRAME_PTR frame) weight, slant, width, size (0 if scalable), dpi, spacing, avgwidth (0 if scalable) */ static Lisp_Object -nsfont_list (Lisp_Object frame, Lisp_Object font_spec) +nsfont_list (struct frame *f, Lisp_Object font_spec) { - return ns_findfonts (font_spec, NO); + return ns_findfonts (font_spec, NO); } @@ -688,16 +689,16 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec) `face-font-selection-order' is ignored here. Properties to be considered are same as for list(). */ static Lisp_Object -nsfont_match (Lisp_Object frame, Lisp_Object font_spec) +nsfont_match (struct frame *f, Lisp_Object font_spec) { - return ns_findfonts(font_spec, YES); + return ns_findfonts (font_spec, YES); } /* List available families. The value is a list of family names (symbols). */ static Lisp_Object -nsfont_list_family (Lisp_Object frame) +nsfont_list_family (struct frame *f) { Lisp_Object list = Qnil; NSEnumerator *families; @@ -722,7 +723,7 @@ nsfont_list_family (Lisp_Object frame) /* Open a font specified by FONT_ENTITY on frame F. If the font is scalable, open it with PIXEL_SIZE. */ static Lisp_Object -nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) +nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size) { BOOL synthItal; unsigned int traits = 0; @@ -760,9 +761,9 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) family = [[NSFont userFixedPitchFontOfSize: 0] familyName]; /* Should be > 0.23 as some font descriptors (e.g. Terminus) set to that when setting family in ns_spec_to_descriptor(). */ - if (ns_attribute_fvalue (fontDesc, NSFontWeightTrait) > 0.50) + if (ns_attribute_fvalue (fontDesc, NSFontWeightTrait) > 0.50F) traits |= NSBoldFontMask; - if (fabs (ns_attribute_fvalue (fontDesc, NSFontSlantTrait) > 0.05)) + if (fabs (ns_attribute_fvalue (fontDesc, NSFontSlantTrait) > 0.05F)) traits |= NSItalicFontMask; /* see http://cocoadev.com/forums/comments.php?DiscussionID=74 */ @@ -795,6 +796,7 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) 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) @@ -868,16 +870,17 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) 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); font_info->max_bounds.lbearing = lrint (brect.origin.x); font_info->max_bounds.rbearing = - lrint (brect.size.width - font_info->width); + lrint (brect.size.width - (CGFloat) font_info->width); #ifdef NS_IMPL_COCOA /* set up synthItal and the CG font */ @@ -918,8 +921,7 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) font->underline_thickness = lrint (font_info->underwidth); font->props[FONT_NAME_INDEX] = Ffont_xlfd_name (font_object, Qnil); - font->props[FONT_FULLNAME_INDEX] = - make_unibyte_string (font_info->name, strlen (font_info->name)); + font->props[FONT_FULLNAME_INDEX] = build_unibyte_string (font_info->name); } unblock_input (); @@ -927,29 +929,30 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) } -/* Close FONT on frame F. */ +/* Close FONT. */ static void -nsfont_close (FRAME_PTR 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; + } } @@ -980,7 +983,7 @@ nsfont_encode_char (struct font *font, int c) 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; } @@ -1038,8 +1041,8 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, /* NOTE: focus and clip must be set also, currently assumed (true in nsterm.m call) from ==0, to ==nchars */ { - static char cbuf[1024]; - char *c = cbuf; + static unsigned char cbuf[1024]; + unsigned char *c = cbuf; #ifdef NS_IMPL_GNUSTEP static float advances[1024]; float *adv = advances; @@ -1049,16 +1052,26 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, #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; @@ -1173,7 +1186,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, : 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); @@ -1186,8 +1199,8 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, 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))); @@ -1206,7 +1219,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, [bgCol set]; DPSmoveto (context, r.origin.x, r.origin.y); /*[context GSSetTextDrawingMode: GSTextFillStroke]; /// not implemented yet */ - DPSxshow (context, cbuf, advances, len); + DPSxshow (context, (const char *) cbuf, advances, len); DPSstroke (context); [col set]; /*[context GSSetTextDrawingMode: GSTextFill]; /// not implemented yet */ @@ -1216,7 +1229,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, /* draw with DPSxshow () */ DPSmoveto (context, r.origin.x, r.origin.y); - DPSxshow (context, cbuf, advances, len); + DPSxshow (context, (const char *) cbuf, advances, len); DPSstroke (context); DPSgrestore (context); @@ -1237,7 +1250,9 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, 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); @@ -1262,22 +1277,19 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, 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; } @@ -1353,8 +1365,8 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block) #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; } @@ -1404,7 +1416,7 @@ ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block) metrics = font_info->metrics[block]; for (g = block<<8, i =0; i<0x100 && g < numGlyphs; g++, i++, metrics++) { - float w, lb, rb; + CGFloat w, lb, rb; NSRect r = [sfont boundingRectForGlyph: g]; w = max ([sfont advancementForGlyph: g].width, 2.0); @@ -1416,7 +1428,7 @@ ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block) if (lb < 0) metrics->lbearing = round (lb - LCD_SMOOTHING_MARGIN); if (font_info->ital) - rb += 0.22 * font_info->height; + rb += (CGFloat) (0.22F * font_info->height); metrics->rbearing = lrint (w + rb + LCD_SMOOTHING_MARGIN); metrics->descent = r.origin.y < 0 ? -r.origin.y : 0; @@ -1482,7 +1494,7 @@ ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block) characterIndex: (NSUInteger)charIndex { len = glyphIndex+length; - for (i =glyphIndex; i maxGlyph) maxGlyph = len;