1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 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 |
… | |
… | |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
|
|
24 | #include "rxvtlib.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
26 | |
27 | |
27 | #include <cstdlib> |
28 | #include <cstdlib> |
28 | #include <wchar.h> |
29 | #include <wchar.h> |
29 | #include <inttypes.h> |
30 | #include <inttypes.h> |
30 | |
31 | |
31 | #define DISPLAY r->display->display |
|
|
32 | #define TGC r->TermWin.gc |
|
|
33 | |
|
|
34 | #define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width |
32 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
|
|
33 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
|
|
34 | |
|
|
35 | #define OVERLAP_OK(w,prop) (w) > ( \ |
|
|
36 | prop->slant >= rxvt_fontprop::italic \ |
|
|
37 | ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
|
|
38 | : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
|
|
39 | ) |
35 | |
40 | |
36 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
37 | codeset cs; |
42 | codeset cs; |
38 | const char *name; |
43 | const char *name; |
39 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
… | |
… | |
152 | 0x304c, 0x672c, // が本 |
157 | 0x304c, 0x672c, // が本 |
153 | }; |
158 | }; |
154 | |
159 | |
155 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
156 | |
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->xdisp |
|
|
163 | #define dTermGC GC gc = term->gc |
|
|
164 | |
157 | ///////////////////////////////////////////////////////////////////////////// |
165 | ///////////////////////////////////////////////////////////////////////////// |
158 | |
166 | |
159 | #if XFT |
167 | #if XFT |
160 | rxvt_drawable::~rxvt_drawable () |
168 | rxvt_drawable::~rxvt_drawable () |
161 | { |
169 | { |
… | |
… | |
164 | } |
172 | } |
165 | |
173 | |
166 | rxvt_drawable::operator XftDraw *() |
174 | rxvt_drawable::operator XftDraw *() |
167 | { |
175 | { |
168 | if (!xftdrawable) |
176 | if (!xftdrawable) |
169 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
177 | xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap); |
170 | |
178 | |
171 | return xftdrawable; |
179 | return xftdrawable; |
172 | } |
180 | } |
173 | #endif |
181 | #endif |
174 | |
182 | |
175 | ///////////////////////////////////////////////////////////////////////////// |
183 | ///////////////////////////////////////////////////////////////////////////// |
176 | |
|
|
177 | static void *enc_buf; |
|
|
178 | static uint32_t enc_len; |
|
|
179 | |
|
|
180 | static inline void * |
|
|
181 | get_enc_buf (uint32_t len) |
|
|
182 | { |
|
|
183 | if (len > enc_len) |
|
|
184 | { |
|
|
185 | free (enc_buf); |
|
|
186 | enc_buf = malloc (len); |
|
|
187 | enc_len = len; |
|
|
188 | } |
|
|
189 | |
|
|
190 | return enc_buf; |
|
|
191 | } |
|
|
192 | |
184 | |
193 | static const char * |
185 | static const char * |
194 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
186 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
195 | { |
187 | { |
196 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
188 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
189 | uint8_t *res = buf; |
197 | |
190 | |
198 | while (len--) |
191 | while (len--) |
199 | { |
192 | { |
200 | uint32_t c = FROM_UNICODE (cs, *text++); |
193 | uint32_t c = FROM_UNICODE (cs, *text++); |
201 | |
194 | |
… | |
… | |
206 | } |
199 | } |
207 | |
200 | |
208 | *buf++ = c; |
201 | *buf++ = c; |
209 | } |
202 | } |
210 | |
203 | |
211 | return (const char *)enc_buf; |
204 | return (const char *)res; |
212 | } |
205 | } |
213 | |
206 | |
214 | static const XChar2b * |
207 | static const XChar2b * |
215 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
208 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
216 | { |
209 | { |
217 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
210 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
211 | XChar2b *res = buf; |
218 | |
212 | |
219 | while (len--) |
213 | while (len--) |
220 | { |
214 | { |
221 | uint32_t c = FROM_UNICODE (cs, *text++); |
215 | uint32_t c = FROM_UNICODE (cs, *text++); |
222 | |
216 | |
… | |
… | |
229 | buf->byte1 = c >> 8; |
223 | buf->byte1 = c >> 8; |
230 | buf->byte2 = c; |
224 | buf->byte2 = c; |
231 | buf++; |
225 | buf++; |
232 | } |
226 | } |
233 | |
227 | |
234 | return (XChar2b *)enc_buf; |
228 | return res; |
235 | } |
229 | } |
236 | |
230 | |
237 | ///////////////////////////////////////////////////////////////////////////// |
231 | ///////////////////////////////////////////////////////////////////////////// |
238 | |
232 | |
239 | void |
233 | void |
… | |
… | |
245 | if (this->name) free (this->name); // let the compiler optimize |
239 | if (this->name) free (this->name); // let the compiler optimize |
246 | this->name = name; |
240 | this->name = name; |
247 | } |
241 | } |
248 | |
242 | |
249 | void |
243 | void |
250 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
244 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
251 | { |
245 | { |
|
|
246 | dTermDisplay; |
|
|
247 | dTermGC; |
|
|
248 | |
252 | if (color == Color_bg) |
249 | if (color == Color_bg) |
253 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
250 | XClearArea (disp, d, x, y, w, h, false); |
254 | else if (color >= 0) |
251 | else if (color >= 0) |
255 | { |
252 | { |
256 | #if XFT |
253 | #if XFT |
257 | XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); |
254 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
258 | #else |
255 | #else |
259 | XSetForeground (d.display->display, TGC, r->pix_colors[color]); |
256 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
257 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
258 | #endif |
262 | } |
259 | } |
263 | } |
260 | } |
264 | |
261 | |
265 | #include "table/linedraw.h" |
262 | #include "table/linedraw.h" |
… | |
… | |
276 | rxvt_fontprop properties () |
273 | rxvt_fontprop properties () |
277 | { |
274 | { |
278 | rxvt_fontprop p; |
275 | rxvt_fontprop p; |
279 | |
276 | |
280 | p.width = p.height = 1; |
277 | p.width = p.height = 1; |
|
|
278 | p.ascent = rxvt_fontprop::unset; |
281 | p.weight = rxvt_fontprop::medium; |
279 | p.weight = rxvt_fontprop::medium; |
282 | p.slant = rxvt_fontprop::roman; |
280 | p.slant = rxvt_fontprop::roman; |
283 | |
281 | |
284 | return p; |
282 | return p; |
285 | } |
283 | } |
… | |
… | |
292 | set_name (strdup ("built-in support font")); |
290 | set_name (strdup ("built-in support font")); |
293 | |
291 | |
294 | return true; |
292 | return true; |
295 | } |
293 | } |
296 | |
294 | |
297 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
295 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
298 | { |
296 | { |
299 | careful = false; |
297 | careful = false; |
300 | |
298 | |
301 | if (unicode <= 0x001f) |
299 | if (unicode <= 0x001f) |
302 | return true; |
300 | return true; |
… | |
… | |
305 | return false; |
303 | return false; |
306 | |
304 | |
307 | if (unicode <= 0x009f) |
305 | if (unicode <= 0x009f) |
308 | return true; |
306 | return true; |
309 | |
307 | |
310 | if (unicode >= 0x2500 && unicode <= 0x259f) |
308 | if (unicode >= 0x2500 && unicode <= 0x259f && |
|
|
309 | !term->option (Opt_skipBuiltinGlyphs)) |
311 | return true; |
310 | return true; |
312 | |
311 | |
313 | if (IS_COMPOSE (unicode)) |
312 | if (IS_COMPOSE (unicode)) |
314 | return true; |
313 | return true; |
315 | |
314 | |
… | |
… | |
331 | void |
330 | void |
332 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
331 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
333 | const text_t *text, int len, |
332 | const text_t *text, int len, |
334 | int fg, int bg) |
333 | int fg, int bg) |
335 | { |
334 | { |
336 | Display *disp = d.display->display; |
335 | dTermDisplay; |
|
|
336 | dTermGC; |
337 | |
337 | |
338 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
338 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
339 | |
339 | |
340 | XSetForeground (disp, TGC, r->pix_colors[fg]); |
340 | XSetForeground (disp, gc, term->pix_colors[fg]); |
341 | |
341 | |
342 | while (len) |
342 | while (len) |
343 | { |
343 | { |
344 | #if ENABLE_COMBINING |
344 | #if ENABLE_COMBINING |
345 | compose_char *cc; |
345 | compose_char *cc; |
… | |
… | |
349 | |
349 | |
350 | while (++text, --len && *text == NOCHAR) |
350 | while (++text, --len && *text == NOCHAR) |
351 | ; |
351 | ; |
352 | |
352 | |
353 | int width = text - tp; |
353 | int width = text - tp; |
354 | int fwidth = r->TermWin.fwidth * width; |
354 | int fwidth = term->fwidth * width; |
355 | |
355 | |
356 | if (0x2500 <= t && t <= 0x259f) |
356 | if (0x2500 <= t && t <= 0x259f) |
357 | { |
357 | { |
358 | uint16_t offs = linedraw_offs[t - 0x2500]; |
358 | uint16_t offs = linedraw_offs[t - 0x2500]; |
359 | uint32_t *a = linedraw_command + (offs >> 4); |
359 | uint32_t *a = linedraw_command + (offs >> 4); |
360 | uint32_t *b = a + (offs & 15); |
360 | uint32_t *b = a + (offs & 15); |
361 | |
361 | |
362 | int W = fwidth; |
362 | int W = fwidth; |
363 | int H = r->TermWin.fheight; |
363 | int H = term->fheight; |
364 | |
364 | |
365 | int x_[16]; |
365 | int x_[16]; |
366 | int y_[16]; |
366 | int y_[16]; |
367 | |
367 | |
368 | for (int i = 0; i <= 8; i++) |
368 | for (int i = 0; i <= 8; i++) |
… | |
… | |
376 | |
376 | |
377 | XGCValues gcv; |
377 | XGCValues gcv; |
378 | |
378 | |
379 | gcv.cap_style = CapButt; |
379 | gcv.cap_style = CapButt; |
380 | gcv.line_width = 0; |
380 | gcv.line_width = 0; |
381 | XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); |
381 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
382 | |
382 | |
383 | while (a < b) |
383 | while (a < b) |
384 | { |
384 | { |
385 | uint32_t command = *a++; |
385 | uint32_t command = *a++; |
386 | |
386 | |
… | |
… | |
393 | int y2 = y_[(command >> 0) & 15]; |
393 | int y2 = y_[(command >> 0) & 15]; |
394 | |
394 | |
395 | switch (op) |
395 | switch (op) |
396 | { |
396 | { |
397 | case 0: // line |
397 | case 0: // line |
398 | XDrawLine (disp, d, TGC, x1, y1, x2, y2); |
398 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
399 | break; |
399 | break; |
400 | |
400 | |
401 | case 1: // rectangle, possibly stippled |
401 | case 1: // rectangle, possibly stippled |
402 | if (a) |
402 | if (a) |
403 | { |
403 | { |
… | |
… | |
406 | gcv.fill_style = FillStippled; |
406 | gcv.fill_style = FillStippled; |
407 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
407 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
408 | gcv.ts_x_origin = x; |
408 | gcv.ts_x_origin = x; |
409 | gcv.ts_y_origin = y; |
409 | gcv.ts_y_origin = y; |
410 | |
410 | |
411 | XChangeGC (disp, TGC, |
411 | XChangeGC (disp, gc, |
412 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
412 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
413 | &gcv); |
413 | &gcv); |
414 | } |
414 | } |
415 | |
415 | |
416 | XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
416 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
417 | |
417 | |
418 | if (a) |
418 | if (a) |
419 | { |
419 | { |
420 | XFreePixmap (disp, gcv.stipple); |
420 | XFreePixmap (disp, gcv.stipple); |
421 | gcv.stipple = 0; |
421 | gcv.stipple = 0; |
422 | gcv.fill_style = FillSolid; |
422 | gcv.fill_style = FillSolid; |
423 | XChangeGC (disp, TGC, GCFillStyle, &gcv); |
423 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
424 | } |
424 | } |
425 | break; |
425 | break; |
426 | case 2: // arc |
426 | case 2: // arc |
427 | XDrawArc (disp, d, TGC, |
427 | XDrawArc (disp, d, gc, |
428 | x1 - W/2, y1 - H/2, W-1, H-1, |
428 | x1 - W/2, y1 - H/2, W-1, H-1, |
429 | (a - 1) * 90*64, (b - 1) * 90*64); |
429 | (a - 1) * 90*64, (b - 1) * 90*64); |
430 | break; |
430 | break; |
431 | } |
431 | } |
432 | } |
432 | } |
… | |
… | |
463 | case ZERO_WIDTH_CHAR: |
463 | case ZERO_WIDTH_CHAR: |
464 | case NOCHAR: |
464 | case NOCHAR: |
465 | break; |
465 | break; |
466 | |
466 | |
467 | default: |
467 | default: |
468 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
468 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
469 | fwidth - 4, r->TermWin.fheight - 4); |
469 | fwidth - 4, term->fheight - 4); |
470 | } |
470 | } |
471 | |
471 | |
472 | x += fwidth; |
472 | x += fwidth; |
473 | } |
473 | } |
474 | } |
474 | } |
… | |
… | |
482 | |
482 | |
483 | rxvt_fontprop properties (); |
483 | rxvt_fontprop properties (); |
484 | |
484 | |
485 | bool load (const rxvt_fontprop &prop); |
485 | bool load (const rxvt_fontprop &prop); |
486 | |
486 | |
487 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
487 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
488 | |
488 | |
489 | void draw (rxvt_drawable &d, int x, int y, |
489 | void draw (rxvt_drawable &d, int x, int y, |
490 | const text_t *text, int len, |
490 | const text_t *text, int len, |
491 | int fg, int bg); |
491 | int fg, int bg); |
492 | |
492 | |
… | |
… | |
504 | char * |
504 | char * |
505 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
505 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
506 | { |
506 | { |
507 | unsigned long value; |
507 | unsigned long value; |
508 | |
508 | |
509 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
509 | if (XGetFontProperty (f, XInternAtom (term->xdisp, property, 0), &value)) |
510 | return XGetAtomName (DISPLAY, value); |
510 | return XGetAtomName (term->xdisp, value); |
511 | else |
511 | else |
512 | return rxvt_strdup (repl); |
512 | return rxvt_strdup (repl); |
513 | } |
513 | } |
514 | |
514 | |
515 | rxvt_fontprop |
515 | rxvt_fontprop |
… | |
… | |
523 | bool |
523 | bool |
524 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
524 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
525 | { |
525 | { |
526 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
526 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
527 | p.height = height; |
527 | p.height = height; |
|
|
528 | p.ascent = rxvt_fontprop::unset; |
528 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
529 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
529 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
530 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
530 | |
531 | |
531 | return true; |
532 | return true; |
532 | } |
533 | } |
… | |
… | |
535 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
536 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
536 | { |
537 | { |
537 | unsigned long height; |
538 | unsigned long height; |
538 | |
539 | |
539 | #if 0 |
540 | #if 0 |
540 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
541 | if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) |
541 | return false; |
542 | return false; |
542 | #else |
543 | #else |
543 | height = f->ascent + f->descent; |
544 | height = f->ascent + f->descent; |
544 | #endif |
545 | #endif |
545 | |
546 | |
546 | unsigned long avgwidth; |
547 | unsigned long avgwidth; |
547 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
548 | if (!XGetFontProperty (f, XInternAtom (term->xdisp, "AVERAGE_WIDTH", 0), &avgwidth)) |
548 | avgwidth = 0; |
549 | avgwidth = 0; |
549 | |
550 | |
550 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
551 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
551 | char *slant = get_property (f, "SLANT", "r"); |
552 | char *slant = get_property (f, "SLANT", "r"); |
552 | |
553 | |
553 | set_properties (p, height, weight, slant, avgwidth); |
554 | set_properties (p, height, weight, slant, avgwidth); |
554 | |
555 | |
555 | free (weight); |
556 | free (weight); |
556 | free (slant); |
557 | free (slant); |
557 | |
558 | |
|
|
559 | p.ascent = f->ascent; |
|
|
560 | |
558 | return true; |
561 | return true; |
559 | } |
562 | } |
560 | |
563 | |
561 | bool |
564 | bool |
562 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
565 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
563 | { |
566 | { |
|
|
567 | dTermDisplay; |
564 | int slashes = 0; |
568 | int slashes = 0; |
565 | const char *comp[13]; |
569 | const char *comp[13]; |
566 | |
570 | |
567 | for (const char *c = name; *c; c++) |
571 | for (const char *c = name; *c; c++) |
568 | if (*c == '-') |
572 | if (*c == '-') |
… | |
… | |
576 | if (slashes >= 13 |
580 | if (slashes >= 13 |
577 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
581 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
578 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
582 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
579 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
583 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
580 | |
584 | |
581 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
585 | XFontStruct *f = XLoadQueryFont (disp, name); |
582 | |
586 | |
583 | if (f) |
587 | if (f) |
584 | { |
588 | { |
585 | // the font should really exist now. if not, we have a problem |
589 | // the font should really exist now. if not, we have a problem |
586 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
590 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
587 | // in that case, just return garbage. |
591 | // in that case, just return garbage. |
588 | bool ret = set_properties (p, f); |
592 | bool ret = set_properties (p, f); |
589 | XFreeFont (DISPLAY, f); |
593 | XFreeFont (disp, f); |
590 | return ret; |
594 | return ret; |
591 | } |
595 | } |
592 | else |
596 | else |
593 | return false; |
597 | return false; |
594 | } |
598 | } |
… | |
… | |
632 | } |
636 | } |
633 | |
637 | |
634 | bool |
638 | bool |
635 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
639 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
636 | { |
640 | { |
637 | Display *disp = DISPLAY; |
641 | dTermDisplay; |
638 | |
642 | |
639 | clear (); |
643 | clear (); |
640 | |
644 | |
641 | char field_str[64]; // enough for 128 bits |
645 | char field_str[64]; // enough for 128 bits |
642 | |
646 | |
… | |
… | |
717 | int diff = 0; |
721 | int diff = 0; |
718 | |
722 | |
719 | if (replace_field (fname, list[i], 6, '0', field_str)) |
723 | if (replace_field (fname, list[i], 6, '0', field_str)) |
720 | diff += 10; // slightly penalize scalable fonts |
724 | diff += 10; // slightly penalize scalable fonts |
721 | else if (replace_field (fname, list[i], 11, '0', "0")) |
725 | else if (replace_field (fname, list[i], 11, '0', "0")) |
722 | diff += 300; // more heavily penalize what looks like scaled bitmap fotns |
726 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
723 | |
727 | |
724 | if (!set_properties (p, fname)) |
728 | if (!set_properties (p, fname)) |
725 | continue; |
729 | continue; |
726 | |
730 | |
727 | if (prop.height != rxvt_fontprop::unset |
731 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
851 | |
855 | |
852 | XCharStruct g; |
856 | XCharStruct g; |
853 | int dir_ret, asc_ret, des_ret; |
857 | int dir_ret, asc_ret, des_ret; |
854 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
858 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
855 | |
859 | |
856 | int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
860 | int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
857 | |
861 | |
858 | if (width < g.width) width = g.width; |
862 | if (width < g.width) width = g.width; |
859 | } |
863 | } |
860 | |
864 | |
861 | if (cs == CS_UNKNOWN) |
865 | if (cs == CS_UNKNOWN) |
… | |
… | |
880 | void |
884 | void |
881 | rxvt_font_x11::clear () |
885 | rxvt_font_x11::clear () |
882 | { |
886 | { |
883 | if (f) |
887 | if (f) |
884 | { |
888 | { |
885 | XFreeFont (DISPLAY, f); |
889 | XFreeFont (term->xdisp, f); |
886 | f = 0; |
890 | f = 0; |
887 | } |
891 | } |
888 | } |
892 | } |
889 | |
893 | |
890 | bool |
894 | bool |
891 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
895 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
892 | { |
896 | { |
893 | uint32_t ch = FROM_UNICODE (cs, unicode); |
897 | uint32_t ch = FROM_UNICODE (cs, unicode); |
894 | |
898 | |
895 | if (ch == NOCHAR) |
899 | if (ch == NOCHAR) |
896 | return false; |
900 | return false; |
… | |
… | |
934 | |
938 | |
935 | if (!prop || prop->width == rxvt_fontprop::unset) |
939 | if (!prop || prop->width == rxvt_fontprop::unset) |
936 | return true; |
940 | return true; |
937 | |
941 | |
938 | // check character against base font bounding box |
942 | // check character against base font bounding box |
939 | int w = xcs->width; |
943 | int w = xcs->rbearing - xcs->lbearing; |
940 | int wcw = wcwidth (unicode); |
944 | int wcw = WCWIDTH (unicode); |
941 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
945 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
942 | |
946 | |
943 | careful = w > prop->width; |
947 | careful = w > prop->width; |
944 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
948 | if (careful && OVERLAP_OK (w, prop)) |
945 | return false; |
949 | return false; |
946 | |
950 | |
947 | return true; |
951 | return true; |
948 | } |
952 | } |
949 | |
953 | |
… | |
… | |
955 | // this looks like a mess /. |
959 | // this looks like a mess /. |
956 | // and it is a mess /. |
960 | // and it is a mess /. |
957 | // yet we are trying to be perfect /. |
961 | // yet we are trying to be perfect /. |
958 | // but the result still isn't perfect /. |
962 | // but the result still isn't perfect /. |
959 | |
963 | |
|
|
964 | dTermDisplay; |
|
|
965 | dTermGC; |
|
|
966 | |
960 | bool slow = this->slow |
967 | bool slow = this->slow |
961 | || width != r->TermWin.fwidth |
968 | || width != term->fwidth |
962 | || height != r->TermWin.fheight; |
969 | || height != term->fheight; |
963 | |
970 | |
964 | int base = ascent; // sorry, incorrect: r->TermWin.fbase; |
971 | int base = ascent; // sorry, incorrect: term->fbase; |
965 | |
972 | |
966 | XGCValues v; |
973 | XGCValues v; |
967 | v.foreground = r->pix_colors[fg]; |
974 | v.foreground = term->pix_colors[fg]; |
968 | v.font = f->fid; |
975 | v.font = f->fid; |
969 | |
976 | |
970 | if (enc2b) |
977 | if (enc2b) |
971 | { |
978 | { |
972 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
979 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
973 | |
980 | |
974 | if (bg == Color_bg && !slow) |
981 | if (bg == Color_bg && !slow) |
975 | { |
982 | { |
976 | v.background = r->pix_colors[bg]; |
983 | v.background = term->pix_colors[bg]; |
977 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
984 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
978 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
985 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
979 | } |
986 | } |
980 | else |
987 | else |
981 | { |
988 | { |
982 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
989 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
983 | |
990 | |
984 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
991 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
985 | |
992 | |
986 | if (slow) |
993 | if (slow) |
987 | { |
994 | { |
988 | do |
995 | do |
989 | { |
996 | { |
990 | if (xc->byte1 || xc->byte2) |
997 | if (xc->byte1 || xc->byte2) |
991 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
998 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
992 | |
999 | |
993 | x += r->TermWin.fwidth; |
1000 | x += term->fwidth; |
994 | xc++; len--; |
1001 | xc++; len--; |
995 | } |
1002 | } |
996 | while (len); |
1003 | while (len); |
997 | } |
1004 | } |
998 | else |
1005 | else |
999 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1006 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
1000 | } |
1007 | } |
1001 | } |
1008 | } |
1002 | else |
1009 | else |
1003 | { |
1010 | { |
1004 | const char *xc = enc_char (text, len, cs, slow); |
1011 | const char *xc = enc_char (text, len, cs, slow); |
1005 | |
1012 | |
1006 | if (bg == Color_bg && !slow) |
1013 | if (bg == Color_bg && !slow) |
1007 | { |
1014 | { |
1008 | v.background = r->pix_colors[bg]; |
1015 | v.background = term->pix_colors[bg]; |
1009 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1016 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
1010 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1017 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
1011 | } |
1018 | } |
1012 | else |
1019 | else |
1013 | { |
1020 | { |
1014 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1021 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1015 | |
1022 | |
1016 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1023 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1017 | |
1024 | |
1018 | if (slow) |
1025 | if (slow) |
1019 | { |
1026 | { |
1020 | do |
1027 | do |
1021 | { |
1028 | { |
1022 | if (*xc) |
1029 | if (*xc) |
1023 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1030 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
1024 | |
1031 | |
1025 | x += r->TermWin.fwidth; |
1032 | x += term->fwidth; |
1026 | xc++; len--; |
1033 | xc++; len--; |
1027 | } |
1034 | } |
1028 | while (len); |
1035 | while (len); |
1029 | } |
1036 | } |
1030 | else |
1037 | else |
1031 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1038 | XDrawString (disp, d, gc, x, y + base, xc, len); |
1032 | } |
1039 | } |
1033 | } |
1040 | } |
1034 | } |
1041 | } |
1035 | |
1042 | |
1036 | ///////////////////////////////////////////////////////////////////////////// |
1043 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1048 | |
1055 | |
1049 | void draw (rxvt_drawable &d, int x, int y, |
1056 | void draw (rxvt_drawable &d, int x, int y, |
1050 | const text_t *text, int len, |
1057 | const text_t *text, int len, |
1051 | int fg, int bg); |
1058 | int fg, int bg); |
1052 | |
1059 | |
1053 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1060 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1054 | |
1061 | |
1055 | protected: |
1062 | protected: |
1056 | XftFont *f; |
1063 | XftFont *f; |
1057 | }; |
1064 | }; |
1058 | |
1065 | |
1059 | void |
1066 | void |
1060 | rxvt_font_xft::clear () |
1067 | rxvt_font_xft::clear () |
1061 | { |
1068 | { |
1062 | if (f) |
1069 | if (f) |
1063 | { |
1070 | { |
1064 | XftFontClose (DISPLAY, f); |
1071 | XftFontClose (term->xdisp, f); |
1065 | f = 0; |
1072 | f = 0; |
1066 | } |
1073 | } |
1067 | } |
1074 | } |
1068 | |
1075 | |
1069 | rxvt_fontprop |
1076 | rxvt_fontprop |
… | |
… | |
1073 | |
1080 | |
1074 | FT_Face face = XftLockFace (f); |
1081 | FT_Face face = XftLockFace (f); |
1075 | |
1082 | |
1076 | p.width = width; |
1083 | p.width = width; |
1077 | p.height = height; |
1084 | p.height = height; |
|
|
1085 | p.ascent = ascent; |
1078 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1086 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1079 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1087 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1080 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1088 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1081 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1089 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1082 | |
1090 | |
… | |
… | |
1086 | } |
1094 | } |
1087 | |
1095 | |
1088 | bool |
1096 | bool |
1089 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1097 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1090 | { |
1098 | { |
1091 | Display *disp = DISPLAY; |
1099 | dTermDisplay; |
1092 | |
1100 | |
1093 | clear (); |
1101 | clear (); |
1094 | |
1102 | |
1095 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1103 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1096 | |
1104 | |
… | |
… | |
1123 | |
1131 | |
1124 | // store generated name so iso14755 view gives better results |
1132 | // store generated name so iso14755 view gives better results |
1125 | set_name ((char *)FcNameUnparse (p)); |
1133 | set_name ((char *)FcNameUnparse (p)); |
1126 | |
1134 | |
1127 | XftResult result; |
1135 | XftResult result; |
1128 | FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); |
1136 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1129 | |
1137 | |
1130 | FcPatternDestroy (p); |
1138 | FcPatternDestroy (p); |
1131 | |
1139 | |
1132 | if (!match) |
1140 | if (!match) |
1133 | return false; |
1141 | return false; |
… | |
… | |
1175 | XGlyphInfo g; |
1183 | XGlyphInfo g; |
1176 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1184 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1177 | |
1185 | |
1178 | g.width -= g.x; |
1186 | g.width -= g.x; |
1179 | |
1187 | |
1180 | int wcw = wcwidth (ch); |
1188 | int wcw = WCWIDTH (ch); |
1181 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1189 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1182 | |
1190 | |
1183 | if (width < g.width ) width = g.width; |
1191 | if (width < g.width ) width = g.width; |
1184 | if (height < g.height ) height = g.height; |
1192 | if (height < g.height ) height = g.height; |
1185 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1193 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
|
|
1194 | } |
|
|
1195 | |
|
|
1196 | if (!width) |
|
|
1197 | { |
|
|
1198 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
|
|
1199 | |
|
|
1200 | XftFontClose (disp, f); |
|
|
1201 | f = 0; |
|
|
1202 | |
|
|
1203 | success = false; |
|
|
1204 | break; |
1186 | } |
1205 | } |
1187 | |
1206 | |
1188 | if (prop.height == rxvt_fontprop::unset |
1207 | if (prop.height == rxvt_fontprop::unset |
1189 | || (height <= prop.height && glheight <= prop.height) |
1208 | || (height <= prop.height && glheight <= prop.height) |
1190 | || height <= 2 |
1209 | || height <= 2 |
… | |
… | |
1201 | ftheight -= height - prop.height; |
1220 | ftheight -= height - prop.height; |
1202 | } |
1221 | } |
1203 | else |
1222 | else |
1204 | ftheight = prop.height - 1; |
1223 | ftheight = prop.height - 1; |
1205 | |
1224 | |
1206 | XftFontClose (disp, f); |
1225 | XftFontClose (disp, f); |
1207 | FcPatternDel (match, FC_PIXEL_SIZE); |
1226 | FcPatternDel (match, FC_PIXEL_SIZE); |
1208 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1227 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1209 | } |
1228 | } |
1210 | |
1229 | |
1211 | FcPatternDestroy (match); |
1230 | FcPatternDestroy (match); |
1212 | |
1231 | |
1213 | #if 0 // do it per-character |
1232 | #if 0 // do it per-character |
… | |
… | |
1220 | |
1239 | |
1221 | return success; |
1240 | return success; |
1222 | } |
1241 | } |
1223 | |
1242 | |
1224 | bool |
1243 | bool |
1225 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1244 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1226 | { |
1245 | { |
1227 | careful = false; |
1246 | careful = false; |
1228 | |
1247 | |
1229 | if (!XftCharExists (DISPLAY, f, unicode)) |
1248 | if (!XftCharExists (term->xdisp, f, unicode)) |
1230 | return false; |
1249 | return false; |
1231 | |
1250 | |
1232 | if (!prop || prop->width == rxvt_fontprop::unset) |
1251 | if (!prop || prop->width == rxvt_fontprop::unset) |
1233 | return true; |
1252 | return true; |
1234 | |
1253 | |
1235 | // check character against base font bounding box |
1254 | // check character against base font bounding box |
1236 | FcChar32 ch = unicode; |
1255 | FcChar32 ch = unicode; |
1237 | XGlyphInfo g; |
1256 | XGlyphInfo g; |
1238 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1257 | XftTextExtents32 (term->xdisp, f, &ch, 1, &g); |
1239 | |
1258 | |
1240 | int w = g.width - g.x; |
1259 | int w = g.width - g.x; |
1241 | int wcw = wcwidth (unicode); |
1260 | int wcw = WCWIDTH (unicode); |
1242 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
1261 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
1243 | |
1262 | |
1244 | careful = w > prop->width; |
1263 | careful = w > prop->width; |
1245 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1264 | if (careful && OVERLAP_OK (w, prop)) |
1246 | return false; |
1265 | return false; |
1247 | |
1266 | |
1248 | return true; |
1267 | return true; |
1249 | } |
1268 | } |
1250 | |
1269 | |
1251 | void |
1270 | void |
1252 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1271 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1253 | const text_t *text, int len, |
1272 | const text_t *text, int len, |
1254 | int fg, int bg) |
1273 | int fg, int bg) |
1255 | { |
1274 | { |
1256 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1275 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1257 | |
|
|
1258 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1259 | |
1276 | |
1260 | XGlyphInfo extents; |
1277 | XGlyphInfo extents; |
1261 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1278 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1262 | FcChar32 *ep = enc; |
1279 | XftGlyphSpec *ep = enc; |
1263 | int ewidth = 0; |
1280 | |
|
|
1281 | dTermDisplay; |
|
|
1282 | dTermGC; |
|
|
1283 | |
|
|
1284 | // cut trailing spaces |
|
|
1285 | while (len && text [len - 1] == ' ') |
|
|
1286 | len--; |
1264 | |
1287 | |
1265 | while (len) |
1288 | while (len) |
1266 | { |
1289 | { |
1267 | int cwidth = r->TermWin.fwidth; |
1290 | int cwidth = term->fwidth; |
1268 | FcChar32 fc = *text++; len--; |
1291 | FcChar32 fc = *text++; len--; |
1269 | |
1292 | |
1270 | while (len && *text == NOCHAR) |
1293 | while (len && *text == NOCHAR) |
1271 | text++, len--, cwidth += r->TermWin.fwidth; |
1294 | text++, len--, cwidth += term->fwidth; |
1272 | |
1295 | |
1273 | if (fc == ' ' && ep == enc) // skip leading spaces |
1296 | if (fc != ' ') // skip spaces |
|
|
1297 | { |
|
|
1298 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1299 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1300 | |
|
|
1301 | ep->glyph = glyph; |
|
|
1302 | ep->x = x + (cwidth - extents.xOff >> 1); |
|
|
1303 | ep->y = y + ascent; |
|
|
1304 | ep++; |
|
|
1305 | } |
|
|
1306 | |
1274 | x += cwidth; |
1307 | x += cwidth; |
1275 | else |
|
|
1276 | { |
|
|
1277 | FT_UInt gl = XftCharIndex (d.display->display, f, fc); |
|
|
1278 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1279 | |
|
|
1280 | if (extents.xOff != cwidth) |
|
|
1281 | { |
|
|
1282 | if (ewidth) |
|
|
1283 | { |
|
|
1284 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1285 | x, y + base, enc, ep - enc); |
|
|
1286 | x += ewidth; |
|
|
1287 | |
|
|
1288 | ep = enc; |
|
|
1289 | ewidth = 0; |
|
|
1290 | } |
|
|
1291 | |
|
|
1292 | if (extents.xOff > cwidth) |
|
|
1293 | extents.xOff = cwidth; |
|
|
1294 | |
|
|
1295 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1296 | x + (cwidth - extents.xOff >> 1), |
|
|
1297 | y + base, &gl, 1); |
|
|
1298 | x += cwidth; |
|
|
1299 | } |
|
|
1300 | else |
|
|
1301 | { |
|
|
1302 | *ep++ = gl; |
|
|
1303 | ewidth += cwidth; |
|
|
1304 | } |
|
|
1305 | } |
|
|
1306 | } |
1308 | } |
1307 | |
1309 | |
1308 | if (ep != enc) |
1310 | if (ep != enc) |
1309 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1311 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1310 | x, y + base, enc, ep - enc); |
|
|
1311 | } |
1312 | } |
1312 | #endif |
1313 | #endif |
1313 | |
1314 | |
1314 | ///////////////////////////////////////////////////////////////////////////// |
1315 | ///////////////////////////////////////////////////////////////////////////// |
1315 | |
1316 | |
1316 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1317 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1317 | : fontdesc (0), r (r) |
1318 | : fontdesc (0), term (term) |
1318 | { |
1319 | { |
1319 | clear (); |
1320 | clear (); |
1320 | } |
1321 | } |
1321 | |
1322 | |
1322 | rxvt_fontset::~rxvt_fontset () |
1323 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1325 | } |
1326 | } |
1326 | |
1327 | |
1327 | void |
1328 | void |
1328 | rxvt_fontset::clear () |
1329 | rxvt_fontset::clear () |
1329 | { |
1330 | { |
1330 | prop.width = prop.height = prop.weight = prop.slant |
1331 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1331 | = rxvt_fontprop::unset; |
1332 | = rxvt_fontprop::unset; |
1332 | |
1333 | |
1333 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1334 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1334 | FONT_UNREF (*i); |
1335 | FONT_UNREF (*i); |
1335 | |
1336 | |
… | |
… | |
1366 | f = new rxvt_font_x11; |
1367 | f = new rxvt_font_x11; |
1367 | } |
1368 | } |
1368 | else |
1369 | else |
1369 | f = new rxvt_font_x11; |
1370 | f = new rxvt_font_x11; |
1370 | |
1371 | |
1371 | f->set_term (r); |
1372 | f->set_term (term); |
1372 | f->set_name (strdup (name)); |
1373 | f->set_name (strdup (name)); |
1373 | |
1374 | |
1374 | f->cs = cs; |
1375 | f->cs = cs; |
1375 | f->loaded = false; |
1376 | f->loaded = false; |
1376 | |
1377 | |
… | |
… | |
1508 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1509 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1509 | goto next_font; |
1510 | goto next_font; |
1510 | |
1511 | |
1511 | if (!realize_font (i)) |
1512 | if (!realize_font (i)) |
1512 | goto next_font; |
1513 | goto next_font; |
|
|
1514 | |
|
|
1515 | if (prop.ascent != rxvt_fontprop::unset) |
|
|
1516 | max_it (f->ascent, prop.ascent); |
1513 | } |
1517 | } |
1514 | |
1518 | |
1515 | if (f->cs == CS_UNKNOWN) |
1519 | if (f->cs == CS_UNKNOWN) |
1516 | goto next_font; |
1520 | goto next_font; |
1517 | |
1521 | |
… | |
… | |
1556 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1560 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1557 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1561 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1558 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1562 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1559 | |
1563 | |
1560 | XftResult result; |
1564 | XftResult result; |
1561 | FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); |
1565 | FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); |
1562 | |
1566 | |
1563 | FcPatternDestroy (p); |
1567 | FcPatternDestroy (p); |
1564 | |
1568 | |
1565 | if (match) |
1569 | if (match) |
1566 | { |
1570 | { |