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 GC r->TermWin.gc |
31 | |
30 | |
32 | const struct rxvt_fallback_font { |
31 | const struct rxvt_fallback_font { |
33 | codeset cs; |
32 | codeset cs; |
34 | const char *name; |
33 | const char *name; |
… | |
… | |
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" }, |
|
|
80 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
78 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, |
81 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
79 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, |
82 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
80 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, |
83 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
81 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, |
84 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
82 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, |
85 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
83 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, |
86 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
84 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, |
87 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
85 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, |
88 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
86 | #endif |
89 | #endif |
87 | |
90 | |
88 | #if XFT |
91 | #if XFT |
89 | { CS_UNICODE, "xft:Andale Mono" }, |
92 | { CS_UNICODE, "xft:Andale Mono" }, |
90 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
93 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
… | |
… | |
93 | { CS_UNICODE, "xft:FreeMono" }, |
96 | { CS_UNICODE, "xft:FreeMono" }, |
94 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
97 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
95 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
98 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
96 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
97 | |
100 | |
|
|
101 | #if UNICODE_3 && XFT |
|
|
102 | { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters |
|
|
103 | #endif |
|
|
104 | |
98 | { CS_UNKNOWN, 0 } |
105 | { CS_UNKNOWN, 0 } |
99 | }; |
106 | }; |
100 | |
107 | |
101 | ///////////////////////////////////////////////////////////////////////////// |
108 | ///////////////////////////////////////////////////////////////////////////// |
102 | |
109 | |
|
|
110 | #if XFT |
|
|
111 | rxvt_drawable::~rxvt_drawable () |
|
|
112 | { |
|
|
113 | if (xftdrawable) |
|
|
114 | XftDrawDestroy (xftdrawable); |
|
|
115 | } |
|
|
116 | |
|
|
117 | rxvt_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 | |
103 | static void *enc_buf; |
128 | static void *enc_buf; |
104 | static uint32_t enc_len; |
129 | static uint32_t enc_len; |
105 | |
130 | |
106 | static inline void * |
131 | static inline void * |
107 | get_enc_buf (int len) |
132 | get_enc_buf (uint32_t len) |
108 | { |
133 | { |
109 | if (len > enc_len) |
134 | if (len > enc_len) |
110 | { |
135 | { |
111 | free (enc_buf); |
136 | free (enc_buf); |
112 | enc_buf = malloc (len); |
137 | enc_buf = malloc (len); |
… | |
… | |
114 | |
139 | |
115 | return enc_buf; |
140 | return enc_buf; |
116 | } |
141 | } |
117 | |
142 | |
118 | static const char * |
143 | static const char * |
119 | enc_char (const text_t *text, int len, codeset cs, bool &zero) |
144 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
120 | { |
145 | { |
121 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
146 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
122 | |
147 | |
123 | while (len--) |
148 | while (len--) |
124 | { |
149 | { |
… | |
… | |
135 | |
160 | |
136 | return (const char *)enc_buf; |
161 | return (const char *)enc_buf; |
137 | } |
162 | } |
138 | |
163 | |
139 | static const XChar2b * |
164 | static const XChar2b * |
140 | enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) |
165 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
141 | { |
166 | { |
142 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
167 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
143 | |
168 | |
144 | while (len--) |
169 | while (len--) |
145 | { |
170 | { |
… | |
… | |
160 | } |
185 | } |
161 | |
186 | |
162 | ///////////////////////////////////////////////////////////////////////////// |
187 | ///////////////////////////////////////////////////////////////////////////// |
163 | |
188 | |
164 | void |
189 | void |
165 | rxvt_font::clear_rect (int x, int y, int w, int h, int color) |
190 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
166 | { |
191 | { |
167 | if (color == Color_bg) |
192 | if (color == Color_bg) |
168 | XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); |
193 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
169 | else if (color >= 0) |
194 | else if (color >= 0) |
170 | { |
195 | { |
|
|
196 | #if XFT |
|
|
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
|
|
198 | #else |
171 | XSetForeground (DISPLAY, GC, r->PixColors[color]); |
199 | XSetForeground (d.display->display, GC, r->PixColors[color]); |
172 | XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); |
200 | XFillRectangle (d.display->display, d, GC, x, y, w, h); |
|
|
201 | #endif |
173 | } |
202 | } |
174 | } |
203 | } |
175 | |
204 | |
176 | static const char *linedraw_cmds[128] = { |
205 | static const char *linedraw_cmds[128] = { |
177 | "1hH", "2hH", "1vV", "2vV", |
206 | "1hH", "2hH", "1vV", "2vV", |
… | |
… | |
239 | bool load (const rxvt_fontprop &prop) |
268 | bool load (const rxvt_fontprop &prop) |
240 | { |
269 | { |
241 | width = 1; height = 1; |
270 | width = 1; height = 1; |
242 | ascent = 1; descent = 0; |
271 | ascent = 1; descent = 0; |
243 | |
272 | |
|
|
273 | set_name ("built-in pseudofont"); |
|
|
274 | |
244 | return true; |
275 | return true; |
245 | } |
276 | } |
246 | |
277 | |
247 | bool has_codepoint (uint32_t unicode) |
278 | bool has_codepoint (unicode_t unicode) |
248 | { |
279 | { |
249 | if (unicode <= 0x001f) |
280 | if (unicode <= 0x001f) |
250 | return true; |
281 | return true; |
|
|
282 | |
251 | if (unicode >= 0x0080 && unicode <= 0x009f) |
283 | if (unicode >= 0x0080 && unicode <= 0x009f) |
252 | return true; |
284 | return true; |
253 | |
285 | |
254 | if (unicode >= 0x2500 && unicode <= 0x257f |
286 | if (unicode >= 0x2500 && unicode <= 0x257f |
255 | && linedraw_cmds[unicode - 0x2500]) |
287 | && linedraw_cmds[unicode - 0x2500]) |
|
|
288 | return true; |
|
|
289 | |
|
|
290 | if (IS_COMPOSE (unicode)) |
256 | return true; |
291 | return true; |
257 | |
292 | |
258 | switch (unicode) |
293 | switch (unicode) |
259 | { |
294 | { |
260 | case ZERO_WIDTH_CHAR: |
295 | case ZERO_WIDTH_CHAR: |
… | |
… | |
262 | } |
297 | } |
263 | |
298 | |
264 | return false; |
299 | return false; |
265 | } |
300 | } |
266 | |
301 | |
267 | void draw (int x, int y, |
302 | void draw (rxvt_drawable &d, int x, int y, |
268 | const text_t *text, int len, |
303 | const text_t *text, int len, |
269 | int fg, int bg); |
304 | int fg, int bg); |
270 | }; |
305 | }; |
271 | |
306 | |
272 | void |
307 | void |
273 | rxvt_font_default::draw (int x, int y, |
308 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
274 | const text_t *text, int len, |
309 | const text_t *text, int len, |
275 | int fg, int bg) |
310 | int fg, int bg) |
276 | { |
311 | { |
277 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
312 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
278 | |
313 | |
279 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
314 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
280 | |
315 | |
281 | while (len--) |
316 | while (len--) |
282 | { |
317 | { |
|
|
318 | #if ENABLE_COMBINING |
|
|
319 | compose_char *cc; |
|
|
320 | #endif |
283 | text_t t = *text++; |
321 | text_t t = *text++; |
284 | |
322 | |
|
|
323 | // is it in our linedrawing table? |
285 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
324 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
286 | { |
325 | { |
287 | const char *p = linedraw_cmds[t - 0x2500]; |
326 | const char *p = linedraw_cmds[t - 0x2500]; |
288 | |
327 | |
289 | int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; |
328 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
290 | int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; |
329 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
291 | |
330 | |
292 | XGCValues gcv; |
331 | XGCValues gcv; |
293 | |
332 | |
294 | while (*p) |
333 | while (*p) |
295 | { |
334 | { |
296 | switch (*p++) |
335 | switch (*p++) |
297 | { |
336 | { |
298 | case '1': |
337 | case '1': |
299 | gcv.line_width = 0; |
338 | gcv.line_width = 0; |
300 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
339 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
301 | break; |
340 | break; |
302 | |
341 | |
303 | case '2': |
342 | case '2': |
304 | gcv.line_width = 2; |
343 | gcv.line_width = 2; |
305 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
344 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
306 | break; |
345 | break; |
307 | |
346 | |
308 | case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; |
347 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; |
309 | case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; |
348 | case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; |
310 | case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; |
349 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; |
311 | case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; |
350 | case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; |
312 | case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; |
351 | case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break; |
313 | case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; |
352 | case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; |
314 | } |
353 | } |
315 | } |
354 | } |
316 | |
355 | |
317 | gcv.line_width = 0; |
356 | gcv.line_width = 0; |
318 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
357 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
358 | } |
|
|
359 | #if ENABLE_COMBINING |
|
|
360 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
319 | } |
361 | { |
|
|
362 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
|
|
363 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
364 | if (cc->c2 != NOCHAR) |
|
|
365 | { |
|
|
366 | // prefer font of first character, for no good reasons |
|
|
367 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
368 | ? f1 |
|
|
369 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
370 | |
|
|
371 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
372 | } |
|
|
373 | } |
|
|
374 | #endif |
320 | else |
375 | else |
321 | switch (*text++) |
376 | switch (t) |
322 | { |
377 | { |
323 | case NOCHAR: |
|
|
324 | case ZERO_WIDTH_CHAR: |
378 | case ZERO_WIDTH_CHAR: |
325 | break; |
379 | break; |
326 | default: |
380 | default: |
327 | XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
381 | int w = 0; |
|
|
382 | while (len > 0 && *text == NOCHAR) |
|
|
383 | { |
|
|
384 | ++text; |
|
|
385 | --len; |
|
|
386 | w += r->TermWin.fwidth; |
|
|
387 | } |
|
|
388 | |
|
|
389 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
|
|
390 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
|
|
391 | x += w; |
328 | } |
392 | } |
329 | |
393 | |
330 | x += r->TermWin.fwidth; |
394 | x += r->TermWin.fwidth; |
331 | } |
395 | } |
332 | } |
396 | } |
… | |
… | |
337 | rxvt_font_x11 () { f = 0; } |
401 | rxvt_font_x11 () { f = 0; } |
338 | |
402 | |
339 | void clear (); |
403 | void clear (); |
340 | |
404 | |
341 | rxvt_fontprop properties (); |
405 | rxvt_fontprop properties (); |
342 | rxvt_fontprop properties (XFontStruct *f); |
|
|
343 | |
406 | |
344 | bool load (const rxvt_fontprop &prop); |
407 | bool load (const rxvt_fontprop &prop); |
345 | |
408 | |
346 | bool has_codepoint (uint32_t unicode); |
409 | bool has_codepoint (unicode_t unicode); |
347 | |
410 | |
348 | void draw (int x, int y, |
411 | void draw (rxvt_drawable &d, int x, int y, |
349 | const text_t *text, int len, |
412 | const text_t *text, int len, |
350 | int fg, int bg); |
413 | int fg, int bg); |
351 | |
414 | |
352 | XFontStruct *f; |
415 | XFontStruct *f; |
353 | codeset cs; |
416 | codeset cs; |
354 | bool enc2b, encm; |
417 | bool enc2b, encm; |
355 | |
418 | |
356 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
419 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
|
|
420 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
|
|
421 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
|
|
422 | bool set_properties (rxvt_fontprop &p, const char *name); |
357 | }; |
423 | }; |
358 | |
424 | |
359 | const char * |
425 | const char * |
360 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
426 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
361 | { |
427 | { |
… | |
… | |
368 | } |
434 | } |
369 | |
435 | |
370 | rxvt_fontprop |
436 | rxvt_fontprop |
371 | rxvt_font_x11::properties () |
437 | rxvt_font_x11::properties () |
372 | { |
438 | { |
373 | return properties (f); |
|
|
374 | } |
|
|
375 | |
|
|
376 | rxvt_fontprop |
|
|
377 | rxvt_font_x11::properties (XFontStruct *f) |
|
|
378 | { |
|
|
379 | rxvt_fontprop p; |
439 | rxvt_fontprop p; |
|
|
440 | set_properties (p, f); |
|
|
441 | return p; |
|
|
442 | } |
380 | |
443 | |
|
|
444 | bool |
|
|
445 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
|
|
446 | { |
|
|
447 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
|
|
448 | p.height = height; |
|
|
449 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
450 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
|
|
451 | |
|
|
452 | return true; |
|
|
453 | } |
|
|
454 | |
|
|
455 | bool |
|
|
456 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
|
|
457 | { |
381 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
458 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
382 | const char *slant = get_property (f, "SLANT", "r"); |
459 | const char *slant = get_property (f, "SLANT", "r"); |
383 | |
460 | |
|
|
461 | unsigned long height; |
|
|
462 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
|
|
463 | return false; |
|
|
464 | |
384 | unsigned long avgwidth; |
465 | unsigned long avgwidth; |
385 | p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth) |
466 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
386 | ? avgwidth / 10 |
467 | avgwidth = 0; |
387 | : (height + 1) / 2; |
|
|
388 | p.height = height; |
|
|
389 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
390 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
|
|
391 | |
468 | |
392 | return p; |
469 | return set_properties (p, height, weight, slant, avgwidth); |
|
|
470 | } |
|
|
471 | |
|
|
472 | bool |
|
|
473 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
|
|
474 | { |
|
|
475 | int slashes = 0; |
|
|
476 | const char *comp[13]; |
|
|
477 | |
|
|
478 | for (const char *c = name; *c; c++) |
|
|
479 | if (*c == '-') |
|
|
480 | { |
|
|
481 | comp[slashes++] = c + 1; |
|
|
482 | if (slashes >= 13) |
|
|
483 | break; |
|
|
484 | } |
|
|
485 | |
|
|
486 | /* can we short-circuit the costly XLoadQueryFont? */ |
|
|
487 | if (slashes >= 13 |
|
|
488 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
|
|
489 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
|
|
490 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
|
|
491 | |
|
|
492 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
|
|
493 | |
|
|
494 | if (f) |
|
|
495 | { |
|
|
496 | // the font should really exist now. if not, we have a problem |
|
|
497 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
|
|
498 | // in that case, just return garbage. |
|
|
499 | bool ret = set_properties (p, f); |
|
|
500 | XFreeFont (DISPLAY, f); |
|
|
501 | return ret; |
|
|
502 | } |
|
|
503 | else |
|
|
504 | return false; |
|
|
505 | } |
|
|
506 | |
|
|
507 | // fix the size of scalable fonts |
|
|
508 | static void |
|
|
509 | fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) |
|
|
510 | { |
|
|
511 | int slashes = 0; |
|
|
512 | const char *size; |
|
|
513 | |
|
|
514 | for (const char *c = name; *c; c++) |
|
|
515 | if (*c == '-') |
|
|
516 | { |
|
|
517 | if (slashes == 6) |
|
|
518 | size = c + 1; |
|
|
519 | |
|
|
520 | if (++slashes >= 13) |
|
|
521 | break; |
|
|
522 | } |
|
|
523 | |
|
|
524 | if (slashes >= 13 && size[0] == '0') |
|
|
525 | { |
|
|
526 | strncpy (buf, name, size - name); |
|
|
527 | buf += size - name; |
|
|
528 | buf += sprintf (buf, "%d", prop.height); |
|
|
529 | strcpy (buf, size + 1); |
|
|
530 | } |
|
|
531 | else |
|
|
532 | strcpy (buf, name); |
393 | } |
533 | } |
394 | |
534 | |
395 | bool |
535 | bool |
396 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
536 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
397 | { |
537 | { |
398 | clear (); |
538 | clear (); |
399 | |
539 | |
400 | char **list; |
540 | char **list; |
401 | int count; |
541 | int count; |
402 | XFontStruct *info; |
|
|
403 | list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); |
542 | list = XListFonts (DISPLAY, name, 512, &count); |
|
|
543 | set_name (0); |
404 | |
544 | |
405 | if (!list) |
545 | if (!list) |
406 | return false; |
546 | return false; |
407 | |
547 | |
408 | int bestdiff = 0x7fffffff; |
548 | int bestdiff = 0x7fffffff; |
409 | XFontStruct *best = 0; |
|
|
410 | for (int i = 0; i < count; i++) |
549 | for (int i = 0; i < count; i++) |
411 | { |
550 | { |
412 | XFontStruct *f = info + i; |
551 | rxvt_fontprop p; |
|
|
552 | char fname[1024]; |
|
|
553 | fix_scalable (fname, list[i], prop); |
413 | |
554 | |
|
|
555 | if (!set_properties (p, fname)) |
|
|
556 | continue; |
|
|
557 | |
414 | if (f->ascent + f->descent <= prop.height) // weed out too large fonts |
558 | if (p.height > prop.height) // weed out too large fonts |
415 | { |
559 | continue; |
416 | rxvt_fontprop p = properties (f); |
560 | |
417 | int diff = (prop.height - f->ascent + f->descent) * 32 |
561 | int diff = (prop.height - p.height) * 32 |
418 | + abs (prop.weight - p.weight) |
562 | + abs (prop.weight - p.weight) |
419 | + abs (prop.slant - p.slant ); |
563 | + abs (prop.slant - p.slant ); |
420 | |
564 | |
421 | if (!best // compare against best found so far |
565 | if (!name // compare against best found so far |
422 | || diff < bestdiff) |
566 | || diff < bestdiff) |
423 | { |
567 | { |
424 | best = f; |
568 | set_name (strdup (fname)); |
425 | bestdiff = diff; |
569 | bestdiff = diff; |
426 | } |
570 | } |
427 | } |
|
|
428 | } |
571 | } |
429 | |
572 | |
|
|
573 | XFreeFontNames (list); |
|
|
574 | |
430 | if (!best) |
575 | if (!name) |
431 | return false; |
576 | return false; |
432 | |
|
|
433 | set_name (strdup (list[best - info])); |
|
|
434 | |
|
|
435 | XFreeFontInfo (list, info, count); |
|
|
436 | |
577 | |
437 | f = XLoadQueryFont (DISPLAY, name); |
578 | f = XLoadQueryFont (DISPLAY, name); |
438 | |
579 | |
439 | if (!f) |
580 | if (!f) |
440 | return false; |
581 | return false; |
441 | |
|
|
442 | unsigned long value; |
|
|
443 | |
582 | |
444 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
583 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
445 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
584 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
446 | |
585 | |
447 | if (registry && encoding) |
586 | if (registry && encoding) |
… | |
… | |
522 | f = 0; |
661 | f = 0; |
523 | } |
662 | } |
524 | } |
663 | } |
525 | |
664 | |
526 | bool |
665 | bool |
527 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
666 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
528 | { |
667 | { |
529 | uint32_t ch = FROM_UNICODE (cs, unicode); |
668 | uint32_t ch = FROM_UNICODE (cs, unicode); |
530 | |
669 | |
531 | if (ch == NOCHAR) |
670 | if (ch == NOCHAR) |
532 | return false; |
671 | return false; |
… | |
… | |
534 | /* check wether the character exists in _this_ font. horrible. */ |
673 | /* check wether the character exists in _this_ font. horrible. */ |
535 | XCharStruct *xcs; |
674 | XCharStruct *xcs; |
536 | |
675 | |
537 | if (encm) |
676 | if (encm) |
538 | { |
677 | { |
539 | int byte1 = ch >> 8; |
678 | unsigned char byte1 = ch >> 8; |
540 | int byte2 = ch & 255; |
679 | unsigned char byte2 = ch & 255; |
541 | |
680 | |
542 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
681 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
543 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
682 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
544 | return false; |
683 | return false; |
545 | |
684 | |
… | |
… | |
568 | |
707 | |
569 | return true; |
708 | return true; |
570 | } |
709 | } |
571 | |
710 | |
572 | void |
711 | void |
573 | rxvt_font_x11::draw (int x, int y, |
712 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
574 | const text_t *text, int len, |
713 | const text_t *text, int len, |
575 | int fg, int bg) |
714 | int fg, int bg) |
576 | { |
715 | { |
577 | // this looks like a mess /. |
716 | // this looks like a mess /. |
578 | // and it is a mess /. |
717 | // and it is a mess /. |
… | |
… | |
594 | { |
733 | { |
595 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
734 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
596 | |
735 | |
597 | if (bg == Color_bg && !slow) |
736 | if (bg == Color_bg && !slow) |
598 | { |
737 | { |
599 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
738 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
600 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
739 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
601 | } |
740 | } |
602 | else |
741 | else |
603 | { |
742 | { |
604 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
743 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
605 | |
744 | |
606 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
745 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
607 | |
746 | |
608 | if (slow) |
747 | if (slow) |
609 | { |
748 | { |
610 | do |
749 | do |
611 | { |
750 | { |
612 | if (xc->byte1 || xc->byte2) |
751 | if (xc->byte1 || xc->byte2) |
613 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
752 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
614 | |
753 | |
615 | x += r->TermWin.fwidth; |
754 | x += r->TermWin.fwidth; |
616 | xc++; len--; |
755 | xc++; len--; |
617 | } |
756 | } |
618 | while (len); |
757 | while (len); |
619 | } |
758 | } |
620 | else |
759 | else |
621 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
760 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
622 | } |
761 | } |
623 | } |
762 | } |
624 | else |
763 | else |
625 | { |
764 | { |
626 | const char *xc = enc_char (text, len, cs, slow); |
765 | const char *xc = enc_char (text, len, cs, slow); |
627 | |
766 | |
628 | if (bg == Color_bg && !slow) |
767 | if (bg == Color_bg && !slow) |
629 | { |
768 | { |
630 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
769 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
631 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
770 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
632 | } |
771 | } |
633 | else |
772 | else |
634 | { |
773 | { |
635 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
774 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
636 | |
775 | |
637 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
776 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
638 | |
777 | |
639 | if (slow) |
778 | if (slow) |
640 | { |
779 | { |
641 | do |
780 | do |
642 | { |
781 | { |
643 | if (*xc) |
782 | if (*xc) |
644 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
783 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
645 | |
784 | |
646 | x += r->TermWin.fwidth; |
785 | x += r->TermWin.fwidth; |
647 | xc++; len--; |
786 | xc++; len--; |
648 | } |
787 | } |
649 | while (len); |
788 | while (len); |
650 | } |
789 | } |
651 | else |
790 | else |
652 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
791 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
653 | } |
792 | } |
654 | } |
793 | } |
655 | } |
794 | } |
656 | |
795 | |
657 | ///////////////////////////////////////////////////////////////////////////// |
796 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
662 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
801 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
663 | #define SWATHBITS 8 |
802 | #define SWATHBITS 8 |
664 | #endif |
803 | #endif |
665 | |
804 | |
666 | struct rxvt_font_xft : rxvt_font { |
805 | struct rxvt_font_xft : rxvt_font { |
667 | rxvt_font_xft () { f = 0; d = 0; } |
806 | rxvt_font_xft () { f = 0; } |
668 | |
807 | |
669 | void clear (); |
808 | void clear (); |
670 | |
809 | |
671 | rxvt_fontprop properties (); |
810 | rxvt_fontprop properties (); |
672 | |
811 | |
673 | bool load (const rxvt_fontprop &prop); |
812 | bool load (const rxvt_fontprop &prop); |
674 | |
813 | |
675 | void draw (int x, int y, |
814 | void draw (rxvt_drawable &d, int x, int y, |
676 | const text_t *text, int len, |
815 | const text_t *text, int len, |
677 | int fg, int bg); |
816 | int fg, int bg); |
678 | |
817 | |
679 | bool has_codepoint (uint32_t unicode); |
818 | bool has_codepoint (unicode_t unicode); |
680 | |
819 | |
681 | protected: |
820 | protected: |
682 | XftFont *f; |
821 | XftFont *f; |
683 | XftDraw *d; |
|
|
684 | }; |
822 | }; |
685 | |
823 | |
686 | void |
824 | void |
687 | rxvt_font_xft::clear () |
825 | rxvt_font_xft::clear () |
688 | { |
826 | { |
689 | if (f) |
827 | if (f) |
690 | { |
828 | { |
691 | XftFontClose (DISPLAY, f); |
829 | XftFontClose (DISPLAY, f); |
692 | f = 0; |
830 | f = 0; |
693 | } |
|
|
694 | |
|
|
695 | if (d) |
|
|
696 | { |
|
|
697 | XftDrawDestroy (d); |
|
|
698 | d = 0; |
|
|
699 | } |
831 | } |
700 | } |
832 | } |
701 | |
833 | |
702 | rxvt_fontprop |
834 | rxvt_fontprop |
703 | rxvt_font_xft::properties () |
835 | rxvt_font_xft::properties () |
… | |
… | |
804 | |
936 | |
805 | return true; |
937 | return true; |
806 | } |
938 | } |
807 | |
939 | |
808 | bool |
940 | bool |
809 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
941 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
810 | { |
942 | { |
811 | return XftCharExists (DISPLAY, f, unicode); |
943 | return XftCharExists (DISPLAY, f, unicode); |
812 | } |
944 | } |
813 | |
945 | |
814 | void |
946 | void |
815 | rxvt_font_xft::draw (int x, int y, |
947 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
816 | const text_t *text, int len, |
948 | const text_t *text, int len, |
817 | int fg, int bg) |
949 | int fg, int bg) |
818 | { |
950 | { |
819 | if (!d) |
|
|
820 | { |
|
|
821 | dR; |
|
|
822 | d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); |
|
|
823 | } |
|
|
824 | |
|
|
825 | if (bg >= 0 && bg != Color_bg) |
|
|
826 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
|
|
827 | else |
|
|
828 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
951 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
829 | |
952 | |
830 | if (!slow && width == r->TermWin.fwidth) |
953 | if (!slow && width == r->TermWin.fwidth && 0) |
831 | { |
954 | { |
832 | if (sizeof (text_t) == sizeof (FcChar16)) |
955 | if (sizeof (text_t) == sizeof (FcChar16)) |
833 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
956 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
834 | else |
957 | else |
835 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
958 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
… | |
… | |
838 | { |
961 | { |
839 | while (len) |
962 | while (len) |
840 | { |
963 | { |
841 | if (*text != NOCHAR && *text != ' ') |
964 | if (*text != NOCHAR && *text != ' ') |
842 | { |
965 | { |
|
|
966 | int fwidth = r->TermWin.fwidth; |
|
|
967 | if (len >= 2 && text[1] == NOCHAR) |
|
|
968 | fwidth *= 2; |
|
|
969 | |
|
|
970 | XGlyphInfo extents; |
843 | if (sizeof (text_t) == sizeof (FcChar16)) |
971 | if (sizeof (text_t) == sizeof (FcChar16)) |
844 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
972 | { |
|
|
973 | XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); |
|
|
974 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
975 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
|
|
976 | } |
845 | else |
977 | else |
846 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
978 | { |
|
|
979 | XGlyphInfo extents; |
|
|
980 | XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); |
|
|
981 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
982 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
|
|
983 | } |
847 | } |
984 | } |
848 | |
985 | |
849 | x += r->TermWin.fwidth; |
986 | x += r->TermWin.fwidth; |
850 | text++; |
987 | text++; |
851 | len--; |
988 | len--; |
… | |
… | |
855 | #endif |
992 | #endif |
856 | |
993 | |
857 | ///////////////////////////////////////////////////////////////////////////// |
994 | ///////////////////////////////////////////////////////////////////////////// |
858 | |
995 | |
859 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
996 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
860 | #ifdef EXPLICIT_CONTEXT |
|
|
861 | : r(r) |
997 | : r (r) |
862 | #endif |
|
|
863 | { |
998 | { |
864 | clear (); |
999 | clear (); |
865 | } |
1000 | } |
866 | |
1001 | |
867 | rxvt_fontset::~rxvt_fontset () |
1002 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
870 | } |
1005 | } |
871 | |
1006 | |
872 | void |
1007 | void |
873 | rxvt_fontset::clear () |
1008 | rxvt_fontset::clear () |
874 | { |
1009 | { |
875 | for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) |
1010 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
876 | FONT_UNREF (*i); |
1011 | FONT_UNREF (*i); |
877 | |
1012 | |
878 | fonts.clear (); |
1013 | fonts.clear (); |
879 | base_id = 0; |
1014 | base_id = 0; |
880 | base_prop.height = 0x7fffffff; |
1015 | base_prop.height = 0x7fffffff; |
… | |
… | |
907 | f = new rxvt_font_x11; |
1042 | f = new rxvt_font_x11; |
908 | } |
1043 | } |
909 | else |
1044 | else |
910 | f = new rxvt_font_x11; |
1045 | f = new rxvt_font_x11; |
911 | |
1046 | |
|
|
1047 | f->fs = this; |
912 | f->set_term (r); |
1048 | f->set_term (r); |
913 | f->set_name (strdup (name)); |
1049 | f->set_name (strdup (name)); |
914 | |
1050 | |
915 | f->cs = cs; |
1051 | f->cs = cs; |
916 | f->loaded = false; |
1052 | f->loaded = false; |
… | |
… | |
934 | |
1070 | |
935 | if (*desc == '[') |
1071 | if (*desc == '[') |
936 | { |
1072 | { |
937 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1073 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
938 | |
1074 | |
939 | const char *extra = desc++; |
1075 | //const char *extra = desc++; // not yet used |
940 | |
1076 | |
941 | desc = strchr (desc, ']'); |
1077 | desc = strchr (desc, ']'); |
942 | |
1078 | |
943 | if (!desc) |
1079 | if (!desc) |
944 | { |
1080 | { |
… | |
… | |
983 | } |
1119 | } |
984 | |
1120 | |
985 | return true; |
1121 | return true; |
986 | } |
1122 | } |
987 | |
1123 | |
988 | void |
1124 | bool |
989 | rxvt_fontset::populate (const char *desc) |
1125 | rxvt_fontset::populate (const char *desc) |
990 | { |
1126 | { |
991 | clear (); |
1127 | clear (); |
992 | |
1128 | |
993 | fonts.push_back (new_font (0, CS_UNICODE)); |
1129 | fonts.push_back (new_font (0, CS_UNICODE)); |
… | |
… | |
997 | |
1133 | |
998 | if (!base_id) |
1134 | if (!base_id) |
999 | base_id = 1; |
1135 | base_id = 1; |
1000 | |
1136 | |
1001 | // we currently need a base-font, no matter what |
1137 | // we currently need a base-font, no matter what |
1002 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1138 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1003 | { |
1139 | { |
|
|
1140 | puts ("unable to load specified font (s), falling back to 'fixed'\n"); |
1004 | add_fonts ("fixed"); |
1141 | add_fonts ("fixed"); |
1005 | base_id = fonts.size () - 1; |
1142 | base_id = fonts.size () - 1; |
1006 | } |
1143 | } |
1007 | |
1144 | |
1008 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1145 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1009 | { |
1146 | return false; |
1010 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
|
|
1011 | exit (1); |
|
|
1012 | } |
|
|
1013 | |
1147 | |
1014 | base_prop = fonts[base_id]->properties (); |
1148 | base_prop = fonts[base_id]->properties (); |
|
|
1149 | |
|
|
1150 | return true; |
1015 | } |
1151 | } |
1016 | |
1152 | |
1017 | int |
1153 | int |
1018 | rxvt_fontset::find_font (uint32_t unicode) |
1154 | rxvt_fontset::find_font (unicode_t unicode) |
1019 | { |
1155 | { |
1020 | for (int i = 0; i < fonts.size (); i++) |
1156 | for (unsigned int i = 0; i < fonts.size (); i++) |
1021 | { |
1157 | { |
1022 | rxvt_font *f = fonts[i]; |
1158 | rxvt_font *f = fonts[i]; |
1023 | |
1159 | |
1024 | if (!f->loaded) |
1160 | if (!f->loaded) |
1025 | { |
1161 | { |