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.43 by pcg, Mon Mar 15 07:10:47 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" },
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, TGC, r->PixColors[color]);
172 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif
173 } 202 }
174} 203}
175 204
176static const char *linedraw_cmds[128] = { 205static const char *linedraw_cmds[128 + 32] = {
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",
252
253 // 2580
254 0, 0, 0, 0,
255 0, 0, 0, 0,
256 0, 0, 0, 0,
257 0, 0, 0, 0,
258
259 // 2590
260 0, 0, 0, 0,
261 0, 0, "k", "l",
262 "i", "ikl", "il", "ijk",
263 "ijl", "j", "jk", "jkl",
223 264
224 // to be done 265 // to be done
225}; 266};
226 267
227struct rxvt_font_default : rxvt_font { 268struct rxvt_font_default : rxvt_font {
… …
239 bool load (const rxvt_fontprop &prop) 280 bool load (const rxvt_fontprop &prop)
240 { 281 {
241 width = 1; height = 1; 282 width = 1; height = 1;
242 ascent = 1; descent = 0; 283 ascent = 1; descent = 0;
243 284
285 set_name ("built-in pseudofont");
286
244 return true; 287 return true;
245 } 288 }
246 289
247 bool has_codepoint (uint32_t unicode) 290 bool has_codepoint (unicode_t unicode)
248 { 291 {
249 if (unicode <= 0x001f) 292 if (unicode <= 0x001f)
250 return true; 293 return true;
294
251 if (unicode >= 0x0080 && unicode <= 0x009f) 295 if (unicode >= 0x0080 && unicode <= 0x009f)
252 return true; 296 return true;
253 297
254 if (unicode >= 0x2500 && unicode <= 0x257f 298 if (unicode >= 0x2500 && unicode <= 0x257f
255 && linedraw_cmds[unicode - 0x2500]) 299 && linedraw_cmds[unicode - 0x2500])
300 return true;
301
302 if (unicode >= 0x2580 && unicode <= 0x259f)
303 return true;
304
305 if (IS_COMPOSE (unicode))
256 return true; 306 return true;
257 307
258 switch (unicode) 308 switch (unicode)
259 { 309 {
260 case ZERO_WIDTH_CHAR: 310 case ZERO_WIDTH_CHAR:
… …
262 } 312 }
263 313
264 return false; 314 return false;
265 } 315 }
266 316
267 void draw (int x, int y, 317 void draw (rxvt_drawable &d, int x, int y,
268 const text_t *text, int len, 318 const text_t *text, int len,
269 int fg, int bg); 319 int fg, int bg);
270}; 320};
271 321
322static void rect_stipple (Display *display, Drawable d, GC gc, int s1, int s2, int x, int y, int w, int h)
323{
324 XGCValues gcv;
325 char bm[2] = { s1, s2 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (display, d, bm, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 if (!gcv.stipple)
333 return;
334
335 XChangeGC (display, gc, GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
336 XFillRectangle (display, d, gc, x, y, w, h);
337
338 XFreePixmap (display, gcv.stipple);
339
340 gcv.fill_style = FillSolid;
341 XChangeGC (display, gc, GCFillStyle, &gcv);
342}
343
272void 344void
273rxvt_font_default::draw (int x, int y, 345rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274 const text_t *text, int len, 346 const text_t *text, int len,
275 int fg, int bg) 347 int fg, int bg)
276{ 348{
277 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 349 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278 350
279 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 351 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
280 352
281 while (len--) 353 while (len--)
282 { 354 {
355#if ENABLE_COMBINING
356 compose_char *cc;
357#endif
283 text_t t = *text++; 358 text_t t = *text++;
284 359
360 int W = r->TermWin.fwidth , w = (W - 1) / 2;
361 int H = r->TermWin.fheight, h = (H - 1) / 2;
362 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
363 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
364
365 // is it in our linedrawing table?
285 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 366 if (t >= 0x2500 & t <= 0x259f && linedraw_cmds[t - 0x2500])
286 { 367 {
287 const char *p = linedraw_cmds[t - 0x2500]; 368 const char *p = linedraw_cmds[t - 0x2500];
288 369
289 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;
290 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;
291
292 XGCValues gcv; 370 XGCValues gcv;
371
372 gcv.cap_style = CapNotLast;
373 XChangeGC (d.display->display, TGC, GCCapStyle, &gcv);
293 374
294 while (*p) 375 while (*p)
295 { 376 {
296 switch (*p++) 377 switch (*p++)
297 { 378 {
298 case '1': 379 case '1':
299 gcv.line_width = 0; 380 gcv.line_width = 0;
300 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 381 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
301 break; 382 break;
302 383
303 case '2': 384 case '2':
304 gcv.line_width = 2; 385 gcv.line_width = 3;
305 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 386 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
306 break; 387 break;
307 388
308 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 389 case 'h': XDrawLine (d.display->display, d, TGC, x0, y1, x1+1, y1 ); break;
309 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 390 case 'H': XDrawLine (d.display->display, d, TGC, x1, y1, x2 , y1 ); break;
391 case '-': XDrawLine (d.display->display, d, TGC, x0, y1, x2 , y1 ); break;
310 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 392 case 'v': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y1+1); break;
311 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 393 case 'V': XDrawLine (d.display->display, d, TGC, x1, y1, x1 , y2 ); break;
394 case '|': XDrawLine (d.display->display, d, TGC, x1, y0, x1 , y2 ); break;
395
312 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; 396 case '/' : XDrawLine (d.display->display, d, TGC, x0, y2, x2 , y0 ); break;
313 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; 397 case '\\': XDrawLine (d.display->display, d, TGC, x0, y0, x2 , y2 ); break;
398
399 case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break;
400 case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break;
401 case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break;
402 case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break;
403
404 case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break;
405 case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break;
406 case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break;
407 case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break;
314 } 408 }
315 } 409 }
316 410
317 gcv.line_width = 0; 411 gcv.line_width = 0;
318 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 412 XChangeGC (d.display->display, TGC, GCLineWidth, &gcv);
413 }
414
415#if ENABLE_COMBINING
416 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319 } 417 {
418 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
419 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
420 if (cc->c2 != NOCHAR)
421 {
422 // prefer font of first character, for no good reasons
423 rxvt_font *f2 = f1->has_codepoint (cc->c2)
424 ? f1
425 : (*fs)[fs->find_font (cc->c2)];
426
427 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
428 }
429 }
430#endif
320 else 431 else
321 switch (*text++) 432 switch (t)
322 { 433 {
323 case NOCHAR:
324 case ZERO_WIDTH_CHAR: 434 case ZERO_WIDTH_CHAR:
325 break; 435 break;
436
437 case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break;
438 case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break;
439 case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break;
440 case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break;
441 case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break;
442 case 0x2585: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 3 - 5) / 8, W, H - (H * 3 - 5) / 8); break;
443 case 0x2586: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 2 - 6) / 8, W, H - (H * 2 - 6) / 8); break;
444 case 0x2587: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 1 - 7) / 8, W, H - (H * 1 - 7) / 8); break;
445 case 0x2588: XFillRectangle (d.display->display, d, TGC, x0, y0, W, H); break;
446 case 0x2589: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 7 - 1) / 8, H); break;
447 case 0x258a: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 6 - 2) / 8, H); break;
448 case 0x258b: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 5 - 3) / 8, H); break;
449 case 0x258c: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 4 - 4) / 8, H); break;
450 case 0x258d: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 3 - 5) / 8, H); break;
451 case 0x258e: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 2 - 6) / 8, H); break;
452 case 0x258f: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 1 - 7) / 8, H); break;
453 case 0x2590: XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, H); break;
454
455 case 0x2591: rect_stipple (d.display->display, d, TGC, 0x00, 0x01, x0, y0, W, H); break;
456 case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break;
457 case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break;
458
459 case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break;
460 case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); break;
461
326 default: 462 default:
327 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 463 int w = 0;
464 while (len > 0 && *text == NOCHAR)
465 {
466 ++text;
467 --len;
468 w += r->TermWin.fwidth;
469 }
470
471 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
472 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
473 x += w;
328 } 474 }
329 475
330 x += r->TermWin.fwidth; 476 x += r->TermWin.fwidth;
331 } 477 }
332} 478}
… …
340 486
341 rxvt_fontprop properties (); 487 rxvt_fontprop properties ();
342 488
343 bool load (const rxvt_fontprop &prop); 489 bool load (const rxvt_fontprop &prop);
344 490
345 bool has_codepoint (uint32_t unicode); 491 bool has_codepoint (unicode_t unicode);
346 492
347 void draw (int x, int y, 493 void draw (rxvt_drawable &d, int x, int y,
348 const text_t *text, int len, 494 const text_t *text, int len,
349 int fg, int bg); 495 int fg, int bg);
350 496
351 XFontStruct *f; 497 XFontStruct *f;
352 codeset cs; 498 codeset cs;
… …
407 553
408bool 554bool
409rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 555rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410{ 556{
411 int slashes = 0; 557 int slashes = 0;
412 const char *comp[12]; 558 const char *comp[13];
413 559
414 for (const char *c = name; *c; c++) 560 for (const char *c = name; *c; c++)
415 if (*c == '-') 561 if (*c == '-')
416 { 562 {
417 comp[slashes++] = c + 1; 563 comp[slashes++] = c + 1;
… …
427 573
428 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 574 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429 575
430 if (f) 576 if (f)
431 { 577 {
432 // the font should really exists now. if not, we have a problem 578 // 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). 579 // (e.g. if the user did xset fp rehash just when we were searching fonts).
434 // in that case, just return garbage. 580 // in that case, just return garbage.
435 bool ret = set_properties (p, f); 581 bool ret = set_properties (p, f);
436 XFreeFont (DISPLAY, f); 582 XFreeFont (DISPLAY, f);
437 return ret; 583 return ret;
… …
514 f = XLoadQueryFont (DISPLAY, name); 660 f = XLoadQueryFont (DISPLAY, name);
515 661
516 if (!f) 662 if (!f)
517 return false; 663 return false;
518 664
519 unsigned long value;
520
521 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 665 const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 666 const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523 667
524 if (registry && encoding) 668 if (registry && encoding)
525 { 669 {
… …
599 f = 0; 743 f = 0;
600 } 744 }
601} 745}
602 746
603bool 747bool
604rxvt_font_x11::has_codepoint (uint32_t unicode) 748rxvt_font_x11::has_codepoint (unicode_t unicode)
605{ 749{
606 uint32_t ch = FROM_UNICODE (cs, unicode); 750 uint32_t ch = FROM_UNICODE (cs, unicode);
607 751
608 if (ch == NOCHAR) 752 if (ch == NOCHAR)
609 return false; 753 return false;
… …
611 /* check wether the character exists in _this_ font. horrible. */ 755 /* check wether the character exists in _this_ font. horrible. */
612 XCharStruct *xcs; 756 XCharStruct *xcs;
613 757
614 if (encm) 758 if (encm)
615 { 759 {
616 int byte1 = ch >> 8; 760 unsigned char byte1 = ch >> 8;
617 int byte2 = ch & 255; 761 unsigned char byte2 = ch & 255;
618 762
619 if (byte1 < f->min_byte1 || byte1 > f->max_byte1 763 if (byte1 < f->min_byte1 || byte1 > f->max_byte1
620 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) 764 || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2)
621 return false; 765 return false;
622 766
… …
645 789
646 return true; 790 return true;
647} 791}
648 792
649void 793void
650rxvt_font_x11::draw (int x, int y, 794rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651 const text_t *text, int len, 795 const text_t *text, int len,
652 int fg, int bg) 796 int fg, int bg)
653{ 797{
654 // this looks like a mess /. 798 // this looks like a mess /.
655 // and it is a mess /. 799 // and it is a mess /.
… …
671 { 815 {
672 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 816 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673 817
674 if (bg == Color_bg && !slow) 818 if (bg == Color_bg && !slow)
675 { 819 {
676 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 820 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
677 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 821 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
678 } 822 }
679 else 823 else
680 { 824 {
681 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 825 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682 826
683 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 827 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
684 828
685 if (slow) 829 if (slow)
686 { 830 {
687 do 831 do
688 { 832 {
689 if (xc->byte1 || xc->byte2) 833 if (xc->byte1 || xc->byte2)
690 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 834 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
691 835
692 x += r->TermWin.fwidth; 836 x += r->TermWin.fwidth;
693 xc++; len--; 837 xc++; len--;
694 } 838 }
695 while (len); 839 while (len);
696 } 840 }
697 else 841 else
698 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 842 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
699 } 843 }
700 } 844 }
701 else 845 else
702 { 846 {
703 const char *xc = enc_char (text, len, cs, slow); 847 const char *xc = enc_char (text, len, cs, slow);
704 848
705 if (bg == Color_bg && !slow) 849 if (bg == Color_bg && !slow)
706 { 850 {
707 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 851 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 852 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
709 } 853 }
710 else 854 else
711 { 855 {
712 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 856 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713 857
714 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 858 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
715 859
716 if (slow) 860 if (slow)
717 { 861 {
718 do 862 do
719 { 863 {
720 if (*xc) 864 if (*xc)
721 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 865 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
722 866
723 x += r->TermWin.fwidth; 867 x += r->TermWin.fwidth;
724 xc++; len--; 868 xc++; len--;
725 } 869 }
726 while (len); 870 while (len);
727 } 871 }
728 else 872 else
729 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 873 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
730 } 874 }
731 } 875 }
732} 876}
733 877
734///////////////////////////////////////////////////////////////////////////// 878/////////////////////////////////////////////////////////////////////////////
… …
739//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 883//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740#define SWATHBITS 8 884#define SWATHBITS 8
741#endif 885#endif
742 886
743struct rxvt_font_xft : rxvt_font { 887struct rxvt_font_xft : rxvt_font {
744 rxvt_font_xft () { f = 0; d = 0; } 888 rxvt_font_xft () { f = 0; }
745 889
746 void clear (); 890 void clear ();
747 891
748 rxvt_fontprop properties (); 892 rxvt_fontprop properties ();
749 893
750 bool load (const rxvt_fontprop &prop); 894 bool load (const rxvt_fontprop &prop);
751 895
752 void draw (int x, int y, 896 void draw (rxvt_drawable &d, int x, int y,
753 const text_t *text, int len, 897 const text_t *text, int len,
754 int fg, int bg); 898 int fg, int bg);
755 899
756 bool has_codepoint (uint32_t unicode); 900 bool has_codepoint (unicode_t unicode);
757 901
758protected: 902protected:
759 XftFont *f; 903 XftFont *f;
760 XftDraw *d;
761}; 904};
762 905
763void 906void
764rxvt_font_xft::clear () 907rxvt_font_xft::clear ()
765{ 908{
766 if (f) 909 if (f)
767 { 910 {
768 XftFontClose (DISPLAY, f); 911 XftFontClose (DISPLAY, f);
769 f = 0; 912 f = 0;
770 }
771
772 if (d)
773 {
774 XftDrawDestroy (d);
775 d = 0;
776 } 913 }
777} 914}
778 915
779rxvt_fontprop 916rxvt_fontprop
780rxvt_font_xft::properties () 917rxvt_font_xft::properties ()
… …
881 1018
882 return true; 1019 return true;
883} 1020}
884 1021
885bool 1022bool
886rxvt_font_xft::has_codepoint (uint32_t unicode) 1023rxvt_font_xft::has_codepoint (unicode_t unicode)
887{ 1024{
888 return XftCharExists (DISPLAY, f, unicode); 1025 return XftCharExists (DISPLAY, f, unicode);
889} 1026}
890 1027
891void 1028void
892rxvt_font_xft::draw (int x, int y, 1029rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893 const text_t *text, int len, 1030 const text_t *text, int len,
894 int fg, int bg) 1031 int fg, int bg)
895{ 1032{
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); 1033 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906 1034
907 if (!slow && width == r->TermWin.fwidth && 0) 1035 if (!slow && width == r->TermWin.fwidth && 0)
908 { 1036 {
909 if (sizeof (text_t) == sizeof (FcChar16)) 1037 if (sizeof (text_t) == sizeof (FcChar16))
910 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 1038 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
915 { 1043 {
916 while (len) 1044 while (len)
917 { 1045 {
918 if (*text != NOCHAR && *text != ' ') 1046 if (*text != NOCHAR && *text != ' ')
919 { 1047 {
1048 int fwidth = r->TermWin.fwidth;
1049 if (len >= 2 && text[1] == NOCHAR)
1050 fwidth *= 2;
1051
920 XGlyphInfo extents; 1052 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 1053 if (sizeof (text_t) == sizeof (FcChar16))
922 { 1054 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 1055 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, 1056 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 1057 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 1058 }
927 else 1059 else
928 { 1060 {
929 XGlyphInfo extents; 1061 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 1062 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, 1063 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 1064 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 1065 }
934 } 1066 }
935 1067
936 x += r->TermWin.fwidth; 1068 x += r->TermWin.fwidth;
… …
942#endif 1074#endif
943 1075
944///////////////////////////////////////////////////////////////////////////// 1076/////////////////////////////////////////////////////////////////////////////
945 1077
946rxvt_fontset::rxvt_fontset (rxvt_t r) 1078rxvt_fontset::rxvt_fontset (rxvt_t r)
947#ifdef EXPLICIT_CONTEXT
948: r(r) 1079: r (r)
949#endif
950{ 1080{
951 clear (); 1081 clear ();
952} 1082}
953 1083
954rxvt_fontset::~rxvt_fontset () 1084rxvt_fontset::~rxvt_fontset ()
… …
957} 1087}
958 1088
959void 1089void
960rxvt_fontset::clear () 1090rxvt_fontset::clear ()
961{ 1091{
962 for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) 1092 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963 FONT_UNREF (*i); 1093 FONT_UNREF (*i);
964 1094
965 fonts.clear (); 1095 fonts.clear ();
966 base_id = 0; 1096 base_id = 0;
967 base_prop.height = 0x7fffffff; 1097 base_prop.height = 0x7fffffff;
… …
994 f = new rxvt_font_x11; 1124 f = new rxvt_font_x11;
995 } 1125 }
996 else 1126 else
997 f = new rxvt_font_x11; 1127 f = new rxvt_font_x11;
998 1128
1129 f->fs = this;
999 f->set_term (r); 1130 f->set_term (r);
1000 f->set_name (strdup (name)); 1131 f->set_name (strdup (name));
1001 1132
1002 f->cs = cs; 1133 f->cs = cs;
1003 f->loaded = false; 1134 f->loaded = false;
… …
1021 1152
1022 if (*desc == '[') 1153 if (*desc == '[')
1023 { 1154 {
1024 fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); 1155 fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025 1156
1026 const char *extra = desc++; 1157 //const char *extra = desc++; // not yet used
1027 1158
1028 desc = strchr (desc, ']'); 1159 desc = strchr (desc, ']');
1029 1160
1030 if (!desc) 1161 if (!desc)
1031 { 1162 {
… …
1070 } 1201 }
1071 1202
1072 return true; 1203 return true;
1073} 1204}
1074 1205
1075void 1206bool
1076rxvt_fontset::populate (const char *desc) 1207rxvt_fontset::populate (const char *desc)
1077{ 1208{
1078 clear (); 1209 clear ();
1079 1210
1080 fonts.push_back (new_font (0, CS_UNICODE)); 1211 fonts.push_back (new_font (0, CS_UNICODE));
… …
1084 1215
1085 if (!base_id) 1216 if (!base_id)
1086 base_id = 1; 1217 base_id = 1;
1087 1218
1088 // we currently need a base-font, no matter what 1219 // we currently need a base-font, no matter what
1089 if (fonts.size () <= base_id || !realize_font (base_id)) 1220 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1090 { 1221 {
1222 puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091 add_fonts ("fixed"); 1223 add_fonts ("fixed");
1092 base_id = fonts.size () - 1; 1224 base_id = fonts.size () - 1;
1093 } 1225 }
1094 1226
1095 if (fonts.size () <= base_id || !realize_font (base_id)) 1227 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1096 { 1228 return false;
1097 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098 exit (1);
1099 }
1100 1229
1101 base_prop = fonts[base_id]->properties (); 1230 base_prop = fonts[base_id]->properties ();
1231
1232 return true;
1102} 1233}
1103 1234
1104int 1235int
1105rxvt_fontset::find_font (uint32_t unicode) 1236rxvt_fontset::find_font (unicode_t unicode)
1106{ 1237{
1107 for (int i = 0; i < fonts.size (); i++) 1238 for (unsigned int i = 0; i < fonts.size (); i++)
1108 { 1239 {
1109 rxvt_font *f = fonts[i]; 1240 rxvt_font *f = fonts[i];
1110 1241
1111 if (!f->loaded) 1242 if (!f->loaded)
1112 { 1243 {

Diff Legend

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