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.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC

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
32const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
33 codeset cs; 32 codeset cs;
34 const char *name; 33 const char *name;
… …
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_1990_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, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 89#endif
87 90
88#if XFT 91#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
… …
93 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
97 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
98 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
99}; 106};
100 107
101///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
102 109
110#if XFT
111rxvt_drawable::~rxvt_drawable ()
112{
113 if (xftdrawable)
114 XftDrawDestroy (xftdrawable);
115}
116
117rxvt_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
103static void *enc_buf; 128static void *enc_buf;
104static uint32_t enc_len; 129static uint32_t enc_len;
105 130
106static inline void * 131static inline void *
107get_enc_buf (int len) 132get_enc_buf (uint32_t len)
108{ 133{
109 if (len > enc_len) 134 if (len > enc_len)
110 { 135 {
111 free (enc_buf); 136 free (enc_buf);
112 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
114 139
115 return enc_buf; 140 return enc_buf;
116} 141}
117 142
118static const char * 143static const char *
119enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120{ 145{
121 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
122 147
123 while (len--) 148 while (len--)
124 { 149 {
… …
135 160
136 return (const char *)enc_buf; 161 return (const char *)enc_buf;
137} 162}
138 163
139static const XChar2b * 164static const XChar2b *
140enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141{ 166{
142 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
143 168
144 while (len--) 169 while (len--)
145 { 170 {
… …
160} 185}
161 186
162///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
163 188
164void 189void
165rxvt_font::clear_rect (int x, int y, int w, int h, int color) 190rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166{ 191{
167 if (color == Color_bg) 192 if (color == Color_bg)
168 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
169 else if (color >= 0) 194 else if (color >= 0)
170 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
171 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, GC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, GC, x, y, w, h);
201#endif
173 } 202 }
174} 203}
175 204
176static const char *linedraw_cmds[128] = { 205static const char *linedraw_cmds[128] = {
177 "1hH", "2hH", "1vV", "2vV", 206 "1-", "2-", "1|", "2|",
178 0, 0, 0, 0, 207 0, 0, 0, 0,
179 0, 0, 0, 0, 208 0, 0, 0, 0,
180 "1HV", "2H1V", "1H2V", "2HV", 209 "1HV", "2H1V", "1H2V", "2HV",
181 210
182 // 2510 211 // 2510
183 "1hV", "2h1V", "1h2V", "2hV", 212 "1hV", "2h1V", "1h2V", "2hV",
184 "1Hv", "2H1v", "1H2v", "2Hv", 213 "1Hv", "2H1v", "1H2v", "2Hv",
185 "1hv", "2h1v", "1h2v", "2hv", 214 "1hv", "2h1v", "1h2v", "2hv",
186 "1HvV", "2H1vV", "1HV2v", "1Hv2V", 215 "1H|", "2H1|", "1HV2v", "1Hv2V",
187 216
188 // 2520 217 // 2520
189 "1H2vV", "2Hv1V", "2HV1v", "2HvV", 218 "1H2|", "2Hv1V", "2HV1v", "2H|",
190 "1hvV", "2h1vV", "1hV2v", "1hv2V", 219 "1h|", "2h1|", "1hV2v", "1hv2V",
191 "1h2vV", "2hv1V", "1v2hV", "2hvV", 220 "1h2|", "2hv1V", "1v2hV", "2h|",
192 "1hHV", "2h1HV", "2H1hV", "2hH1V", 221 "1-V", "2h1HV", "2H1hV", "2-1V",
193 222
194 // 2530 223 // 2530
195 "1hH2V", "2hV1H", "1h2HV", "2hHV", 224 "1-2V", "2hV1H", "1h2HV", "2-V",
196 "1hHv", "1vH2h", "1hv2H", "1v2hH", 225 "1-v", "1vH2h", "1hv2H", "1v2-",
197 "1hH2v", "1H2hv", "1h2Hv", "2hHv", 226 "1-2v", "1H2hv", "1h2Hv", "2-v",
198 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH", 227 "1-|", "1|H2h", "1h|2H", "1|2-",
199 228
200 // 2540 229 // 2540
201 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv", 230 "1-V2v", "1-v2V", "1-2|", "1HV2hv",
202 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv", 231 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v",
203 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV", 232 "1v2-V", "1H2h|", "1h2H|", "2-|",
204 0, 0, 0, 0, 233 0, 0, 0, 0,
205 234
206 // 2550 235 // 2550
207 0, 0, 0, 0, 236 0, 0, 0, 0,
208 0, 0, 0, 0, 237 0, 0, 0, 0,
… …
211 240
212 // 2560 241 // 2560
213 0, 0, 0, 0, 242 0, 0, 0, 0,
214 0, 0, 0, 0, 243 0, 0, 0, 0,
215 0, 0, 0, 0, 244 0, 0, 0, 0,
216 0, 0, 0, 0, 245 0, "A", "B", "C",
217 246
218 // 2570 247 // 2570
219 0, "1a", "1b", "1ab", 248 "D", "1/", "1\\", "1/\\",
220 "1h", "1v", "1H", "1V", 249 "1h", "1v", "1H", "1V",
221 "2h", "2v", "2H", "2V", 250 "2h", "2v", "2H", "2V",
222 "1h2H", "1v2V", "1H2h", "1V2v" 251 "1h2H", "1v2V", "1H2h", "1V2v"
223 252
224 // to be done 253 // to be done
… …
239 bool load (const rxvt_fontprop &prop) 268 bool load (const rxvt_fontprop &prop)
240 { 269 {
241 width = 1; height = 1; 270 width = 1; height = 1;
242 ascent = 1; descent = 0; 271 ascent = 1; descent = 0;
243 272
273 set_name ("built-in pseudofont");
274
244 return true; 275 return true;
245 } 276 }
246 277
247 bool has_codepoint (uint32_t unicode) 278 bool has_codepoint (unicode_t unicode)
248 { 279 {
249 if (unicode <= 0x001f) 280 if (unicode <= 0x001f)
250 return true; 281 return true;
282
251 if (unicode >= 0x0080 && unicode <= 0x009f) 283 if (unicode >= 0x0080 && unicode <= 0x009f)
252 return true; 284 return true;
253 285
254 if (unicode >= 0x2500 && unicode <= 0x257f 286 if (unicode >= 0x2500 && unicode <= 0x257f
255 && linedraw_cmds[unicode - 0x2500]) 287 && linedraw_cmds[unicode - 0x2500])
288 return true;
289
290 if (IS_COMPOSE (unicode))
256 return true; 291 return true;
257 292
258 switch (unicode) 293 switch (unicode)
259 { 294 {
260 case ZERO_WIDTH_CHAR: 295 case ZERO_WIDTH_CHAR:
… …
262 } 297 }
263 298
264 return false; 299 return false;
265 } 300 }
266 301
267 void draw (int x, int y, 302 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 303 const text_t *text, int len,
269 int fg, int bg); 304 int fg, int bg);
270}; 305};
271 306
272void 307void
273rxvt_font_default::draw (int x, int y, 308rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 309 const text_t *text, int len,
275 int fg, int bg) 310 int fg, int bg)
276{ 311{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 312 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 313
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 314 XSetForeground (d.display->display, GC, r->PixColors[fg]);
280 315
281 while (len--) 316 while (len--)
282 { 317 {
318#if ENABLE_COMBINING
319 compose_char *cc;
320#endif
283 text_t t = *text++; 321 text_t t = *text++;
284 322
323 // is it in our linedrawing table?
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 324 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286 { 325 {
287 const char *p = linedraw_cmds[t - 0x2500]; 326 const char *p = linedraw_cmds[t - 0x2500];
288 327
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 328 int W = r->TermWin.fwidth , w = (W - 1) / 2;
329 int H = r->TermWin.fheight, h = (H - 1) / 2;
330 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
290 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 331 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
291 332
292 XGCValues gcv; 333 XGCValues gcv;
334
335 gcv.cap_style = CapNotLast;
336 XChangeGC (d.display->display, GC, GCCapStyle, &gcv);
293 337
294 while (*p) 338 while (*p)
295 { 339 {
296 switch (*p++) 340 switch (*p++)
297 { 341 {
298 case '1': 342 case '1':
299 gcv.line_width = 0; 343 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301 break; 345 break;
302 346
303 case '2': 347 case '2':
304 gcv.line_width = 2; 348 gcv.line_width = 3;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 349 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306 break; 350 break;
307 351
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 352 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1+1, y1 ); break;
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 353 case 'H': XDrawLine (d.display->display, d, GC, x2, y1, x1-1, y1 ); break;
354 case '-': XDrawLine (d.display->display, d, GC, x0, y1, x2 , y1 ); break;
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 355 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y1+1); break;
356 case 'V': XDrawLine (d.display->display, d, GC, x1, y2, x1 , y1-1); break;
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 357 case '|': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y2 ); break;
358
312 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 359 case '/' : XDrawLine (d.display->display, d, GC, x0, y2, x2 , y0 ); break;
313 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); 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;
314 } 366 }
315 } 367 }
316 368
317 gcv.line_width = 0; 369 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 370 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
371 }
372
373#if ENABLE_COMBINING
374 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319 } 375 {
376 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
377 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
378 if (cc->c2 != NOCHAR)
379 {
380 // prefer font of first character, for no good reasons
381 rxvt_font *f2 = f1->has_codepoint (cc->c2)
382 ? f1
383 : (*fs)[fs->find_font (cc->c2)];
384
385 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
386 }
387 }
388#endif
320 else 389 else
321 switch (*text++) 390 switch (t)
322 { 391 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 392 case ZERO_WIDTH_CHAR:
325 break; 393 break;
326 default: 394 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 395 int w = 0;
396 while (len > 0 && *text == NOCHAR)
397 {
398 ++text;
399 --len;
400 w += r->TermWin.fwidth;
401 }
402
403 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
404 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
405 x += w;
328 } 406 }
329 407
330 x += r->TermWin.fwidth; 408 x += r->TermWin.fwidth;
331 } 409 }
332} 410}
… …
340 418
341 rxvt_fontprop properties (); 419 rxvt_fontprop properties ();
342 420
343 bool load (const rxvt_fontprop &prop); 421 bool load (const rxvt_fontprop &prop);
344 422
345 bool has_codepoint (uint32_t unicode); 423 bool has_codepoint (unicode_t unicode);
346 424
347 void draw (int x, int y, 425 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 426 const text_t *text, int len,
349 int fg, int bg); 427 int fg, int bg);
350 428
351 XFontStruct *f; 429 XFontStruct *f;
352 codeset cs; 430 codeset cs;
… …
407 485
408bool 486bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 487rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{ 488{
411 int slashes = 0; 489 int slashes = 0;
412 const char *comp[12]; 490 const char *comp[13];
413 491
414 for (const char *c = name; *c; c++) 492 for (const char *c = name; *c; c++)
415 if (*c == '-') 493 if (*c == '-')
416 { 494 {
417 comp[slashes++] = c + 1; 495 comp[slashes++] = c + 1;
… …
427 505
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 506 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 507
430 if (f) 508 if (f)
431 { 509 {
432 // the font should really exists now. if not, we have a problem 510 // the font should really exist now. if not, we have a problem
433 // (e.g. if the user did xset fp rehash just when we were searching fonts). 511 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage. 512 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 513 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 514 XFreeFont (DISPLAY, f);
437 return ret; 515 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 592 f = XLoadQueryFont (DISPLAY, name);
515 593
516 if (!f) 594 if (!f)
517 return false; 595 return false;
518 596
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 597 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 598 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 599
524 if (registry && encoding) 600 if (registry && encoding)
525 { 601 {
… …
599 f = 0; 675 f = 0;
600 } 676 }
601} 677}
602 678
603bool 679bool
604rxvt_font_x11::has_codepoint (uint32_t unicode) 680rxvt_font_x11::has_codepoint (unicode_t unicode)
605{ 681{
606 uint32_t ch = FROM_UNICODE (cs, unicode); 682 uint32_t ch = FROM_UNICODE (cs, unicode);
607 683
608 if (ch == NOCHAR) 684 if (ch == NOCHAR)
609 return false; 685 return false;
… …
611 /* check wether the character exists in _this_ font. horrible. */ 687 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 688 XCharStruct *xcs;
613 689
614 if (encm) 690 if (encm)
615 { 691 {
616 int byte1 = ch >> 8; 692 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 693 unsigned char byte2 = ch & 255;
618 694
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 695 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 696 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 697 return false;
622 698
… …
645 721
646 return true; 722 return true;
647} 723}
648 724
649void 725void
650rxvt_font_x11::draw (int x, int y, 726rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 727 const text_t *text, int len,
652 int fg, int bg) 728 int fg, int bg)
653{ 729{
654 // this looks like a mess /. 730 // this looks like a mess /.
655 // and it is a mess /. 731 // and it is a mess /.
… …
671 { 747 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 748 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 749
674 if (bg == Color_bg && !slow) 750 if (bg == Color_bg && !slow)
675 { 751 {
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 752 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 753 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
678 } 754 }
679 else 755 else
680 { 756 {
681 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 757 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682 758
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 759 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
684 760
685 if (slow) 761 if (slow)
686 { 762 {
687 do 763 do
688 { 764 {
689 if (xc->byte1 || xc->byte2) 765 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 766 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
691 767
692 x += r->TermWin.fwidth; 768 x += r->TermWin.fwidth;
693 xc++; len--; 769 xc++; len--;
694 } 770 }
695 while (len); 771 while (len);
696 } 772 }
697 else 773 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 774 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
699 } 775 }
700 } 776 }
701 else 777 else
702 { 778 {
703 const char *xc = enc_char (text, len, cs, slow); 779 const char *xc = enc_char (text, len, cs, slow);
704 780
705 if (bg == Color_bg && !slow) 781 if (bg == Color_bg && !slow)
706 { 782 {
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 783 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 784 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
709 } 785 }
710 else 786 else
711 { 787 {
712 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 788 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713 789
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 790 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v);
715 791
716 if (slow) 792 if (slow)
717 { 793 {
718 do 794 do
719 { 795 {
720 if (*xc) 796 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 797 XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
722 798
723 x += r->TermWin.fwidth; 799 x += r->TermWin.fwidth;
724 xc++; len--; 800 xc++; len--;
725 } 801 }
726 while (len); 802 while (len);
727 } 803 }
728 else 804 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 805 XDrawString (d.display->display, d, GC, x, y + base, xc, len);
730 } 806 }
731 } 807 }
732} 808}
733 809
734///////////////////////////////////////////////////////////////////////////// 810/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 815//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 816#define SWATHBITS 8
741#endif 817#endif
742 818
743struct rxvt_font_xft : rxvt_font { 819struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 820 rxvt_font_xft () { f = 0; }
745 821
746 void clear (); 822 void clear ();
747 823
748 rxvt_fontprop properties (); 824 rxvt_fontprop properties ();
749 825
750 bool load (const rxvt_fontprop &prop); 826 bool load (const rxvt_fontprop &prop);
751 827
752 void draw (int x, int y, 828 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 829 const text_t *text, int len,
754 int fg, int bg); 830 int fg, int bg);
755 831
756 bool has_codepoint (uint32_t unicode); 832 bool has_codepoint (unicode_t unicode);
757 833
758protected: 834protected:
759 XftFont *f; 835 XftFont *f;
760 XftDraw *d;
761}; 836};
762 837
763void 838void
764rxvt_font_xft::clear () 839rxvt_font_xft::clear ()
765{ 840{
766 if (f) 841 if (f)
767 { 842 {
768 XftFontClose (DISPLAY, f); 843 XftFontClose (DISPLAY, f);
769 f = 0; 844 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 845 }
777} 846}
778 847
779rxvt_fontprop 848rxvt_fontprop
780rxvt_font_xft::properties () 849rxvt_font_xft::properties ()
… …
881 950
882 return true; 951 return true;
883} 952}
884 953
885bool 954bool
886rxvt_font_xft::has_codepoint (uint32_t unicode) 955rxvt_font_xft::has_codepoint (unicode_t unicode)
887{ 956{
888 return XftCharExists (DISPLAY, f, unicode); 957 return XftCharExists (DISPLAY, f, unicode);
889} 958}
890 959
891void 960void
892rxvt_font_xft::draw (int x, int y, 961rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 962 const text_t *text, int len,
894 int fg, int bg) 963 int fg, int bg)
895{ 964{
896 if (!d)
897 {
898 dR;
899 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
900 }
901
902 if (bg >= 0 && bg != Color_bg)
903 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
904 else
905 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 965 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 966
907 if (!slow && width == r->TermWin.fwidth && 0) 967 if (!slow && width == r->TermWin.fwidth && 0)
908 { 968 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 969 if (sizeof (text_t) == sizeof (FcChar16))
910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 970 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
915 { 975 {
916 while (len) 976 while (len)
917 { 977 {
918 if (*text != NOCHAR && *text != ' ') 978 if (*text != NOCHAR && *text != ' ')
919 { 979 {
980 int fwidth = r->TermWin.fwidth;
981 if (len >= 2 && text[1] == NOCHAR)
982 fwidth *= 2;
983
920 XGlyphInfo extents; 984 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 985 if (sizeof (text_t) == sizeof (FcChar16))
922 { 986 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 987 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 988 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 989 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 990 }
927 else 991 else
928 { 992 {
929 XGlyphInfo extents; 993 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 994 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2, 995 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 996 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 997 }
934 } 998 }
935 999
936 x += r->TermWin.fwidth; 1000 x += r->TermWin.fwidth;
… …
942#endif 1006#endif
943 1007
944///////////////////////////////////////////////////////////////////////////// 1008/////////////////////////////////////////////////////////////////////////////
945 1009
946rxvt_fontset::rxvt_fontset (rxvt_t r) 1010rxvt_fontset::rxvt_fontset (rxvt_t r)
947#ifdef EXPLICIT_CONTEXT
948: r(r) 1011: r (r)
949#endif
950{ 1012{
951 clear (); 1013 clear ();
952} 1014}
953 1015
954rxvt_fontset::~rxvt_fontset () 1016rxvt_fontset::~rxvt_fontset ()
… …
957} 1019}
958 1020
959void 1021void
960rxvt_fontset::clear () 1022rxvt_fontset::clear ()
961{ 1023{
962 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1024 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963 FONT_UNREF (*i); 1025 FONT_UNREF (*i);
964 1026
965 fonts.clear (); 1027 fonts.clear ();
966 base_id = 0; 1028 base_id = 0;
967 base_prop.height = 0x7fffffff; 1029 base_prop.height = 0x7fffffff;
… …
994 f = new rxvt_font_x11; 1056 f = new rxvt_font_x11;
995 } 1057 }
996 else 1058 else
997 f = new rxvt_font_x11; 1059 f = new rxvt_font_x11;
998 1060
1061 f->fs = this;
999 f->set_term (r); 1062 f->set_term (r);
1000 f->set_name (strdup (name)); 1063 f->set_name (strdup (name));
1001 1064
1002 f->cs = cs; 1065 f->cs = cs;
1003 f->loaded = false; 1066 f->loaded = false;
… …
1021 1084
1022 if (*desc == '[') 1085 if (*desc == '[')
1023 { 1086 {
1024 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1087 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025 1088
1026 const char *extra = desc++; 1089 //const char *extra = desc++; // not yet used
1027 1090
1028 desc = strchr (desc, ']'); 1091 desc = strchr (desc, ']');
1029 1092
1030 if (!desc) 1093 if (!desc)
1031 { 1094 {
… …
1070 } 1133 }
1071 1134
1072 return true; 1135 return true;
1073} 1136}
1074 1137
1075void 1138bool
1076rxvt_fontset::populate (const char *desc) 1139rxvt_fontset::populate (const char *desc)
1077{ 1140{
1078 clear (); 1141 clear ();
1079 1142
1080 fonts.push_back (new_font (0, CS_UNICODE)); 1143 fonts.push_back (new_font (0, CS_UNICODE));
… …
1084 1147
1085 if (!base_id) 1148 if (!base_id)
1086 base_id = 1; 1149 base_id = 1;
1087 1150
1088 // we currently need a base-font, no matter what 1151 // we currently need a base-font, no matter what
1089 if (fonts.size () <= base_id || !realize_font (base_id)) 1152 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1090 { 1153 {
1154 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091 add_fonts ("fixed"); 1155 add_fonts ("fixed");
1092 base_id = fonts.size () - 1; 1156 base_id = fonts.size () - 1;
1093 } 1157 }
1094 1158
1095 if (fonts.size () <= base_id || !realize_font (base_id)) 1159 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1096 { 1160 return false;
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 exit (1);
1099 }
1100 1161
1101 base_prop = fonts[base_id]->properties (); 1162 base_prop = fonts[base_id]->properties ();
1163
1164 return true;
1102} 1165}
1103 1166
1104int 1167int
1105rxvt_fontset::find_font (uint32_t unicode) 1168rxvt_fontset::find_font (unicode_t unicode)
1106{ 1169{
1107 for (int i = 0; i < fonts.size (); i++) 1170 for (unsigned int i = 0; i < fonts.size (); i++)
1108 { 1171 {
1109 rxvt_font *f = fonts[i]; 1172 rxvt_font *f = fonts[i];
1110 1173
1111 if (!f->loaded) 1174 if (!f->loaded)
1112 { 1175 {

Diff Legend

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