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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC vs.
Revision 1.53 by root, Mon Jun 21 19:09:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-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
31const struct rxvt_fallback_font { 31const 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
62 // prefer xft for complex scripts 62 // prefer xft for complex scripts
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, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68#endif 68#endif
69 69
70#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
71# if XFT 71# if XFT
72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
… …
89#endif 89#endif
90 90
91#if XFT 91#if XFT
92 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
93 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
94 { CS_UNICODE, "xft:FreeMono" },
94#endif 95#endif
95 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
96 { CS_UNICODE, "xft:FreeMono" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
100 100
101#if UNICODE_3 && XFT 101#if UNICODE_3 && XFT
… …
194 else if (color >= 0) 194 else if (color >= 0)
195 { 195 {
196#if XFT 196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else 198#else
199 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
200 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif 201#endif
202 } 202 }
203} 203}
204 204
205static const char *linedraw_cmds[128] = { 205#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 206
256struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
257 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
258 { 210 {
259 rxvt_fontprop p; 211 rxvt_fontprop p;
260 212
261 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
268 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
269 { 221 {
270 width = 1; height = 1; 222 width = 1; height = 1;
271 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
272 224
273 set_name ("built-in pseudofont"); 225 set_name (strdup ("built-in pseudofont"));
274 226
275 return true; 227 return true;
276 } 228 }
277 229
278 bool has_codepoint (unicode_t unicode) 230 bool has_codepoint (unicode_t unicode)
279 { 231 {
280 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
281 return true; 233 return true;
282 234
283 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
284 return true; 239 return true;
285 240
286 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
287 && linedraw_cmds[unicode - 0x2500])
288 return true; 242 return true;
289 243
290 if (IS_COMPOSE (unicode)) 244 if (IS_COMPOSE (unicode))
291 return true; 245 return true;
292 246
… …
309 const text_t *text, int len, 263 const text_t *text, int len,
310 int fg, int bg) 264 int fg, int bg)
311{ 265{
312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
313 267
314 XSetForeground (d.display->display, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
315 269
316 while (len--) 270 while (len--)
317 { 271 {
318#if ENABLE_COMBINING 272#if ENABLE_COMBINING
319 compose_char *cc; 273 compose_char *cc;
320#endif 274#endif
321 text_t t = *text++; 275 text_t t = *text++;
322 276
323 // is it in our linedrawing table? 277 if (0x2500 <= t && t <= 0x259f)
324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 278 {
279 uint16_t offs = linedraw_offs[t - 0x2500];
280 uint32_t *a = linedraw_command + (offs >> 4);
281 uint32_t *b = a + (offs & 15);
282
283 int W = r->TermWin.fwidth;
284 int H = r->TermWin.fheight;
285
286 int x_[16];
287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
325 { 290 {
326 const char *p = linedraw_cmds[t - 0x2500]; 291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
327 294
328 int W = r->TermWin.fwidth , w = (W - 1) / 2; 295 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; 296 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 297
333 XGCValues gcv; 298 XGCValues gcv;
334 299
335 gcv.cap_style = CapNotLast; 300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
336 XChangeGC (d.display->display, GC, GCCapStyle, &gcv); 302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
337 303
338 while (*p) 304 while (a < b)
339 { 305 {
306 uint32_t command = *a++;
307
308 int op = (command >> 24) & 255;
309 int a = (command >> 20) & 15;
310 int b = (command >> 16) & 15;
311 int x1 = x_[(command >> 12) & 15];
312 int y1 = y_[(command >> 8) & 15];
313 int x2 = x_[(command >> 4) & 15];
314 int y2 = y_[(command >> 0) & 15];
315
340 switch (*p++) 316 switch (op)
341 { 317 {
342 case '1': 318 case 0: // line
343 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
345 break; 320 break;
346 321
347 case '2': 322 case 1: // rectangle, possibly stippled
323 if (a)
324 {
325 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 XChangeGC (d.display->display, TGC,
333 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
334 &gcv);
335 }
336
337 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
338
339 if (a)
340 {
341 XFreePixmap (d.display->display, gcv.stipple);
348 gcv.line_width = 3; 342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
349 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
350 break; 346 break;
351 347 case 2: // arc
352 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1+1, y1 ); break; 348 XDrawArc (d.display->display, d, TGC,
353 case 'H': XDrawLine (d.display->display, d, GC, x2, y1, x1-1, y1 ); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
354 case '-': XDrawLine (d.display->display, d, GC, x0, y1, x2 , y1 ); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
355 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y1+1); break; 351 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 } 352 }
367 } 353 }
368
369 gcv.line_width = 0;
370 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
371 } 354 }
372
373#if ENABLE_COMBINING 355#if ENABLE_COMBINING
374 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
375 { 357 {
376 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
377 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
… …
389 else 371 else
390 switch (t) 372 switch (t)
391 { 373 {
392 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
393 break; 375 break;
376
394 default: 377 default:
395 int w = 0; 378 int w = 0;
396 while (len > 0 && *text == NOCHAR) 379 while (len > 0 && *text == NOCHAR)
397 { 380 {
398 ++text; 381 ++text;
399 --len; 382 --len;
400 w += r->TermWin.fwidth; 383 w += r->TermWin.fwidth;
401 } 384 }
402 385
403 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
404 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
405 x += w; 388 x += w;
406 } 389 }
407 390
408 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
409 } 392 }
… …
428 411
429 XFontStruct *f; 412 XFontStruct *f;
430 codeset cs; 413 codeset cs;
431 bool enc2b, encm; 414 bool enc2b, encm;
432 415
433 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
434 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
435 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
436 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
437}; 420};
438 421
439const char * 422char *
440rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
441{ 424{
442 unsigned long value; 425 unsigned long value;
443 426
444 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
445 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
446 else 429 else
447 return repl; 430 return rxvt_strdup (repl);
448} 431}
449 432
450rxvt_fontprop 433rxvt_fontprop
451rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
452{ 435{
… …
467} 450}
468 451
469bool 452bool
470rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
471{ 454{
472 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
473 const char *slant = get_property (f, "SLANT", "r");
474
475 unsigned long height; 455 unsigned long height;
476 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
477 return false; 457 return false;
478 458
479 unsigned long avgwidth; 459 unsigned long avgwidth;
480 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
481 avgwidth = 0; 461 avgwidth = 0;
482 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
483 return set_properties (p, height, weight, slant, avgwidth); 466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
484} 472}
485 473
486bool 474bool
487rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
488{ 476{
… …
592 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
593 581
594 if (!f) 582 if (!f)
595 return false; 583 return false;
596 584
597 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
598 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
599 587
600 if (registry && encoding) 588 if (registry && encoding)
601 { 589 {
602 char charset[64]; 590 char charset[64];
603 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
616 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
617 break; 605 break;
618 606
619 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
620 } 608 }
609
610 free (registry);
611 free (encoding);
621 612
622 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
623 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 614 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
624 615
625 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
738 729
739 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
740 731
741 XGCValues v; 732 XGCValues v;
742 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
743 v.background = r->PixColors[bg];
744 v.font = f->fid; 734 v.font = f->fid;
745 735
746 if (enc2b) 736 if (enc2b)
747 { 737 {
748 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
749 739
750 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
751 { 741 {
742 v.background = r->PixColors[bg];
752 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
753 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
754 } 745 }
755 else 746 else
756 { 747 {
757 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 748 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
758 749
759 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
760 751
761 if (slow) 752 if (slow)
762 { 753 {
763 do 754 do
764 { 755 {
765 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
766 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
767 758
768 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
769 xc++; len--; 760 xc++; len--;
770 } 761 }
771 while (len); 762 while (len);
772 } 763 }
773 else 764 else
774 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
775 } 766 }
776 } 767 }
777 else 768 else
778 { 769 {
779 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
780 771
781 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
782 { 773 {
774 v.background = r->PixColors[bg];
783 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
784 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
785 } 777 }
786 else 778 else
787 { 779 {
788 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 780 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
789 781
790 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
791 783
792 if (slow) 784 if (slow)
793 { 785 {
794 do 786 do
795 { 787 {
796 if (*xc) 788 if (*xc)
797 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
798 790
799 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
800 xc++; len--; 792 xc++; len--;
801 } 793 }
802 while (len); 794 while (len);
803 } 795 }
804 else 796 else
805 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
806 } 798 }
807 } 799 }
808} 800}
809 801
810///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
1006#endif 998#endif
1007 999
1008///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
1009 1001
1010rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
1011: r (r) 1003: r (r), fontdesc (0)
1012{ 1004{
1013 clear (); 1005 clear ();
1014} 1006}
1015 1007
1016rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
1021void 1013void
1022rxvt_fontset::clear () 1014rxvt_fontset::clear ()
1023{ 1015{
1024 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1025 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
1026 1020
1027 fonts.clear (); 1021 fonts.clear ();
1028 base_id = 0; 1022 base_id = 0;
1029 base_prop.height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
1030 base_prop.weight = rxvt_fontprop::medium; 1024 base_prop.weight = rxvt_fontprop::medium;
… …
1138bool 1132bool
1139rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
1140{ 1134{
1141 clear (); 1135 clear ();
1142 1136
1137 fontdesc = strdup (desc);
1138
1143 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
1144 realize_font (0); 1140 realize_font (0);
1145 1141
1146 add_fonts (desc); 1142 add_fonts (desc);
1147 1143
… …
1165} 1161}
1166 1162
1167int 1163int
1168rxvt_fontset::find_font (unicode_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
1169{ 1165{
1170 for (unsigned int i = 0; i < fonts.size (); i++) 1166 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1167 i < fonts.size ();
1168 i++)
1171 { 1169 {
1172 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
1173 1171
1174 if (!f->loaded) 1172 if (!f->loaded)
1175 { 1173 {

Diff Legend

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