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; |
… | |
… | |
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, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
67 | { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
66 | { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
68 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
67 | { CS_JIS0212_1990_0, "-*-mincho-*-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" }, |
|
|
80 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
78 | { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" }, |
81 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
79 | { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" }, |
82 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
80 | { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" }, |
83 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
81 | { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" }, |
84 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
82 | { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" }, |
85 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
83 | { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" }, |
86 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
84 | { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" }, |
87 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
85 | { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-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" }, |
91 | #endif |
94 | #endif |
92 | { CS_UNICODE, "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
95 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
96 | { CS_UNICODE, "xft:FreeMono" }, |
|
|
97 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
98 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
93 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
94 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
100 | |
95 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
101 | #if UNICODE_3 && XFT |
|
|
102 | { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters |
|
|
103 | #endif |
96 | |
104 | |
97 | { CS_UNKNOWN, 0 } |
105 | { CS_UNKNOWN, 0 } |
98 | }; |
106 | }; |
99 | |
107 | |
100 | ///////////////////////////////////////////////////////////////////////////// |
108 | ///////////////////////////////////////////////////////////////////////////// |
101 | |
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 | |
102 | static void *enc_buf; |
128 | static void *enc_buf; |
103 | static uint32_t enc_len; |
129 | static uint32_t enc_len; |
104 | |
130 | |
105 | static inline void * |
131 | static inline void * |
106 | get_enc_buf (int len) |
132 | get_enc_buf (uint32_t len) |
107 | { |
133 | { |
108 | if (len > enc_len) |
134 | if (len > enc_len) |
109 | { |
135 | { |
110 | free (enc_buf); |
136 | free (enc_buf); |
111 | enc_buf = malloc (len); |
137 | enc_buf = malloc (len); |
… | |
… | |
113 | |
139 | |
114 | return enc_buf; |
140 | return enc_buf; |
115 | } |
141 | } |
116 | |
142 | |
117 | static const char * |
143 | static const char * |
118 | 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) |
119 | { |
145 | { |
120 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
146 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
121 | |
147 | |
122 | while (len--) |
148 | while (len--) |
123 | { |
149 | { |
… | |
… | |
134 | |
160 | |
135 | return (const char *)enc_buf; |
161 | return (const char *)enc_buf; |
136 | } |
162 | } |
137 | |
163 | |
138 | static const XChar2b * |
164 | static const XChar2b * |
139 | 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) |
140 | { |
166 | { |
141 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
167 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
142 | |
168 | |
143 | while (len--) |
169 | while (len--) |
144 | { |
170 | { |
… | |
… | |
159 | } |
185 | } |
160 | |
186 | |
161 | ///////////////////////////////////////////////////////////////////////////// |
187 | ///////////////////////////////////////////////////////////////////////////// |
162 | |
188 | |
163 | void |
189 | void |
164 | 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) |
165 | { |
191 | { |
166 | if (color == Color_bg) |
192 | if (color == Color_bg) |
167 | XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); |
193 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
168 | else if (color >= 0) |
194 | else if (color >= 0) |
169 | { |
195 | { |
|
|
196 | #if XFT |
|
|
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
|
|
198 | #else |
170 | XSetForeground (DISPLAY, GC, r->PixColors[color]); |
199 | XSetForeground (d.display->display, GC, r->PixColors[color]); |
171 | XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); |
200 | XFillRectangle (d.display->display, d, GC, x, y, w, h); |
|
|
201 | #endif |
172 | } |
202 | } |
173 | } |
203 | } |
174 | |
204 | |
175 | static const char *linedraw_cmds[128] = { |
205 | static const char *linedraw_cmds[128] = { |
176 | "1hH", "2hH", "1vV", "2vV", |
206 | "1hH", "2hH", "1vV", "2vV", |
… | |
… | |
226 | struct rxvt_font_default : rxvt_font { |
256 | struct rxvt_font_default : rxvt_font { |
227 | rxvt_fontprop properties () |
257 | rxvt_fontprop properties () |
228 | { |
258 | { |
229 | rxvt_fontprop p; |
259 | rxvt_fontprop p; |
230 | |
260 | |
231 | p.height = 1; |
261 | p.width = p.height = 1; |
232 | p.weight = rxvt_fontprop::medium; |
262 | p.weight = rxvt_fontprop::medium; |
233 | p.slant = rxvt_fontprop::roman; |
263 | p.slant = rxvt_fontprop::roman; |
234 | |
264 | |
235 | return p; |
265 | return p; |
236 | } |
266 | } |
… | |
… | |
245 | |
275 | |
246 | bool has_codepoint (uint32_t unicode) |
276 | bool has_codepoint (uint32_t unicode) |
247 | { |
277 | { |
248 | if (unicode <= 0x001f) |
278 | if (unicode <= 0x001f) |
249 | return true; |
279 | return true; |
|
|
280 | |
250 | if (unicode >= 0x0080 && unicode <= 0x009f) |
281 | if (unicode >= 0x0080 && unicode <= 0x009f) |
251 | return true; |
282 | return true; |
252 | |
283 | |
253 | if (unicode >= 0x2500 && unicode <= 0x257f |
284 | if (unicode >= 0x2500 && unicode <= 0x257f |
254 | && linedraw_cmds[unicode - 0x2500]) |
285 | && linedraw_cmds[unicode - 0x2500]) |
|
|
286 | return true; |
|
|
287 | |
|
|
288 | if (IS_COMPOSE (unicode)) |
255 | return true; |
289 | return true; |
256 | |
290 | |
257 | switch (unicode) |
291 | switch (unicode) |
258 | { |
292 | { |
259 | case ZERO_WIDTH_CHAR: |
293 | case ZERO_WIDTH_CHAR: |
… | |
… | |
261 | } |
295 | } |
262 | |
296 | |
263 | return false; |
297 | return false; |
264 | } |
298 | } |
265 | |
299 | |
266 | void draw (int x, int y, |
300 | void draw (rxvt_drawable &d, int x, int y, |
267 | const text_t *text, int len, |
301 | const text_t *text, int len, |
268 | int fg, int bg); |
302 | int fg, int bg); |
269 | }; |
303 | }; |
270 | |
304 | |
271 | void |
305 | void |
272 | rxvt_font_default::draw (int x, int y, |
306 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
273 | const text_t *text, int len, |
307 | const text_t *text, int len, |
274 | int fg, int bg) |
308 | int fg, int bg) |
275 | { |
309 | { |
276 | 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); |
277 | |
311 | |
278 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
312 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
279 | |
313 | |
280 | while (len--) |
314 | while (len--) |
281 | { |
315 | { |
|
|
316 | compose_char *cc; |
282 | text_t t = *text++; |
317 | text_t t = *text++; |
283 | |
318 | |
|
|
319 | // is it in our linedrawing table? |
284 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
320 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
285 | { |
321 | { |
286 | const char *p = linedraw_cmds[t - 0x2500]; |
322 | const char *p = linedraw_cmds[t - 0x2500]; |
287 | |
323 | |
288 | 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; |
289 | 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; |
290 | |
326 | |
291 | XGCValues gcv; |
327 | XGCValues gcv; |
292 | |
328 | |
293 | while (*p) |
329 | while (*p) |
294 | { |
330 | { |
295 | switch (*p++) |
331 | switch (*p++) |
296 | { |
332 | { |
297 | case '1': |
333 | case '1': |
298 | gcv.line_width = 0; |
334 | gcv.line_width = 0; |
299 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
335 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
300 | break; |
336 | break; |
301 | |
337 | |
302 | case '2': |
338 | case '2': |
303 | gcv.line_width = 2; |
339 | gcv.line_width = 2; |
304 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
340 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
305 | break; |
341 | break; |
306 | |
342 | |
307 | 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; |
308 | 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; |
309 | 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; |
310 | 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; |
311 | 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; |
312 | 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; |
313 | } |
349 | } |
314 | } |
350 | } |
315 | |
351 | |
316 | gcv.line_width = 0; |
352 | gcv.line_width = 0; |
317 | 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); |
318 | } |
360 | } |
319 | else |
361 | else |
320 | switch (*text++) |
362 | switch (t) |
321 | { |
363 | { |
322 | case NOCHAR: |
|
|
323 | case ZERO_WIDTH_CHAR: |
364 | case ZERO_WIDTH_CHAR: |
324 | break; |
365 | break; |
325 | default: |
366 | default: |
326 | 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; |
327 | } |
378 | } |
328 | |
379 | |
329 | x += r->TermWin.fwidth; |
380 | x += r->TermWin.fwidth; |
330 | } |
381 | } |
331 | } |
382 | } |
… | |
… | |
336 | rxvt_font_x11 () { f = 0; } |
387 | rxvt_font_x11 () { f = 0; } |
337 | |
388 | |
338 | void clear (); |
389 | void clear (); |
339 | |
390 | |
340 | rxvt_fontprop properties (); |
391 | rxvt_fontprop properties (); |
341 | rxvt_fontprop properties (XFontStruct *f); |
|
|
342 | |
392 | |
343 | bool load (const rxvt_fontprop &prop); |
393 | bool load (const rxvt_fontprop &prop); |
344 | |
394 | |
345 | bool has_codepoint (uint32_t unicode); |
395 | bool has_codepoint (uint32_t unicode); |
346 | |
396 | |
347 | void draw (int x, int y, |
397 | void draw (rxvt_drawable &d, int x, int y, |
348 | const text_t *text, int len, |
398 | const text_t *text, int len, |
349 | int fg, int bg); |
399 | int fg, int bg); |
350 | |
400 | |
351 | XFontStruct *f; |
401 | XFontStruct *f; |
352 | codeset cs; |
402 | codeset cs; |
353 | bool enc2b, encm; |
403 | bool enc2b, encm; |
354 | |
404 | |
355 | 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); |
356 | }; |
409 | }; |
357 | |
410 | |
358 | const char * |
411 | const char * |
359 | 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 |
360 | { |
413 | { |
… | |
… | |
367 | } |
420 | } |
368 | |
421 | |
369 | rxvt_fontprop |
422 | rxvt_fontprop |
370 | rxvt_font_x11::properties () |
423 | rxvt_font_x11::properties () |
371 | { |
424 | { |
372 | return properties (f); |
|
|
373 | } |
|
|
374 | |
|
|
375 | rxvt_fontprop |
|
|
376 | rxvt_font_x11::properties (XFontStruct *f) |
|
|
377 | { |
|
|
378 | rxvt_fontprop p; |
425 | rxvt_fontprop p; |
|
|
426 | set_properties (p, f); |
|
|
427 | return p; |
|
|
428 | } |
379 | |
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 | { |
380 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
444 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
381 | const char *slant = get_property (f, "SLANT", "r"); |
445 | const char *slant = get_property (f, "SLANT", "r"); |
382 | |
446 | |
383 | p.height = height; |
447 | unsigned long height; |
384 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
448 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
385 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
449 | return false; |
386 | |
450 | |
387 | 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); |
388 | } |
519 | } |
389 | |
520 | |
390 | bool |
521 | bool |
391 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
522 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
392 | { |
523 | { |
393 | clear (); |
524 | clear (); |
394 | |
525 | |
395 | char **list; |
526 | char **list; |
396 | int count; |
527 | int count; |
397 | XFontStruct *info; |
|
|
398 | list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info); |
528 | list = XListFonts (DISPLAY, name, 512, &count); |
|
|
529 | set_name (0); |
399 | |
530 | |
400 | if (!list) |
531 | if (!list) |
401 | return false; |
532 | return false; |
402 | |
533 | |
403 | int bestdiff = 0x7fffffff; |
534 | int bestdiff = 0x7fffffff; |
404 | XFontStruct *best = 0; |
|
|
405 | for (int i = 0; i < count; i++) |
535 | for (int i = 0; i < count; i++) |
406 | { |
536 | { |
407 | XFontStruct *f = info + i; |
537 | rxvt_fontprop p; |
|
|
538 | char fname[1024]; |
|
|
539 | fix_scalable (fname, list[i], prop); |
408 | |
540 | |
|
|
541 | if (!set_properties (p, fname)) |
|
|
542 | continue; |
|
|
543 | |
409 | if (f->ascent + f->descent <= prop.height) // weed out too large fonts |
544 | if (p.height > prop.height) // weed out too large fonts |
410 | { |
545 | continue; |
411 | rxvt_fontprop p = properties (f); |
546 | |
412 | int diff = (prop.height - f->ascent + f->descent) * 32 |
547 | int diff = (prop.height - p.height) * 32 |
413 | + abs (prop.weight - p.weight) |
548 | + abs (prop.weight - p.weight) |
414 | + abs (prop.slant - p.slant ); |
549 | + abs (prop.slant - p.slant ); |
415 | |
550 | |
416 | if (!best // compare against best found so far |
551 | if (!name // compare against best found so far |
417 | || diff < bestdiff) |
552 | || diff < bestdiff) |
418 | { |
553 | { |
419 | best = f; |
554 | set_name (strdup (fname)); |
420 | bestdiff = diff; |
555 | bestdiff = diff; |
421 | } |
556 | } |
422 | } |
|
|
423 | } |
557 | } |
424 | |
558 | |
425 | set_name (strdup (list[best - info])); |
559 | XFreeFontNames (list); |
426 | |
560 | |
427 | XFreeFontInfo (list, info, count); |
561 | if (!name) |
|
|
562 | return false; |
428 | |
563 | |
429 | f = XLoadQueryFont (DISPLAY, name); |
564 | f = XLoadQueryFont (DISPLAY, name); |
430 | |
565 | |
431 | if (!f) |
566 | if (!f) |
432 | return false; |
567 | return false; |
433 | |
|
|
434 | unsigned long value; |
|
|
435 | |
568 | |
436 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
569 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
437 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
570 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
438 | |
571 | |
439 | if (registry && encoding) |
572 | if (registry && encoding) |
… | |
… | |
526 | /* check wether the character exists in _this_ font. horrible. */ |
659 | /* check wether the character exists in _this_ font. horrible. */ |
527 | XCharStruct *xcs; |
660 | XCharStruct *xcs; |
528 | |
661 | |
529 | if (encm) |
662 | if (encm) |
530 | { |
663 | { |
531 | int byte1 = ch >> 8; |
664 | unsigned char byte1 = ch >> 8; |
532 | int byte2 = ch & 255; |
665 | unsigned char byte2 = ch & 255; |
533 | |
666 | |
534 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
667 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
535 | || 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) |
536 | return false; |
669 | return false; |
537 | |
670 | |
… | |
… | |
560 | |
693 | |
561 | return true; |
694 | return true; |
562 | } |
695 | } |
563 | |
696 | |
564 | void |
697 | void |
565 | rxvt_font_x11::draw (int x, int y, |
698 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
566 | const text_t *text, int len, |
699 | const text_t *text, int len, |
567 | int fg, int bg) |
700 | int fg, int bg) |
568 | { |
701 | { |
569 | // this looks like a mess /. |
702 | // this looks like a mess /. |
570 | // and it is a mess /. |
703 | // and it is a mess /. |
… | |
… | |
586 | { |
719 | { |
587 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
720 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
588 | |
721 | |
589 | if (bg == Color_bg && !slow) |
722 | if (bg == Color_bg && !slow) |
590 | { |
723 | { |
591 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
724 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
592 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
725 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
593 | } |
726 | } |
594 | else |
727 | else |
595 | { |
728 | { |
596 | 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); |
597 | |
730 | |
598 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
731 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
599 | |
732 | |
600 | if (slow) |
733 | if (slow) |
601 | { |
734 | { |
602 | do |
735 | do |
603 | { |
736 | { |
604 | if (xc->byte1 || xc->byte2) |
737 | if (xc->byte1 || xc->byte2) |
605 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
738 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
606 | |
739 | |
607 | x += r->TermWin.fwidth; |
740 | x += r->TermWin.fwidth; |
608 | xc++; len--; |
741 | xc++; len--; |
609 | } |
742 | } |
610 | while (len); |
743 | while (len); |
611 | } |
744 | } |
612 | else |
745 | else |
613 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
746 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
614 | } |
747 | } |
615 | } |
748 | } |
616 | else |
749 | else |
617 | { |
750 | { |
618 | const char *xc = enc_char (text, len, cs, slow); |
751 | const char *xc = enc_char (text, len, cs, slow); |
619 | |
752 | |
620 | if (bg == Color_bg && !slow) |
753 | if (bg == Color_bg && !slow) |
621 | { |
754 | { |
622 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
755 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
623 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
756 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
624 | } |
757 | } |
625 | else |
758 | else |
626 | { |
759 | { |
627 | 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); |
628 | |
761 | |
629 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
762 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
630 | |
763 | |
631 | if (slow) |
764 | if (slow) |
632 | { |
765 | { |
633 | do |
766 | do |
634 | { |
767 | { |
635 | if (*xc) |
768 | if (*xc) |
636 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
769 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
637 | |
770 | |
638 | x += r->TermWin.fwidth; |
771 | x += r->TermWin.fwidth; |
639 | xc++; len--; |
772 | xc++; len--; |
640 | } |
773 | } |
641 | while (len); |
774 | while (len); |
642 | } |
775 | } |
643 | else |
776 | else |
644 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
777 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
645 | } |
778 | } |
646 | } |
779 | } |
647 | } |
780 | } |
648 | |
781 | |
649 | ///////////////////////////////////////////////////////////////////////////// |
782 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
654 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
787 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
655 | #define SWATHBITS 8 |
788 | #define SWATHBITS 8 |
656 | #endif |
789 | #endif |
657 | |
790 | |
658 | struct rxvt_font_xft : rxvt_font { |
791 | struct rxvt_font_xft : rxvt_font { |
659 | #if 0 |
|
|
660 | enum { |
|
|
661 | SWATHCOUNT = 1 << (21 - UNIBITS), |
|
|
662 | SWATHSIZE = 1 << (SWATHBITS - 5) |
|
|
663 | }; |
|
|
664 | typedef uint32_t swath[SWATHSIZE]; |
|
|
665 | |
|
|
666 | swath *cvr[SWATHCOUNT]; |
|
|
667 | #endif |
|
|
668 | |
|
|
669 | #if 0 |
|
|
670 | void gen_coverage_swath (unsigned int page); |
|
|
671 | |
|
|
672 | bool has_char (uint32_t ch) |
|
|
673 | { |
|
|
674 | unsigned int page = ch >> SWATHBITS; |
|
|
675 | unsigned int idx = ch & ((1 << SWATHBITS) - 1); |
|
|
676 | |
|
|
677 | if (page >= SWATHCOUNT) |
|
|
678 | return false; |
|
|
679 | |
|
|
680 | if (!cvr[page]) gen_coverage_swath (page); |
|
|
681 | |
|
|
682 | return cvr[page][idx >> 5] & (1 << (idx & 31)); |
|
|
683 | } |
|
|
684 | #endif |
|
|
685 | rxvt_font_xft () { f = 0; d = 0; } |
792 | rxvt_font_xft () { f = 0; } |
686 | |
793 | |
687 | void clear (); |
794 | void clear (); |
688 | |
795 | |
689 | rxvt_fontprop properties (); |
796 | rxvt_fontprop properties (); |
690 | |
797 | |
691 | bool load (const rxvt_fontprop &prop); |
798 | bool load (const rxvt_fontprop &prop); |
692 | |
799 | |
693 | void draw (int x, int y, |
800 | void draw (rxvt_drawable &d, int x, int y, |
694 | const text_t *text, int len, |
801 | const text_t *text, int len, |
695 | int fg, int bg); |
802 | int fg, int bg); |
696 | |
803 | |
697 | bool has_codepoint (uint32_t unicode); |
804 | bool has_codepoint (uint32_t unicode); |
698 | |
805 | |
699 | protected: |
806 | protected: |
700 | XftFont *f; |
807 | XftFont *f; |
701 | XftDraw *d; |
|
|
702 | |
|
|
703 | #if 0 |
|
|
704 | virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0; |
|
|
705 | void set_swath (uint32_t ch) |
|
|
706 | { |
|
|
707 | cvr[ch >> SWATHBITS] |= 1 << (ch & ((1 << SWATHBITS) - 1)); |
|
|
708 | } |
|
|
709 | #endif |
|
|
710 | }; |
808 | }; |
711 | |
809 | |
712 | void |
810 | void |
713 | rxvt_font_xft::clear () |
811 | rxvt_font_xft::clear () |
714 | { |
812 | { |
715 | if (f) |
813 | if (f) |
716 | { |
814 | { |
717 | XftFontClose (DISPLAY, f); |
815 | XftFontClose (DISPLAY, f); |
718 | f = 0; |
816 | f = 0; |
719 | } |
817 | } |
720 | |
|
|
721 | if (d) |
|
|
722 | { |
|
|
723 | XftDrawDestroy (d); |
|
|
724 | d = 0; |
|
|
725 | } |
|
|
726 | |
|
|
727 | #if 0 |
|
|
728 | for (int i = 0; i < SWATHCOUNT; i++) |
|
|
729 | delete cvr[i]; |
|
|
730 | #endif |
|
|
731 | } |
818 | } |
732 | |
819 | |
733 | rxvt_fontprop |
820 | rxvt_fontprop |
734 | rxvt_font_xft::properties () |
821 | rxvt_font_xft::properties () |
735 | { |
822 | { |
736 | rxvt_fontprop p; |
823 | rxvt_fontprop p; |
737 | |
824 | |
738 | FT_Face face = XftLockFace (f); |
825 | FT_Face face = XftLockFace (f); |
739 | |
826 | |
740 | p.height = height; |
827 | p.width = width; p.height = height; |
741 | 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; |
742 | 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; |
743 | |
830 | |
744 | XftUnlockFace (f); |
831 | XftUnlockFace (f); |
745 | |
832 | |
… | |
… | |
767 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
854 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
768 | |
855 | |
769 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
856 | if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
770 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
857 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
771 | |
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 | |
772 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
865 | //FcPatternAddBool (p, FC_MINSPACE, 1); |
773 | |
866 | |
774 | XftResult result; |
867 | XftResult result; |
775 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
868 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
776 | |
869 | |
… | |
… | |
828 | XftUnlockFace (f); |
921 | XftUnlockFace (f); |
829 | |
922 | |
830 | return true; |
923 | return true; |
831 | } |
924 | } |
832 | |
925 | |
833 | #if 0 |
|
|
834 | void rxvt_font::gen_coverage_swath (unsigned int page) |
|
|
835 | { |
|
|
836 | cvr[page] = new swath; |
|
|
837 | |
|
|
838 | for (int i = 0; i < SWATHSIZE; i++) |
|
|
839 | cvr[page][i] = 0; |
|
|
840 | |
|
|
841 | populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1); |
|
|
842 | } |
|
|
843 | #endif |
|
|
844 | |
|
|
845 | bool |
926 | bool |
846 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
927 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
847 | { |
928 | { |
848 | return XftCharExists (DISPLAY, f, unicode); |
929 | return XftCharExists (DISPLAY, f, unicode); |
849 | } |
930 | } |
850 | |
931 | |
851 | void |
932 | void |
852 | rxvt_font_xft::draw (int x, int y, |
933 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
853 | const text_t *text, int len, |
934 | const text_t *text, int len, |
854 | int fg, int bg) |
935 | int fg, int bg) |
855 | { |
936 | { |
856 | if (!d) |
|
|
857 | { |
|
|
858 | dR; |
|
|
859 | d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP); |
|
|
860 | } |
|
|
861 | |
|
|
862 | if (bg >= 0 && bg != Color_bg) |
|
|
863 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
|
|
864 | else |
|
|
865 | 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); |
866 | |
938 | |
867 | if (!slow && width == r->TermWin.fwidth) |
939 | if (!slow && width == r->TermWin.fwidth && 0) |
868 | { |
940 | { |
869 | if (sizeof (text_t) == sizeof (FcChar16)) |
941 | if (sizeof (text_t) == sizeof (FcChar16)) |
870 | 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); |
871 | else |
943 | else |
872 | 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); |
… | |
… | |
875 | { |
947 | { |
876 | while (len) |
948 | while (len) |
877 | { |
949 | { |
878 | if (*text != NOCHAR && *text != ' ') |
950 | if (*text != NOCHAR && *text != ' ') |
879 | { |
951 | { |
|
|
952 | int fwidth = r->TermWin.fwidth; |
|
|
953 | if (len >= 2 && text[1] == NOCHAR) |
|
|
954 | fwidth *= 2; |
|
|
955 | |
|
|
956 | XGlyphInfo extents; |
880 | if (sizeof (text_t) == sizeof (FcChar16)) |
957 | if (sizeof (text_t) == sizeof (FcChar16)) |
881 | 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 | } |
882 | else |
963 | else |
883 | 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 | } |
884 | } |
970 | } |
885 | |
971 | |
886 | x += r->TermWin.fwidth; |
972 | x += r->TermWin.fwidth; |
887 | text++; |
973 | text++; |
888 | len--; |
974 | len--; |
… | |
… | |
892 | #endif |
978 | #endif |
893 | |
979 | |
894 | ///////////////////////////////////////////////////////////////////////////// |
980 | ///////////////////////////////////////////////////////////////////////////// |
895 | |
981 | |
896 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
982 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
897 | #ifdef EXPLICIT_CONTEXT |
|
|
898 | : r(r) |
983 | : r (r) |
899 | #endif |
|
|
900 | { |
984 | { |
901 | clear (); |
985 | clear (); |
902 | } |
986 | } |
903 | |
987 | |
904 | rxvt_fontset::~rxvt_fontset () |
988 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
907 | } |
991 | } |
908 | |
992 | |
909 | void |
993 | void |
910 | rxvt_fontset::clear () |
994 | rxvt_fontset::clear () |
911 | { |
995 | { |
912 | for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) |
996 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
913 | FONT_UNREF (*i); |
997 | FONT_UNREF (*i); |
914 | |
998 | |
915 | fonts.clear (); |
999 | fonts.clear (); |
916 | base_id = 0; |
1000 | base_id = 0; |
917 | base_prop.height = 0x7fffffff; |
1001 | base_prop.height = 0x7fffffff; |
… | |
… | |
944 | f = new rxvt_font_x11; |
1028 | f = new rxvt_font_x11; |
945 | } |
1029 | } |
946 | else |
1030 | else |
947 | f = new rxvt_font_x11; |
1031 | f = new rxvt_font_x11; |
948 | |
1032 | |
|
|
1033 | f->fs = this; |
949 | f->set_term (r); |
1034 | f->set_term (r); |
950 | f->set_name (strdup (name)); |
1035 | f->set_name (strdup (name)); |
951 | |
1036 | |
952 | f->cs = cs; |
1037 | f->cs = cs; |
953 | f->loaded = false; |
1038 | f->loaded = false; |
… | |
… | |
971 | |
1056 | |
972 | if (*desc == '[') |
1057 | if (*desc == '[') |
973 | { |
1058 | { |
974 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1059 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
975 | |
1060 | |
976 | const char *extra = desc++; |
1061 | //const char *extra = desc++; // not yet used |
977 | |
1062 | |
978 | desc = strchr (desc, ']'); |
1063 | desc = strchr (desc, ']'); |
979 | |
1064 | |
980 | if (!desc) |
1065 | if (!desc) |
981 | { |
1066 | { |
… | |
… | |
1020 | } |
1105 | } |
1021 | |
1106 | |
1022 | return true; |
1107 | return true; |
1023 | } |
1108 | } |
1024 | |
1109 | |
1025 | void |
1110 | bool |
1026 | rxvt_fontset::populate (const char *desc) |
1111 | rxvt_fontset::populate (const char *desc) |
1027 | { |
1112 | { |
1028 | clear (); |
1113 | clear (); |
1029 | |
1114 | |
1030 | fonts.push_back (new_font (0, CS_UNICODE)); |
1115 | fonts.push_back (new_font (0, CS_UNICODE)); |
… | |
… | |
1034 | |
1119 | |
1035 | if (!base_id) |
1120 | if (!base_id) |
1036 | base_id = 1; |
1121 | base_id = 1; |
1037 | |
1122 | |
1038 | // we currently need a base-font, no matter what |
1123 | // we currently need a base-font, no matter what |
1039 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1124 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1040 | { |
1125 | { |
|
|
1126 | puts ("unable to load specified font (s), falling back to 'fixed'\n"); |
1041 | add_fonts ("fixed"); |
1127 | add_fonts ("fixed"); |
1042 | base_id = fonts.size () - 1; |
1128 | base_id = fonts.size () - 1; |
1043 | } |
1129 | } |
1044 | |
1130 | |
1045 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1131 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1046 | { |
1132 | return false; |
1047 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
|
|
1048 | exit (1); |
|
|
1049 | } |
|
|
1050 | |
1133 | |
1051 | base_prop = fonts[base_id]->properties (); |
1134 | base_prop = fonts[base_id]->properties (); |
|
|
1135 | |
|
|
1136 | return true; |
1052 | } |
1137 | } |
1053 | |
1138 | |
1054 | int |
1139 | int |
1055 | rxvt_fontset::find_font (uint32_t unicode) |
1140 | rxvt_fontset::find_font (uint32_t unicode) |
1056 | { |
1141 | { |
1057 | for (int i = 0; i < fonts.size (); i++) |
1142 | for (unsigned int i = 0; i < fonts.size (); i++) |
1058 | { |
1143 | { |
1059 | rxvt_font *f = fonts[i]; |
1144 | rxvt_font *f = fonts[i]; |
1060 | |
1145 | |
1061 | if (!f->loaded) |
1146 | if (!f->loaded) |
1062 | { |
1147 | { |