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", |
… | |
… | |
227 | struct rxvt_font_default : rxvt_font { |
256 | struct rxvt_font_default : rxvt_font { |
228 | rxvt_fontprop properties () |
257 | rxvt_fontprop properties () |
229 | { |
258 | { |
230 | rxvt_fontprop p; |
259 | rxvt_fontprop p; |
231 | |
260 | |
232 | p.height = 1; |
261 | p.width = p.height = 1; |
233 | p.weight = rxvt_fontprop::medium; |
262 | p.weight = rxvt_fontprop::medium; |
234 | p.slant = rxvt_fontprop::roman; |
263 | p.slant = rxvt_fontprop::roman; |
235 | |
264 | |
236 | return p; |
265 | return p; |
237 | } |
266 | } |
… | |
… | |
246 | |
275 | |
247 | bool has_codepoint (uint32_t unicode) |
276 | bool has_codepoint (uint32_t unicode) |
248 | { |
277 | { |
249 | if (unicode <= 0x001f) |
278 | if (unicode <= 0x001f) |
250 | return true; |
279 | return true; |
|
|
280 | |
251 | if (unicode >= 0x0080 && unicode <= 0x009f) |
281 | if (unicode >= 0x0080 && unicode <= 0x009f) |
252 | return true; |
282 | return true; |
253 | |
283 | |
254 | if (unicode >= 0x2500 && unicode <= 0x257f |
284 | if (unicode >= 0x2500 && unicode <= 0x257f |
255 | && linedraw_cmds[unicode - 0x2500]) |
285 | && linedraw_cmds[unicode - 0x2500]) |
|
|
286 | return true; |
|
|
287 | |
|
|
288 | if (IS_COMPOSE (unicode)) |
256 | return true; |
289 | return true; |
257 | |
290 | |
258 | switch (unicode) |
291 | switch (unicode) |
259 | { |
292 | { |
260 | case ZERO_WIDTH_CHAR: |
293 | case ZERO_WIDTH_CHAR: |
… | |
… | |
262 | } |
295 | } |
263 | |
296 | |
264 | return false; |
297 | return false; |
265 | } |
298 | } |
266 | |
299 | |
267 | void draw (int x, int y, |
300 | void draw (rxvt_drawable &d, int x, int y, |
268 | const text_t *text, int len, |
301 | const text_t *text, int len, |
269 | int fg, int bg); |
302 | int fg, int bg); |
270 | }; |
303 | }; |
271 | |
304 | |
272 | void |
305 | void |
273 | rxvt_font_default::draw (int x, int y, |
306 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
274 | const text_t *text, int len, |
307 | const text_t *text, int len, |
275 | int fg, int bg) |
308 | int fg, int bg) |
276 | { |
309 | { |
277 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
310 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
278 | |
311 | |
279 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
312 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
280 | |
313 | |
281 | while (len--) |
314 | while (len--) |
282 | { |
315 | { |
|
|
316 | compose_char *cc; |
283 | text_t t = *text++; |
317 | text_t t = *text++; |
284 | |
318 | |
|
|
319 | // is it in our linedrawing table? |
285 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
320 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
286 | { |
321 | { |
287 | const char *p = linedraw_cmds[t - 0x2500]; |
322 | const char *p = linedraw_cmds[t - 0x2500]; |
288 | |
323 | |
289 | int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; |
324 | 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; |
325 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
291 | |
326 | |
292 | XGCValues gcv; |
327 | XGCValues gcv; |
293 | |
328 | |
294 | while (*p) |
329 | while (*p) |
295 | { |
330 | { |
296 | switch (*p++) |
331 | switch (*p++) |
297 | { |
332 | { |
298 | case '1': |
333 | case '1': |
299 | gcv.line_width = 0; |
334 | gcv.line_width = 0; |
300 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
335 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
301 | break; |
336 | break; |
302 | |
337 | |
303 | case '2': |
338 | case '2': |
304 | gcv.line_width = 2; |
339 | gcv.line_width = 2; |
305 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
340 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
306 | break; |
341 | break; |
307 | |
342 | |
308 | case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; |
343 | 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; |
344 | 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; |
345 | 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; |
346 | 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; |
347 | 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; |
348 | case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; |
314 | } |
349 | } |
315 | } |
350 | } |
316 | |
351 | |
317 | gcv.line_width = 0; |
352 | gcv.line_width = 0; |
318 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
353 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
354 | } |
|
|
355 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
|
|
356 | { |
|
|
357 | (*fs)[fs->find_font (cc->c1)]->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
358 | if (cc->c2 != NOCHAR) |
|
|
359 | (*fs)[fs->find_font (cc->c2)]->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
319 | } |
360 | } |
320 | else |
361 | else |
321 | switch (*text++) |
362 | switch (t) |
322 | { |
363 | { |
323 | case NOCHAR: |
|
|
324 | case ZERO_WIDTH_CHAR: |
364 | case ZERO_WIDTH_CHAR: |
325 | break; |
365 | break; |
326 | default: |
366 | default: |
327 | XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
367 | int w = 0; |
|
|
368 | while (len > 0 && *text == NOCHAR) |
|
|
369 | { |
|
|
370 | ++text; |
|
|
371 | --len; |
|
|
372 | w += r->TermWin.fwidth; |
|
|
373 | } |
|
|
374 | |
|
|
375 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
|
|
376 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
|
|
377 | x += w; |
328 | } |
378 | } |
329 | |
379 | |
330 | x += r->TermWin.fwidth; |
380 | x += r->TermWin.fwidth; |
331 | } |
381 | } |
332 | } |
382 | } |
… | |
… | |
337 | rxvt_font_x11 () { f = 0; } |
387 | rxvt_font_x11 () { f = 0; } |
338 | |
388 | |
339 | void clear (); |
389 | void clear (); |
340 | |
390 | |
341 | rxvt_fontprop properties (); |
391 | rxvt_fontprop properties (); |
342 | rxvt_fontprop properties (XFontStruct *f); |
|
|
343 | |
392 | |
344 | bool load (const rxvt_fontprop &prop); |
393 | bool load (const rxvt_fontprop &prop); |
345 | |
394 | |
346 | bool has_codepoint (uint32_t unicode); |
395 | bool has_codepoint (uint32_t unicode); |
347 | |
396 | |
348 | void draw (int x, int y, |
397 | void draw (rxvt_drawable &d, int x, int y, |
349 | const text_t *text, int len, |
398 | const text_t *text, int len, |
350 | int fg, int bg); |
399 | int fg, int bg); |
351 | |
400 | |
352 | XFontStruct *f; |
401 | XFontStruct *f; |
353 | codeset cs; |
402 | codeset cs; |
354 | bool enc2b, encm; |
403 | bool enc2b, encm; |
355 | |
404 | |
356 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
405 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
|
|
406 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
|
|
407 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
|
|
408 | bool set_properties (rxvt_fontprop &p, const char *name); |
357 | }; |
409 | }; |
358 | |
410 | |
359 | const char * |
411 | const char * |
360 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
412 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
361 | { |
413 | { |
… | |
… | |
368 | } |
420 | } |
369 | |
421 | |
370 | rxvt_fontprop |
422 | rxvt_fontprop |
371 | rxvt_font_x11::properties () |
423 | rxvt_font_x11::properties () |
372 | { |
424 | { |
373 | return properties (f); |
|
|
374 | } |
|
|
375 | |
|
|
376 | rxvt_fontprop |
|
|
377 | rxvt_font_x11::properties (XFontStruct *f) |
|
|
378 | { |
|
|
379 | rxvt_fontprop p; |
425 | rxvt_fontprop p; |
|
|
426 | set_properties (p, f); |
|
|
427 | return p; |
|
|
428 | } |
380 | |
429 | |
|
|
430 | bool |
|
|
431 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
|
|
432 | { |
|
|
433 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
|
|
434 | p.height = height; |
|
|
435 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
|
|
436 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
|
|
437 | |
|
|
438 | return true; |
|
|
439 | } |
|
|
440 | |
|
|
441 | bool |
|
|
442 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
|
|
443 | { |
381 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
444 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
382 | const char *slant = get_property (f, "SLANT", "r"); |
445 | const char *slant = get_property (f, "SLANT", "r"); |
383 | |
446 | |
384 | p.height = height; |
447 | unsigned long height; |
385 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
448 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
386 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
449 | return false; |
387 | |
450 | |
388 | return p; |
451 | unsigned long avgwidth; |
|
|
452 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
|
|
453 | avgwidth = 0; |
|
|
454 | |
|
|
455 | return set_properties (p, height, weight, slant, avgwidth); |
|
|
456 | } |
|
|
457 | |
|
|
458 | bool |
|
|
459 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
|
|
460 | { |
|
|
461 | int slashes = 0; |
|
|
462 | const char *comp[13]; |
|
|
463 | |
|
|
464 | for (const char *c = name; *c; c++) |
|
|
465 | if (*c == '-') |
|
|
466 | { |
|
|
467 | comp[slashes++] = c + 1; |
|
|
468 | if (slashes >= 13) |
|
|
469 | break; |
|
|
470 | } |
|
|
471 | |
|
|
472 | /* can we short-circuit the costly XLoadQueryFont? */ |
|
|
473 | if (slashes >= 13 |
|
|
474 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
|
|
475 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
|
|
476 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
|
|
477 | |
|
|
478 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
|
|
479 | |
|
|
480 | if (f) |
|
|
481 | { |
|
|
482 | // the font should really exist now. if not, we have a problem |
|
|
483 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
|
|
484 | // in that case, just return garbage. |
|
|
485 | bool ret = set_properties (p, f); |
|
|
486 | XFreeFont (DISPLAY, f); |
|
|
487 | return ret; |
|
|
488 | } |
|
|
489 | else |
|
|
490 | return false; |
|
|
491 | } |
|
|
492 | |
|
|
493 | // fix the size of scalable fonts |
|
|
494 | static void |
|
|
495 | fix_scalable (char *buf, const char *name, const rxvt_fontprop &prop) |
|
|
496 | { |
|
|
497 | int slashes = 0; |
|
|
498 | const char *size; |
|
|
499 | |
|
|
500 | for (const char *c = name; *c; c++) |
|
|
501 | if (*c == '-') |
|
|
502 | { |
|
|
503 | if (slashes == 6) |
|
|
504 | size = c + 1; |
|
|
505 | |
|
|
506 | if (++slashes >= 13) |
|
|
507 | break; |
|
|
508 | } |
|
|
509 | |
|
|
510 | if (slashes >= 13 && size[0] == '0') |
|
|
511 | { |
|
|
512 | strncpy (buf, name, size - name); |
|
|
513 | buf += size - name; |
|
|
514 | buf += sprintf (buf, "%d", prop.height); |
|
|
515 | strcpy (buf, size + 1); |
|
|
516 | } |
|
|
517 | else |
|
|
518 | strcpy (buf, name); |
389 | } |
519 | } |
390 | |
520 | |
391 | bool |
521 | bool |
392 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
522 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
393 | { |
523 | { |
394 | clear (); |
524 | clear (); |
395 | |
525 | |
396 | char **list; |
526 | char **list; |
397 | int count; |
527 | int count; |
398 | XFontStruct *info; |
|
|
399 | list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); |
528 | list = XListFonts (DISPLAY, name, 512, &count); |
|
|
529 | set_name (0); |
400 | |
530 | |
401 | if (!list) |
531 | if (!list) |
402 | return false; |
532 | return false; |
403 | |
533 | |
404 | int bestdiff = 0x7fffffff; |
534 | int bestdiff = 0x7fffffff; |
405 | XFontStruct *best = 0; |
|
|
406 | for (int i = 0; i < count; i++) |
535 | for (int i = 0; i < count; i++) |
407 | { |
536 | { |
408 | XFontStruct *f = info + i; |
537 | rxvt_fontprop p; |
|
|
538 | char fname[1024]; |
|
|
539 | fix_scalable (fname, list[i], prop); |
409 | |
540 | |
|
|
541 | if (!set_properties (p, fname)) |
|
|
542 | continue; |
|
|
543 | |
410 | if (f->ascent + f->descent <= prop.height) // weed out too large fonts |
544 | if (p.height > prop.height) // weed out too large fonts |
411 | { |
545 | continue; |
412 | rxvt_fontprop p = properties (f); |
546 | |
413 | int diff = (prop.height - f->ascent + f->descent) * 32 |
547 | int diff = (prop.height - p.height) * 32 |
414 | + abs (prop.weight - p.weight) |
548 | + abs (prop.weight - p.weight) |
415 | + abs (prop.slant - p.slant ); |
549 | + abs (prop.slant - p.slant ); |
416 | |
550 | |
417 | if (!best // compare against best found so far |
551 | if (!name // compare against best found so far |
418 | || diff < bestdiff) |
552 | || diff < bestdiff) |
419 | { |
553 | { |
420 | best = f; |
554 | set_name (strdup (fname)); |
421 | bestdiff = diff; |
555 | bestdiff = diff; |
422 | } |
556 | } |
423 | } |
|
|
424 | } |
557 | } |
425 | |
558 | |
|
|
559 | XFreeFontNames (list); |
|
|
560 | |
426 | if (!best) |
561 | if (!name) |
427 | return false; |
562 | return false; |
428 | |
|
|
429 | set_name (strdup (list[best - info])); |
|
|
430 | |
|
|
431 | XFreeFontInfo (list, info, count); |
|
|
432 | |
563 | |
433 | f = XLoadQueryFont (DISPLAY, name); |
564 | f = XLoadQueryFont (DISPLAY, name); |
434 | |
565 | |
435 | if (!f) |
566 | if (!f) |
436 | return false; |
567 | return false; |
437 | |
|
|
438 | unsigned long value; |
|
|
439 | |
568 | |
440 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
569 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
441 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
570 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
442 | |
571 | |
443 | if (registry && encoding) |
572 | if (registry && encoding) |
… | |
… | |
530 | /* check wether the character exists in _this_ font. horrible. */ |
659 | /* check wether the character exists in _this_ font. horrible. */ |
531 | XCharStruct *xcs; |
660 | XCharStruct *xcs; |
532 | |
661 | |
533 | if (encm) |
662 | if (encm) |
534 | { |
663 | { |
535 | int byte1 = ch >> 8; |
664 | unsigned char byte1 = ch >> 8; |
536 | int byte2 = ch & 255; |
665 | unsigned char byte2 = ch & 255; |
537 | |
666 | |
538 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
667 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
539 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
668 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
540 | return false; |
669 | return false; |
541 | |
670 | |
… | |
… | |
564 | |
693 | |
565 | return true; |
694 | return true; |
566 | } |
695 | } |
567 | |
696 | |
568 | void |
697 | void |
569 | rxvt_font_x11::draw (int x, int y, |
698 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
570 | const text_t *text, int len, |
699 | const text_t *text, int len, |
571 | int fg, int bg) |
700 | int fg, int bg) |
572 | { |
701 | { |
573 | // this looks like a mess /. |
702 | // this looks like a mess /. |
574 | // and it is a mess /. |
703 | // and it is a mess /. |
… | |
… | |
590 | { |
719 | { |
591 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
720 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
592 | |
721 | |
593 | if (bg == Color_bg && !slow) |
722 | if (bg == Color_bg && !slow) |
594 | { |
723 | { |
595 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
724 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
596 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
725 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
597 | } |
726 | } |
598 | else |
727 | else |
599 | { |
728 | { |
600 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
729 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
601 | |
730 | |
602 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
731 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
603 | |
732 | |
604 | if (slow) |
733 | if (slow) |
605 | { |
734 | { |
606 | do |
735 | do |
607 | { |
736 | { |
608 | if (xc->byte1 || xc->byte2) |
737 | if (xc->byte1 || xc->byte2) |
609 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
738 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
610 | |
739 | |
611 | x += r->TermWin.fwidth; |
740 | x += r->TermWin.fwidth; |
612 | xc++; len--; |
741 | xc++; len--; |
613 | } |
742 | } |
614 | while (len); |
743 | while (len); |
615 | } |
744 | } |
616 | else |
745 | else |
617 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
746 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
618 | } |
747 | } |
619 | } |
748 | } |
620 | else |
749 | else |
621 | { |
750 | { |
622 | const char *xc = enc_char (text, len, cs, slow); |
751 | const char *xc = enc_char (text, len, cs, slow); |
623 | |
752 | |
624 | if (bg == Color_bg && !slow) |
753 | if (bg == Color_bg && !slow) |
625 | { |
754 | { |
626 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
755 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
627 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
756 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
628 | } |
757 | } |
629 | else |
758 | else |
630 | { |
759 | { |
631 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
760 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
632 | |
761 | |
633 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
762 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
634 | |
763 | |
635 | if (slow) |
764 | if (slow) |
636 | { |
765 | { |
637 | do |
766 | do |
638 | { |
767 | { |
639 | if (*xc) |
768 | if (*xc) |
640 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
769 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
641 | |
770 | |
642 | x += r->TermWin.fwidth; |
771 | x += r->TermWin.fwidth; |
643 | xc++; len--; |
772 | xc++; len--; |
644 | } |
773 | } |
645 | while (len); |
774 | while (len); |
646 | } |
775 | } |
647 | else |
776 | else |
648 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
777 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
649 | } |
778 | } |
650 | } |
779 | } |
651 | } |
780 | } |
652 | |
781 | |
653 | ///////////////////////////////////////////////////////////////////////////// |
782 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
658 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
787 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
659 | #define SWATHBITS 8 |
788 | #define SWATHBITS 8 |
660 | #endif |
789 | #endif |
661 | |
790 | |
662 | struct rxvt_font_xft : rxvt_font { |
791 | struct rxvt_font_xft : rxvt_font { |
663 | #if 0 |
|
|
664 | enum { |
|
|
665 | SWATHCOUNT = 1 << (21 - UNIBITS), |
|
|
666 | SWATHSIZE = 1 << (SWATHBITS - 5) |
|
|
667 | }; |
|
|
668 | typedef uint32_t swath[SWATHSIZE]; |
|
|
669 | |
|
|
670 | swath *cvr[SWATHCOUNT]; |
|
|
671 | #endif |
|
|
672 | |
|
|
673 | #if 0 |
|
|
674 | void gen_coverage_swath (unsigned int page); |
|
|
675 | |
|
|
676 | bool has_char (uint32_t ch) |
|
|
677 | { |
|
|
678 | unsigned int page = ch >> SWATHBITS; |
|
|
679 | unsigned int idx = ch & ((1 << SWATHBITS) - 1); |
|
|
680 | |
|
|
681 | if (page >= SWATHCOUNT) |
|
|
682 | return false; |
|
|
683 | |
|
|
684 | if (!cvr[page]) gen_coverage_swath (page); |
|
|
685 | |
|
|
686 | return cvr[page][idx >> 5] & (1 << (idx & 31)); |
|
|
687 | } |
|
|
688 | #endif |
|
|
689 | rxvt_font_xft () { f = 0; d = 0; } |
792 | rxvt_font_xft () { f = 0; } |
690 | |
793 | |
691 | void clear (); |
794 | void clear (); |
692 | |
795 | |
693 | rxvt_fontprop properties (); |
796 | rxvt_fontprop properties (); |
694 | |
797 | |
695 | bool load (const rxvt_fontprop &prop); |
798 | bool load (const rxvt_fontprop &prop); |
696 | |
799 | |
697 | void draw (int x, int y, |
800 | void draw (rxvt_drawable &d, int x, int y, |
698 | const text_t *text, int len, |
801 | const text_t *text, int len, |
699 | int fg, int bg); |
802 | int fg, int bg); |
700 | |
803 | |
701 | bool has_codepoint (uint32_t unicode); |
804 | bool has_codepoint (uint32_t unicode); |
702 | |
805 | |
703 | protected: |
806 | protected: |
704 | XftFont *f; |
807 | XftFont *f; |
705 | XftDraw *d; |
|
|
706 | |
|
|
707 | #if 0 |
|
|
708 | virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0; |
|
|
709 | void set_swath (uint32_t ch) |
|
|
710 | { |
|
|
711 | cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1)); |
|
|
712 | } |
|
|
713 | #endif |
|
|
714 | }; |
808 | }; |
715 | |
809 | |
716 | void |
810 | void |
717 | rxvt_font_xft::clear () |
811 | rxvt_font_xft::clear () |
718 | { |
812 | { |
719 | if (f) |
813 | if (f) |
720 | { |
814 | { |
721 | XftFontClose (DISPLAY, f); |
815 | XftFontClose (DISPLAY, f); |
722 | f = 0; |
816 | f = 0; |
723 | } |
817 | } |
724 | |
|
|
725 | if (d) |
|
|
726 | { |
|
|
727 | XftDrawDestroy (d); |
|
|
728 | d = 0; |
|
|
729 | } |
|
|
730 | |
|
|
731 | #if 0 |
|
|
732 | for (int i = 0; i < SWATHCOUNT; i++) |
|
|
733 | delete cvr[i]; |
|
|
734 | #endif |
|
|
735 | } |
818 | } |
736 | |
819 | |
737 | rxvt_fontprop |
820 | rxvt_fontprop |
738 | rxvt_font_xft::properties () |
821 | rxvt_font_xft::properties () |
739 | { |
822 | { |
740 | rxvt_fontprop p; |
823 | rxvt_fontprop p; |
741 | |
824 | |
742 | FT_Face face = XftLockFace (f); |
825 | FT_Face face = XftLockFace (f); |
743 | |
826 | |
744 | p.height = height; |
827 | p.width = width; p.height = height; |
745 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
828 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
746 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
829 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
747 | |
830 | |
748 | XftUnlockFace (f); |
831 | XftUnlockFace (f); |
749 | |
832 | |
… | |
… | |
771 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
854 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
772 | |
855 | |
773 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
856 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
774 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
857 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
775 | |
858 | |
|
|
859 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
|
|
860 | // clip width, we can't do better, or can we? |
|
|
861 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
|
|
862 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
|
|
863 | #endif |
|
|
864 | |
776 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
865 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
777 | |
866 | |
778 | XftResult result; |
867 | XftResult result; |
779 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
868 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
780 | |
869 | |
… | |
… | |
832 | XftUnlockFace (f); |
921 | XftUnlockFace (f); |
833 | |
922 | |
834 | return true; |
923 | return true; |
835 | } |
924 | } |
836 | |
925 | |
837 | #if 0 |
|
|
838 | void rxvt_font::gen_coverage_swath (unsigned int page) |
|
|
839 | { |
|
|
840 | cvr[page] = new swath; |
|
|
841 | |
|
|
842 | for (int i = 0; i < SWATHSIZE; i++) |
|
|
843 | cvr[page][i] = 0; |
|
|
844 | |
|
|
845 | populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1); |
|
|
846 | } |
|
|
847 | #endif |
|
|
848 | |
|
|
849 | bool |
926 | bool |
850 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
927 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
851 | { |
928 | { |
852 | return XftCharExists (DISPLAY, f, unicode); |
929 | return XftCharExists (DISPLAY, f, unicode); |
853 | } |
930 | } |
854 | |
931 | |
855 | void |
932 | void |
856 | rxvt_font_xft::draw (int x, int y, |
933 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
857 | const text_t *text, int len, |
934 | const text_t *text, int len, |
858 | int fg, int bg) |
935 | int fg, int bg) |
859 | { |
936 | { |
860 | if (!d) |
|
|
861 | { |
|
|
862 | dR; |
|
|
863 | d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); |
|
|
864 | } |
|
|
865 | |
|
|
866 | if (bg >= 0 && bg != Color_bg) |
|
|
867 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
|
|
868 | else |
|
|
869 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
937 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
870 | |
938 | |
871 | if (!slow && width == r->TermWin.fwidth) |
939 | if (!slow && width == r->TermWin.fwidth && 0) |
872 | { |
940 | { |
873 | if (sizeof (text_t) == sizeof (FcChar16)) |
941 | if (sizeof (text_t) == sizeof (FcChar16)) |
874 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
942 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
875 | else |
943 | else |
876 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
944 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len); |
… | |
… | |
879 | { |
947 | { |
880 | while (len) |
948 | while (len) |
881 | { |
949 | { |
882 | if (*text != NOCHAR && *text != ' ') |
950 | if (*text != NOCHAR && *text != ' ') |
883 | { |
951 | { |
|
|
952 | int fwidth = r->TermWin.fwidth; |
|
|
953 | if (len >= 2 && text[1] == NOCHAR) |
|
|
954 | fwidth *= 2; |
|
|
955 | |
|
|
956 | XGlyphInfo extents; |
884 | if (sizeof (text_t) == sizeof (FcChar16)) |
957 | if (sizeof (text_t) == sizeof (FcChar16)) |
885 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
958 | { |
|
|
959 | XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); |
|
|
960 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
961 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
|
|
962 | } |
886 | else |
963 | else |
887 | XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
964 | { |
|
|
965 | XGlyphInfo extents; |
|
|
966 | XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); |
|
|
967 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
|
|
968 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
|
|
969 | } |
888 | } |
970 | } |
889 | |
971 | |
890 | x += r->TermWin.fwidth; |
972 | x += r->TermWin.fwidth; |
891 | text++; |
973 | text++; |
892 | len--; |
974 | len--; |
… | |
… | |
896 | #endif |
978 | #endif |
897 | |
979 | |
898 | ///////////////////////////////////////////////////////////////////////////// |
980 | ///////////////////////////////////////////////////////////////////////////// |
899 | |
981 | |
900 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
982 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
901 | #ifdef EXPLICIT_CONTEXT |
|
|
902 | : r(r) |
983 | : r (r) |
903 | #endif |
|
|
904 | { |
984 | { |
905 | clear (); |
985 | clear (); |
906 | } |
986 | } |
907 | |
987 | |
908 | rxvt_fontset::~rxvt_fontset () |
988 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
911 | } |
991 | } |
912 | |
992 | |
913 | void |
993 | void |
914 | rxvt_fontset::clear () |
994 | rxvt_fontset::clear () |
915 | { |
995 | { |
916 | for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) |
996 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
917 | FONT_UNREF (*i); |
997 | FONT_UNREF (*i); |
918 | |
998 | |
919 | fonts.clear (); |
999 | fonts.clear (); |
920 | base_id = 0; |
1000 | base_id = 0; |
921 | base_prop.height = 0x7fffffff; |
1001 | base_prop.height = 0x7fffffff; |
… | |
… | |
948 | f = new rxvt_font_x11; |
1028 | f = new rxvt_font_x11; |
949 | } |
1029 | } |
950 | else |
1030 | else |
951 | f = new rxvt_font_x11; |
1031 | f = new rxvt_font_x11; |
952 | |
1032 | |
|
|
1033 | f->fs = this; |
953 | f->set_term (r); |
1034 | f->set_term (r); |
954 | f->set_name (strdup (name)); |
1035 | f->set_name (strdup (name)); |
955 | |
1036 | |
956 | f->cs = cs; |
1037 | f->cs = cs; |
957 | f->loaded = false; |
1038 | f->loaded = false; |
… | |
… | |
975 | |
1056 | |
976 | if (*desc == '[') |
1057 | if (*desc == '[') |
977 | { |
1058 | { |
978 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1059 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
979 | |
1060 | |
980 | const char *extra = desc++; |
1061 | //const char *extra = desc++; // not yet used |
981 | |
1062 | |
982 | desc = strchr (desc, ']'); |
1063 | desc = strchr (desc, ']'); |
983 | |
1064 | |
984 | if (!desc) |
1065 | if (!desc) |
985 | { |
1066 | { |
… | |
… | |
1024 | } |
1105 | } |
1025 | |
1106 | |
1026 | return true; |
1107 | return true; |
1027 | } |
1108 | } |
1028 | |
1109 | |
1029 | void |
1110 | bool |
1030 | rxvt_fontset::populate (const char *desc) |
1111 | rxvt_fontset::populate (const char *desc) |
1031 | { |
1112 | { |
1032 | clear (); |
1113 | clear (); |
1033 | |
1114 | |
1034 | fonts.push_back (new_font (0, CS_UNICODE)); |
1115 | fonts.push_back (new_font (0, CS_UNICODE)); |
… | |
… | |
1038 | |
1119 | |
1039 | if (!base_id) |
1120 | if (!base_id) |
1040 | base_id = 1; |
1121 | base_id = 1; |
1041 | |
1122 | |
1042 | // we currently need a base-font, no matter what |
1123 | // we currently need a base-font, no matter what |
1043 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1124 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1044 | { |
1125 | { |
|
|
1126 | puts ("unable to load specified font (s), falling back to 'fixed'\n"); |
1045 | add_fonts ("fixed"); |
1127 | add_fonts ("fixed"); |
1046 | base_id = fonts.size () - 1; |
1128 | base_id = fonts.size () - 1; |
1047 | } |
1129 | } |
1048 | |
1130 | |
1049 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1131 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1050 | { |
1132 | return false; |
1051 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
|
|
1052 | exit (1); |
|
|
1053 | } |
|
|
1054 | |
1133 | |
1055 | base_prop = fonts[base_id]->properties (); |
1134 | base_prop = fonts[base_id]->properties (); |
|
|
1135 | |
|
|
1136 | return true; |
1056 | } |
1137 | } |
1057 | |
1138 | |
1058 | int |
1139 | int |
1059 | rxvt_fontset::find_font (uint32_t unicode) |
1140 | rxvt_fontset::find_font (uint32_t unicode) |
1060 | { |
1141 | { |
1061 | for (int i = 0; i < fonts.size (); i++) |
1142 | for (unsigned int i = 0; i < fonts.size (); i++) |
1062 | { |
1143 | { |
1063 | rxvt_font *f = fonts[i]; |
1144 | rxvt_font *f = fonts[i]; |
1064 | |
1145 | |
1065 | if (!f->loaded) |
1146 | if (!f->loaded) |
1066 | { |
1147 | { |