Mercurial > emacs
annotate src/nsfont.m @ 104815:b3c991e42448
* xterm.h: Rename x_non_menubar_window_to_frame to
x_menubar_window_to_frame
* xterm.c: Remove declarations also in xterm.h
(XTmouse_position): Do not return valid positions
for clicks in the menubar and the toolbar for Gtk+.
* xfns.c (x_any_window_to_frame): Assume less about Gtk+ internals,
if the widget for the event has the same top level as a frame,
return the frame.
(x_menubar_window_to_frame): Detect menu bar even with Gtk+
internal windows, bug #4122.
(x_non_menubar_window_to_frame): Remove.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Wed, 02 Sep 2009 17:03:20 +0000 |
parents | 132eb17eec1d |
children | 7f459491fb93 |
rev | line source |
---|---|
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1 /* Font back-end driver for the NeXT/Open/GNUstep and MacOSX window system. |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
2 See font.h |
100951 | 3 Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
4 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
5 This file is part of GNU Emacs. |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
6 |
96692
6fad3f85eab7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
96689
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
8 it under the terms of the GNU General Public License as published by |
96692
6fad3f85eab7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
96689
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
6fad3f85eab7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
96689
diff
changeset
|
10 (at your option) any later version. |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
11 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
12 GNU Emacs is distributed in the hope that it will be useful, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
15 GNU General Public License for more details. |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
16 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
96692
6fad3f85eab7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
96689
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
19 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
20 Author: Adrian Robert (arobert@cogsci.ucsd.edu) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
21 */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
22 |
99904
ba4876d944bc
Fix bug #1362. * image.c (x_clear_image_1): Do not free background under HAVE_NS, it is not an indexed color. * nsterm.m (free_indexed_color): Add argument checking. * nsfns.m: Move config.h to before system includes (advised by Dan N.).
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98451
diff
changeset
|
23 /* This should be the first include, as it may set up #defines affecting |
ba4876d944bc
Fix bug #1362. * image.c (x_clear_image_1): Do not free background under HAVE_NS, it is not an indexed color. * nsterm.m (free_indexed_color): Add argument checking. * nsfns.m: Move config.h to before system includes (advised by Dan N.).
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98451
diff
changeset
|
24 interpretation of even the system includes. */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
25 #include "config.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
26 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
27 #include "lisp.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
28 #include "dispextern.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
29 #include "composite.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
30 #include "blockinput.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
31 #include "charset.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
32 #include "frame.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
33 #include "window.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
34 #include "fontset.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
35 #include "nsterm.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
36 #include "frame.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
37 #include "character.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
38 #include "font.h" |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
39 |
104048
712697e0dfcc
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103990
diff
changeset
|
40 /* This header is not included from GNUstep's (0.16.0) AppKit.h. */ |
712697e0dfcc
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103990
diff
changeset
|
41 #ifdef NS_IMPL_GNUSTEP |
712697e0dfcc
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103990
diff
changeset
|
42 #import <AppKit/NSFontDescriptor.h> |
712697e0dfcc
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103990
diff
changeset
|
43 #endif |
712697e0dfcc
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103990
diff
changeset
|
44 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
45 #define NSFONT_TRACE 0 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
46 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
47 extern Lisp_Object Qns; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
48 extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
49 static Lisp_Object Qapple, Qroman, Qmedium; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
50 extern Lisp_Object Qappend; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
51 extern int ns_antialias_text, ns_use_qd_smoothing; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
52 extern float ns_antialias_threshold; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
53 extern int ns_tmp_flags; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
54 extern struct nsfont_info *ns_tmp_font; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
55 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
56 /* font glyph and metrics caching functions, implemented at end */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
57 static void ns_uni_to_glyphs (struct nsfont_info *font_info, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
58 unsigned char block); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
59 static void ns_glyph_metrics (struct nsfont_info *font_info, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
60 unsigned char block); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
61 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
62 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
63 /* ========================================================================== |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
64 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
65 Utilities |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
66 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
67 ========================================================================== */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
68 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
69 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
70 /* Replace spaces w/another character so emacs core font parsing routines |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
71 aren't thrown off. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
72 static void |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
73 ns_escape_name (char *name) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
74 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
75 int i =0, len =strlen (name); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
76 for ( ; i<len; i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
77 if (name[i] == ' ') |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
78 name[i] = '_'; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
79 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
80 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
81 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
82 /* Reconstruct spaces in a font family name passed through emacs. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
83 static void |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
84 ns_unescape_name (char *name) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
85 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
86 int i =0, len =strlen (name); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
87 for ( ; i<len; i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
88 if (name[i] == '_') |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
89 name[i] = ' '; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
90 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
91 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
92 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
93 /* Extract family name from a font spec. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
94 static NSString * |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
95 ns_get_family (Lisp_Object font_spec) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
96 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
97 Lisp_Object tem = AREF (font_spec, FONT_FAMILY_INDEX); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
98 if (NILP (tem)) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
99 return nil; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
100 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
101 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
102 char *tmp = strdup (SDATA (SYMBOL_NAME (tem))); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
103 NSString *family; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
104 ns_unescape_name (tmp); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
105 /* For names hard-coded into emacs, like 'helvetica' for splash. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
106 tmp[0] = toupper (tmp[0]); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
107 family = [NSString stringWithUTF8String: tmp]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
108 free (tmp); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
109 return family; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
110 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
111 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
112 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
113 |
103422
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
114 /* Return 0 if attr not set, else value (which might also be 0). |
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
115 On Leopard 0 gets returned even on descriptors where the attribute |
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
116 was never set, so there's no way to distinguish between unspecified |
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
117 and set to not have. Callers should assume 0 means unspecified. */ |
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
118 static float |
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
119 ns_attribute_fvalue (NSFontDescriptor *fdesc, NSString *trait) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
120 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
121 NSDictionary *tdict = [fdesc objectForKey: NSFontTraitsAttribute]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
122 NSNumber *val = [tdict objectForKey: trait]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
123 return val == nil ? 0.0 : [val floatValue]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
124 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
125 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
126 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
127 /* Converts FONT_WEIGHT, FONT_SLANT, FONT_WIDTH, plus family and script/lang |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
128 to NSFont descriptor. Information under extra only needed for matching. */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
129 #define STYLE_REF 100 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
130 static NSFontDescriptor |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
131 *ns_spec_to_descriptor(Lisp_Object font_spec) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
132 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
133 NSFontDescriptor *fdesc; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
134 NSMutableDictionary *fdAttrs = [NSMutableDictionary new]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
135 NSMutableDictionary *tdict = [NSMutableDictionary new]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
136 NSString *family = ns_get_family (font_spec); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
137 float n; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
138 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
139 /* add each attr in font_spec to fdAttrs.. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
140 n = min (FONT_WEIGHT_NUMERIC (font_spec), 200); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
141 if (n != -1 && n != STYLE_REF) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
142 [tdict setObject: [NSNumber numberWithFloat: (n - 100.0) / 100.0] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
143 forKey: NSFontWeightTrait]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
144 n = min (FONT_SLANT_NUMERIC (font_spec), 200); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
145 if (n != -1 && n != STYLE_REF) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
146 [tdict setObject: [NSNumber numberWithFloat: (n - 100.0) / 100.0] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
147 forKey: NSFontSlantTrait]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
148 n = min (FONT_WIDTH_NUMERIC (font_spec), 200); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
149 if (n > -1 && (n > STYLE_REF + 10 || n < STYLE_REF - 10)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
150 [tdict setObject: [NSNumber numberWithFloat: (n - 100.0) / 100.0] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
151 forKey: NSFontWidthTrait]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
152 if ([tdict count] > 0) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
153 [fdAttrs setObject: tdict forKey: NSFontTraitsAttribute]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
154 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
155 fdesc = [NSFontDescriptor fontDescriptorWithFontAttributes: fdAttrs]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
156 if (family != nil) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
157 fdesc = [fdesc fontDescriptorWithFamily: family]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
158 return fdesc; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
159 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
160 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
161 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
162 /* Converts NSFont descriptor to FONT_WEIGHT, FONT_SLANT, FONT_WIDTH, etc.. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
163 static Lisp_Object |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
164 ns_descriptor_to_entity (NSFontDescriptor *desc, Lisp_Object extra, char *style) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
165 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
166 Lisp_Object font_entity = font_make_entity (); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
167 /* NSString *psName = [desc postscriptName]; */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
168 NSString *family = [desc objectForKey: NSFontFamilyAttribute]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
169 unsigned int traits = [desc symbolicTraits]; |
104123
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
170 char *escapedFamily; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
171 |
104123
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
172 /* Shouldn't happen, but on Tiger fallback desc gets name but no family. */ |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
173 if (family == nil) |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
174 family = [desc objectForKey: NSFontNameAttribute]; |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
175 if (family == nil) |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
176 family = [[NSFont userFixedPitchFontOfSize: 0] familyName]; |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
177 |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
178 escapedFamily = strdup ([family UTF8String]); |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
179 ns_escape_name (escapedFamily); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
180 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
181 ASET (font_entity, FONT_TYPE_INDEX, Qns); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
182 ASET (font_entity, FONT_FOUNDRY_INDEX, Qapple); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
183 ASET (font_entity, FONT_FAMILY_INDEX, intern (escapedFamily)); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
184 ASET (font_entity, FONT_ADSTYLE_INDEX, style ? intern (style) : Qnil); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
185 ASET (font_entity, FONT_REGISTRY_INDEX, Qiso10646_1); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
186 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
187 FONT_SET_STYLE (font_entity, FONT_WEIGHT_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
188 traits & NSFontBoldTrait ? Qbold : Qmedium); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
189 /* FONT_SET_STYLE (font_entity, FONT_WEIGHT_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
190 make_number (100 + 100 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
191 * ns_attribute_fvalue (desc, NSFontWeightTrait)));*/ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
192 FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
193 traits & NSFontItalicTrait ? Qitalic : Qnormal); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
194 /* FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
195 make_number (100 + 100 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
196 * ns_attribute_fvalue (desc, NSFontSlantTrait)));*/ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
197 FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
198 traits & NSFontCondensedTrait ? Qcondensed : |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
199 traits & NSFontExpandedTrait ? Qexpanded : Qnormal); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
200 /* FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
201 make_number (100 + 100 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
202 * ns_attribute_fvalue (desc, NSFontWidthTrait)));*/ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
203 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
204 ASET (font_entity, FONT_SIZE_INDEX, make_number (0)); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
205 ASET (font_entity, FONT_AVGWIDTH_INDEX, make_number (0)); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
206 ASET (font_entity, FONT_SPACING_INDEX, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
207 make_number([desc symbolicTraits] & NSFontMonoSpaceTrait |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
208 ? FONT_SPACING_MONO : FONT_SPACING_PROPORTIONAL)); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
209 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
210 ASET (font_entity, FONT_EXTRA_INDEX, extra); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
211 ASET (font_entity, FONT_OBJLIST_INDEX, Qnil); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
212 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
213 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
214 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
215 fprintf (stderr, "created font_entity:\n "); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
216 debug_print (font_entity); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
217 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
218 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
219 free (escapedFamily); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
220 return font_entity; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
221 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
222 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
223 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
224 /* Default font entity. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
225 static Lisp_Object |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
226 ns_fallback_entity () |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
227 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
228 return ns_descriptor_to_entity ([[NSFont userFixedPitchFontOfSize: 0] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
229 fontDescriptor], Qnil, NULL); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
230 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
231 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
232 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
233 /* Utility: get width of a char c in screen font sfont */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
234 static float |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
235 ns_char_width (NSFont *sfont, int c) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
236 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
237 float w; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
238 NSString *cstr = [NSString stringWithFormat: @"%c", c]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
239 #ifdef NS_IMPL_COCOA |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
240 NSGlyph glyph = [sfont glyphWithName: cstr]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
241 if (glyph) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
242 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
243 float w = [sfont advancementForGlyph: glyph].width; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
244 if (w >= 1.5) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
245 return w; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
246 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
247 #endif |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
248 w = [sfont widthOfString: cstr]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
249 return max (w, 2.0); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
250 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
251 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
252 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
253 /* Return whether set1 covers set2 to a reasonable extent given by pct. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
254 We check, out of each 16 unicode char range containing chars in set2, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
255 whether at least one character is present in set1. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
256 This must be true for pct of the pairs to consider it covering. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
257 static BOOL |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
258 ns_charset_covers(NSCharacterSet *set1, NSCharacterSet *set2, float pct) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
259 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
260 const unsigned short *bytes1 = [[set1 bitmapRepresentation] bytes]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
261 const unsigned short *bytes2 = [[set2 bitmapRepresentation] bytes]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
262 int i, off = 0, tot = 0; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
263 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
264 for (i=0; i<4096; i++, bytes1++, bytes2++) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
265 if (*bytes2) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
266 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
267 tot++; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
268 if (*bytes1 == 0) // *bytes1 & *bytes2 != *bytes2 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
269 off++; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
270 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
271 //fprintf(stderr, "off = %d\ttot = %d\n", off,tot); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
272 return (float)off / tot < 1.0 - pct; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
273 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
274 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
275 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
276 /* Convert :lang property to a script. Use of :lang property by font backend |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
277 seems to be limited for now (2009/05) to ja, zh, and ko. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
278 static NSString |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
279 *ns_lang_to_script (Lisp_Object lang) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
280 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
281 if (!strcmp (SDATA (SYMBOL_NAME (lang)), "ja")) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
282 return @"han"; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
283 /* NOTE: ja given for any hanzi that's also a kanji, but Chinese fonts |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
284 have more characters. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
285 else if (!strcmp (SDATA (SYMBOL_NAME (lang)), "zh")) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
286 return @"han"; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
287 else if (!strcmp (SDATA (SYMBOL_NAME (lang)), "ko")) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
288 return @"hangul"; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
289 else |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
290 return @""; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
291 } |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
292 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
293 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
294 /* Convert OTF 4-letter script code to emacs script name. (Why can't |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
295 everyone just use some standard unicode names for these?) */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
296 static NSString |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
297 *ns_otf_to_script (Lisp_Object otf) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
298 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
299 Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
300 return CONSP (script) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
301 ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME XCDR ((script)))] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
302 : @""; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
303 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
304 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
305 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
306 /* Searches the :script, :lang, and :otf extra-bundle properties of the spec |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
307 for something that can be mapped to a unicode script. Empty string returned |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
308 if no script spec found. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
309 TODO: Eventually registry / encoding should be checked and mapped, but for |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
310 now the font backend will try script/lang/otf if registry fails, so it is |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
311 not needed. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
312 static NSString |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
313 *ns_get_req_script (Lisp_Object font_spec) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
314 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
315 Lisp_Object extra = AREF (font_spec, FONT_EXTRA_INDEX); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
316 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
317 for ( ; CONSP (extra); extra = XCDR (extra)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
318 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
319 Lisp_Object tmp = XCAR (extra); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
320 if (CONSP (tmp)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
321 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
322 Lisp_Object key = XCAR (tmp), val = XCDR (tmp); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
323 if (EQ (key, QCscript) && SYMBOLP (val)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
324 return [NSString stringWithUTF8String: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
325 SDATA (SYMBOL_NAME (val))]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
326 if (EQ (key, QClang) && SYMBOLP (val)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
327 return ns_lang_to_script (val); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
328 if (EQ (key, QCotf) && CONSP (val) && SYMBOLP (XCAR (val))) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
329 return ns_otf_to_script (val); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
330 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
331 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
332 return @""; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
333 } |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
334 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
335 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
336 /* This small function is static in fontset.c. If it can be made public for |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
337 all ports, remove this, but otherwise it doesn't seem worth the ifdefs. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
338 static void |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
339 accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
340 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
341 if (EQ (XCAR (arg), val)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
342 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
343 if (CONSP (range)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
344 XSETCDR (arg, Fcons (Fcons (XCAR (range), XCDR (range)), XCDR (arg))); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
345 else |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
346 XSETCDR (arg, Fcons (Fcons (range, range), XCDR (arg))); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
347 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
348 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
349 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
350 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
351 /* Use the unicode range information in Vchar_script_table to convert a script |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
352 name into an NSCharacterSet. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
353 static NSCharacterSet |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
354 *ns_script_to_charset (NSString *scriptName) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
355 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
356 NSMutableCharacterSet *charset = [NSMutableCharacterSet new]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
357 Lisp_Object script = intern ([scriptName UTF8String]); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
358 Lisp_Object script_list = XCHAR_TABLE (Vchar_script_table)->extras[0]; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
359 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
360 if (! NILP (Fmemq (script, script_list))) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
361 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
362 Lisp_Object ranges, range_list; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
363 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
364 ranges = Fcons (script, Qnil); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
365 map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
366 ranges); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
367 range_list = Fnreverse (XCDR (ranges)); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
368 if (! NILP (range_list)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
369 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
370 for (; CONSP (range_list); range_list = XCDR (range_list)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
371 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
372 int start = XINT (XCAR (XCAR (range_list))); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
373 int end = XINT (XCDR (XCAR (range_list))); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
374 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
375 debug_print (XCAR (range_list)); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
376 if (end < 0x10000) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
377 [charset addCharactersInRange: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
378 NSMakeRange (start, end-start)]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
379 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
380 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
381 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
382 return charset; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
383 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
384 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
385 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
386 /* Return an array of font families containing characters for the given |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
387 script, for the given coverage criterion, including at least LastResort. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
388 Results are cached by script for faster access. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
389 If none are found, we reduce the percentage and try again, until 5%. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
390 This provides a font with at least some characters if such can be found. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
391 We don't use isSupersetOfSet: because (a) it doesn't work on Tiger, and |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
392 (b) need approximate match as fonts covering full unicode ranges are rare. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
393 static NSSet |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
394 *ns_get_covering_families (NSString *script, float pct) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
395 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
396 static NSMutableDictionary *scriptToFamilies = nil; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
397 NSMutableSet *families; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
398 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
399 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
400 NSLog(@"Request covering families for script: '%@'", script); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
401 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
402 if (scriptToFamilies == nil) |
103426
3c179a4d2b8a
(ns_get_covering_families): Retain scriptToFamilies.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103422
diff
changeset
|
403 scriptToFamilies = [[NSMutableDictionary alloc] init]; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
404 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
405 if ((families = [scriptToFamilies objectForKey: script]) == nil) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
406 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
407 NSFontManager *fontMgr = [NSFontManager sharedFontManager]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
408 NSArray *allFamilies = [fontMgr availableFontFamilies]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
409 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
410 if ([script length] == 0) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
411 families = [NSMutableSet setWithArray: allFamilies]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
412 else |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
413 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
414 NSCharacterSet *charset = ns_script_to_charset (script); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
415 NSString *family; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
416 families = [NSMutableSet setWithCapacity: 10]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
417 while (1) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
418 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
419 NSEnumerator *allFamiliesEnum = [allFamilies objectEnumerator]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
420 while (family = [allFamiliesEnum nextObject]) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
421 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
422 NSCharacterSet *fset = [[fontMgr fontWithFamily: family |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
423 traits: 0 weight: 5 size: 12.0] coveredCharacterSet]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
424 /* Some fonts on OS X, maybe many on GNUstep, return nil. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
425 if (fset == nil) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
426 fset = [NSCharacterSet characterSetWithRange: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
427 NSMakeRange (0, 127)]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
428 if (ns_charset_covers(fset, charset, pct)) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
429 [families addObject: family]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
430 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
431 pct -= 0.2; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
432 if ([families count] > 0 || pct < 0.05) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
433 break; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
434 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
435 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
436 #ifdef NS_IMPL_COCOA |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
437 if ([families count] == 0) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
438 [families addObject: @"LastResort"]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
439 #endif |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
440 [scriptToFamilies setObject: families forKey: script]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
441 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
442 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
443 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
444 NSLog(@" returning %d families", [families count]); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
445 return families; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
446 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
447 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
448 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
449 /* Implementation for list() and match(). List() can return nil, match() |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
450 must return something. Strategy is to drop family name from attribute |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
451 matching set for match. */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
452 static Lisp_Object |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
453 ns_findfonts (Lisp_Object font_spec, BOOL isMatch) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
454 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
455 Lisp_Object tem, list = Qnil; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
456 NSFontDescriptor *fdesc, *desc; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
457 NSMutableSet *fkeys; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
458 NSArray *matchingDescs; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
459 NSEnumerator *dEnum; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
460 NSString *family; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
461 NSSet *cFamilies; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
462 BOOL foundItal = NO; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
463 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
464 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
465 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
466 fprintf (stderr, "nsfont: %s for fontspec:\n ", |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
467 (isMatch ? "match" : "list")); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
468 debug_print (font_spec); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
469 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
470 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
471 /* If has non-unicode registry, give up. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
472 tem = AREF (font_spec, FONT_REGISTRY_INDEX); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
473 if (! NILP (tem) && !EQ (tem, Qiso10646_1) && !EQ (tem, Qunicode_bmp)) |
104107
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
474 return isMatch ? ns_fallback_entity () : Qnil; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
475 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
476 cFamilies = ns_get_covering_families (ns_get_req_script (font_spec), 0.90); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
477 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
478 fdesc = ns_spec_to_descriptor (font_spec); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
479 fkeys = [NSMutableSet setWithArray: [[fdesc fontAttributes] allKeys]]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
480 if (isMatch) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
481 [fkeys removeObject: NSFontFamilyAttribute]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
482 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
483 matchingDescs = [fdesc matchingFontDescriptorsWithMandatoryKeys: fkeys]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
484 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
485 NSLog(@"Got desc %@ and found %d matching fonts from it: ", fdesc, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
486 [matchingDescs count]); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
487 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
488 for (dEnum = [matchingDescs objectEnumerator]; desc = [dEnum nextObject]; ) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
489 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
490 if (![cFamilies containsObject: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
491 [desc objectForKey: NSFontFamilyAttribute]]) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
492 continue; |
104107
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
493 tem = ns_descriptor_to_entity (desc, |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
494 AREF (font_spec, FONT_EXTRA_INDEX), |
104107
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
495 NULL); |
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
496 if (isMatch) |
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
497 return tem; |
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
498 list = Fcons (tem, list); |
103990
73ea181d96b6
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103908
diff
changeset
|
499 if (fabs (ns_attribute_fvalue (desc, NSFontSlantTrait)) > 0.05) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
500 foundItal = YES; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
501 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
502 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
503 /* Add synthItal member if needed. */ |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
504 family = [fdesc objectForKey: NSFontFamilyAttribute]; |
103422
591af7ba061b
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103343
diff
changeset
|
505 if (family != nil && !foundItal && XINT (Flength (list)) > 0) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
506 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
507 NSFontDescriptor *sDesc = [[[NSFontDescriptor new] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
508 fontDescriptorWithSymbolicTraits: NSFontItalicTrait] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
509 fontDescriptorWithFamily: family]; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
510 list = Fcons (ns_descriptor_to_entity (sDesc, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
511 AREF (font_spec, FONT_EXTRA_INDEX), |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
512 "synthItal"), list); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
513 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
514 |
104058
85bf43e7dada
* nsfont.m (ns_findfonts): Correctly return fallback in match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104048
diff
changeset
|
515 /* Return something if was a match and nothing found. */ |
104107
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
516 if (isMatch) |
6a6fc6d5dad8
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104069
diff
changeset
|
517 return ns_fallback_entity (); |
104058
85bf43e7dada
* nsfont.m (ns_findfonts): Correctly return fallback in match case.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104048
diff
changeset
|
518 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
519 if (NSFONT_TRACE) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
520 fprintf (stderr, " Returning %d entities.\n", XINT (Flength (list))); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
521 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
522 return list; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
523 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
524 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
525 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
526 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
527 /* ========================================================================== |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
528 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
529 Font driver implementation |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
530 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
531 ========================================================================== */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
532 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
533 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
534 static Lisp_Object nsfont_get_cache (FRAME_PTR frame); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
535 static Lisp_Object nsfont_list (Lisp_Object frame, Lisp_Object font_spec); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
536 static Lisp_Object nsfont_match (Lisp_Object frame, Lisp_Object font_spec); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
537 static Lisp_Object nsfont_list_family (Lisp_Object frame); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
538 static Lisp_Object nsfont_open (FRAME_PTR f, Lisp_Object font_entity, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
539 int pixel_size); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
540 static void nsfont_close (FRAME_PTR f, struct font *font); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
541 static int nsfont_has_char (Lisp_Object entity, int c); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
542 static unsigned int nsfont_encode_char (struct font *font, int c); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
543 static int nsfont_text_extents (struct font *font, unsigned int *code, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
544 int nglyphs, struct font_metrics *metrics); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
545 static int nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
546 int with_background); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
547 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
548 struct font_driver nsfont_driver = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
549 { |
96759
1e2f7aab70ba
* Makefile.in: Undef LIB_STANDARD before defining it to silence warning
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96692
diff
changeset
|
550 0, /* Qns */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
551 1, /* case sensitive */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
552 nsfont_get_cache, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
553 nsfont_list, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
554 nsfont_match, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
555 nsfont_list_family, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
556 NULL, /*free_entity */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
557 nsfont_open, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
558 nsfont_close, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
559 NULL, /* prepare_face */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
560 NULL, /* done_face */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
561 nsfont_has_char, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
562 nsfont_encode_char, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
563 nsfont_text_extents, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
564 nsfont_draw, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
565 /* excluded: get_bitmap, free_bitmap, get_outline, free_outline, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
566 anchor_point, otf_capability, otf_driver, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
567 start_for_frame, end_for_frame, shape */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
568 }; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
569 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
570 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
571 /* Return a cache of font-entities on FRAME. The cache must be a |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
572 cons whose cdr part is the actual cache area. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
573 static Lisp_Object |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
574 nsfont_get_cache (FRAME_PTR frame) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
575 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
576 Display_Info *dpyinfo = FRAME_NS_DISPLAY_INFO (frame); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
577 return (dpyinfo->name_list_element); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
578 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
579 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
580 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
581 /* List fonts exactly matching with FONT_SPEC on FRAME. The value is a |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
582 **list** of font-entities. This and match () are sole APIs that allocate |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
583 font-entities. Properties to be considered (2009/05/19) are: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
584 regular: foundry, family, adstyle, registry |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
585 extended: script, lang, otf |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
586 "Extended" properties are not part of the vector but get stored as |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
587 lisp properties under FONT_EXTRA_INDEX. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
588 |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
589 The returned entities should have type set (to 'ns), plus the following: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
590 foundry, family, adstyle, registry, |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
591 weight, slant, width, size (0 if scalable), |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
592 dpi, spacing, avgwidth (0 if scalable) */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
593 static Lisp_Object |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
594 nsfont_list (Lisp_Object frame, Lisp_Object font_spec) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
595 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
596 return ns_findfonts (font_spec, NO); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
597 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
598 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
599 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
600 /* Return a font entity most closely maching with FONT_SPEC on |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
601 FRAME. The closeness is determined by the font backend, thus |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
602 `face-font-selection-order' is ignored here. |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
603 Properties to be considered are same as for list(). */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
604 static Lisp_Object |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
605 nsfont_match (Lisp_Object frame, Lisp_Object font_spec) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
606 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
607 return ns_findfonts(font_spec, YES); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
608 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
609 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
610 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
611 /* List available families. The value is a list of family names |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
612 (symbols). */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
613 static Lisp_Object |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
614 nsfont_list_family (Lisp_Object frame) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
615 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
616 Lisp_Object list = Qnil; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
617 NSEnumerator *families = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
618 [[[NSFontManager sharedFontManager] availableFontFamilies] |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
619 objectEnumerator]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
620 NSString *family; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
621 while (family = [families nextObject]) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
622 list = Fcons (intern ([family UTF8String]), list); |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
623 /* FIXME: escape the name? */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
624 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
625 if (NSFONT_TRACE) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
626 fprintf (stderr, "nsfont: list families returning %d entries\n", |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
627 XINT (Flength (list))); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
628 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
629 return list; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
630 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
631 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
632 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
633 /* Open a font specified by FONT_ENTITY on frame F. If the font is |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
634 scalable, open it with PIXEL_SIZE. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
635 static Lisp_Object |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
636 nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
637 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
638 BOOL synthItal; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
639 unsigned int traits = 0; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
640 struct nsfont_info *font_info; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
641 struct font *font; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
642 NSFontDescriptor *fontDesc = ns_spec_to_descriptor (font_entity); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
643 NSFontManager *fontMgr = [NSFontManager sharedFontManager]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
644 NSString *family; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
645 NSFont *nsfont, *sfont; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
646 Lisp_Object tem; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
647 NSRect brect; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
648 Lisp_Object font_object; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
649 int i; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
650 int fixLeopardBug; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
651 static NSMutableDictionary *fontCache = nil; |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
652 NSNumber *cached; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
653 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
654 /* 2008/03/08: The same font may end up being requested for different |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
655 entities, due to small differences in numeric values or other issues, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
656 or for different copies of the same entity. Therefore we cache to |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
657 avoid creating multiple struct font objects (with metrics cache, etc.) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
658 for the same NSFont object. */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
659 if (fontCache == nil) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
660 fontCache = [[NSMutableDictionary alloc] init]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
661 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
662 if (NSFONT_TRACE) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
663 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
664 fprintf (stderr, "nsfont: open size %d of fontentity:\n ", pixel_size); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
665 debug_print (font_entity); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
666 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
667 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
668 if (pixel_size <= 0) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
669 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
670 /* try to get it out of frame params */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
671 Lisp_Object tem = get_frame_param (f, Qfontsize); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
672 pixel_size = NILP (tem) ? 0 : XFASTINT (tem); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
673 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
674 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
675 tem = AREF (font_entity, FONT_ADSTYLE_INDEX); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
676 synthItal = !NILP (tem) && !strncmp ("synthItal", SDATA (SYMBOL_NAME (tem)), |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
677 9); |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
678 family = ns_get_family (font_entity); |
104123
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
679 if (family == nil) |
132eb17eec1d
* nsfont.m (ns_descriptor_to_entity): Handle case when descriptor has no family set. (nsfont_open): Handle case when entity has no family.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
104107
diff
changeset
|
680 family = [[NSFont userFixedPitchFontOfSize: 0] familyName]; |
103990
73ea181d96b6
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103908
diff
changeset
|
681 /* Should be > 0.23 as some font descriptors (e.g. Terminus) set to that |
73ea181d96b6
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103908
diff
changeset
|
682 when setting family in ns_spec_to_descriptor(). */ |
73ea181d96b6
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103908
diff
changeset
|
683 if (ns_attribute_fvalue (fontDesc, NSFontWeightTrait) > 0.50) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
684 traits |= NSBoldFontMask; |
103990
73ea181d96b6
* nsfont.m (ns_attribute_value): Remove.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103908
diff
changeset
|
685 if (fabs (ns_attribute_fvalue (fontDesc, NSFontSlantTrait) > 0.05)) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
686 traits |= NSItalicFontMask; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
687 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
688 /* see http://cocoadev.com/forums/comments.php?DiscussionID=74 */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
689 fixLeopardBug = traits & NSBoldFontMask ? 10 : 5; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
690 nsfont = [fontMgr fontWithFamily: family |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
691 traits: traits weight: fixLeopardBug |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
692 size: pixel_size]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
693 /* if didn't find, try synthetic italic */ |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
694 if (nsfont == nil && synthItal) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
695 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
696 nsfont = [fontMgr fontWithFamily: family |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
697 traits: traits & ~NSItalicFontMask |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
698 weight: fixLeopardBug size: pixel_size]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
699 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
700 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
701 /* LastResort not really a family */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
702 if (nsfont == nil && [@"LastResort" isEqualToString: family]) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
703 nsfont = [NSFont fontWithName: @"LastResort" size: pixel_size]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
704 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
705 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
706 if (nsfont == nil) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
707 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
708 message_with_string ("*** Warning: font in family '%s' not found", |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
709 build_string ([family UTF8String]), 1); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
710 nsfont = [NSFont userFixedPitchFontOfSize: pixel_size]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
711 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
712 |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
713 if (NSFONT_TRACE) |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
714 NSLog (@"%@\n", nsfont); |
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.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98371
diff
changeset
|
715 |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
716 /* Check the cache */ |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
717 cached = [fontCache objectForKey: nsfont]; |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
718 if (cached != nil && !synthItal) |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
719 { |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
720 if (NSFONT_TRACE) |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
721 fprintf(stderr, "*** nsfont_open CACHE HIT!\n"); |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
722 /* FIXME: Cast from (unsigned long) to Lisp_Object. */ |
102954
b5a34573cf82
* nsselect.m (symbol_to_nsstring, clean_local_selection_data)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102560
diff
changeset
|
723 XHASH (font_object) = [cached unsignedLongValue]; |
b5a34573cf82
* nsselect.m (symbol_to_nsstring, clean_local_selection_data)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102560
diff
changeset
|
724 return font_object; |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
725 } |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
726 else |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
727 { |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
728 font_object = font_make_object (VECSIZE (struct nsfont_info), |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
729 font_entity, pixel_size); |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
730 if (!synthItal) |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
731 [fontCache setObject: [NSNumber numberWithUnsignedLong: |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
732 (unsigned long) XHASH (font_object)] |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
733 forKey: nsfont]; |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
734 } |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
735 |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
736 font_info = (struct nsfont_info *) XFONT_OBJECT (font_object); |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
737 font = (struct font *) font_info; |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
738 if (!font) |
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
739 return Qnil; /* FIXME: other terms do, but return Qnil causes segfault */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
740 |
97198
cf43f4e3ecc8
clear warnings and clean up NS port
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96892
diff
changeset
|
741 font_info->glyphs = (unsigned short **) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
742 xmalloc (0x100 * sizeof (unsigned short *)); |
97198
cf43f4e3ecc8
clear warnings and clean up NS port
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96892
diff
changeset
|
743 font_info->metrics = (struct font_metrics **) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
744 xmalloc (0x100 * sizeof (struct font_metrics *)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
745 if (!font_info->glyphs || !font_info->metrics) |
96759
1e2f7aab70ba
* Makefile.in: Undef LIB_STANDARD before defining it to silence warning
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96692
diff
changeset
|
746 return Qnil; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
747 bzero (font_info->glyphs, 0x100 * sizeof (unsigned short *)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
748 bzero (font_info->metrics, 0x100 * sizeof (struct font_metrics *)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
749 |
98451
db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98399
diff
changeset
|
750 BLOCK_INPUT; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
751 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
752 /* for metrics */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
753 sfont = [nsfont screenFont]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
754 if (sfont == nil) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
755 sfont = nsfont; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
756 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
757 /* non-metric backend font struct fields */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
758 font = (struct font *) font_info; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
759 font->pixel_size = [sfont pointSize]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
760 font->driver = &nsfont_driver; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
761 font->encoding_type = FONT_ENCODING_NOT_DECIDED; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
762 font->encoding_charset = -1; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
763 font->repertory_charset = -1; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
764 font->default_ascent = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
765 font->vertical_centering = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
766 font->baseline_offset = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
767 font->relative_compose = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
768 font->font_encoder = NULL; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
769 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
770 font->props[FONT_FORMAT_INDEX] = Qns; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
771 font->props[FONT_FILE_INDEX] = Qnil; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
772 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
773 { |
103082
a9a213b44de2
nsfont.m (nsfont_open): remove unused variable shrink. Remove commented-out code.
David Reitter <david.reitter@gmail.com>
parents:
102954
diff
changeset
|
774 double expand, hshrink; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
775 float full_height, min_height, hd; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
776 const char *fontName = [[nsfont fontName] UTF8String]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
777 int len = strlen (fontName); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
778 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
779 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
780 font_info->nsfont = sfont; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
781 #else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
782 font_info->nsfont = nsfont; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
783 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
784 [font_info->nsfont retain]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
785 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
786 /* set up ns_font (defined in nsgui.h) */ |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
787 font_info->name = (char *)xmalloc (strlen (fontName) + 1); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
788 bcopy (fontName, font_info->name, strlen (fontName) + 1); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
789 font_info->bold = [fontMgr traitsOfFont: nsfont] & NSBoldFontMask; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
790 font_info->ital = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
791 synthItal || ([fontMgr traitsOfFont: nsfont] & NSItalicFontMask); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
792 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
793 /* Metrics etc.; some fonts return an unusually large max advance, so we |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
794 only use it for fonts that have wide characters. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
795 font_info->width = ([sfont numberOfGlyphs] > 2000) ? |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
796 [sfont maximumAdvancement].width : ns_char_width (sfont, '0'); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
797 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
798 brect = [sfont boundingRectForFont]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
799 full_height = brect.size.height; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
800 min_height = [sfont ascender] - [sfont descender]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
801 hd = full_height - min_height; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
802 |
102560
291f6c889881
Unify shutdown handling under NS, via ns-power-off key event (where appropriate) and save-buffers-kill-emacs.
David Reitter <david.reitter@gmail.com>
parents:
102400
diff
changeset
|
803 /* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */ |
103082
a9a213b44de2
nsfont.m (nsfont_open): remove unused variable shrink. Remove commented-out code.
David Reitter <david.reitter@gmail.com>
parents:
102954
diff
changeset
|
804 expand = 0.0; |
102560
291f6c889881
Unify shutdown handling under NS, via ns-power-off key event (where appropriate) and save-buffers-kill-emacs.
David Reitter <david.reitter@gmail.com>
parents:
102400
diff
changeset
|
805 hshrink = 1.0; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
806 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
807 font_info->underpos = 2; /*[sfont underlinePosition] is often clipped out */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
808 font_info->underwidth = [sfont underlineThickness]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
809 font_info->size = font->pixel_size; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
810 font_info->voffset = lrint (hshrink * [sfont ascender] + expand * hd / 2); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
811 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
812 /* max bounds */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
813 font_info->max_bounds.ascent = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
814 lrint (hshrink * [sfont ascender] + expand * hd/2); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
815 font_info->max_bounds.descent = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
816 -lrint (hshrink* [sfont descender] - expand*hd/2); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
817 font_info->height = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
818 font_info->max_bounds.ascent + font_info->max_bounds.descent; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
819 font_info->max_bounds.width = lrint (font_info->width); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
820 font_info->max_bounds.lbearing = lrint (brect.origin.x); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
821 font_info->max_bounds.rbearing = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
822 lrint (brect.size.width - font_info->width); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
823 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
824 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
825 /* set up synthItal and the CG font */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
826 font_info->synthItal = synthItal; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
827 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
828 ATSFontRef atsFont = ATSFontFindFromPostScriptName |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
829 ((CFStringRef)[nsfont fontName], kATSOptionFlagsDefault); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
830 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
831 if (atsFont == kATSFontRefUnspecified) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
832 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
833 /* see if we can get it by dropping italic (then synthesizing) */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
834 atsFont = ATSFontFindFromPostScriptName ((CFStringRef) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
835 [[fontMgr convertFont: nsfont toNotHaveTrait: NSItalicFontMask] |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
836 fontName], kATSOptionFlagsDefault); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
837 if (atsFont != kATSFontRefUnspecified) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
838 font_info->synthItal = YES; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
839 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
840 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
841 /* last resort fallback */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
842 atsFont = ATSFontFindFromPostScriptName |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
843 ((CFStringRef)@"Monaco", kATSOptionFlagsDefault); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
844 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
845 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
846 font_info->cgfont = CGFontCreateWithPlatformFont ((void*)&atsFont); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
847 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
848 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
849 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
850 /* set up metrics portion of font struct */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
851 font->ascent = [sfont ascender]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
852 font->descent = -[sfont descender]; |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
853 font->min_width = [sfont widthOfString: @"|"]; /* FIXME */ |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
854 font->space_width = lrint (ns_char_width (sfont, ' ')); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
855 font->average_width = lrint (font_info->width); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
856 font->max_width = lrint (font_info->max_bounds.width); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
857 font->height = lrint (font_info->height); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
858 font->underline_position = lrint (font_info->underpos); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
859 font->underline_thickness = lrint (font_info->underwidth); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
860 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
861 font->props[FONT_NAME_INDEX] = Ffont_xlfd_name (font_object, Qnil); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
862 font->props[FONT_FULLNAME_INDEX] = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
863 make_unibyte_string (font_info->name, strlen (font_info->name)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
864 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
865 UNBLOCK_INPUT; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
866 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
867 return font_object; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
868 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
869 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
870 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
871 /* Close FONT on frame F. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
872 static void |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
873 nsfont_close (FRAME_PTR f, struct font *font) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
874 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
875 struct nsfont_info *font_info = (struct nsfont_info *)font; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
876 int i; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
877 |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
878 /* FIXME: this occurs apparently due to same failure to detect same font |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
879 that causes need for cache in nsfont_open () */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
880 if (!font_info) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
881 return; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
882 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
883 for (i =0; i<0x100; i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
884 { |
103624
3e06f0e66062
Remove useless if-before-xfree tests.
Jim Meyering <jim@meyering.net>
parents:
103426
diff
changeset
|
885 xfree (font_info->glyphs[i]); |
3e06f0e66062
Remove useless if-before-xfree tests.
Jim Meyering <jim@meyering.net>
parents:
103426
diff
changeset
|
886 xfree (font_info->metrics[i]); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
887 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
888 [font_info->nsfont release]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
889 #ifdef NS_IMPL_COCOA |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
890 CGFontRelease (font_info->cgfont); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
891 #endif |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
892 xfree (font_info->name); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
893 xfree (font_info); |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
894 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
895 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
896 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
897 /* If FONT_ENTITY has a glyph for character C (Unicode code point), |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
898 return 1. If not, return 0. If a font must be opened to check |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
899 it, return -1. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
900 static int |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
901 nsfont_has_char (Lisp_Object entity, int c) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
902 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
903 return -1; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
904 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
905 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
906 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
907 /* Return a glyph code of FONT for character C (Unicode code point). |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
908 If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
909 static unsigned int |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
910 nsfont_encode_char (struct font *font, int c) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
911 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
912 struct nsfont_info *font_info = (struct nsfont_info *)font; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
913 unsigned char high = (c & 0xff00) >> 8, low = c & 0x00ff; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
914 unsigned short g; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
915 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
916 if (c > 0xFFFF) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
917 return FONT_INVALID_CODE; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
918 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
919 /* did we already cache this block? */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
920 if (!font_info->glyphs[high]) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
921 ns_uni_to_glyphs (font_info, high); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
922 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
923 g = font_info->glyphs[high][low]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
924 return g == 0xFFFF ? FONT_INVALID_CODE : g; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
925 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
926 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
927 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
928 /* Perform the size computation of glyphs of FONT and fill in members |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
929 of METRICS. The glyphs are specified by their glyph codes in |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
930 CODE (length NGLYPHS). */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
931 static int |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
932 nsfont_text_extents (struct font *font, unsigned int *code, int nglyphs, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
933 struct font_metrics *metrics) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
934 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
935 struct nsfont_info *font_info = (struct nsfont_info *)font; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
936 struct font_metrics *pcm; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
937 unsigned char high, low; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
938 int totalWidth = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
939 int i; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
940 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
941 bzero (metrics, sizeof (struct font_metrics)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
942 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
943 for (i =0; i<nglyphs; i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
944 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
945 /* get metrics for this glyph, filling cache if need be */ |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
946 /* TODO: get metrics for whole string from an NSLayoutManager |
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
947 (if not too slow) */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
948 high = (code[i] & 0xFF00) >> 8; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
949 low = code[i] & 0x00FF; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
950 if (!font_info->metrics[high]) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
951 ns_glyph_metrics (font_info, high); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
952 pcm = &(font_info->metrics[high][low]); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
953 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
954 if (metrics->lbearing > totalWidth + pcm->lbearing) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
955 metrics->lbearing = totalWidth + pcm->lbearing; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
956 if (metrics->rbearing < totalWidth + pcm->rbearing) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
957 metrics->rbearing = totalWidth + pcm->rbearing; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
958 if (metrics->ascent < pcm->ascent) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
959 metrics->ascent = pcm->ascent; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
960 if (metrics->descent < pcm->descent) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
961 metrics->descent = pcm->descent; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
962 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
963 totalWidth += pcm->width; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
964 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
965 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
966 metrics->width = totalWidth; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
967 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
968 return totalWidth; /* not specified in doc, but xfont.c does it */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
969 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
970 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
971 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
972 /* Draw glyphs between FROM and TO of S->char2b at (X Y) pixel |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
973 position of frame F with S->FACE and S->GC. If WITH_BACKGROUND |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
974 is nonzero, fill the background in advance. It is assured that |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
975 WITH_BACKGROUND is zero when (FROM > 0 || TO < S->nchars). */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
976 static int |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
977 nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
978 int with_background) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
979 /* NOTE: focus and clip must be set |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
980 also, currently assumed (true in nsterm.m call) from ==0, to ==nchars */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
981 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
982 static char cbuf[1024]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
983 char *c = cbuf; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
984 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
985 static float advances[1024]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
986 float *adv = advances; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
987 #else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
988 static CGSize advances[1024]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
989 CGSize *adv = advances; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
990 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
991 struct face *face; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
992 NSRect r; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
993 struct nsfont_info *font = ns_tmp_font; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
994 NSColor *col, *bgCol; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
995 unsigned short *t = s->char2b; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
996 int i, len; |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
997 char isComposite = s->first_glyph->type == COMPOSITE_GLYPH; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
998 int end = isComposite ? s->cmp_to : s->nchars; |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
999 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1000 /* Select face based on input flags */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1001 switch (ns_tmp_flags) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1002 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1003 case NS_DUMPGLYPH_CURSOR: |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1004 face = s->face; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1005 break; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1006 case NS_DUMPGLYPH_MOUSEFACE: |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1007 face = FACE_FROM_ID (s->f, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1008 FRAME_NS_DISPLAY_INFO (s->f)->mouse_face_face_id); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1009 if (!face) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1010 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1011 break; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1012 default: |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1013 face = s->face; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1014 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1015 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1016 r.origin.x = s->x; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1017 if (s->face->box != FACE_NO_BOX && s->first_glyph->left_box_line_p) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1018 r.origin.x += abs (s->face->box_line_width); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1019 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1020 r.origin.y = s->y; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1021 r.size.height = FONT_HEIGHT (font); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1022 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1023 /* Convert UTF-16 (?) to UTF-8 and determine advances. Note if we just ask |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1024 NS to render the string, it will come out differently from the individual |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1025 character widths added up because of layout processing. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1026 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1027 XCharStruct *cs; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1028 int cwidth, twidth = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1029 int hi, lo; |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
1030 /* FIXME: composition: no vertical displacement is considered. */ |
98371
713cc05ca791
* nsfont.m (nsfont_draw): Fix up composition rendering.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98073
diff
changeset
|
1031 t += s->cmp_from; /* advance into composition */ |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1032 for (i = s->cmp_from; i < end; i++, t++) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1033 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1034 hi = (*t & 0xFF00) >> 8; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1035 lo = *t & 0x00FF; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1036 if (isComposite) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1037 { |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1038 if (!s->first_glyph->u.cmp.automatic) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1039 cwidth = s->cmp->offsets[i * 2] /* (H offset) */ - twidth; |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1040 else |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1041 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1042 Lisp_Object gstring = composition_gstring_from_id (s->cmp_id); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1043 Lisp_Object glyph = LGSTRING_GLYPH (gstring, i); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1044 if (NILP (LGLYPH_ADJUSTMENT (glyph))) |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1045 cwidth = LGLYPH_WIDTH (glyph); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1046 else |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1047 { |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1048 cwidth = LGLYPH_WADJUST (glyph); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1049 #ifdef NS_IMPL_GNUSTEP |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1050 *(adv-1) += LGLYPH_XOFF (glyph); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1051 #else |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1052 (*(adv-1)).width += LGLYPH_XOFF (glyph); |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1053 #endif |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1054 } |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1055 } |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1056 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1057 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1058 { |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
1059 if (!font->metrics[hi]) /* FIXME: why/how can we need this now? */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1060 ns_glyph_metrics (font, hi); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1061 cwidth = font->metrics[hi][lo].width; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1062 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1063 twidth += cwidth; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1064 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1065 *adv++ = cwidth; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1066 CHAR_STRING_ADVANCE (*t, c); /* this converts the char to UTF-8 */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1067 #else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1068 (*adv++).width = cwidth; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1069 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1070 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1071 len = adv - advances; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1072 r.size.width = twidth; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1073 *c = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1074 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1075 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1076 /* fill background if requested */ |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1077 if (with_background && !isComposite) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1078 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1079 NSRect br = r; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1080 int fibw = FRAME_INTERNAL_BORDER_WIDTH (s->f); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1081 int mbox_line_width = max (s->face->box_line_width, 0); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1082 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1083 if (s->row->full_width_p) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1084 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1085 if (br.origin.x <= fibw + 1 + mbox_line_width) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1086 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1087 br.size.width += br.origin.x - mbox_line_width; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1088 br.origin.x = mbox_line_width; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1089 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1090 if (FRAME_PIXEL_WIDTH (s->f) - (br.origin.x + br.size.width) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1091 <= fibw+1) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1092 br.size.width += fibw; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1093 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1094 if (s->face->box == FACE_NO_BOX) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1095 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1096 /* expand unboxed top row over internal border */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1097 if (br.origin.y <= fibw + 1 + mbox_line_width) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1098 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1099 br.size.height += br.origin.y; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1100 br.origin.y = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1101 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1102 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1103 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1104 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1105 int correction = abs (s->face->box_line_width)+1; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1106 br.origin.y += correction; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1107 br.size.height -= 2*correction; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1108 br.origin.x += correction; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1109 br.size.width -= 2*correction; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1110 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1111 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1112 if (!s->face->stipple) |
96812
eb46d3216494
apply fix from Chong Yidong to NS port ns_set_background_color(), and clean up comparison use of result from NS_FACE_BACKGROUND
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96759
diff
changeset
|
1113 [(NS_FACE_BACKGROUND (face) != 0 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1114 ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1115 : FRAME_BACKGROUND_COLOR (s->f)) set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1116 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1117 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1118 struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (s->f); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1119 [[dpyinfo->bitmaps[face->stipple-1].img stippleMask] set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1120 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1121 NSRectFill (br); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1122 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1123 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1124 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1125 /* set up for character rendering */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1126 r.origin.y += font->voffset + (s->height - font->height)/2; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1127 |
97198
cf43f4e3ecc8
clear warnings and clean up NS port
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96892
diff
changeset
|
1128 col = (NS_FACE_FOREGROUND (face) != 0 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1129 ? ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1130 : FRAME_FOREGROUND_COLOR (s->f)); |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
1131 /* FIXME: find another way to pass this */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1132 bgCol = (ns_tmp_flags != NS_DUMPGLYPH_FOREGROUND ? nil |
96812
eb46d3216494
apply fix from Chong Yidong to NS port ns_set_background_color(), and clean up comparison use of result from NS_FACE_BACKGROUND
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96759
diff
changeset
|
1133 : (NS_FACE_BACKGROUND (face) != 0 |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1134 ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1135 : FRAME_BACKGROUND_COLOR (s->f))); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1136 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1137 /* render under GNUstep using DPS */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1138 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1139 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1140 NSGraphicsContext *context = GSCurrentContext (); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1141 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1142 DPSgsave (context); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1143 [font->nsfont set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1144 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1145 /* do erase if "foreground" mode */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1146 if (bgCol != nil) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1147 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1148 [bgCol set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1149 DPSmoveto (context, r.origin.x, r.origin.y); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1150 /*[context GSSetTextDrawingMode: GSTextFillStroke]; /// not implemented yet */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1151 DPSxshow (context, cbuf, advances, len); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1152 DPSstroke (context); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1153 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1154 /*[context GSSetTextDrawingMode: GSTextFill]; /// not implemented yet */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1155 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1156 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1157 /* do underline */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1158 if (face->underline_p) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1159 { |
97584
06f7d5858c5a
* nsfns.m (ns-read-file-name): Add casts to avoid warning. (ns-convert-utf8-nfd-to-nfc): Warn if cannot execute correctly. * nsfont.m (nsfont_draw): Compare indexed colors to 0, not nil. * nsterm.h (EmacsView-unlockFocusNeedsFlush:): Add declaration. (EmacsApp-cursor_blink_handler): Remove declaration. * nsterm.m (ns_draw_glyph_string): Update first conditional body to match 01 Feb 2008 changes in xterm.c. (ns_read_socket): Add cast to avoid warning. (EmacsApp-application:openFiles:): Don't call replyToOpenOrPrint: on GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97198
diff
changeset
|
1160 if (face->underline_color != 0) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1161 [ns_lookup_indexed_color (face->underline_color, s->f) set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1162 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1163 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1164 DPSmoveto (context, r.origin.x, r.origin.y + font->underpos); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1165 DPSlineto (context, r.origin.x+r.size.width, r.origin.y+font->underpos); |
97584
06f7d5858c5a
* nsfns.m (ns-read-file-name): Add casts to avoid warning. (ns-convert-utf8-nfd-to-nfc): Warn if cannot execute correctly. * nsfont.m (nsfont_draw): Compare indexed colors to 0, not nil. * nsterm.h (EmacsView-unlockFocusNeedsFlush:): Add declaration. (EmacsApp-cursor_blink_handler): Remove declaration. * nsterm.m (ns_draw_glyph_string): Update first conditional body to match 01 Feb 2008 changes in xterm.c. (ns_read_socket): Add cast to avoid warning. (EmacsApp-application:openFiles:): Don't call replyToOpenOrPrint: on GNUstep.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97198
diff
changeset
|
1166 if (face->underline_color != 0) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1167 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1168 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1169 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1170 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1171 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1172 /* draw with DPSxshow () */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1173 DPSmoveto (context, r.origin.x, r.origin.y); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1174 DPSxshow (context, cbuf, advances, len); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1175 DPSstroke (context); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1176 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1177 DPSgrestore (context); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1178 return to-from; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1179 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1180 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1181 #else /* NS_IMPL_COCOA */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1182 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1183 CGContextRef gcontext = |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1184 [[NSGraphicsContext currentContext] graphicsPort]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1185 static CGAffineTransform fliptf; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1186 static BOOL firstTime = YES; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1187 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1188 if (firstTime) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1189 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1190 firstTime = NO; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1191 fliptf = CGAffineTransformMakeScale (1.0, -1.0); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1192 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1193 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1194 CGContextSaveGState (gcontext); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1195 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1196 fliptf.c = font->synthItal ? Fix2X (kATSItalicQDSkew) : 0.0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1197 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1198 CGContextSetFont (gcontext, font->cgfont); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1199 CGContextSetFontSize (gcontext, font->size); |
102400
934376007cef
* nsfont.m (nsfont_draw): Compare ns_antialias_text against lisp value.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
102004
diff
changeset
|
1200 if (ns_antialias_text == Qnil || font->size <= ns_antialias_threshold) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1201 CGContextSetShouldAntialias (gcontext, 0); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1202 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1203 CGContextSetShouldAntialias (gcontext, 1); |
96817
6b7bbb1d9eb1
fix bug with quickdraw smoothing; also, in Makefile, clean out ns_appdir in 'clean' target
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96813
diff
changeset
|
1204 if (EQ (ns_use_qd_smoothing, Qt)) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1205 CGContextSetFontRenderingMode (gcontext, 2); /* 0 is Cocoa, 2 is QD */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1206 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1207 CGContextSetTextMatrix (gcontext, fliptf); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1208 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1209 if (bgCol != nil) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1210 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1211 /* foreground drawing; erase first to avoid overstrike */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1212 [bgCol set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1213 CGContextSetTextDrawingMode (gcontext, kCGTextFillStroke); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1214 CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1215 CGContextShowGlyphsWithAdvances (gcontext, s->char2b, advances, len); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1216 CGContextSetTextDrawingMode (gcontext, kCGTextFill); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1217 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1218 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1219 if (face->underline_p) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1220 { |
97198
cf43f4e3ecc8
clear warnings and clean up NS port
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96892
diff
changeset
|
1221 if (face->underline_color != 0) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1222 [ns_lookup_indexed_color (face->underline_color, s->f) set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1223 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1224 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1225 CGContextBeginPath (gcontext); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1226 CGContextMoveToPoint (gcontext, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1227 r.origin.x, r.origin.y + font->underpos); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1228 CGContextAddLineToPoint (gcontext, r.origin.x + r.size.width, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1229 r.origin.y + font->underpos); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1230 CGContextStrokePath (gcontext); |
97198
cf43f4e3ecc8
clear warnings and clean up NS port
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96892
diff
changeset
|
1231 if (face->underline_color != 0) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1232 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1233 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1234 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1235 [col set]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1236 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1237 CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y); |
98073
e77a63e6f983
* nsfont.m (nsfont_draw): Fix the references to missing gidx data
Teodor Zlatanov <tzz@lifelogs.com>
parents:
97584
diff
changeset
|
1238 CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from, |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1239 advances, len); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1240 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1241 if (face->overstrike) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1242 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1243 CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y); |
98073
e77a63e6f983
* nsfont.m (nsfont_draw): Fix the references to missing gidx data
Teodor Zlatanov <tzz@lifelogs.com>
parents:
97584
diff
changeset
|
1244 CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from, |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1245 advances, len); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1246 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1247 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1248 CGContextRestoreGState (gcontext); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1249 return; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1250 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1251 #endif /* NS_IMPL_COCOA */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1252 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1253 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1254 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1255 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1256 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1257 /* ========================================================================== |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1258 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1259 Font glyph and metrics caching functions |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1260 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1261 ========================================================================== */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1262 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1263 /* Find and cache corresponding glyph codes for unicode values in given |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1264 hi-byte block of 256. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1265 static void |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1266 ns_uni_to_glyphs (struct nsfont_info *font_info, unsigned char block) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1267 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1268 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1269 static EmacsGlyphStorage *glyphStorage; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1270 static char firstTime = 1; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1271 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1272 unichar *unichars = xmalloc (0x101 * sizeof (unichar)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1273 unsigned int i, g, idx; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1274 unsigned short *glyphs; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1275 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1276 if (NSFONT_TRACE) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1277 fprintf (stderr, "%p\tFinding glyphs for glyphs in block %d\n", |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1278 font_info, block); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1279 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1280 BLOCK_INPUT; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1281 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1282 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1283 if (firstTime) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1284 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1285 firstTime = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1286 glyphStorage = [[EmacsGlyphStorage alloc] initWithCapacity: 0x100]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1287 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1288 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1289 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1290 font_info->glyphs[block] = xmalloc (0x100 * sizeof (unsigned short)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1291 if (!unichars || !(font_info->glyphs[block])) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1292 abort (); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1293 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1294 /* create a string containing all unicode characters in this block */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1295 for (idx = block<<8, i =0; i<0x100; idx++, i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1296 if (idx < 0xD800 || idx > 0xDFFF) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1297 unichars[i] = idx; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1298 else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1299 unichars[i] = 0xFEFF; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1300 unichars[0x100] = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1301 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1302 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1303 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1304 NSString *allChars = [[NSString alloc] |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1305 initWithCharactersNoCopy: unichars |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1306 length: 0x100 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1307 freeWhenDone: NO]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1308 NSGlyphGenerator *glyphGenerator = [NSGlyphGenerator sharedGlyphGenerator]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1309 /*NSCharacterSet *coveredChars = [nsfont coveredCharacterSet]; */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1310 unsigned int numGlyphs = [font_info->nsfont numberOfGlyphs]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1311 unsigned int gInd =0, cInd =0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1312 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1313 [glyphStorage setString: allChars font: font_info->nsfont]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1314 [glyphGenerator generateGlyphsForGlyphStorage: glyphStorage |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1315 desiredNumberOfCharacters: glyphStorage->maxChar |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1316 glyphIndex: &gInd characterIndex: &cInd]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1317 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1318 glyphs = font_info->glyphs[block]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1319 for (i =0; i<0x100; i++, glyphs++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1320 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1321 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1322 g = unichars[i]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1323 #else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1324 g = glyphStorage->cglyphs[i]; |
96892
4aec559b9f05
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96817
diff
changeset
|
1325 /* TODO: is this a good check? maybe need to use coveredChars.. */ |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1326 if (g > numGlyphs) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1327 g = 0xFFFF; /* hopefully unused... */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1328 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1329 *glyphs = g; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1330 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1331 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1332 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1333 [allChars release]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1334 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1335 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1336 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1337 UNBLOCK_INPUT; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1338 xfree (unichars); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1339 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1340 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1341 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1342 /* Determine and cache metrics for corresponding glyph codes in given |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1343 hi-byte block of 256. */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1344 static void |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1345 ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1346 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1347 unsigned int i, g; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1348 unsigned int numGlyphs = [font_info->nsfont numberOfGlyphs]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1349 NSFont *sfont; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1350 struct font_metrics *metrics; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1351 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1352 if (NSFONT_TRACE) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1353 fprintf (stderr, "%p\tComputing metrics for glyphs in block %d\n", |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1354 font_info, block); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1355 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1356 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1357 /* not implemented yet (as of startup 0.18), so punt */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1358 if (numGlyphs == 0) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1359 numGlyphs = 0x10000; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1360 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1361 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1362 BLOCK_INPUT; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1363 sfont = [font_info->nsfont screenFont]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1364 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1365 font_info->metrics[block] = xmalloc (0x100 * sizeof (struct font_metrics)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1366 bzero (font_info->metrics[block], 0x100 * sizeof (struct font_metrics)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1367 if (!(font_info->metrics[block])) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1368 abort (); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1369 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1370 metrics = font_info->metrics[block]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1371 for (g = block<<8, i =0; i<0x100 && g < numGlyphs; g++, i++, metrics++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1372 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1373 float w, lb, rb; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1374 NSRect r = [sfont boundingRectForGlyph: g]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1375 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1376 #ifdef NS_IMPL_GNUSTEP |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1377 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1378 /* lord help us */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1379 NSString *s = [NSString stringWithFormat: @"%c", g]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1380 w = [sfont widthOfString: s]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1381 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1382 #else |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1383 w = [sfont advancementForGlyph: g].width; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1384 #endif |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1385 w = max (w, 2.0); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1386 metrics->width = lrint (w); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1387 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1388 lb = r.origin.x; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1389 rb = r.size.width - w; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1390 if (lb < 0) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1391 metrics->lbearing = round (lb); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1392 if (font_info->ital) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1393 rb += 0.22 * font_info->height; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1394 metrics->rbearing = lrint (w + rb); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1395 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1396 metrics->descent = r.origin.y < 0 ? -r.origin.y : 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1397 /*lrint (hshrink * [sfont ascender] + expand * hd/2); */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1398 metrics->ascent = r.size.height - metrics->descent; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1399 /*-lrint (hshrink* [sfont descender] - expand * hd/2); */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1400 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1401 UNBLOCK_INPUT; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1402 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1403 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1404 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1405 #ifdef NS_IMPL_COCOA |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1406 /* helper for font glyph setup */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1407 @implementation EmacsGlyphStorage |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1408 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1409 - init |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1410 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1411 return [self initWithCapacity: 1024]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1412 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1413 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1414 - initWithCapacity: (unsigned long) c |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1415 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1416 self = [super init]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1417 maxChar = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1418 maxGlyph = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1419 dict = [NSMutableDictionary new]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1420 cglyphs = (CGGlyph *)xmalloc (c * sizeof (CGGlyph)); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1421 return self; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1422 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1423 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1424 - (void) dealloc |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1425 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1426 if (attrStr != nil) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1427 [attrStr release]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1428 [dict release]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1429 xfree (cglyphs); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1430 [super dealloc]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1431 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1432 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1433 - (void) setString: (NSString *)str font: (NSFont *)font |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1434 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1435 [dict setObject: font forKey: NSFontAttributeName]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1436 attrStr = [[NSAttributedString alloc] initWithString: str attributes: dict]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1437 maxChar = [str length]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1438 maxGlyph = 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1439 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1440 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1441 /* NSGlyphStorage protocol */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1442 - (unsigned int)layoutOptions |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1443 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1444 return 0; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1445 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1446 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1447 - (NSAttributedString *)attributedString |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1448 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1449 return attrStr; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1450 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1451 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1452 - (void)insertGlyphs: (const NSGlyph *)glyphs length: (unsigned int)length |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1453 forStartingGlyphAtIndex: (unsigned int)glyphIndex |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1454 characterIndex: (unsigned int)charIndex |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1455 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1456 len = glyphIndex+length; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1457 for (i =glyphIndex; i<len; i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1458 cglyphs[i] = glyphs[i-glyphIndex]; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1459 if (len > maxGlyph) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1460 maxGlyph = len; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1461 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1462 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1463 - (void)setIntAttribute: (int)attributeTag value: (int)val |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1464 forGlyphAtIndex: (unsigned)glyphIndex |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1465 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1466 return; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1467 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1468 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1469 @end |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1470 #endif /* NS_IMPL_COCOA */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1471 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1472 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1473 /* Debugging */ |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1474 void |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1475 ns_dump_glyphstring (struct glyph_string *s) |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1476 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1477 int i; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1478 |
103343
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1479 fprintf (stderr, "Glyph string len = %d at (%d, %d) overhang (%d, %d)," |
83dbc377f674
Changes to support :script/:lang/:otf in NS font driver.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
103245
diff
changeset
|
1480 "overlap = %d, bg_filled = %d:", |
96676
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1481 s->nchars, s->x, s->y, s->left_overhang, s->right_overhang, |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1482 s->row->overlapping_p, s->background_filled_p); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1483 for (i =0; i<s->nchars; i++) |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1484 fprintf (stderr, "%c", s->first_glyph[i].u.ch); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1485 fprintf (stderr, "\n"); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1486 } |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1487 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1488 |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1489 void |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1490 syms_of_nsfont () |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1491 { |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1492 nsfont_driver.type = Qns; |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1493 register_font_driver (&nsfont_driver, NULL); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1494 DEFSYM (Qapple, "apple"); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1495 DEFSYM (Qroman, "roman"); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1496 DEFSYM (Qmedium, "medium"); |
336d4f3f5eca
adding forgotten file src/nsfont.m for emacs.app merge
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
diff
changeset
|
1497 } |
96685 | 1498 |
96689
f34c4d928d39
Use nicer comment syntax for arch taglines in Objective-C files
Miles Bader <miles@gnu.org>
parents:
96685
diff
changeset
|
1499 // arch-tag: d6c3c6f0-62de-4978-8b1e-b7966fe02cae |