… | |
… | |
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 GC r->TermWin.gc |
29 | #define TGC r->TermWin.gc |
30 | |
30 | |
31 | const struct rxvt_fallback_font { |
31 | const struct rxvt_fallback_font { |
32 | codeset cs; |
32 | codeset cs; |
33 | const char *name; |
33 | const char *name; |
34 | } fallback_fonts[] = { |
34 | } fallback_fonts[] = { |
… | |
… | |
61 | # if XFT |
61 | # if XFT |
62 | // prefer xft for complex scripts |
62 | // prefer xft for complex scripts |
63 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
63 | { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, |
64 | # endif |
64 | # endif |
65 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
65 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
66 | { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
66 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
67 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
67 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
68 | #endif |
68 | #endif |
69 | |
69 | |
70 | #if ENCODING_CN || ENCODING_CN_EXT |
70 | #if ENCODING_CN || ENCODING_CN_EXT |
71 | # if XFT |
71 | # if XFT |
… | |
… | |
194 | else if (color >= 0) |
194 | else if (color >= 0) |
195 | { |
195 | { |
196 | #if XFT |
196 | #if XFT |
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
198 | #else |
198 | #else |
199 | XSetForeground (d.display->display, GC, r->PixColors[color]); |
199 | XSetForeground (d.display->display, TGC, r->PixColors[color]); |
200 | XFillRectangle (d.display->display, d, GC, x, y, w, h); |
200 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
201 | #endif |
201 | #endif |
202 | } |
202 | } |
203 | } |
203 | } |
204 | |
|
|
205 | static const char *linedraw_cmds[128] = { |
|
|
206 | "1hH", "2hH", "1vV", "2vV", |
|
|
207 | 0, 0, 0, 0, |
|
|
208 | 0, 0, 0, 0, |
|
|
209 | "1HV", "2H1V", "1H2V", "2HV", |
|
|
210 | |
|
|
211 | // 2510 |
|
|
212 | "1hV", "2h1V", "1h2V", "2hV", |
|
|
213 | "1Hv", "2H1v", "1H2v", "2Hv", |
|
|
214 | "1hv", "2h1v", "1h2v", "2hv", |
|
|
215 | "1HvV", "2H1vV", "1HV2v", "1Hv2V", |
|
|
216 | |
|
|
217 | // 2520 |
|
|
218 | "1H2vV", "2Hv1V", "2HV1v", "2HvV", |
|
|
219 | "1hvV", "2h1vV", "1hV2v", "1hv2V", |
|
|
220 | "1h2vV", "2hv1V", "1v2hV", "2hvV", |
|
|
221 | "1hHV", "2h1HV", "2H1hV", "2hH1V", |
|
|
222 | |
|
|
223 | // 2530 |
|
|
224 | "1hH2V", "2hV1H", "1h2HV", "2hHV", |
|
|
225 | "1hHv", "1vH2h", "1hv2H", "1v2hH", |
|
|
226 | "1hH2v", "1H2hv", "1h2Hv", "2hHv", |
|
|
227 | "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH", |
|
|
228 | |
|
|
229 | // 2540 |
|
|
230 | "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv", |
|
|
231 | "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv", |
|
|
232 | "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV", |
|
|
233 | 0, 0, 0, 0, |
|
|
234 | |
|
|
235 | // 2550 |
|
|
236 | 0, 0, 0, 0, |
|
|
237 | 0, 0, 0, 0, |
|
|
238 | 0, 0, 0, 0, |
|
|
239 | 0, 0, 0, 0, |
|
|
240 | |
|
|
241 | // 2560 |
|
|
242 | 0, 0, 0, 0, |
|
|
243 | 0, 0, 0, 0, |
|
|
244 | 0, 0, 0, 0, |
|
|
245 | 0, 0, 0, 0, |
|
|
246 | |
|
|
247 | // 2570 |
|
|
248 | 0, "1a", "1b", "1ab", |
|
|
249 | "1h", "1v", "1H", "1V", |
|
|
250 | "2h", "2v", "2H", "2V", |
|
|
251 | "1h2H", "1v2V", "1H2h", "1V2v" |
|
|
252 | |
|
|
253 | // to be done |
|
|
254 | }; |
|
|
255 | |
204 | |
256 | struct rxvt_font_default : rxvt_font { |
205 | struct rxvt_font_default : rxvt_font { |
257 | rxvt_fontprop properties () |
206 | rxvt_fontprop properties () |
258 | { |
207 | { |
259 | rxvt_fontprop p; |
208 | rxvt_fontprop p; |
… | |
… | |
273 | set_name ("built-in pseudofont"); |
222 | set_name ("built-in pseudofont"); |
274 | |
223 | |
275 | return true; |
224 | return true; |
276 | } |
225 | } |
277 | |
226 | |
278 | bool has_codepoint (uint32_t unicode) |
227 | bool has_codepoint (unicode_t unicode) |
279 | { |
228 | { |
280 | if (unicode <= 0x001f) |
229 | if (unicode <= 0x001f) |
281 | return true; |
230 | return true; |
282 | |
231 | |
283 | if (unicode >= 0x0080 && unicode <= 0x009f) |
232 | if (unicode >= 0x0080 && unicode <= 0x009f) |
284 | return true; |
233 | return true; |
285 | |
234 | |
286 | if (unicode >= 0x2500 && unicode <= 0x257f |
235 | if (unicode >= 0x2500 && unicode <= 0x259f) |
287 | && linedraw_cmds[unicode - 0x2500]) |
|
|
288 | return true; |
236 | return true; |
289 | |
237 | |
290 | if (IS_COMPOSE (unicode)) |
238 | if (IS_COMPOSE (unicode)) |
291 | return true; |
239 | return true; |
292 | |
240 | |
… | |
… | |
302 | void draw (rxvt_drawable &d, int x, int y, |
250 | void draw (rxvt_drawable &d, int x, int y, |
303 | const text_t *text, int len, |
251 | const text_t *text, int len, |
304 | int fg, int bg); |
252 | int fg, int bg); |
305 | }; |
253 | }; |
306 | |
254 | |
|
|
255 | static 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 | |
307 | void |
279 | void |
308 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
280 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
309 | const text_t *text, int len, |
281 | const text_t *text, int len, |
310 | int fg, int bg) |
282 | int fg, int bg) |
311 | { |
283 | { |
312 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
284 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
313 | |
285 | |
314 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
286 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
315 | |
287 | |
316 | while (len--) |
288 | while (len--) |
317 | { |
289 | { |
|
|
290 | #if ENABLE_COMBINING |
318 | compose_char *cc; |
291 | compose_char *cc; |
|
|
292 | #endif |
319 | text_t t = *text++; |
293 | text_t t = *text++; |
320 | |
294 | |
321 | // is it in our linedrawing table? |
295 | int x_[16]; |
322 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
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; |
323 | { |
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 | |
324 | const char *p = linedraw_cmds[t - 0x2500]; |
312 | int i1 = linedraw_offs[t - 0x2500]; |
|
|
313 | int i2 = linedraw_offs[t - 0x2500 + 1]; |
325 | |
314 | |
326 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
|
|
327 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
|
|
328 | |
|
|
329 | XGCValues gcv; |
315 | XGCValues gcv; |
330 | |
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 | { |
331 | while (*p) |
323 | while (i1 < i2) |
332 | { |
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 | |
333 | switch (*p++) |
335 | switch (op) |
334 | { |
336 | { |
335 | case '1': |
337 | case 0: // line |
336 | gcv.line_width = 0; |
338 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
337 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
338 | break; |
339 | break; |
339 | |
340 | |
340 | case '2': |
341 | case 1: // rectangle, possibly stippled |
341 | gcv.line_width = 2; |
342 | if (a) |
|
|
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; |
342 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
363 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
364 | } |
|
|
365 | |
343 | break; |
366 | break; |
344 | |
367 | case 2: // arc |
345 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; |
368 | break; |
346 | case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; |
|
|
347 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; |
|
|
348 | case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; |
|
|
349 | case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break; |
|
|
350 | case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; |
|
|
351 | } |
369 | } |
352 | } |
370 | } |
353 | |
371 | |
354 | gcv.line_width = 0; |
372 | #if 0 |
355 | XChangeGC (d.display->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 | } |
356 | } |
383 | } |
|
|
384 | #endif |
|
|
385 | |
|
|
386 | } |
|
|
387 | #if ENABLE_COMBINING |
357 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
388 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
358 | { |
389 | { |
359 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
390 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
360 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
391 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
361 | if (cc->c2 != NOCHAR) |
392 | if (cc->c2 != NOCHAR) |
… | |
… | |
366 | : (*fs)[fs->find_font (cc->c2)]; |
397 | : (*fs)[fs->find_font (cc->c2)]; |
367 | |
398 | |
368 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
399 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
369 | } |
400 | } |
370 | } |
401 | } |
|
|
402 | #endif |
371 | else |
403 | else |
372 | switch (t) |
404 | switch (t) |
373 | { |
405 | { |
374 | case ZERO_WIDTH_CHAR: |
406 | case ZERO_WIDTH_CHAR: |
375 | 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 | |
376 | default: |
436 | default: |
377 | int w = 0; |
437 | int w = 0; |
378 | while (len > 0 && *text == NOCHAR) |
438 | while (len > 0 && *text == NOCHAR) |
379 | { |
439 | { |
380 | ++text; |
440 | ++text; |
381 | --len; |
441 | --len; |
382 | w += r->TermWin.fwidth; |
442 | w += r->TermWin.fwidth; |
383 | } |
443 | } |
384 | |
444 | |
385 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
445 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
386 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
446 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
387 | x += w; |
447 | x += w; |
388 | } |
448 | } |
389 | |
449 | |
390 | x += r->TermWin.fwidth; |
450 | x += r->TermWin.fwidth; |
391 | } |
451 | } |
… | |
… | |
400 | |
460 | |
401 | rxvt_fontprop properties (); |
461 | rxvt_fontprop properties (); |
402 | |
462 | |
403 | bool load (const rxvt_fontprop &prop); |
463 | bool load (const rxvt_fontprop &prop); |
404 | |
464 | |
405 | bool has_codepoint (uint32_t unicode); |
465 | bool has_codepoint (unicode_t unicode); |
406 | |
466 | |
407 | void draw (rxvt_drawable &d, int x, int y, |
467 | void draw (rxvt_drawable &d, int x, int y, |
408 | const text_t *text, int len, |
468 | const text_t *text, int len, |
409 | int fg, int bg); |
469 | int fg, int bg); |
410 | |
470 | |
… | |
… | |
657 | f = 0; |
717 | f = 0; |
658 | } |
718 | } |
659 | } |
719 | } |
660 | |
720 | |
661 | bool |
721 | bool |
662 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
722 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
663 | { |
723 | { |
664 | uint32_t ch = FROM_UNICODE (cs, unicode); |
724 | uint32_t ch = FROM_UNICODE (cs, unicode); |
665 | |
725 | |
666 | if (ch == NOCHAR) |
726 | if (ch == NOCHAR) |
667 | return false; |
727 | return false; |
… | |
… | |
729 | { |
789 | { |
730 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
790 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
731 | |
791 | |
732 | if (bg == Color_bg && !slow) |
792 | if (bg == Color_bg && !slow) |
733 | { |
793 | { |
734 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
794 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
735 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
795 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
736 | } |
796 | } |
737 | else |
797 | else |
738 | { |
798 | { |
739 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
799 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
740 | |
800 | |
741 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
801 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
742 | |
802 | |
743 | if (slow) |
803 | if (slow) |
744 | { |
804 | { |
745 | do |
805 | do |
746 | { |
806 | { |
747 | if (xc->byte1 || xc->byte2) |
807 | if (xc->byte1 || xc->byte2) |
748 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
808 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
749 | |
809 | |
750 | x += r->TermWin.fwidth; |
810 | x += r->TermWin.fwidth; |
751 | xc++; len--; |
811 | xc++; len--; |
752 | } |
812 | } |
753 | while (len); |
813 | while (len); |
754 | } |
814 | } |
755 | else |
815 | else |
756 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
816 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
757 | } |
817 | } |
758 | } |
818 | } |
759 | else |
819 | else |
760 | { |
820 | { |
761 | const char *xc = enc_char (text, len, cs, slow); |
821 | const char *xc = enc_char (text, len, cs, slow); |
762 | |
822 | |
763 | if (bg == Color_bg && !slow) |
823 | if (bg == Color_bg && !slow) |
764 | { |
824 | { |
765 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
825 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
766 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
826 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
767 | } |
827 | } |
768 | else |
828 | else |
769 | { |
829 | { |
770 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
830 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
771 | |
831 | |
772 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
832 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
773 | |
833 | |
774 | if (slow) |
834 | if (slow) |
775 | { |
835 | { |
776 | do |
836 | do |
777 | { |
837 | { |
778 | if (*xc) |
838 | if (*xc) |
779 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
839 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
780 | |
840 | |
781 | x += r->TermWin.fwidth; |
841 | x += r->TermWin.fwidth; |
782 | xc++; len--; |
842 | xc++; len--; |
783 | } |
843 | } |
784 | while (len); |
844 | while (len); |
785 | } |
845 | } |
786 | else |
846 | else |
787 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
847 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
788 | } |
848 | } |
789 | } |
849 | } |
790 | } |
850 | } |
791 | |
851 | |
792 | ///////////////////////////////////////////////////////////////////////////// |
852 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
809 | |
869 | |
810 | void draw (rxvt_drawable &d, int x, int y, |
870 | void draw (rxvt_drawable &d, int x, int y, |
811 | const text_t *text, int len, |
871 | const text_t *text, int len, |
812 | int fg, int bg); |
872 | int fg, int bg); |
813 | |
873 | |
814 | bool has_codepoint (uint32_t unicode); |
874 | bool has_codepoint (unicode_t unicode); |
815 | |
875 | |
816 | protected: |
876 | protected: |
817 | XftFont *f; |
877 | XftFont *f; |
818 | }; |
878 | }; |
819 | |
879 | |
… | |
… | |
932 | |
992 | |
933 | return true; |
993 | return true; |
934 | } |
994 | } |
935 | |
995 | |
936 | bool |
996 | bool |
937 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
997 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
938 | { |
998 | { |
939 | return XftCharExists (DISPLAY, f, unicode); |
999 | return XftCharExists (DISPLAY, f, unicode); |
940 | } |
1000 | } |
941 | |
1001 | |
942 | void |
1002 | void |
… | |
… | |
1145 | |
1205 | |
1146 | return true; |
1206 | return true; |
1147 | } |
1207 | } |
1148 | |
1208 | |
1149 | int |
1209 | int |
1150 | rxvt_fontset::find_font (uint32_t unicode) |
1210 | rxvt_fontset::find_font (unicode_t unicode) |
1151 | { |
1211 | { |
1152 | for (unsigned int i = 0; i < fonts.size (); i++) |
1212 | for (unsigned int i = 0; i < fonts.size (); i++) |
1153 | { |
1213 | { |
1154 | rxvt_font *f = fonts[i]; |
1214 | rxvt_font *f = fonts[i]; |
1155 | |
1215 | |