… | |
… | |
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[] = { |
… | |
… | |
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 | |
204 | |
205 | static const char *linedraw_cmds[128] = { |
205 | #include "table/linedraw.h" |
206 | "1-", "2-", "1|", "2|", |
|
|
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 | "1H|", "2H1|", "1HV2v", "1Hv2V", |
|
|
216 | |
|
|
217 | // 2520 |
|
|
218 | "1H2|", "2Hv1V", "2HV1v", "2H|", |
|
|
219 | "1h|", "2h1|", "1hV2v", "1hv2V", |
|
|
220 | "1h2|", "2hv1V", "1v2hV", "2h|", |
|
|
221 | "1-V", "2h1HV", "2H1hV", "2-1V", |
|
|
222 | |
|
|
223 | // 2530 |
|
|
224 | "1-2V", "2hV1H", "1h2HV", "2-V", |
|
|
225 | "1-v", "1vH2h", "1hv2H", "1v2-", |
|
|
226 | "1-2v", "1H2hv", "1h2Hv", "2-v", |
|
|
227 | "1-|", "1|H2h", "1h|2H", "1|2-", |
|
|
228 | |
|
|
229 | // 2540 |
|
|
230 | "1-V2v", "1-v2V", "1-2|", "1HV2hv", |
|
|
231 | "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v", |
|
|
232 | "1v2-V", "1H2h|", "1h2H|", "2-|", |
|
|
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, "A", "B", "C", |
|
|
246 | |
|
|
247 | // 2570 |
|
|
248 | "D", "1/", "1\\", "1/\\", |
|
|
249 | "1h", "1v", "1H", "1V", |
|
|
250 | "2h", "2v", "2H", "2V", |
|
|
251 | "1h2H", "1v2V", "1H2h", "1V2v" |
|
|
252 | |
|
|
253 | // to be done |
|
|
254 | }; |
|
|
255 | |
206 | |
256 | struct rxvt_font_default : rxvt_font { |
207 | struct rxvt_font_default : rxvt_font { |
|
|
208 | |
257 | rxvt_fontprop properties () |
209 | rxvt_fontprop properties () |
258 | { |
210 | { |
259 | rxvt_fontprop p; |
211 | rxvt_fontprop p; |
260 | |
212 | |
261 | p.width = p.height = 1; |
213 | p.width = p.height = 1; |
… | |
… | |
268 | bool load (const rxvt_fontprop &prop) |
220 | bool load (const rxvt_fontprop &prop) |
269 | { |
221 | { |
270 | width = 1; height = 1; |
222 | width = 1; height = 1; |
271 | ascent = 1; descent = 0; |
223 | ascent = 1; descent = 0; |
272 | |
224 | |
273 | set_name ("built-in pseudofont"); |
225 | set_name (strdup ("built-in pseudofont")); |
274 | |
226 | |
275 | return true; |
227 | return true; |
276 | } |
228 | } |
277 | |
229 | |
278 | bool has_codepoint (unicode_t unicode) |
230 | bool has_codepoint (unicode_t unicode) |
279 | { |
231 | { |
280 | if (unicode <= 0x001f) |
232 | if (unicode <= 0x001f) |
281 | return true; |
233 | return true; |
282 | |
234 | |
283 | if (unicode >= 0x0080 && unicode <= 0x009f) |
235 | if (unicode <= 0x007f) |
|
|
236 | return false; |
|
|
237 | |
|
|
238 | if (unicode <= 0x009f) |
284 | return true; |
239 | return true; |
285 | |
240 | |
286 | if (unicode >= 0x2500 && unicode <= 0x257f |
241 | if (unicode >= 0x2500 && unicode <= 0x259f) |
287 | && linedraw_cmds[unicode - 0x2500]) |
|
|
288 | return true; |
242 | return true; |
289 | |
243 | |
290 | if (IS_COMPOSE (unicode)) |
244 | if (IS_COMPOSE (unicode)) |
291 | return true; |
245 | return true; |
292 | |
246 | |
… | |
… | |
309 | const text_t *text, int len, |
263 | const text_t *text, int len, |
310 | int fg, int bg) |
264 | int fg, int bg) |
311 | { |
265 | { |
312 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
266 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
313 | |
267 | |
314 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
268 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
315 | |
269 | |
316 | while (len--) |
270 | while (len--) |
317 | { |
271 | { |
318 | #if ENABLE_COMBINING |
272 | #if ENABLE_COMBINING |
319 | compose_char *cc; |
273 | compose_char *cc; |
320 | #endif |
274 | #endif |
321 | text_t t = *text++; |
275 | text_t t = *text++; |
322 | |
276 | |
323 | // is it in our linedrawing table? |
277 | if (0x2500 <= t && t <= 0x259f) |
324 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
278 | { |
|
|
279 | uint16_t offs = linedraw_offs[t - 0x2500]; |
|
|
280 | uint32_t *a = linedraw_command + (offs >> 4); |
|
|
281 | uint32_t *b = a + (offs & 15); |
|
|
282 | |
|
|
283 | int W = r->TermWin.fwidth; |
|
|
284 | int H = r->TermWin.fheight; |
|
|
285 | |
|
|
286 | int x_[16]; |
|
|
287 | int y_[16]; |
|
|
288 | |
|
|
289 | for (int i = 0; i <= 8; i++) |
325 | { |
290 | { |
326 | const char *p = linedraw_cmds[t - 0x2500]; |
291 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
292 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
|
|
293 | } |
327 | |
294 | |
328 | int W = r->TermWin.fwidth , w = (W - 1) / 2; |
295 | x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; |
329 | int H = r->TermWin.fheight, h = (H - 1) / 2; |
296 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
330 | int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; |
|
|
331 | int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; |
|
|
332 | |
297 | |
333 | XGCValues gcv; |
298 | XGCValues gcv; |
334 | |
299 | |
335 | gcv.cap_style = CapNotLast; |
300 | gcv.cap_style = CapButt; |
|
|
301 | gcv.line_width = 0; |
336 | XChangeGC (d.display->display, GC, GCCapStyle, &gcv); |
302 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
337 | |
303 | |
338 | while (*p) |
304 | while (a < b) |
339 | { |
305 | { |
|
|
306 | uint32_t command = *a++; |
|
|
307 | |
|
|
308 | int op = (command >> 24) & 255; |
|
|
309 | int a = (command >> 20) & 15; |
|
|
310 | int b = (command >> 16) & 15; |
|
|
311 | int x1 = x_[(command >> 12) & 15]; |
|
|
312 | int y1 = y_[(command >> 8) & 15]; |
|
|
313 | int x2 = x_[(command >> 4) & 15]; |
|
|
314 | int y2 = y_[(command >> 0) & 15]; |
|
|
315 | |
340 | switch (*p++) |
316 | switch (op) |
341 | { |
317 | { |
342 | case '1': |
318 | case 0: // line |
343 | gcv.line_width = 0; |
319 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
344 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
345 | break; |
320 | break; |
346 | |
321 | |
347 | case '2': |
322 | case 1: // rectangle, possibly stippled |
|
|
323 | if (a) |
|
|
324 | { |
|
|
325 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
|
|
326 | |
|
|
327 | gcv.fill_style = FillStippled; |
|
|
328 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
329 | gcv.ts_x_origin = x; |
|
|
330 | gcv.ts_y_origin = y; |
|
|
331 | |
|
|
332 | XChangeGC (d.display->display, TGC, |
|
|
333 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
334 | &gcv); |
|
|
335 | } |
|
|
336 | |
|
|
337 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
|
|
338 | |
|
|
339 | if (a) |
|
|
340 | { |
|
|
341 | XFreePixmap (d.display->display, gcv.stipple); |
348 | gcv.line_width = 3; |
342 | gcv.stipple = 0; |
|
|
343 | gcv.fill_style = FillSolid; |
349 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
344 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
345 | } |
350 | break; |
346 | break; |
351 | |
347 | case 2: // arc |
352 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1+1, y1 ); break; |
348 | XDrawArc (d.display->display, d, TGC, |
353 | case 'H': XDrawLine (d.display->display, d, GC, x2, y1, x1-1, y1 ); break; |
349 | x1 - W/2, y1 - H/2, W-1, H-1, |
354 | case '-': XDrawLine (d.display->display, d, GC, x0, y1, x2 , y1 ); break; |
350 | (a - 1) * 90*64, (b - 1) * 90*64); |
355 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y1+1); break; |
351 | break; |
356 | case 'V': XDrawLine (d.display->display, d, GC, x1, y2, x1 , y1-1); break; |
|
|
357 | case '|': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y2 ); break; |
|
|
358 | |
|
|
359 | case '/' : XDrawLine (d.display->display, d, GC, x0, y2, x2 , y0 ); break; |
|
|
360 | case '\\': XDrawLine (d.display->display, d, GC, x0, y0, x2 , y2 ); break; |
|
|
361 | |
|
|
362 | case 'A': XDrawArc (d.display->display, d, GC, x1 , y1 , W-1, H-1, 90*64, 90*64); break; |
|
|
363 | case 'B': XDrawArc (d.display->display, d, GC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break; |
|
|
364 | case 'C': XDrawArc (d.display->display, d, GC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break; |
|
|
365 | case 'D': XDrawArc (d.display->display, d, GC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break; |
|
|
366 | } |
352 | } |
367 | } |
353 | } |
368 | |
|
|
369 | gcv.line_width = 0; |
|
|
370 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
371 | } |
354 | } |
372 | |
|
|
373 | #if ENABLE_COMBINING |
355 | #if ENABLE_COMBINING |
374 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
356 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
375 | { |
357 | { |
376 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
358 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
377 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
359 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
… | |
… | |
389 | else |
371 | else |
390 | switch (t) |
372 | switch (t) |
391 | { |
373 | { |
392 | case ZERO_WIDTH_CHAR: |
374 | case ZERO_WIDTH_CHAR: |
393 | break; |
375 | break; |
|
|
376 | |
394 | default: |
377 | default: |
395 | int w = 0; |
378 | int w = 0; |
396 | while (len > 0 && *text == NOCHAR) |
379 | while (len > 0 && *text == NOCHAR) |
397 | { |
380 | { |
398 | ++text; |
381 | ++text; |
399 | --len; |
382 | --len; |
400 | w += r->TermWin.fwidth; |
383 | w += r->TermWin.fwidth; |
401 | } |
384 | } |
402 | |
385 | |
403 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
386 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
404 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
387 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
405 | x += w; |
388 | x += w; |
406 | } |
389 | } |
407 | |
390 | |
408 | x += r->TermWin.fwidth; |
391 | x += r->TermWin.fwidth; |
409 | } |
392 | } |
… | |
… | |
747 | { |
730 | { |
748 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
731 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
749 | |
732 | |
750 | if (bg == Color_bg && !slow) |
733 | if (bg == Color_bg && !slow) |
751 | { |
734 | { |
752 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
735 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
753 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
736 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
754 | } |
737 | } |
755 | else |
738 | else |
756 | { |
739 | { |
757 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
740 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
758 | |
741 | |
759 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
742 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
760 | |
743 | |
761 | if (slow) |
744 | if (slow) |
762 | { |
745 | { |
763 | do |
746 | do |
764 | { |
747 | { |
765 | if (xc->byte1 || xc->byte2) |
748 | if (xc->byte1 || xc->byte2) |
766 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
749 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
767 | |
750 | |
768 | x += r->TermWin.fwidth; |
751 | x += r->TermWin.fwidth; |
769 | xc++; len--; |
752 | xc++; len--; |
770 | } |
753 | } |
771 | while (len); |
754 | while (len); |
772 | } |
755 | } |
773 | else |
756 | else |
774 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
757 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
775 | } |
758 | } |
776 | } |
759 | } |
777 | else |
760 | else |
778 | { |
761 | { |
779 | const char *xc = enc_char (text, len, cs, slow); |
762 | const char *xc = enc_char (text, len, cs, slow); |
780 | |
763 | |
781 | if (bg == Color_bg && !slow) |
764 | if (bg == Color_bg && !slow) |
782 | { |
765 | { |
783 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
766 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
784 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
767 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
785 | } |
768 | } |
786 | else |
769 | else |
787 | { |
770 | { |
788 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
771 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
789 | |
772 | |
790 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
773 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
791 | |
774 | |
792 | if (slow) |
775 | if (slow) |
793 | { |
776 | { |
794 | do |
777 | do |
795 | { |
778 | { |
796 | if (*xc) |
779 | if (*xc) |
797 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
780 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
798 | |
781 | |
799 | x += r->TermWin.fwidth; |
782 | x += r->TermWin.fwidth; |
800 | xc++; len--; |
783 | xc++; len--; |
801 | } |
784 | } |
802 | while (len); |
785 | while (len); |
803 | } |
786 | } |
804 | else |
787 | else |
805 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
788 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
806 | } |
789 | } |
807 | } |
790 | } |
808 | } |
791 | } |
809 | |
792 | |
810 | ///////////////////////////////////////////////////////////////////////////// |
793 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1165 | } |
1148 | } |
1166 | |
1149 | |
1167 | int |
1150 | int |
1168 | rxvt_fontset::find_font (unicode_t unicode) |
1151 | rxvt_fontset::find_font (unicode_t unicode) |
1169 | { |
1152 | { |
1170 | for (unsigned int i = 0; i < fonts.size (); i++) |
1153 | for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii |
|
|
1154 | i < fonts.size (); |
|
|
1155 | i++) |
1171 | { |
1156 | { |
1172 | rxvt_font *f = fonts[i]; |
1157 | rxvt_font *f = fonts[i]; |
1173 | |
1158 | |
1174 | if (!f->loaded) |
1159 | if (!f->loaded) |
1175 | { |
1160 | { |