ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.C
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC vs.
Revision 1.53 by root, Mon Jun 21 19:09:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
23#include "rxvt.h" 23#include "rxvt.h"
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->Xdisplay 28#define DISPLAY r->display->display
29#define DRAWABLE r->TermWin.vt
30#define GC r->TermWin.gc 29#define TGC r->TermWin.gc
31 30
32const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
33 codeset cs; 32 codeset cs;
34 const char *name; 33 const char *name;
35} fallback_fonts[] = { 34} fallback_fonts[] = {
36 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
38 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
39 38
40#if ENCODING_EU 39#if ENCODING_EU
41 // cyrillic 40 // cyrillic
42 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
43 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
44 43
45 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
46 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
47 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
48 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
49 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
50 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
51 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
52 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
53 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
54 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
55 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
56 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
57 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
58#endif 57#endif
59 58
60 // japanese 59 // japanese
61#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
62# if XFT 61# if XFT
63 // prefer xft for complex scripts 62 // prefer xft for complex scripts
64 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
65# endif 64# endif
66 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
67 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
68 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
69#endif 68#endif
70 69
71#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
72# if XFT 71# if XFT
73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77# endif 76# endif
77 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
78 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
79 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
87#endif 89#endif
88 90
89#if XFT 91#if XFT
90 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
91 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
94 { CS_UNICODE, "xft:FreeMono" },
92#endif 95#endif
93 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
94 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
98 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
99 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
100}; 106};
101 107
102///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
103 109
110#if XFT
111rxvt_drawable::~rxvt_drawable ()
112{
113 if (xftdrawable)
114 XftDrawDestroy (xftdrawable);
115}
116
117rxvt_drawable::operator XftDraw *()
118{
119 if (!xftdrawable)
120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
121
122 return xftdrawable;
123}
124#endif
125
126/////////////////////////////////////////////////////////////////////////////
127
104static void *enc_buf; 128static void *enc_buf;
105static uint32_t enc_len; 129static uint32_t enc_len;
106 130
107static inline void * 131static inline void *
108get_enc_buf (int len) 132get_enc_buf (uint32_t len)
109{ 133{
110 if (len > enc_len) 134 if (len > enc_len)
111 { 135 {
112 free (enc_buf); 136 free (enc_buf);
113 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
115 139
116 return enc_buf; 140 return enc_buf;
117} 141}
118 142
119static const char * 143static const char *
120enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
121{ 145{
122 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
123 147
124 while (len--) 148 while (len--)
125 { 149 {
… …
136 160
137 return (const char *)enc_buf; 161 return (const char *)enc_buf;
138} 162}
139 163
140static const XChar2b * 164static const XChar2b *
141enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
142{ 166{
143 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
144 168
145 while (len--) 169 while (len--)
146 { 170 {
… …
161} 185}
162 186
163///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
164 188
165void 189void
166rxvt_font::clear_rect (int x, int y, int w, int h, int color) 190rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
167{ 191{
168 if (color == Color_bg) 192 if (color == Color_bg)
169 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
170 else if (color >= 0) 194 else if (color >= 0)
171 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
172 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
173 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
174 } 202 }
175} 203}
176 204
177static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
178 "1hH", "2hH", "1vV", "2vV",
179 0, 0, 0, 0,
180 0, 0, 0, 0,
181 "1HV", "2H1V", "1H2V", "2HV",
182
183 // 2510
184 "1hV", "2h1V", "1h2V", "2hV",
185 "1Hv", "2H1v", "1H2v", "2Hv",
186 "1hv", "2h1v", "1h2v", "2hv",
187 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
188
189 // 2520
190 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
191 "1hvV", "2h1vV", "1hV2v", "1hv2V",
192 "1h2vV", "2hv1V", "1v2hV", "2hvV",
193 "1hHV", "2h1HV", "2H1hV", "2hH1V",
194
195 // 2530
196 "1hH2V", "2hV1H", "1h2HV", "2hHV",
197 "1hHv", "1vH2h", "1hv2H", "1v2hH",
198 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
199 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
200
201 // 2540
202 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
203 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
204 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
205 0, 0, 0, 0,
206
207 // 2550
208 0, 0, 0, 0,
209 0, 0, 0, 0,
210 0, 0, 0, 0,
211 0, 0, 0, 0,
212
213 // 2560
214 0, 0, 0, 0,
215 0, 0, 0, 0,
216 0, 0, 0, 0,
217 0, 0, 0, 0,
218
219 // 2570
220 0, "1a", "1b", "1ab",
221 "1h", "1v", "1H", "1V",
222 "2h", "2v", "2H", "2V",
223 "1h2H", "1v2V", "1H2h", "1V2v"
224
225 // to be done
226};
227 206
228struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
229 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
230 { 210 {
231 rxvt_fontprop p; 211 rxvt_fontprop p;
232 212
233 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
240 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
241 { 221 {
242 width = 1; height = 1; 222 width = 1; height = 1;
243 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
244 224
225 set_name (strdup ("built-in pseudofont"));
226
245 return true; 227 return true;
246 } 228 }
247 229
248 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
249 { 231 {
250 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
251 return true; 233 return true;
252 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
253 return true; 239 return true;
254 240
255 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
256 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
257 return true; 245 return true;
258 246
259 switch (unicode) 247 switch (unicode)
260 { 248 {
261 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
263 } 251 }
264 252
265 return false; 253 return false;
266 } 254 }
267 255
268 void draw (int x, int y, 256 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 257 const text_t *text, int len,
270 int fg, int bg); 258 int fg, int bg);
271}; 259};
272 260
273void 261void
274rxvt_font_default::draw (int x, int y, 262rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 263 const text_t *text, int len,
276 int fg, int bg) 264 int fg, int bg)
277{ 265{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 267
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
281 269
282 while (len--) 270 while (len--)
283 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
284 text_t t = *text++; 275 text_t t = *text++;
285 276
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 277 if (0x2500 <= t && t <= 0x259f)
278 {
279 uint16_t offs = linedraw_offs[t - 0x2500];
280 uint32_t *a = linedraw_command + (offs >> 4);
281 uint32_t *b = a + (offs & 15);
282
283 int W = r->TermWin.fwidth;
284 int H = r->TermWin.fheight;
285
286 int x_[16];
287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
287 { 290 {
288 const char *p = linedraw_cmds[t - 0x2500]; 291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
289 294
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
291 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
292 297
293 XGCValues gcv; 298 XGCValues gcv;
294 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
295 while (*p) 304 while (a < b)
296 { 305 {
306 uint32_t command = *a++;
307
308 int op = (command >> 24) & 255;
309 int a = (command >> 20) & 15;
310 int b = (command >> 16) & 15;
311 int x1 = x_[(command >> 12) & 15];
312 int y1 = y_[(command >> 8) & 15];
313 int x2 = x_[(command >> 4) & 15];
314 int y2 = y_[(command >> 0) & 15];
315
297 switch (*p++) 316 switch (op)
298 { 317 {
299 case '1': 318 case 0: // line
300 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
302 break; 320 break;
303 321
304 case '2': 322 case 1: // rectangle, possibly stippled
323 if (a)
324 {
325 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 XChangeGC (d.display->display, TGC,
333 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
334 &gcv);
335 }
336
337 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
338
339 if (a)
340 {
341 XFreePixmap (d.display->display, gcv.stipple);
305 gcv.line_width = 2; 342 gcv.stipple = 0;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 343 gcv.fill_style = FillSolid;
344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
307 break; 346 break;
308 347 case 2: // arc
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
310 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
311 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
312 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 351 break;
313 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
314 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
315 } 352 }
316 } 353 }
317 354 }
318 gcv.line_width = 0; 355#if ENABLE_COMBINING
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
320 } 357 {
358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
360 if (cc->c2 != NOCHAR)
361 {
362 // prefer font of first character, for no good reasons
363 rxvt_font *f2 = f1->has_codepoint (cc->c2)
364 ? f1
365 : (*fs)[fs->find_font (cc->c2)];
366
367 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
368 }
369 }
370#endif
321 else 371 else
322 switch (*text++) 372 switch (t)
323 { 373 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
326 break; 375 break;
376
327 default: 377 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 378 int w = 0;
379 while (len > 0 && *text == NOCHAR)
380 {
381 ++text;
382 --len;
383 w += r->TermWin.fwidth;
384 }
385
386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
388 x += w;
329 } 389 }
330 390
331 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
332 } 392 }
333} 393}
… …
341 401
342 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
343 403
344 bool load (const rxvt_fontprop &prop); 404 bool load (const rxvt_fontprop &prop);
345 405
346 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
347 407
348 void draw (int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 409 const text_t *text, int len,
350 int fg, int bg); 410 int fg, int bg);
351 411
352 XFontStruct *f; 412 XFontStruct *f;
353 codeset cs; 413 codeset cs;
354 bool enc2b, encm; 414 bool enc2b, encm;
355 415
356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
357 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
358 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
359 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
360}; 420};
361 421
362const char * 422char *
363rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
364{ 424{
365 unsigned long value; 425 unsigned long value;
366 426
367 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
368 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
369 else 429 else
370 return repl; 430 return rxvt_strdup (repl);
371} 431}
372 432
373rxvt_fontprop 433rxvt_fontprop
374rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
375{ 435{
… …
390} 450}
391 451
392bool 452bool
393rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
394{ 454{
395 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
396 const char *slant = get_property (f, "SLANT", "r");
397
398 unsigned long height; 455 unsigned long height;
399 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
400 return false; 457 return false;
401 458
402 unsigned long avgwidth; 459 unsigned long avgwidth;
403 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
404 avgwidth = 0; 461 avgwidth = 0;
405 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
406 return set_properties (p, height, weight, slant, avgwidth); 466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
407} 472}
408 473
409bool 474bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 476{
412 int slashes = 0; 477 int slashes = 0;
413 const char *comp[12]; 478 const char *comp[13];
414 479
415 for (const char *c = name; *c; c++) 480 for (const char *c = name; *c; c++)
416 if (*c == '-') 481 if (*c == '-')
417 { 482 {
418 comp[slashes++] = c + 1; 483 comp[slashes++] = c + 1;
… …
428 493
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 494 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 495
431 if (f) 496 if (f)
432 { 497 {
433 // the font should really exists now. if not, we have a problem 498 // the font should really exist now. if not, we have a problem
434 // (e.g. if the user did xset fp rehash just when we were searching fonts). 499 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 500 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 501 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 502 XFreeFont (DISPLAY, f);
438 return ret; 503 return ret;
… …
515 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
516 581
517 if (!f) 582 if (!f)
518 return false; 583 return false;
519 584
520 unsigned long value;
521
522 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
523 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
524 587
525 if (registry && encoding) 588 if (registry && encoding)
526 { 589 {
527 char charset[64]; 590 char charset[64];
528 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
541 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
542 break; 605 break;
543 606
544 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
545 } 608 }
609
610 free (registry);
611 free (encoding);
546 612
547 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
548 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 614 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
549 615
550 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
600 f = 0; 666 f = 0;
601 } 667 }
602} 668}
603 669
604bool 670bool
605rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
606{ 672{
607 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
608 674
609 if (ch == NOCHAR) 675 if (ch == NOCHAR)
610 return false; 676 return false;
… …
612 /* check wether the character exists in _this_ font. horrible. */ 678 /* check wether the character exists in _this_ font. horrible. */
613 XCharStruct *xcs; 679 XCharStruct *xcs;
614 680
615 if (encm) 681 if (encm)
616 { 682 {
617 int byte1 = ch >> 8; 683 unsigned char byte1 = ch >> 8;
618 int byte2 = ch & 255; 684 unsigned char byte2 = ch & 255;
619 685
620 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 686 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
621 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 687 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
622 return false; 688 return false;
623 689
… …
646 712
647 return true; 713 return true;
648} 714}
649 715
650void 716void
651rxvt_font_x11::draw (int x, int y, 717rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
652 const text_t *text, int len, 718 const text_t *text, int len,
653 int fg, int bg) 719 int fg, int bg)
654{ 720{
655 // this looks like a mess /. 721 // this looks like a mess /.
656 // and it is a mess /. 722 // and it is a mess /.
… …
663 729
664 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
665 731
666 XGCValues v; 732 XGCValues v;
667 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
668 v.background = r->PixColors[bg];
669 v.font = f->fid; 734 v.font = f->fid;
670 735
671 if (enc2b) 736 if (enc2b)
672 { 737 {
673 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
674 739
675 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
676 { 741 {
742 v.background = r->PixColors[bg];
677 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
678 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
679 } 745 }
680 else 746 else
681 { 747 {
682 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 748 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
683 749
684 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
685 751
686 if (slow) 752 if (slow)
687 { 753 {
688 do 754 do
689 { 755 {
690 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
691 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
692 758
693 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
694 xc++; len--; 760 xc++; len--;
695 } 761 }
696 while (len); 762 while (len);
697 } 763 }
698 else 764 else
699 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
700 } 766 }
701 } 767 }
702 else 768 else
703 { 769 {
704 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
705 771
706 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
707 { 773 {
774 v.background = r->PixColors[bg];
708 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
709 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
710 } 777 }
711 else 778 else
712 { 779 {
713 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 780 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
714 781
715 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
716 783
717 if (slow) 784 if (slow)
718 { 785 {
719 do 786 do
720 { 787 {
721 if (*xc) 788 if (*xc)
722 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
723 790
724 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
725 xc++; len--; 792 xc++; len--;
726 } 793 }
727 while (len); 794 while (len);
728 } 795 }
729 else 796 else
730 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
731 } 798 }
732 } 799 }
733} 800}
734 801
735///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
740//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 807//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
741#define SWATHBITS 8 808#define SWATHBITS 8
742#endif 809#endif
743 810
744struct rxvt_font_xft : rxvt_font { 811struct rxvt_font_xft : rxvt_font {
745 rxvt_font_xft () { f = 0; d = 0; } 812 rxvt_font_xft () { f = 0; }
746 813
747 void clear (); 814 void clear ();
748 815
749 rxvt_fontprop properties (); 816 rxvt_fontprop properties ();
750 817
751 bool load (const rxvt_fontprop &prop); 818 bool load (const rxvt_fontprop &prop);
752 819
753 void draw (int x, int y, 820 void draw (rxvt_drawable &d, int x, int y,
754 const text_t *text, int len, 821 const text_t *text, int len,
755 int fg, int bg); 822 int fg, int bg);
756 823
757 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
758 825
759protected: 826protected:
760 XftFont *f; 827 XftFont *f;
761 XftDraw *d;
762}; 828};
763 829
764void 830void
765rxvt_font_xft::clear () 831rxvt_font_xft::clear ()
766{ 832{
767 if (f) 833 if (f)
768 { 834 {
769 XftFontClose (DISPLAY, f); 835 XftFontClose (DISPLAY, f);
770 f = 0; 836 f = 0;
771 }
772
773 if (d)
774 {
775 XftDrawDestroy (d);
776 d = 0;
777 } 837 }
778} 838}
779 839
780rxvt_fontprop 840rxvt_fontprop
781rxvt_font_xft::properties () 841rxvt_font_xft::properties ()
… …
882 942
883 return true; 943 return true;
884} 944}
885 945
886bool 946bool
887rxvt_font_xft::has_codepoint (uint32_t unicode) 947rxvt_font_xft::has_codepoint (unicode_t unicode)
888{ 948{
889 return XftCharExists (DISPLAY, f, unicode); 949 return XftCharExists (DISPLAY, f, unicode);
890} 950}
891 951
892void 952void
893rxvt_font_xft::draw (int x, int y, 953rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
894 const text_t *text, int len, 954 const text_t *text, int len,
895 int fg, int bg) 955 int fg, int bg)
896{ 956{
897 if (!d)
898 {
899 dR;
900 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
901 }
902
903 if (bg >= 0 && bg != Color_bg)
904 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
905 else
906 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 957 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
907 958
908 if (!slow && width == r->TermWin.fwidth && 0) 959 if (!slow && width == r->TermWin.fwidth && 0)
909 { 960 {
910 if (sizeof (text_t) == sizeof (FcChar16)) 961 if (sizeof (text_t) == sizeof (FcChar16))
911 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 962 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
923 fwidth *= 2; 974 fwidth *= 2;
924 975
925 XGlyphInfo extents; 976 XGlyphInfo extents;
926 if (sizeof (text_t) == sizeof (FcChar16)) 977 if (sizeof (text_t) == sizeof (FcChar16))
927 { 978 {
928 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 979 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
929 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 980 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
930 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 981 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
931 } 982 }
932 else 983 else
933 { 984 {
934 XGlyphInfo extents; 985 XGlyphInfo extents;
935 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 986 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
936 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 987 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
937 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 988 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
938 } 989 }
939 } 990 }
940 991
… …
947#endif 998#endif
948 999
949///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
950 1001
951rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
952#ifdef EXPLICIT_CONTEXT 1003: r (r), fontdesc (0)
953: r(r)
954#endif
955{ 1004{
956 clear (); 1005 clear ();
957} 1006}
958 1007
959rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
962} 1011}
963 1012
964void 1013void
965rxvt_fontset::clear () 1014rxvt_fontset::clear ()
966{ 1015{
967 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
968 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
969 1020
970 fonts.clear (); 1021 fonts.clear ();
971 base_id = 0; 1022 base_id = 0;
972 base_prop.height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
973 base_prop.weight = rxvt_fontprop::medium; 1024 base_prop.weight = rxvt_fontprop::medium;
… …
999 f = new rxvt_font_x11; 1050 f = new rxvt_font_x11;
1000 } 1051 }
1001 else 1052 else
1002 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
1003 1054
1055 f->fs = this;
1004 f->set_term (r); 1056 f->set_term (r);
1005 f->set_name (strdup (name)); 1057 f->set_name (strdup (name));
1006 1058
1007 f->cs = cs; 1059 f->cs = cs;
1008 f->loaded = false; 1060 f->loaded = false;
… …
1026 1078
1027 if (*desc == '[') 1079 if (*desc == '[')
1028 { 1080 {
1029 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1081 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1030 1082
1031 const char *extra = desc++; 1083 //const char *extra = desc++; // not yet used
1032 1084
1033 desc = strchr (desc, ']'); 1085 desc = strchr (desc, ']');
1034 1086
1035 if (!desc) 1087 if (!desc)
1036 { 1088 {
… …
1075 } 1127 }
1076 1128
1077 return true; 1129 return true;
1078} 1130}
1079 1131
1080void 1132bool
1081rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
1082{ 1134{
1083 clear (); 1135 clear ();
1136
1137 fontdesc = strdup (desc);
1084 1138
1085 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
1086 realize_font (0); 1140 realize_font (0);
1087 1141
1088 add_fonts (desc); 1142 add_fonts (desc);
1089 1143
1090 if (!base_id) 1144 if (!base_id)
1091 base_id = 1; 1145 base_id = 1;
1092 1146
1093 // we currently need a base-font, no matter what 1147 // we currently need a base-font, no matter what
1094 if (fonts.size () <= base_id || !realize_font (base_id)) 1148 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1149 {
1096 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1150 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1097 add_fonts ("fixed"); 1151 add_fonts ("fixed");
1098 base_id = fonts.size () - 1; 1152 base_id = fonts.size () - 1;
1099 } 1153 }
1100 1154
1101 if (fonts.size () <= base_id || !realize_font (base_id)) 1155 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1102 { 1156 return false;
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 exit (1);
1105 }
1106 1157
1107 base_prop = fonts[base_id]->properties (); 1158 base_prop = fonts[base_id]->properties ();
1159
1160 return true;
1108} 1161}
1109 1162
1110int 1163int
1111rxvt_fontset::find_font (uint32_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
1112{ 1165{
1113 for (int i = 0; i < fonts.size (); i++) 1166 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1167 i < fonts.size ();
1168 i++)
1114 { 1169 {
1115 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
1116 1171
1117 if (!f->loaded) 1172 if (!f->loaded)
1118 { 1173 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines