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.19 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.44 by pcg, Tue Mar 16 04:52:20 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
… …
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 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};
107
108/////////////////////////////////////////////////////////////////////////////
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
101 125
102///////////////////////////////////////////////////////////////////////////// 126/////////////////////////////////////////////////////////////////////////////
103 127
104static void *enc_buf; 128static void *enc_buf;
105static uint32_t enc_len; 129static uint32_t enc_len;
… …
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
177static const char *linedraw_cmds[128] = {
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 204
228struct rxvt_font_default : rxvt_font { 205struct rxvt_font_default : rxvt_font {
229 rxvt_fontprop properties () 206 rxvt_fontprop properties ()
230 { 207 {
231 rxvt_fontprop p; 208 rxvt_fontprop p;
… …
240 bool load (const rxvt_fontprop &prop) 217 bool load (const rxvt_fontprop &prop)
241 { 218 {
242 width = 1; height = 1; 219 width = 1; height = 1;
243 ascent = 1; descent = 0; 220 ascent = 1; descent = 0;
244 221
222 set_name ("built-in pseudofont");
223
245 return true; 224 return true;
246 } 225 }
247 226
248 bool has_codepoint (uint32_t unicode) 227 bool has_codepoint (unicode_t unicode)
249 { 228 {
250 if (unicode <= 0x001f) 229 if (unicode <= 0x001f)
251 return true; 230 return true;
231
252 if (unicode >= 0x0080 && unicode <= 0x009f) 232 if (unicode >= 0x0080 && unicode <= 0x009f)
253 return true; 233 return true;
254 234
255 if (unicode >= 0x2500 && unicode <= 0x257f 235 if (unicode >= 0x2500 && unicode <= 0x259f)
256 && linedraw_cmds[unicode - 0x2500]) 236 return true;
237
238 if (IS_COMPOSE (unicode))
257 return true; 239 return true;
258 240
259 switch (unicode) 241 switch (unicode)
260 { 242 {
261 case ZERO_WIDTH_CHAR: 243 case ZERO_WIDTH_CHAR:
… …
263 } 245 }
264 246
265 return false; 247 return false;
266 } 248 }
267 249
268 void draw (int x, int y, 250 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 251 const text_t *text, int len,
270 int fg, int bg); 252 int fg, int bg);
271}; 253};
272 254
255static void rect_stipple (Display *display, Drawable d, GC gc, int s1, int s2, int x, int y, int w, int h)
256{
257 XGCValues gcv;
258 char bm[2] = { s1, s2 };
259
260 gcv.fill_style = FillStippled;
261 gcv.stipple = XCreateBitmapFromData (display, d, bm, 2, 2);
262 gcv.ts_x_origin = x;
263 gcv.ts_y_origin = y;
264
265 if (!gcv.stipple)
266 return;
267
268 XChangeGC (display, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
269 XFillRectangle (display, d, gc, x, y, w, h);
270
271 XFreePixmap (display, gcv.stipple);
272
273 gcv.fill_style = FillSolid;
274 XChangeGC (display, gc, GCFillStyle, &gcv);
275}
276
277#include "table/linedraw.h"
278
273void 279void
274rxvt_font_default::draw (int x, int y, 280rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 281 const text_t *text, int len,
276 int fg, int bg) 282 int fg, int bg)
277{ 283{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 284 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 285
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 286 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
281 287
282 while (len--) 288 while (len--)
283 { 289 {
290#if ENABLE_COMBINING
291 compose_char *cc;
292#endif
284 text_t t = *text++; 293 text_t t = *text++;
285 294
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 295 int x_[16];
296 int y_[16];
297
298 int W = r->TermWin.fwidth , w = (W - 1) / 2;
299 int H = r->TermWin.fheight, h = (H - 1) / 2;
300 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
301 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
302
303 for (int i = 0; i <= 8; i++)
304 {
305 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
306 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
287 { 307 }
308
309 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
310 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
311
288 const char *p = linedraw_cmds[t - 0x2500]; 312 int i1 = linedraw_offs[t - 0x2500];
313 int i2 = linedraw_offs[t - 0x2500 + 1];
289 314
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;
291 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;
292
293 XGCValues gcv; 315 XGCValues gcv;
294 316
317 gcv.cap_style = CapButt;
318 gcv.line_width = 0;
319 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
320
321 if (i1 != i2)
322 {
295 while (*p) 323 while (i1 < i2)
296 { 324 {
325 uint32_t command = linedraw_command [i1++];
326
327 int op = (command >> 24) & 255;
328 int a = (command >> 20) & 15;
329 int b = (command >> 16) & 15;
330 int x1 = x_[(command >> 12) & 15];
331 int y1 = y_[(command >> 8) & 15];
332 int x2 = x_[(command >> 4) & 15];
333 int y2 = y_[(command >> 0) & 15];
334
297 switch (*p++) 335 switch (op)
298 { 336 {
299 case '1': 337 case 0: // line
300 gcv.line_width = 0; 338 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
302 break; 339 break;
303 340
304 case '2': 341 case 1: // rectangle, possibly stippled
305 gcv.line_width = 2; 342 if (a)
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 343 {
344 static char bm[] = { 0,0 , 1,3 , 2,1 , 0,1 };
345
346 gcv.fill_style = FillStippled;
347 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
348 gcv.ts_x_origin = x;
349 gcv.ts_y_origin = y;
350
351 XChangeGC (d.display->display, TGC,
352 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
353 &gcv);
354 }
355
356
357 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
358
359 if (a)
360 {
361 XFreePixmap (d.display->display, gcv.stipple);
362 gcv.fill_style = FillSolid;
363 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
364 }
365
307 break; 366 break;
308 367 case 2: // arc
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 368 break;
310 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;
311 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;
312 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); 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 } 369 }
316 } 370 }
317 371
318 gcv.line_width = 0; 372#if 0
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 373 case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break;
374 case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break;
375 case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break;
376 case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break;
377
378 case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break;
379 case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break;
380 case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break;
381 case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break;
382 }
383 }
384#endif
385
386 }
387#if ENABLE_COMBINING
388 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
320 } 389 {
390 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
391 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
392 if (cc->c2 != NOCHAR)
393 {
394 // prefer font of first character, for no good reasons
395 rxvt_font *f2 = f1->has_codepoint (cc->c2)
396 ? f1
397 : (*fs)[fs->find_font (cc->c2)];
398
399 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
400 }
401 }
402#endif
321 else 403 else
322 switch (*text++) 404 switch (t)
323 { 405 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 406 case ZERO_WIDTH_CHAR:
326 break; 407 break;
408
409#if 0
410 case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break;
411 case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break;
412 case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break;
413 case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break;
414 case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break;
415 case 0x2585: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 3 - 5) / 8, W, H - (H * 3 - 5) / 8); break;
416 case 0x2586: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 2 - 6) / 8, W, H - (H * 2 - 6) / 8); break;
417 case 0x2587: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 1 - 7) / 8, W, H - (H * 1 - 7) / 8); break;
418 case 0x2588: XFillRectangle (d.display->display, d, TGC, x0, y0, W, H); break;
419 case 0x2589: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 7 - 1) / 8, H); break;
420 case 0x258a: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 6 - 2) / 8, H); break;
421 case 0x258b: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 5 - 3) / 8, H); break;
422 case 0x258c: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 4 - 4) / 8, H); break;
423 case 0x258d: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 3 - 5) / 8, H); break;
424 case 0x258e: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 2 - 6) / 8, H); break;
425 case 0x258f: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 1 - 7) / 8, H); break;
426 case 0x2590: XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, H); break;
427
428 case 0x2591: rect_stipple (d.display->display, d, TGC, 0x00, 0x01, x0, y0, W, H); break;
429 case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break;
430 case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break;
431
432 case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break;
433 case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); break;
434#endif
435
327 default: 436 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 437 int w = 0;
438 while (len > 0 && *text == NOCHAR)
439 {
440 ++text;
441 --len;
442 w += r->TermWin.fwidth;
443 }
444
445 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
446 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
447 x += w;
329 } 448 }
330 449
331 x += r->TermWin.fwidth; 450 x += r->TermWin.fwidth;
332 } 451 }
333} 452}
… …
341 460
342 rxvt_fontprop properties (); 461 rxvt_fontprop properties ();
343 462
344 bool load (const rxvt_fontprop &prop); 463 bool load (const rxvt_fontprop &prop);
345 464
346 bool has_codepoint (uint32_t unicode); 465 bool has_codepoint (unicode_t unicode);
347 466
348 void draw (int x, int y, 467 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 468 const text_t *text, int len,
350 int fg, int bg); 469 int fg, int bg);
351 470
352 XFontStruct *f; 471 XFontStruct *f;
353 codeset cs; 472 codeset cs;
… …
408 527
409bool 528bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 530{
412 int slashes = 0; 531 int slashes = 0;
413 const char *comp[12]; 532 const char *comp[13];
414 533
415 for (const char *c = name; *c; c++) 534 for (const char *c = name; *c; c++)
416 if (*c == '-') 535 if (*c == '-')
417 { 536 {
418 comp[slashes++] = c + 1; 537 comp[slashes++] = c + 1;
… …
598 f = 0; 717 f = 0;
599 } 718 }
600} 719}
601 720
602bool 721bool
603rxvt_font_x11::has_codepoint (uint32_t unicode) 722rxvt_font_x11::has_codepoint (unicode_t unicode)
604{ 723{
605 uint32_t ch = FROM_UNICODE (cs, unicode); 724 uint32_t ch = FROM_UNICODE (cs, unicode);
606 725
607 if (ch == NOCHAR) 726 if (ch == NOCHAR)
608 return false; 727 return false;
… …
644 763
645 return true; 764 return true;
646} 765}
647 766
648void 767void
649rxvt_font_x11::draw (int x, int y, 768rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
650 const text_t *text, int len, 769 const text_t *text, int len,
651 int fg, int bg) 770 int fg, int bg)
652{ 771{
653 // this looks like a mess /. 772 // this looks like a mess /.
654 // and it is a mess /. 773 // and it is a mess /.
… …
670 { 789 {
671 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 790 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
672 791
673 if (bg == Color_bg && !slow) 792 if (bg == Color_bg && !slow)
674 { 793 {
675 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 794 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
676 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 795 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
677 } 796 }
678 else 797 else
679 { 798 {
680 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 799 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
681 800
682 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 801 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
683 802
684 if (slow) 803 if (slow)
685 { 804 {
686 do 805 do
687 { 806 {
688 if (xc->byte1 || xc->byte2) 807 if (xc->byte1 || xc->byte2)
689 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 808 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
690 809
691 x += r->TermWin.fwidth; 810 x += r->TermWin.fwidth;
692 xc++; len--; 811 xc++; len--;
693 } 812 }
694 while (len); 813 while (len);
695 } 814 }
696 else 815 else
697 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 816 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
698 } 817 }
699 } 818 }
700 else 819 else
701 { 820 {
702 const char *xc = enc_char (text, len, cs, slow); 821 const char *xc = enc_char (text, len, cs, slow);
703 822
704 if (bg == Color_bg && !slow) 823 if (bg == Color_bg && !slow)
705 { 824 {
706 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 825 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
707 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 826 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
708 } 827 }
709 else 828 else
710 { 829 {
711 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 830 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
712 831
713 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 832 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
714 833
715 if (slow) 834 if (slow)
716 { 835 {
717 do 836 do
718 { 837 {
719 if (*xc) 838 if (*xc)
720 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 839 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
721 840
722 x += r->TermWin.fwidth; 841 x += r->TermWin.fwidth;
723 xc++; len--; 842 xc++; len--;
724 } 843 }
725 while (len); 844 while (len);
726 } 845 }
727 else 846 else
728 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 847 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
729 } 848 }
730 } 849 }
731} 850}
732 851
733///////////////////////////////////////////////////////////////////////////// 852/////////////////////////////////////////////////////////////////////////////
… …
738//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 857//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
739#define SWATHBITS 8 858#define SWATHBITS 8
740#endif 859#endif
741 860
742struct rxvt_font_xft : rxvt_font { 861struct rxvt_font_xft : rxvt_font {
743 rxvt_font_xft () { f = 0; d = 0; } 862 rxvt_font_xft () { f = 0; }
744 863
745 void clear (); 864 void clear ();
746 865
747 rxvt_fontprop properties (); 866 rxvt_fontprop properties ();
748 867
749 bool load (const rxvt_fontprop &prop); 868 bool load (const rxvt_fontprop &prop);
750 869
751 void draw (int x, int y, 870 void draw (rxvt_drawable &d, int x, int y,
752 const text_t *text, int len, 871 const text_t *text, int len,
753 int fg, int bg); 872 int fg, int bg);
754 873
755 bool has_codepoint (uint32_t unicode); 874 bool has_codepoint (unicode_t unicode);
756 875
757protected: 876protected:
758 XftFont *f; 877 XftFont *f;
759 XftDraw *d;
760}; 878};
761 879
762void 880void
763rxvt_font_xft::clear () 881rxvt_font_xft::clear ()
764{ 882{
765 if (f) 883 if (f)
766 { 884 {
767 XftFontClose (DISPLAY, f); 885 XftFontClose (DISPLAY, f);
768 f = 0; 886 f = 0;
769 }
770
771 if (d)
772 {
773 XftDrawDestroy (d);
774 d = 0;
775 } 887 }
776} 888}
777 889
778rxvt_fontprop 890rxvt_fontprop
779rxvt_font_xft::properties () 891rxvt_font_xft::properties ()
… …
880 992
881 return true; 993 return true;
882} 994}
883 995
884bool 996bool
885rxvt_font_xft::has_codepoint (uint32_t unicode) 997rxvt_font_xft::has_codepoint (unicode_t unicode)
886{ 998{
887 return XftCharExists (DISPLAY, f, unicode); 999 return XftCharExists (DISPLAY, f, unicode);
888} 1000}
889 1001
890void 1002void
891rxvt_font_xft::draw (int x, int y, 1003rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
892 const text_t *text, int len, 1004 const text_t *text, int len,
893 int fg, int bg) 1005 int fg, int bg)
894{ 1006{
895 if (!d)
896 d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
897
898 if (bg >= 0 && bg != Color_bg)
899 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
900 else
901 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1007 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
902 1008
903 if (!slow && width == r->TermWin.fwidth && 0) 1009 if (!slow && width == r->TermWin.fwidth && 0)
904 { 1010 {
905 if (sizeof (text_t) == sizeof (FcChar16)) 1011 if (sizeof (text_t) == sizeof (FcChar16))
906 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1012 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
918 fwidth *= 2; 1024 fwidth *= 2;
919 1025
920 XGlyphInfo extents; 1026 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 1027 if (sizeof (text_t) == sizeof (FcChar16))
922 { 1028 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 1029 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1030 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 1031 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 1032 }
927 else 1033 else
928 { 1034 {
929 XGlyphInfo extents; 1035 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 1036 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 1037 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 1038 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 1039 }
934 } 1040 }
935 1041
… …
992 f = new rxvt_font_x11; 1098 f = new rxvt_font_x11;
993 } 1099 }
994 else 1100 else
995 f = new rxvt_font_x11; 1101 f = new rxvt_font_x11;
996 1102
1103 f->fs = this;
997 f->set_term (r); 1104 f->set_term (r);
998 f->set_name (strdup (name)); 1105 f->set_name (strdup (name));
999 1106
1000 f->cs = cs; 1107 f->cs = cs;
1001 f->loaded = false; 1108 f->loaded = false;
… …
1068 } 1175 }
1069 1176
1070 return true; 1177 return true;
1071} 1178}
1072 1179
1073void 1180bool
1074rxvt_fontset::populate (const char *desc) 1181rxvt_fontset::populate (const char *desc)
1075{ 1182{
1076 clear (); 1183 clear ();
1077 1184
1078 fonts.push_back (new_font (0, CS_UNICODE)); 1185 fonts.push_back (new_font (0, CS_UNICODE));
… …
1090 add_fonts ("fixed"); 1197 add_fonts ("fixed");
1091 base_id = fonts.size () - 1; 1198 base_id = fonts.size () - 1;
1092 } 1199 }
1093 1200
1094 if ((int)fonts.size () <= base_id || !realize_font (base_id)) 1201 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1202 return false;
1096 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1097 exit (1);
1098 }
1099 1203
1100 base_prop = fonts[base_id]->properties (); 1204 base_prop = fonts[base_id]->properties ();
1205
1206 return true;
1101} 1207}
1102 1208
1103int 1209int
1104rxvt_fontset::find_font (uint32_t unicode) 1210rxvt_fontset::find_font (unicode_t unicode)
1105{ 1211{
1106 for (unsigned int i = 0; i < fonts.size (); i++) 1212 for (unsigned int i = 0; i < fonts.size (); i++)
1107 { 1213 {
1108 rxvt_font *f = fonts[i]; 1214 rxvt_font *f = fonts[i];
1109 1215

Diff Legend

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