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.15 by pcg, Thu Jan 29 00:38:56 2004 UTC vs.
Revision 1.47 by pcg, Tue Mar 16 06:04:28 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 TGC 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;
35} fallback_fonts[] = { 34} fallback_fonts[] = {
… …
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" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
87#endif 89#endif
88 90
89#if XFT 91#if XFT
90 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
91 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
… …
94 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
98 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
99 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
100}; 106};
101 107
102///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
103 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
104static void *enc_buf; 128static void *enc_buf;
105static uint32_t enc_len; 129static uint32_t enc_len;
106 130
107static inline void * 131static inline void *
108get_enc_buf (int len) 132get_enc_buf (uint32_t len)
109{ 133{
110 if (len > enc_len) 134 if (len > enc_len)
111 { 135 {
112 free (enc_buf); 136 free (enc_buf);
113 enc_buf = malloc (len); 137 enc_buf = malloc (len);
… …
115 139
116 return enc_buf; 140 return enc_buf;
117} 141}
118 142
119static const char * 143static const char *
120enc_char (const text_t *text, int len, codeset cs, bool &zero) 144enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
121{ 145{
122 uint8_t *buf = (uint8_t *)get_enc_buf (len); 146 uint8_t *buf = (uint8_t *)get_enc_buf (len);
123 147
124 while (len--) 148 while (len--)
125 { 149 {
… …
136 160
137 return (const char *)enc_buf; 161 return (const char *)enc_buf;
138} 162}
139 163
140static const XChar2b * 164static const XChar2b *
141enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) 165enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
142{ 166{
143 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 167 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b));
144 168
145 while (len--) 169 while (len--)
146 { 170 {
… …
161} 185}
162 186
163///////////////////////////////////////////////////////////////////////////// 187/////////////////////////////////////////////////////////////////////////////
164 188
165void 189void
166rxvt_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)
167{ 191{
168 if (color == Color_bg) 192 if (color == Color_bg)
169 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 193 XClearArea (d.display->display, d, x, y, w, h, FALSE);
170 else if (color >= 0) 194 else if (color >= 0)
171 { 195 {
196#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else
172 XSetForeground (DISPLAY, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
173 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
174 } 202 }
175} 203}
176 204
177static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
178 "1hH", "2hH", "1vV", "2vV",
179 0, 0, 0, 0,
180 0, 0, 0, 0,
181 "1HV", "2H1V", "1H2V", "2HV",
182
183 // 2510
184 "1hV", "2h1V", "1h2V", "2hV",
185 "1Hv", "2H1v", "1H2v", "2Hv",
186 "1hv", "2h1v", "1h2v", "2hv",
187 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
188
189 // 2520
190 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
191 "1hvV", "2h1vV", "1hV2v", "1hv2V",
192 "1h2vV", "2hv1V", "1v2hV", "2hvV",
193 "1hHV", "2h1HV", "2H1hV", "2hH1V",
194
195 // 2530
196 "1hH2V", "2hV1H", "1h2HV", "2hHV",
197 "1hHv", "1vH2h", "1hv2H", "1v2hH",
198 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
199 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
200
201 // 2540
202 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
203 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
204 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
205 0, 0, 0, 0,
206
207 // 2550
208 0, 0, 0, 0,
209 0, 0, 0, 0,
210 0, 0, 0, 0,
211 0, 0, 0, 0,
212
213 // 2560
214 0, 0, 0, 0,
215 0, 0, 0, 0,
216 0, 0, 0, 0,
217 0, 0, 0, 0,
218
219 // 2570
220 0, "1a", "1b", "1ab",
221 "1h", "1v", "1H", "1V",
222 "2h", "2v", "2H", "2V",
223 "1h2H", "1v2V", "1H2h", "1V2v"
224
225 // to be done
226};
227 206
228struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
229 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
230 { 210 {
231 rxvt_fontprop p; 211 rxvt_fontprop p;
232 212
233 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
240 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
241 { 221 {
242 width = 1; height = 1; 222 width = 1; height = 1;
243 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
244 224
225 set_name (strdup ("built-in pseudofont"));
226
245 return true; 227 return true;
246 } 228 }
247 229
248 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
249 { 231 {
250 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
251 return true; 233 return true;
234
252 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode >= 0x0080 && unicode <= 0x009f)
253 return true; 236 return true;
254 237
255 if (unicode >= 0x2500 && unicode <= 0x257f 238 if (unicode >= 0x2500 && unicode <= 0x259f)
256 && linedraw_cmds[unicode - 0x2500]) 239 return true;
240
241 if (IS_COMPOSE (unicode))
257 return true; 242 return true;
258 243
259 switch (unicode) 244 switch (unicode)
260 { 245 {
261 case ZERO_WIDTH_CHAR: 246 case ZERO_WIDTH_CHAR:
… …
263 } 248 }
264 249
265 return false; 250 return false;
266 } 251 }
267 252
268 void draw (int x, int y, 253 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 254 const text_t *text, int len,
270 int fg, int bg); 255 int fg, int bg);
271}; 256};
272 257
273void 258void
274rxvt_font_default::draw (int x, int y, 259rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 260 const text_t *text, int len,
276 int fg, int bg) 261 int fg, int bg)
277{ 262{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 263 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 264
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 265 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
281 266
282 while (len--) 267 while (len--)
283 { 268 {
269#if ENABLE_COMBINING
270 compose_char *cc;
271#endif
284 text_t t = *text++; 272 text_t t = *text++;
285 273
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 274 if (0x2500 <= t && t <= 0x259f)
275 {
276 uint16_t offs = linedraw_offs[t - 0x2500];
277 uint32_t *a = linedraw_command + (offs >> 4);
278 uint32_t *b = a + (offs & 15);
279
280 int W = r->TermWin.fwidth;
281 int H = r->TermWin.fheight;
282
283 int x_[16];
284 int y_[16];
285
286 for (int i = 0; i <= 8; i++)
287 { 287 {
288 const char *p = linedraw_cmds[t - 0x2500]; 288 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
289 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
290 }
289 291
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 292 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
291 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 293 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
292 294
293 XGCValues gcv; 295 XGCValues gcv;
294 296
297 gcv.cap_style = CapButt;
298 gcv.line_width = 0;
299 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
300
295 while (*p) 301 while (a < b)
296 { 302 {
303 uint32_t command = *a++;
304
305 int op = (command >> 24) & 255;
306 int a = (command >> 20) & 15;
307 int b = (command >> 16) & 15;
308 int x1 = x_[(command >> 12) & 15];
309 int y1 = y_[(command >> 8) & 15];
310 int x2 = x_[(command >> 4) & 15];
311 int y2 = y_[(command >> 0) & 15];
312
297 switch (*p++) 313 switch (op)
298 { 314 {
299 case '1': 315 case 0: // line
300 gcv.line_width = 0; 316 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
302 break; 317 break;
303 318
304 case '2': 319 case 1: // rectangle, possibly stippled
320 if (a)
321 {
322 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
323
324 gcv.fill_style = FillStippled;
325 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
326 gcv.ts_x_origin = x;
327 gcv.ts_y_origin = y;
328
329 XChangeGC (d.display->display, TGC,
330 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
331 &gcv);
332 }
333
334 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
335
336 if (a)
337 {
338 XFreePixmap (d.display->display, gcv.stipple);
305 gcv.line_width = 2; 339 gcv.stipple = 0;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 340 gcv.fill_style = FillSolid;
341 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
342 }
307 break; 343 break;
308 344 case 2: // arc
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 345 XDrawArc (d.display->display, d, TGC,
310 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 346 x1 - W/2, y1 - H/2, W-1, H-1,
311 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 347 (a - 1) * 90*64, (b - 1) * 90*64);
312 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 348 break;
313 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
314 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
315 } 349 }
316 } 350 }
317 351 }
318 gcv.line_width = 0; 352#if ENABLE_COMBINING
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 353 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
320 } 354 {
355 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
356 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
357 if (cc->c2 != NOCHAR)
358 {
359 // prefer font of first character, for no good reasons
360 rxvt_font *f2 = f1->has_codepoint (cc->c2)
361 ? f1
362 : (*fs)[fs->find_font (cc->c2)];
363
364 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
365 }
366 }
367#endif
321 else 368 else
322 switch (*text++) 369 switch (t)
323 { 370 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 371 case ZERO_WIDTH_CHAR:
326 break; 372 break;
373
327 default: 374 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 375 int w = 0;
376 while (len > 0 && *text == NOCHAR)
377 {
378 ++text;
379 --len;
380 w += r->TermWin.fwidth;
381 }
382
383 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
384 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
385 x += w;
329 } 386 }
330 387
331 x += r->TermWin.fwidth; 388 x += r->TermWin.fwidth;
332 } 389 }
333} 390}
… …
341 398
342 rxvt_fontprop properties (); 399 rxvt_fontprop properties ();
343 400
344 bool load (const rxvt_fontprop &prop); 401 bool load (const rxvt_fontprop &prop);
345 402
346 bool has_codepoint (uint32_t unicode); 403 bool has_codepoint (unicode_t unicode);
347 404
348 void draw (int x, int y, 405 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 406 const text_t *text, int len,
350 int fg, int bg); 407 int fg, int bg);
351 408
352 XFontStruct *f; 409 XFontStruct *f;
353 codeset cs; 410 codeset cs;
… …
408 465
409bool 466bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 467rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 468{
412 int slashes = 0; 469 int slashes = 0;
413 const char *comp[12]; 470 const char *comp[13];
414 471
415 for (const char *c = name; *c; c++) 472 for (const char *c = name; *c; c++)
416 if (*c == '-') 473 if (*c == '-')
417 { 474 {
418 comp[slashes++] = c + 1; 475 comp[slashes++] = c + 1;
… …
428 485
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 486 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 487
431 if (f) 488 if (f)
432 { 489 {
433 // the font should really exists now. if not, we have a problem 490 // the font should really exist now. if not, we have a problem
434 // (e.g. if the user did xset fp rehash just when we were searching fonts). 491 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 492 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 493 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 494 XFreeFont (DISPLAY, f);
438 return ret; 495 return ret;
… …
515 f = XLoadQueryFont (DISPLAY, name); 572 f = XLoadQueryFont (DISPLAY, name);
516 573
517 if (!f) 574 if (!f)
518 return false; 575 return false;
519 576
520 unsigned long value;
521
522 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 577 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
523 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 578 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
524 579
525 if (registry && encoding) 580 if (registry && encoding)
526 { 581 {
… …
600 f = 0; 655 f = 0;
601 } 656 }
602} 657}
603 658
604bool 659bool
605rxvt_font_x11::has_codepoint (uint32_t unicode) 660rxvt_font_x11::has_codepoint (unicode_t unicode)
606{ 661{
607 uint32_t ch = FROM_UNICODE (cs, unicode); 662 uint32_t ch = FROM_UNICODE (cs, unicode);
608 663
609 if (ch == NOCHAR) 664 if (ch == NOCHAR)
610 return false; 665 return false;
… …
612 /* check wether the character exists in _this_ font. horrible. */ 667 /* check wether the character exists in _this_ font. horrible. */
613 XCharStruct *xcs; 668 XCharStruct *xcs;
614 669
615 if (encm) 670 if (encm)
616 { 671 {
617 int byte1 = ch >> 8; 672 unsigned char byte1 = ch >> 8;
618 int byte2 = ch & 255; 673 unsigned char byte2 = ch & 255;
619 674
620 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 675 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
621 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 676 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
622 return false; 677 return false;
623 678
… …
646 701
647 return true; 702 return true;
648} 703}
649 704
650void 705void
651rxvt_font_x11::draw (int x, int y, 706rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
652 const text_t *text, int len, 707 const text_t *text, int len,
653 int fg, int bg) 708 int fg, int bg)
654{ 709{
655 // this looks like a mess /. 710 // this looks like a mess /.
656 // and it is a mess /. 711 // and it is a mess /.
… …
672 { 727 {
673 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
674 729
675 if (bg == Color_bg && !slow) 730 if (bg == Color_bg && !slow)
676 { 731 {
677 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 732 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
678 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 733 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
679 } 734 }
680 else 735 else
681 { 736 {
682 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 737 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
683 738
684 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 739 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
685 740
686 if (slow) 741 if (slow)
687 { 742 {
688 do 743 do
689 { 744 {
690 if (xc->byte1 || xc->byte2) 745 if (xc->byte1 || xc->byte2)
691 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 746 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
692 747
693 x += r->TermWin.fwidth; 748 x += r->TermWin.fwidth;
694 xc++; len--; 749 xc++; len--;
695 } 750 }
696 while (len); 751 while (len);
697 } 752 }
698 else 753 else
699 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 754 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
700 } 755 }
701 } 756 }
702 else 757 else
703 { 758 {
704 const char *xc = enc_char (text, len, cs, slow); 759 const char *xc = enc_char (text, len, cs, slow);
705 760
706 if (bg == Color_bg && !slow) 761 if (bg == Color_bg && !slow)
707 { 762 {
708 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 763 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
709 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 764 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
710 } 765 }
711 else 766 else
712 { 767 {
713 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 768 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
714 769
715 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 770 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
716 771
717 if (slow) 772 if (slow)
718 { 773 {
719 do 774 do
720 { 775 {
721 if (*xc) 776 if (*xc)
722 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 777 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
723 778
724 x += r->TermWin.fwidth; 779 x += r->TermWin.fwidth;
725 xc++; len--; 780 xc++; len--;
726 } 781 }
727 while (len); 782 while (len);
728 } 783 }
729 else 784 else
730 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 785 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
731 } 786 }
732 } 787 }
733} 788}
734 789
735///////////////////////////////////////////////////////////////////////////// 790/////////////////////////////////////////////////////////////////////////////
… …
740//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 795//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
741#define SWATHBITS 8 796#define SWATHBITS 8
742#endif 797#endif
743 798
744struct rxvt_font_xft : rxvt_font { 799struct rxvt_font_xft : rxvt_font {
745 rxvt_font_xft () { f = 0; d = 0; } 800 rxvt_font_xft () { f = 0; }
746 801
747 void clear (); 802 void clear ();
748 803
749 rxvt_fontprop properties (); 804 rxvt_fontprop properties ();
750 805
751 bool load (const rxvt_fontprop &prop); 806 bool load (const rxvt_fontprop &prop);
752 807
753 void draw (int x, int y, 808 void draw (rxvt_drawable &d, int x, int y,
754 const text_t *text, int len, 809 const text_t *text, int len,
755 int fg, int bg); 810 int fg, int bg);
756 811
757 bool has_codepoint (uint32_t unicode); 812 bool has_codepoint (unicode_t unicode);
758 813
759protected: 814protected:
760 XftFont *f; 815 XftFont *f;
761 XftDraw *d;
762}; 816};
763 817
764void 818void
765rxvt_font_xft::clear () 819rxvt_font_xft::clear ()
766{ 820{
767 if (f) 821 if (f)
768 { 822 {
769 XftFontClose (DISPLAY, f); 823 XftFontClose (DISPLAY, f);
770 f = 0; 824 f = 0;
771 }
772
773 if (d)
774 {
775 XftDrawDestroy (d);
776 d = 0;
777 } 825 }
778} 826}
779 827
780rxvt_fontprop 828rxvt_fontprop
781rxvt_font_xft::properties () 829rxvt_font_xft::properties ()
… …
882 930
883 return true; 931 return true;
884} 932}
885 933
886bool 934bool
887rxvt_font_xft::has_codepoint (uint32_t unicode) 935rxvt_font_xft::has_codepoint (unicode_t unicode)
888{ 936{
889 return XftCharExists (DISPLAY, f, unicode); 937 return XftCharExists (DISPLAY, f, unicode);
890} 938}
891 939
892void 940void
893rxvt_font_xft::draw (int x, int y, 941rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
894 const text_t *text, int len, 942 const text_t *text, int len,
895 int fg, int bg) 943 int fg, int bg)
896{ 944{
897 if (!d)
898 {
899 dR;
900 d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
901 }
902
903 if (bg >= 0 && bg != Color_bg)
904 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
905 else
906 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 945 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
907 946
908 if (!slow && width == r->TermWin.fwidth && 0) 947 if (!slow && width == r->TermWin.fwidth && 0)
909 { 948 {
910 if (sizeof (text_t) == sizeof (FcChar16)) 949 if (sizeof (text_t) == sizeof (FcChar16))
911 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 950 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
923 fwidth *= 2; 962 fwidth *= 2;
924 963
925 XGlyphInfo extents; 964 XGlyphInfo extents;
926 if (sizeof (text_t) == sizeof (FcChar16)) 965 if (sizeof (text_t) == sizeof (FcChar16))
927 { 966 {
928 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 967 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
929 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 968 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
930 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 969 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
931 } 970 }
932 else 971 else
933 { 972 {
934 XGlyphInfo extents; 973 XGlyphInfo extents;
935 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 974 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
936 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 975 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
937 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 976 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
938 } 977 }
939 } 978 }
940 979
… …
947#endif 986#endif
948 987
949///////////////////////////////////////////////////////////////////////////// 988/////////////////////////////////////////////////////////////////////////////
950 989
951rxvt_fontset::rxvt_fontset (rxvt_t r) 990rxvt_fontset::rxvt_fontset (rxvt_t r)
952#ifdef EXPLICIT_CONTEXT
953: r(r) 991: r (r)
954#endif
955{ 992{
956 clear (); 993 clear ();
957} 994}
958 995
959rxvt_fontset::~rxvt_fontset () 996rxvt_fontset::~rxvt_fontset ()
… …
962} 999}
963 1000
964void 1001void
965rxvt_fontset::clear () 1002rxvt_fontset::clear ()
966{ 1003{
967 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1004 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
968 FONT_UNREF (*i); 1005 FONT_UNREF (*i);
969 1006
970 fonts.clear (); 1007 fonts.clear ();
971 base_id = 0; 1008 base_id = 0;
972 base_prop.height = 0x7fffffff; 1009 base_prop.height = 0x7fffffff;
… …
999 f = new rxvt_font_x11; 1036 f = new rxvt_font_x11;
1000 } 1037 }
1001 else 1038 else
1002 f = new rxvt_font_x11; 1039 f = new rxvt_font_x11;
1003 1040
1041 f->fs = this;
1004 f->set_term (r); 1042 f->set_term (r);
1005 f->set_name (strdup (name)); 1043 f->set_name (strdup (name));
1006 1044
1007 f->cs = cs; 1045 f->cs = cs;
1008 f->loaded = false; 1046 f->loaded = false;
… …
1026 1064
1027 if (*desc == '[') 1065 if (*desc == '[')
1028 { 1066 {
1029 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1067 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1030 1068
1031 const char *extra = desc++; 1069 //const char *extra = desc++; // not yet used
1032 1070
1033 desc = strchr (desc, ']'); 1071 desc = strchr (desc, ']');
1034 1072
1035 if (!desc) 1073 if (!desc)
1036 { 1074 {
… …
1075 } 1113 }
1076 1114
1077 return true; 1115 return true;
1078} 1116}
1079 1117
1080void 1118bool
1081rxvt_fontset::populate (const char *desc) 1119rxvt_fontset::populate (const char *desc)
1082{ 1120{
1083 clear (); 1121 clear ();
1084 1122
1085 fonts.push_back (new_font (0, CS_UNICODE)); 1123 fonts.push_back (new_font (0, CS_UNICODE));
… …
1089 1127
1090 if (!base_id) 1128 if (!base_id)
1091 base_id = 1; 1129 base_id = 1;
1092 1130
1093 // we currently need a base-font, no matter what 1131 // we currently need a base-font, no matter what
1094 if (fonts.size () <= base_id || !realize_font (base_id)) 1132 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1133 {
1096 puts ("unable to load specified font(s), falling back to 'fixed'\n"); 1134 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1097 add_fonts ("fixed"); 1135 add_fonts ("fixed");
1098 base_id = fonts.size () - 1; 1136 base_id = fonts.size () - 1;
1099 } 1137 }
1100 1138
1101 if (fonts.size () <= base_id || !realize_font (base_id)) 1139 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1102 { 1140 return false;
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 exit (1);
1105 }
1106 1141
1107 base_prop = fonts[base_id]->properties (); 1142 base_prop = fonts[base_id]->properties ();
1143
1144 return true;
1108} 1145}
1109 1146
1110int 1147int
1111rxvt_fontset::find_font (uint32_t unicode) 1148rxvt_fontset::find_font (unicode_t unicode)
1112{ 1149{
1113 for (int i = 0; i < fonts.size (); i++) 1150 for (unsigned int i = 0; i < fonts.size (); i++)
1114 { 1151 {
1115 rxvt_font *f = fonts[i]; 1152 rxvt_font *f = fonts[i];
1116 1153
1117 if (!f->loaded) 1154 if (!f->loaded)
1118 { 1155 {

Diff Legend

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