1 | /*--------------------------------*-C-*---------------------------------*; |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: defaultfont.C |
2 | * File: defaultfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
… | |
… | |
24 | #include "defaultfont.h" |
24 | #include "defaultfont.h" |
25 | |
25 | |
26 | #include <cstdlib> |
26 | #include <cstdlib> |
27 | |
27 | |
28 | #define DISPLAY r->display->display |
28 | #define DISPLAY r->display->display |
29 | #define GC r->TermWin.gc |
29 | #define TGC r->TermWin.gc |
30 | |
30 | |
31 | const struct rxvt_fallback_font { |
31 | const struct rxvt_fallback_font { |
32 | codeset cs; |
32 | codeset cs; |
33 | const char *name; |
33 | const char *name; |
34 | } fallback_fonts[] = { |
34 | } fallback_fonts[] = { |
35 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
35 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
36 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
36 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
37 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
37 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
38 | |
38 | |
39 | #if ENCODING_EU |
39 | #if ENCODING_EU |
40 | // cyrillic |
40 | // cyrillic |
41 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
41 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
42 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
42 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
43 | |
43 | |
44 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
44 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
45 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
45 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
46 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
46 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
47 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
47 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
48 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
48 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
49 | { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, |
49 | { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, |
50 | { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, |
50 | { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, |
51 | { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, |
51 | { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, |
52 | { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, |
52 | { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, |
53 | { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, |
53 | { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, |
54 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
54 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
55 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
55 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
56 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
56 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
57 | #endif |
57 | #endif |
58 | |
58 | |
59 | // japanese |
59 | // japanese |
60 | #if ENCODING_JP || ENCODING_JP_EXT |
60 | #if ENCODING_JP || ENCODING_JP_EXT |
61 | # if XFT |
61 | # if XFT |
… | |
… | |
63 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
63 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
64 | # endif |
64 | # endif |
65 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
65 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
66 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
66 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
67 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
67 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
|
|
68 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
|
|
69 | { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
|
|
70 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
68 | #endif |
71 | #endif |
69 | |
72 | |
70 | #if ENCODING_CN || ENCODING_CN_EXT |
73 | #if ENCODING_CN || ENCODING_CN_EXT |
71 | # if XFT |
74 | # if XFT |
72 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
75 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
… | |
… | |
89 | #endif |
92 | #endif |
90 | |
93 | |
91 | #if XFT |
94 | #if XFT |
92 | { CS_UNICODE, "xft:Andale Mono" }, |
95 | { CS_UNICODE, "xft:Andale Mono" }, |
93 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
96 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
|
|
97 | { CS_UNICODE, "xft:FreeMono" }, |
94 | #endif |
98 | #endif |
95 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
96 | { CS_UNICODE, "xft:FreeMono" }, |
|
|
97 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
100 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
98 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
101 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
102 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
100 | |
103 | |
101 | #if UNICODE_3 && XFT |
104 | #if UNICODE_3 && XFT |
… | |
… | |
133 | { |
136 | { |
134 | if (len > enc_len) |
137 | if (len > enc_len) |
135 | { |
138 | { |
136 | free (enc_buf); |
139 | free (enc_buf); |
137 | enc_buf = malloc (len); |
140 | enc_buf = malloc (len); |
|
|
141 | enc_len = len; |
138 | } |
142 | } |
139 | |
143 | |
140 | return enc_buf; |
144 | return enc_buf; |
141 | } |
145 | } |
142 | |
146 | |
… | |
… | |
194 | else if (color >= 0) |
198 | else if (color >= 0) |
195 | { |
199 | { |
196 | #if XFT |
200 | #if XFT |
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
201 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
198 | #else |
202 | #else |
199 | XSetForeground (d.display->display, GC, r->PixColors[color]); |
203 | XSetForeground (d.display->display, TGC, r->PixColors[color]); |
200 | XFillRectangle (d.display->display, d, GC, x, y, w, h); |
204 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
201 | #endif |
205 | #endif |
202 | } |
206 | } |
203 | } |
207 | } |
204 | |
208 | |
205 | static const char *linedraw_cmds[128] = { |
209 | #include "table/linedraw.h" |
206 | "1-", "2-", "1|", "2|", |
|
|
207 | 0, 0, 0, 0, |
|
|
208 | 0, 0, 0, 0, |
|
|
209 | "1HV", "2H1V", "1H2V", "2HV", |
|
|
210 | |
|
|
211 | // 2510 |
|
|
212 | "1hV", "2h1V", "1h2V", "2hV", |
|
|
213 | "1Hv", "2H1v", "1H2v", "2Hv", |
|
|
214 | "1hv", "2h1v", "1h2v", "2hv", |
|
|
215 | "1H|", "2H1|", "1HV2v", "1Hv2V", |
|
|
216 | |
|
|
217 | // 2520 |
|
|
218 | "1H2|", "2Hv1V", "2HV1v", "2H|", |
|
|
219 | "1h|", "2h1|", "1hV2v", "1hv2V", |
|
|
220 | "1h2|", "2hv1V", "1v2hV", "2h|", |
|
|
221 | "1-V", "2h1HV", "2H1hV", "2-1V", |
|
|
222 | |
|
|
223 | // 2530 |
|
|
224 | "1-2V", "2hV1H", "1h2HV", "2-V", |
|
|
225 | "1-v", "1vH2h", "1hv2H", "1v2-", |
|
|
226 | "1-2v", "1H2hv", "1h2Hv", "2-v", |
|
|
227 | "1-|", "1|H2h", "1h|2H", "1|2-", |
|
|
228 | |
|
|
229 | // 2540 |
|
|
230 | "1-V2v", "1-v2V", "1-2|", "1HV2hv", |
|
|
231 | "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v", |
|
|
232 | "1v2-V", "1H2h|", "1h2H|", "2-|", |
|
|
233 | 0, 0, 0, 0, |
|
|
234 | |
|
|
235 | // 2550 |
|
|
236 | 0, 0, 0, 0, |
|
|
237 | 0, 0, 0, 0, |
|
|
238 | 0, 0, 0, 0, |
|
|
239 | 0, 0, 0, 0, |
|
|
240 | |
|
|
241 | // 2560 |
|
|
242 | 0, 0, 0, 0, |
|
|
243 | 0, 0, 0, 0, |
|
|
244 | 0, 0, 0, 0, |
|
|
245 | 0, "A", "B", "C", |
|
|
246 | |
|
|
247 | // 2570 |
|
|
248 | "D", "1/", "1\\", "1/\\", |
|
|
249 | "1h", "1v", "1H", "1V", |
|
|
250 | "2h", "2v", "2H", "2V", |
|
|
251 | "1h2H", "1v2V", "1H2h", "1V2v" |
|
|
252 | |
|
|
253 | // to be done |
|
|
254 | }; |
|
|
255 | |
210 | |
256 | struct rxvt_font_default : rxvt_font { |
211 | struct rxvt_font_default : rxvt_font { |
|
|
212 | |
257 | rxvt_fontprop properties () |
213 | rxvt_fontprop properties () |
258 | { |
214 | { |
259 | rxvt_fontprop p; |
215 | rxvt_fontprop p; |
260 | |
216 | |
261 | p.width = p.height = 1; |
217 | p.width = p.height = 1; |
… | |
… | |
268 | bool load (const rxvt_fontprop &prop) |
224 | bool load (const rxvt_fontprop &prop) |
269 | { |
225 | { |
270 | width = 1; height = 1; |
226 | width = 1; height = 1; |
271 | ascent = 1; descent = 0; |
227 | ascent = 1; descent = 0; |
272 | |
228 | |
273 | set_name ("built-in pseudofont"); |
229 | set_name (strdup ("built-in pseudofont")); |
274 | |
230 | |
275 | return true; |
231 | return true; |
276 | } |
232 | } |
277 | |
233 | |
278 | bool has_codepoint (unicode_t unicode) |
234 | bool has_codepoint (unicode_t unicode) |
279 | { |
235 | { |
280 | if (unicode <= 0x001f) |
236 | if (unicode <= 0x001f) |
281 | return true; |
237 | return true; |
282 | |
238 | |
283 | if (unicode >= 0x0080 && unicode <= 0x009f) |
239 | if (unicode <= 0x007f) |
|
|
240 | return false; |
|
|
241 | |
|
|
242 | if (unicode <= 0x009f) |
284 | return true; |
243 | return true; |
285 | |
244 | |
286 | if (unicode >= 0x2500 && unicode <= 0x257f |
245 | if (unicode >= 0x2500 && unicode <= 0x259f) |
287 | && linedraw_cmds[unicode - 0x2500]) |
|
|
288 | return true; |
246 | return true; |
289 | |
247 | |
290 | if (IS_COMPOSE (unicode)) |
248 | if (IS_COMPOSE (unicode)) |
291 | return true; |
249 | return true; |
292 | |
250 | |
… | |
… | |
309 | const text_t *text, int len, |
267 | const text_t *text, int len, |
310 | int fg, int bg) |
268 | int fg, int bg) |
311 | { |
269 | { |
312 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
270 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
313 | |
271 | |
314 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
272 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
315 | |
273 | |
316 | while (len--) |
274 | while (len--) |
317 | { |
275 | { |
318 | #if ENABLE_COMBINING |
276 | #if ENABLE_COMBINING |
319 | compose_char *cc; |
277 | compose_char *cc; |
320 | #endif |
278 | #endif |
321 | text_t t = *text++; |
279 | text_t t = *text++; |
322 | |
280 | |
323 | // is it in our linedrawing table? |
281 | if (0x2500 <= t && t <= 0x259f) |
324 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
282 | { |
|
|
283 | uint16_t offs = linedraw_offs[t - 0x2500]; |
|
|
284 | uint32_t *a = linedraw_command + (offs >> 4); |
|
|
285 | uint32_t *b = a + (offs & 15); |
|
|
286 | |
|
|
287 | int W = r->TermWin.fwidth; |
|
|
288 | int H = r->TermWin.fheight; |
|
|
289 | |
|
|
290 | int x_[16]; |
|
|
291 | int y_[16]; |
|
|
292 | |
|
|
293 | for (int i = 0; i <= 8; i++) |
325 | { |
294 | { |
326 | const char *p = linedraw_cmds[t - 0x2500]; |
295 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
296 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
|
|
297 | } |
327 | |
298 | |
328 | int W = r->TermWin.fwidth , w = (W - 1) / 2; |
299 | x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; |
329 | int H = r->TermWin.fheight, h = (H - 1) / 2; |
300 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
330 | int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; |
|
|
331 | int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; |
|
|
332 | |
301 | |
333 | XGCValues gcv; |
302 | XGCValues gcv; |
334 | |
303 | |
335 | gcv.cap_style = CapNotLast; |
304 | gcv.cap_style = CapButt; |
|
|
305 | gcv.line_width = 0; |
336 | XChangeGC (d.display->display, GC, GCCapStyle, &gcv); |
306 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
337 | |
307 | |
338 | while (*p) |
308 | while (a < b) |
339 | { |
309 | { |
|
|
310 | uint32_t command = *a++; |
|
|
311 | |
|
|
312 | int op = (command >> 24) & 255; |
|
|
313 | int a = (command >> 20) & 15; |
|
|
314 | int b = (command >> 16) & 15; |
|
|
315 | int x1 = x_[(command >> 12) & 15]; |
|
|
316 | int y1 = y_[(command >> 8) & 15]; |
|
|
317 | int x2 = x_[(command >> 4) & 15]; |
|
|
318 | int y2 = y_[(command >> 0) & 15]; |
|
|
319 | |
340 | switch (*p++) |
320 | switch (op) |
341 | { |
321 | { |
342 | case '1': |
322 | case 0: // line |
343 | gcv.line_width = 0; |
323 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
344 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
345 | break; |
324 | break; |
346 | |
325 | |
347 | case '2': |
326 | case 1: // rectangle, possibly stippled |
|
|
327 | if (a) |
|
|
328 | { |
|
|
329 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
|
|
330 | |
|
|
331 | gcv.fill_style = FillStippled; |
|
|
332 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
333 | gcv.ts_x_origin = x; |
|
|
334 | gcv.ts_y_origin = y; |
|
|
335 | |
|
|
336 | XChangeGC (d.display->display, TGC, |
|
|
337 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
338 | &gcv); |
|
|
339 | } |
|
|
340 | |
|
|
341 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
|
|
342 | |
|
|
343 | if (a) |
|
|
344 | { |
|
|
345 | XFreePixmap (d.display->display, gcv.stipple); |
348 | gcv.line_width = 3; |
346 | gcv.stipple = 0; |
|
|
347 | gcv.fill_style = FillSolid; |
349 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
348 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
349 | } |
350 | break; |
350 | break; |
351 | |
351 | case 2: // arc |
352 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1+1, y1 ); break; |
352 | XDrawArc (d.display->display, d, TGC, |
353 | case 'H': XDrawLine (d.display->display, d, GC, x2, y1, x1-1, y1 ); break; |
353 | x1 - W/2, y1 - H/2, W-1, H-1, |
354 | case '-': XDrawLine (d.display->display, d, GC, x0, y1, x2 , y1 ); break; |
354 | (a - 1) * 90*64, (b - 1) * 90*64); |
355 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y1+1); break; |
355 | break; |
356 | case 'V': XDrawLine (d.display->display, d, GC, x1, y2, x1 , y1-1); break; |
|
|
357 | case '|': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y2 ); break; |
|
|
358 | |
|
|
359 | case '/' : XDrawLine (d.display->display, d, GC, x0, y2, x2 , y0 ); break; |
|
|
360 | case '\\': XDrawLine (d.display->display, d, GC, x0, y0, x2 , y2 ); break; |
|
|
361 | |
|
|
362 | case 'A': XDrawArc (d.display->display, d, GC, x1 , y1 , W-1, H-1, 90*64, 90*64); break; |
|
|
363 | case 'B': XDrawArc (d.display->display, d, GC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break; |
|
|
364 | case 'C': XDrawArc (d.display->display, d, GC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break; |
|
|
365 | case 'D': XDrawArc (d.display->display, d, GC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break; |
|
|
366 | } |
356 | } |
367 | } |
357 | } |
368 | |
|
|
369 | gcv.line_width = 0; |
|
|
370 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
371 | } |
358 | } |
372 | |
|
|
373 | #if ENABLE_COMBINING |
359 | #if ENABLE_COMBINING |
374 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
360 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
375 | { |
361 | { |
376 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
362 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
377 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
363 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
… | |
… | |
389 | else |
375 | else |
390 | switch (t) |
376 | switch (t) |
391 | { |
377 | { |
392 | case ZERO_WIDTH_CHAR: |
378 | case ZERO_WIDTH_CHAR: |
393 | break; |
379 | break; |
|
|
380 | |
394 | default: |
381 | default: |
395 | int w = 0; |
382 | int w = 0; |
396 | while (len > 0 && *text == NOCHAR) |
383 | while (len > 0 && *text == NOCHAR) |
397 | { |
384 | { |
398 | ++text; |
385 | ++text; |
399 | --len; |
386 | --len; |
400 | w += r->TermWin.fwidth; |
387 | w += r->TermWin.fwidth; |
401 | } |
388 | } |
402 | |
389 | |
403 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
390 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
404 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
391 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
405 | x += w; |
392 | x += w; |
406 | } |
393 | } |
407 | |
394 | |
408 | x += r->TermWin.fwidth; |
395 | x += r->TermWin.fwidth; |
409 | } |
396 | } |
… | |
… | |
428 | |
415 | |
429 | XFontStruct *f; |
416 | XFontStruct *f; |
430 | codeset cs; |
417 | codeset cs; |
431 | bool enc2b, encm; |
418 | bool enc2b, encm; |
432 | |
419 | |
433 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
420 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
434 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
421 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
435 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
422 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
436 | bool set_properties (rxvt_fontprop &p, const char *name); |
423 | bool set_properties (rxvt_fontprop &p, const char *name); |
437 | }; |
424 | }; |
438 | |
425 | |
439 | const char * |
426 | char * |
440 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
427 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
441 | { |
428 | { |
442 | unsigned long value; |
429 | unsigned long value; |
443 | |
430 | |
444 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
431 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
445 | return XGetAtomName (DISPLAY, value); |
432 | return XGetAtomName (DISPLAY, value); |
446 | else |
433 | else |
447 | return repl; |
434 | return rxvt_strdup (repl); |
448 | } |
435 | } |
449 | |
436 | |
450 | rxvt_fontprop |
437 | rxvt_fontprop |
451 | rxvt_font_x11::properties () |
438 | rxvt_font_x11::properties () |
452 | { |
439 | { |
… | |
… | |
467 | } |
454 | } |
468 | |
455 | |
469 | bool |
456 | bool |
470 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
457 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
471 | { |
458 | { |
472 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
473 | const char *slant = get_property (f, "SLANT", "r"); |
|
|
474 | |
|
|
475 | unsigned long height; |
459 | unsigned long height; |
476 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
460 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
477 | return false; |
461 | return false; |
478 | |
462 | |
479 | unsigned long avgwidth; |
463 | unsigned long avgwidth; |
480 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
464 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
481 | avgwidth = 0; |
465 | avgwidth = 0; |
482 | |
466 | |
|
|
467 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
468 | char *slant = get_property (f, "SLANT", "r"); |
|
|
469 | |
483 | return set_properties (p, height, weight, slant, avgwidth); |
470 | set_properties (p, height, weight, slant, avgwidth); |
|
|
471 | |
|
|
472 | free (weight); |
|
|
473 | free (slant); |
|
|
474 | |
|
|
475 | return true; |
484 | } |
476 | } |
485 | |
477 | |
486 | bool |
478 | bool |
487 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
479 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
488 | { |
480 | { |
… | |
… | |
592 | f = XLoadQueryFont (DISPLAY, name); |
584 | f = XLoadQueryFont (DISPLAY, name); |
593 | |
585 | |
594 | if (!f) |
586 | if (!f) |
595 | return false; |
587 | return false; |
596 | |
588 | |
597 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
589 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
598 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
590 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
599 | |
591 | |
600 | if (registry && encoding) |
592 | if (registry && encoding) |
601 | { |
593 | { |
602 | char charset[64]; |
594 | char charset[64]; |
603 | snprintf (charset, 64, "%s-%s", registry, encoding); |
595 | snprintf (charset, 64, "%s-%s", registry, encoding); |
… | |
… | |
616 | if (*charset++ == '-' && !--count) |
608 | if (*charset++ == '-' && !--count) |
617 | break; |
609 | break; |
618 | |
610 | |
619 | cs = codeset_from_name (charset); |
611 | cs = codeset_from_name (charset); |
620 | } |
612 | } |
|
|
613 | |
|
|
614 | free (registry); |
|
|
615 | free (encoding); |
621 | |
616 | |
622 | if (cs == CS_UNICODE) |
617 | if (cs == CS_UNICODE) |
623 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
618 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
624 | |
619 | |
625 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
620 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
738 | |
733 | |
739 | int base = r->TermWin.fbase; |
734 | int base = r->TermWin.fbase; |
740 | |
735 | |
741 | XGCValues v; |
736 | XGCValues v; |
742 | v.foreground = r->PixColors[fg]; |
737 | v.foreground = r->PixColors[fg]; |
743 | v.background = r->PixColors[bg]; |
|
|
744 | v.font = f->fid; |
738 | v.font = f->fid; |
745 | |
739 | |
746 | if (enc2b) |
740 | if (enc2b) |
747 | { |
741 | { |
748 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
742 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
749 | |
743 | |
750 | if (bg == Color_bg && !slow) |
744 | if (bg == Color_bg && !slow) |
751 | { |
745 | { |
|
|
746 | v.background = r->PixColors[bg]; |
752 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
747 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
753 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
748 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
754 | } |
749 | } |
755 | else |
750 | else |
756 | { |
751 | { |
757 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
752 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
758 | |
753 | |
759 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
754 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
760 | |
755 | |
761 | if (slow) |
756 | if (slow) |
762 | { |
757 | { |
763 | do |
758 | do |
764 | { |
759 | { |
765 | if (xc->byte1 || xc->byte2) |
760 | if (xc->byte1 || xc->byte2) |
766 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
761 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
767 | |
762 | |
768 | x += r->TermWin.fwidth; |
763 | x += r->TermWin.fwidth; |
769 | xc++; len--; |
764 | xc++; len--; |
770 | } |
765 | } |
771 | while (len); |
766 | while (len); |
772 | } |
767 | } |
773 | else |
768 | else |
774 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
769 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
775 | } |
770 | } |
776 | } |
771 | } |
777 | else |
772 | else |
778 | { |
773 | { |
779 | const char *xc = enc_char (text, len, cs, slow); |
774 | const char *xc = enc_char (text, len, cs, slow); |
780 | |
775 | |
781 | if (bg == Color_bg && !slow) |
776 | if (bg == Color_bg && !slow) |
782 | { |
777 | { |
|
|
778 | v.background = r->PixColors[bg]; |
783 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
779 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
784 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
780 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
785 | } |
781 | } |
786 | else |
782 | else |
787 | { |
783 | { |
788 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
784 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
789 | |
785 | |
790 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
786 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
791 | |
787 | |
792 | if (slow) |
788 | if (slow) |
793 | { |
789 | { |
794 | do |
790 | do |
795 | { |
791 | { |
796 | if (*xc) |
792 | if (*xc) |
797 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
793 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
798 | |
794 | |
799 | x += r->TermWin.fwidth; |
795 | x += r->TermWin.fwidth; |
800 | xc++; len--; |
796 | xc++; len--; |
801 | } |
797 | } |
802 | while (len); |
798 | while (len); |
803 | } |
799 | } |
804 | else |
800 | else |
805 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
801 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
806 | } |
802 | } |
807 | } |
803 | } |
808 | } |
804 | } |
809 | |
805 | |
810 | ///////////////////////////////////////////////////////////////////////////// |
806 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1006 | #endif |
1002 | #endif |
1007 | |
1003 | |
1008 | ///////////////////////////////////////////////////////////////////////////// |
1004 | ///////////////////////////////////////////////////////////////////////////// |
1009 | |
1005 | |
1010 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1006 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1011 | : r (r) |
1007 | : r (r), fontdesc (0) |
1012 | { |
1008 | { |
1013 | clear (); |
1009 | clear (); |
1014 | } |
1010 | } |
1015 | |
1011 | |
1016 | rxvt_fontset::~rxvt_fontset () |
1012 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1021 | void |
1017 | void |
1022 | rxvt_fontset::clear () |
1018 | rxvt_fontset::clear () |
1023 | { |
1019 | { |
1024 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1020 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1025 | FONT_UNREF (*i); |
1021 | FONT_UNREF (*i); |
|
|
1022 | |
|
|
1023 | free (fontdesc); fontdesc = 0; |
1026 | |
1024 | |
1027 | fonts.clear (); |
1025 | fonts.clear (); |
1028 | base_id = 0; |
1026 | base_id = 0; |
1029 | base_prop.height = 0x7fffffff; |
1027 | base_prop.height = 0x7fffffff; |
1030 | base_prop.weight = rxvt_fontprop::medium; |
1028 | base_prop.weight = rxvt_fontprop::medium; |
… | |
… | |
1138 | bool |
1136 | bool |
1139 | rxvt_fontset::populate (const char *desc) |
1137 | rxvt_fontset::populate (const char *desc) |
1140 | { |
1138 | { |
1141 | clear (); |
1139 | clear (); |
1142 | |
1140 | |
|
|
1141 | fontdesc = strdup (desc); |
|
|
1142 | |
1143 | fonts.push_back (new_font (0, CS_UNICODE)); |
1143 | fonts.push_back (new_font (0, CS_UNICODE)); |
1144 | realize_font (0); |
1144 | realize_font (0); |
1145 | |
1145 | |
1146 | add_fonts (desc); |
1146 | add_fonts (desc); |
1147 | |
1147 | |
… | |
… | |
1163 | |
1163 | |
1164 | return true; |
1164 | return true; |
1165 | } |
1165 | } |
1166 | |
1166 | |
1167 | int |
1167 | int |
1168 | rxvt_fontset::find_font (unicode_t unicode) |
1168 | rxvt_fontset::find_font (unicode_t unicode, bool bold) |
1169 | { |
1169 | { |
1170 | for (unsigned int i = 0; i < fonts.size (); i++) |
1170 | for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii |
|
|
1171 | i < fonts.size (); |
|
|
1172 | i++) |
1171 | { |
1173 | { |
1172 | rxvt_font *f = fonts[i]; |
1174 | rxvt_font *f = fonts[i]; |
1173 | |
1175 | |
1174 | if (!f->loaded) |
1176 | if (!f->loaded) |
1175 | { |
1177 | { |
… | |
… | |
1178 | |
1180 | |
1179 | if (!realize_font (i)) |
1181 | if (!realize_font (i)) |
1180 | goto next_font; |
1182 | goto next_font; |
1181 | } |
1183 | } |
1182 | |
1184 | |
|
|
1185 | if (f->cs == CS_UNKNOWN) |
|
|
1186 | goto next_font; |
|
|
1187 | |
|
|
1188 | if (bold && f->properties ().weight < rxvt_fontprop::bold) |
|
|
1189 | goto next_font; |
|
|
1190 | |
1183 | if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) |
1191 | if (f->has_codepoint (unicode)) |
1184 | return i; |
1192 | return i; |
1185 | |
1193 | |
1186 | next_font: |
1194 | next_font: |
1187 | if (i == fonts.size () - 1 && fallback->name) |
1195 | if (i == fonts.size () - 1 && fallback->name) |
1188 | { |
1196 | { |
… | |
… | |
1190 | fallback++; |
1198 | fallback++; |
1191 | i = 0; |
1199 | i = 0; |
1192 | } |
1200 | } |
1193 | } |
1201 | } |
1194 | |
1202 | |
|
|
1203 | // if no bold font found, use a regular one |
|
|
1204 | if (bold) |
|
|
1205 | return find_font (unicode); |
|
|
1206 | |
1195 | return 0; /* we must return SOME font */ |
1207 | return 0; /* we must return SOME font */ |
1196 | } |
1208 | } |
1197 | |
1209 | |
1198 | |
1210 | |
1199 | |
1211 | |