Mercurial > emacs
changeset 98399:6b3b02fd9846
* nsfont.m (nsfont_trait_distance): Fix bug. (nsfont_list): Return a list rather than a vector (syncs with Handa changes of 2008-05-14). (nsfont_open): Improve logging.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Tue, 30 Sep 2008 01:03:00 +0000 |
| parents | 39408ed11da9 |
| children | f9165517710c |
| files | src/ChangeLog src/nsfont.m |
| diffstat | 2 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Sep 30 00:48:01 2008 +0000 +++ b/src/ChangeLog Tue Sep 30 01:03:00 2008 +0000 @@ -1,3 +1,10 @@ +2008-09-29 Adrian Robert <Adrian.B.Robert@gmail.com> + + * nsfont.m (nsfont_trait_distance): Fix bug. + (nsfont_list): Return a list rather than a vector (syncs with Handa + changes of 2008-05-14). + (nsfont_open): Improve logging. + 2008-09-29 Andreas Schwab <schwab@suse.de> * keyboard.c (syms_of_keyboard) <input-decode-map>: Doc fix.
--- a/src/nsfont.m Tue Sep 30 00:48:01 2008 +0000 +++ b/src/nsfont.m Tue Sep 30 01:03:00 2008 +0000 @@ -178,7 +178,7 @@ { fprintf (stderr, "created font_entity:\n "); debug_print (font_entity); - } + } [suffix release]; free (escapedFamily); @@ -190,12 +190,12 @@ 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; } @@ -267,7 +267,7 @@ /* 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) @@ -349,7 +349,7 @@ 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; } @@ -540,8 +540,9 @@ 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 */ @@ -576,6 +577,8 @@ } } +//NSLog(@"%@\n",nsfont); + #if 0 { NSNumber *cached = [fontCache objectForKey: nsfont];