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 | |
32 | const struct rxvt_fallback_font { |
31 | const 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 |
|
|
111 | rxvt_drawable::~rxvt_drawable () |
|
|
112 | { |
|
|
113 | if (xftdrawable) |
|
|
114 | XftDrawDestroy (xftdrawable); |
|
|
115 | } |
|
|
116 | |
|
|
117 | rxvt_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 | |
103 | static void *enc_buf; |
128 | static void *enc_buf; |
104 | static uint32_t enc_len; |
129 | static uint32_t enc_len; |
105 | |
130 | |
106 | static inline void * |
131 | static inline void * |
107 | get_enc_buf (int len) |
132 | get_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 | |
118 | static const char * |
143 | static const char * |
119 | enc_char (const text_t *text, int len, codeset cs, bool &zero) |
144 | enc_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 | |
139 | static const XChar2b * |
164 | static const XChar2b * |
140 | enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero) |
165 | enc_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 | |
164 | void |
189 | void |
165 | rxvt_font::clear_rect (int x, int y, int w, int h, int color) |
190 | rxvt_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 | |
|
|
176 | static const char *linedraw_cmds[128] = { |
|
|
177 | "1hH", "2hH", "1vV", "2vV", |
|
|
178 | 0, 0, 0, 0, |
|
|
179 | 0, 0, 0, 0, |
|
|
180 | "1HV", "2H1V", "1H2V", "2HV", |
|
|
181 | |
|
|
182 | // 2510 |
|
|
183 | "1hV", "2h1V", "1h2V", "2hV", |
|
|
184 | "1Hv", "2H1v", "1H2v", "2Hv", |
|
|
185 | "1hv", "2h1v", "1h2v", "2hv", |
|
|
186 | "1HvV", "2H1vV", "1HV2v", "1Hv2V", |
|
|
187 | |
|
|
188 | // 2520 |
|
|
189 | "1H2vV", "2Hv1V", "2HV1v", "2HvV", |
|
|
190 | "1hvV", "2h1vV", "1hV2v", "1hv2V", |
|
|
191 | "1h2vV", "2hv1V", "1v2hV", "2hvV", |
|
|
192 | "1hHV", "2h1HV", "2H1hV", "2hH1V", |
|
|
193 | |
|
|
194 | // 2530 |
|
|
195 | "1hH2V", "2hV1H", "1h2HV", "2hHV", |
|
|
196 | "1hHv", "1vH2h", "1hv2H", "1v2hH", |
|
|
197 | "1hH2v", "1H2hv", "1h2Hv", "2hHv", |
|
|
198 | "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH", |
|
|
199 | |
|
|
200 | // 2540 |
|
|
201 | "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv", |
|
|
202 | "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv", |
|
|
203 | "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV", |
|
|
204 | 0, 0, 0, 0, |
|
|
205 | |
|
|
206 | // 2550 |
|
|
207 | 0, 0, 0, 0, |
|
|
208 | 0, 0, 0, 0, |
|
|
209 | 0, 0, 0, 0, |
|
|
210 | 0, 0, 0, 0, |
|
|
211 | |
|
|
212 | // 2560 |
|
|
213 | 0, 0, 0, 0, |
|
|
214 | 0, 0, 0, 0, |
|
|
215 | 0, 0, 0, 0, |
|
|
216 | 0, 0, 0, 0, |
|
|
217 | |
|
|
218 | // 2570 |
|
|
219 | 0, "1a", "1b", "1ab", |
|
|
220 | "1h", "1v", "1H", "1V", |
|
|
221 | "2h", "2v", "2H", "2V", |
|
|
222 | "1h2H", "1v2V", "1H2h", "1V2v" |
|
|
223 | |
|
|
224 | // to be done |
|
|
225 | }; |
|
|
226 | |
204 | |
227 | struct rxvt_font_default : rxvt_font { |
205 | struct rxvt_font_default : rxvt_font { |
228 | rxvt_fontprop properties () |
206 | rxvt_fontprop properties () |
229 | { |
207 | { |
230 | rxvt_fontprop p; |
208 | rxvt_fontprop p; |
… | |
… | |
239 | bool load (const rxvt_fontprop &prop) |
217 | bool load (const rxvt_fontprop &prop) |
240 | { |
218 | { |
241 | width = 1; height = 1; |
219 | width = 1; height = 1; |
242 | ascent = 1; descent = 0; |
220 | ascent = 1; descent = 0; |
243 | |
221 | |
|
|
222 | set_name ("built-in pseudofont"); |
|
|
223 | |
244 | return true; |
224 | return true; |
245 | } |
225 | } |
246 | |
226 | |
247 | bool has_codepoint (uint32_t unicode) |
227 | bool has_codepoint (unicode_t unicode) |
248 | { |
228 | { |
249 | if (unicode <= 0x001f) |
229 | if (unicode <= 0x001f) |
250 | return true; |
230 | return true; |
|
|
231 | |
251 | if (unicode >= 0x0080 && unicode <= 0x009f) |
232 | if (unicode >= 0x0080 && unicode <= 0x009f) |
252 | return true; |
233 | return true; |
253 | |
234 | |
254 | if (unicode >= 0x2500 && unicode <= 0x257f |
235 | if (unicode >= 0x2500 && unicode <= 0x259f) |
255 | && linedraw_cmds[unicode - 0x2500]) |
236 | return true; |
|
|
237 | |
|
|
238 | if (IS_COMPOSE (unicode)) |
256 | return true; |
239 | return true; |
257 | |
240 | |
258 | switch (unicode) |
241 | switch (unicode) |
259 | { |
242 | { |
260 | case ZERO_WIDTH_CHAR: |
243 | case ZERO_WIDTH_CHAR: |
… | |
… | |
262 | } |
245 | } |
263 | |
246 | |
264 | return false; |
247 | return false; |
265 | } |
248 | } |
266 | |
249 | |
267 | void draw (int x, int y, |
250 | void draw (rxvt_drawable &d, int x, int y, |
268 | const text_t *text, int len, |
251 | const text_t *text, int len, |
269 | int fg, int bg); |
252 | int fg, int bg); |
270 | }; |
253 | }; |
271 | |
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 | |
272 | void |
279 | void |
273 | rxvt_font_default::draw (int x, int y, |
280 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
274 | const text_t *text, int len, |
281 | const text_t *text, int len, |
275 | int fg, int bg) |
282 | int fg, int bg) |
276 | { |
283 | { |
277 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
284 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
278 | |
285 | |
279 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
286 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
280 | |
287 | |
281 | while (len--) |
288 | while (len--) |
282 | { |
289 | { |
|
|
290 | #if ENABLE_COMBINING |
|
|
291 | compose_char *cc; |
|
|
292 | #endif |
283 | text_t t = *text++; |
293 | text_t t = *text++; |
284 | |
294 | |
285 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
295 | int x_[16]; |
|
|
296 | int y_[16]; |
|
|
297 | |
|
|
298 | int W = r->TermWin.fwidth , w = (W - 1) / 2; |
|
|
299 | int H = r->TermWin.fheight, h = (H - 1) / 2; |
|
|
300 | int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; |
|
|
301 | int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; |
|
|
302 | |
|
|
303 | for (int i = 0; i <= 8; i++) |
|
|
304 | { |
|
|
305 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
306 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
286 | { |
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 | |
287 | const char *p = linedraw_cmds[t - 0x2500]; |
312 | int i1 = linedraw_offs[t - 0x2500]; |
|
|
313 | int i2 = linedraw_offs[t - 0x2500 + 1]; |
288 | |
314 | |
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; |
315 | XGCValues gcv; |
293 | |
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 | { |
294 | while (*p) |
323 | while (i1 < i2) |
295 | { |
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 | |
296 | switch (*p++) |
335 | switch (op) |
297 | { |
336 | { |
298 | case '1': |
337 | case 0: // line |
299 | gcv.line_width = 0; |
338 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
300 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
|
|
301 | break; |
339 | break; |
302 | |
340 | |
303 | case '2': |
341 | case 1: // rectangle, possibly stippled |
304 | gcv.line_width = 2; |
342 | if (a) |
305 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
343 | { |
|
|
344 | static char bm[] = { 0,0 , 1,3 , 2,1 , 0,1 }; |
|
|
345 | |
|
|
346 | gcv.fill_style = FillStippled; |
|
|
347 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
348 | gcv.ts_x_origin = x; |
|
|
349 | gcv.ts_y_origin = y; |
|
|
350 | |
|
|
351 | XChangeGC (d.display->display, TGC, |
|
|
352 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
353 | &gcv); |
|
|
354 | } |
|
|
355 | |
|
|
356 | |
|
|
357 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
|
|
358 | |
|
|
359 | if (a) |
|
|
360 | { |
|
|
361 | XFreePixmap (d.display->display, gcv.stipple); |
|
|
362 | gcv.fill_style = FillSolid; |
|
|
363 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
364 | } |
|
|
365 | |
306 | break; |
366 | break; |
307 | |
367 | case 2: // arc |
308 | case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; |
368 | break; |
309 | case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; |
|
|
310 | case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; |
|
|
311 | case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; |
|
|
312 | case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; |
|
|
313 | case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; |
|
|
314 | } |
369 | } |
315 | } |
370 | } |
316 | |
371 | |
317 | gcv.line_width = 0; |
372 | #if 0 |
318 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
373 | case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 90*64, 90*64); break; |
|
|
374 | case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 0*64, 90*64); break; |
|
|
375 | case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 0*64, -90*64); break; |
|
|
376 | case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -90*64, -90*64); break; |
|
|
377 | |
|
|
378 | case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break; |
|
|
379 | case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break; |
|
|
380 | case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break; |
|
|
381 | case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break; |
|
|
382 | } |
|
|
383 | } |
|
|
384 | #endif |
|
|
385 | |
|
|
386 | } |
|
|
387 | #if ENABLE_COMBINING |
|
|
388 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
319 | } |
389 | { |
|
|
390 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
|
|
391 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
392 | if (cc->c2 != NOCHAR) |
|
|
393 | { |
|
|
394 | // prefer font of first character, for no good reasons |
|
|
395 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
396 | ? f1 |
|
|
397 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
398 | |
|
|
399 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
400 | } |
|
|
401 | } |
|
|
402 | #endif |
320 | else |
403 | else |
321 | switch (*text++) |
404 | switch (t) |
322 | { |
405 | { |
323 | case NOCHAR: |
|
|
324 | case ZERO_WIDTH_CHAR: |
406 | case ZERO_WIDTH_CHAR: |
325 | 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 | |
326 | default: |
436 | default: |
327 | XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
437 | int w = 0; |
|
|
438 | while (len > 0 && *text == NOCHAR) |
|
|
439 | { |
|
|
440 | ++text; |
|
|
441 | --len; |
|
|
442 | w += r->TermWin.fwidth; |
|
|
443 | } |
|
|
444 | |
|
|
445 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
|
|
446 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
|
|
447 | x += w; |
328 | } |
448 | } |
329 | |
449 | |
330 | x += r->TermWin.fwidth; |
450 | x += r->TermWin.fwidth; |
331 | } |
451 | } |
332 | } |
452 | } |
… | |
… | |
340 | |
460 | |
341 | rxvt_fontprop properties (); |
461 | rxvt_fontprop properties (); |
342 | |
462 | |
343 | bool load (const rxvt_fontprop &prop); |
463 | bool load (const rxvt_fontprop &prop); |
344 | |
464 | |
345 | bool has_codepoint (uint32_t unicode); |
465 | bool has_codepoint (unicode_t unicode); |
346 | |
466 | |
347 | void draw (int x, int y, |
467 | void draw (rxvt_drawable &d, int x, int y, |
348 | const text_t *text, int len, |
468 | const text_t *text, int len, |
349 | int fg, int bg); |
469 | int fg, int bg); |
350 | |
470 | |
351 | XFontStruct *f; |
471 | XFontStruct *f; |
352 | codeset cs; |
472 | codeset cs; |
… | |
… | |
407 | |
527 | |
408 | bool |
528 | bool |
409 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
529 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
410 | { |
530 | { |
411 | int slashes = 0; |
531 | int slashes = 0; |
412 | const char *comp[12]; |
532 | const char *comp[13]; |
413 | |
533 | |
414 | for (const char *c = name; *c; c++) |
534 | for (const char *c = name; *c; c++) |
415 | if (*c == '-') |
535 | if (*c == '-') |
416 | { |
536 | { |
417 | comp[slashes++] = c + 1; |
537 | comp[slashes++] = c + 1; |
… | |
… | |
427 | |
547 | |
428 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
548 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
429 | |
549 | |
430 | if (f) |
550 | if (f) |
431 | { |
551 | { |
432 | // the font should really exists now. if not, we have a problem |
552 | // 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). |
553 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
434 | // in that case, just return garbage. |
554 | // in that case, just return garbage. |
435 | bool ret = set_properties (p, f); |
555 | bool ret = set_properties (p, f); |
436 | XFreeFont (DISPLAY, f); |
556 | XFreeFont (DISPLAY, f); |
437 | return ret; |
557 | return ret; |
… | |
… | |
514 | f = XLoadQueryFont (DISPLAY, name); |
634 | f = XLoadQueryFont (DISPLAY, name); |
515 | |
635 | |
516 | if (!f) |
636 | if (!f) |
517 | return false; |
637 | return false; |
518 | |
638 | |
519 | unsigned long value; |
|
|
520 | |
|
|
521 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
639 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
522 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
640 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
523 | |
641 | |
524 | if (registry && encoding) |
642 | if (registry && encoding) |
525 | { |
643 | { |
… | |
… | |
599 | f = 0; |
717 | f = 0; |
600 | } |
718 | } |
601 | } |
719 | } |
602 | |
720 | |
603 | bool |
721 | bool |
604 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
722 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
605 | { |
723 | { |
606 | uint32_t ch = FROM_UNICODE (cs, unicode); |
724 | uint32_t ch = FROM_UNICODE (cs, unicode); |
607 | |
725 | |
608 | if (ch == NOCHAR) |
726 | if (ch == NOCHAR) |
609 | return false; |
727 | return false; |
… | |
… | |
611 | /* check wether the character exists in _this_ font. horrible. */ |
729 | /* check wether the character exists in _this_ font. horrible. */ |
612 | XCharStruct *xcs; |
730 | XCharStruct *xcs; |
613 | |
731 | |
614 | if (encm) |
732 | if (encm) |
615 | { |
733 | { |
616 | int byte1 = ch >> 8; |
734 | unsigned char byte1 = ch >> 8; |
617 | int byte2 = ch & 255; |
735 | unsigned char byte2 = ch & 255; |
618 | |
736 | |
619 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
737 | if (byte1 < f->min_byte1 || byte1 > f->max_byte1 |
620 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
738 | || byte2 < f->min_char_or_byte2 || byte2 > f->max_char_or_byte2) |
621 | return false; |
739 | return false; |
622 | |
740 | |
… | |
… | |
645 | |
763 | |
646 | return true; |
764 | return true; |
647 | } |
765 | } |
648 | |
766 | |
649 | void |
767 | void |
650 | rxvt_font_x11::draw (int x, int y, |
768 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
651 | const text_t *text, int len, |
769 | const text_t *text, int len, |
652 | int fg, int bg) |
770 | int fg, int bg) |
653 | { |
771 | { |
654 | // this looks like a mess /. |
772 | // this looks like a mess /. |
655 | // and it is a mess /. |
773 | // and it is a mess /. |
… | |
… | |
671 | { |
789 | { |
672 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
790 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
673 | |
791 | |
674 | if (bg == Color_bg && !slow) |
792 | if (bg == Color_bg && !slow) |
675 | { |
793 | { |
676 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
794 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
677 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
795 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
678 | } |
796 | } |
679 | else |
797 | else |
680 | { |
798 | { |
681 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
799 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
682 | |
800 | |
683 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
801 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
684 | |
802 | |
685 | if (slow) |
803 | if (slow) |
686 | { |
804 | { |
687 | do |
805 | do |
688 | { |
806 | { |
689 | if (xc->byte1 || xc->byte2) |
807 | if (xc->byte1 || xc->byte2) |
690 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
808 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
691 | |
809 | |
692 | x += r->TermWin.fwidth; |
810 | x += r->TermWin.fwidth; |
693 | xc++; len--; |
811 | xc++; len--; |
694 | } |
812 | } |
695 | while (len); |
813 | while (len); |
696 | } |
814 | } |
697 | else |
815 | else |
698 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
816 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
699 | } |
817 | } |
700 | } |
818 | } |
701 | else |
819 | else |
702 | { |
820 | { |
703 | const char *xc = enc_char (text, len, cs, slow); |
821 | const char *xc = enc_char (text, len, cs, slow); |
704 | |
822 | |
705 | if (bg == Color_bg && !slow) |
823 | if (bg == Color_bg && !slow) |
706 | { |
824 | { |
707 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
825 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
708 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
826 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
709 | } |
827 | } |
710 | else |
828 | else |
711 | { |
829 | { |
712 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
830 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
713 | |
831 | |
714 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
832 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
715 | |
833 | |
716 | if (slow) |
834 | if (slow) |
717 | { |
835 | { |
718 | do |
836 | do |
719 | { |
837 | { |
720 | if (*xc) |
838 | if (*xc) |
721 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
839 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
722 | |
840 | |
723 | x += r->TermWin.fwidth; |
841 | x += r->TermWin.fwidth; |
724 | xc++; len--; |
842 | xc++; len--; |
725 | } |
843 | } |
726 | while (len); |
844 | while (len); |
727 | } |
845 | } |
728 | else |
846 | else |
729 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
847 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
730 | } |
848 | } |
731 | } |
849 | } |
732 | } |
850 | } |
733 | |
851 | |
734 | ///////////////////////////////////////////////////////////////////////////// |
852 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
739 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
857 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
740 | #define SWATHBITS 8 |
858 | #define SWATHBITS 8 |
741 | #endif |
859 | #endif |
742 | |
860 | |
743 | struct rxvt_font_xft : rxvt_font { |
861 | struct rxvt_font_xft : rxvt_font { |
744 | rxvt_font_xft () { f = 0; d = 0; } |
862 | rxvt_font_xft () { f = 0; } |
745 | |
863 | |
746 | void clear (); |
864 | void clear (); |
747 | |
865 | |
748 | rxvt_fontprop properties (); |
866 | rxvt_fontprop properties (); |
749 | |
867 | |
750 | bool load (const rxvt_fontprop &prop); |
868 | bool load (const rxvt_fontprop &prop); |
751 | |
869 | |
752 | void draw (int x, int y, |
870 | void draw (rxvt_drawable &d, int x, int y, |
753 | const text_t *text, int len, |
871 | const text_t *text, int len, |
754 | int fg, int bg); |
872 | int fg, int bg); |
755 | |
873 | |
756 | bool has_codepoint (uint32_t unicode); |
874 | bool has_codepoint (unicode_t unicode); |
757 | |
875 | |
758 | protected: |
876 | protected: |
759 | XftFont *f; |
877 | XftFont *f; |
760 | XftDraw *d; |
|
|
761 | }; |
878 | }; |
762 | |
879 | |
763 | void |
880 | void |
764 | rxvt_font_xft::clear () |
881 | rxvt_font_xft::clear () |
765 | { |
882 | { |
766 | if (f) |
883 | if (f) |
767 | { |
884 | { |
768 | XftFontClose (DISPLAY, f); |
885 | XftFontClose (DISPLAY, f); |
769 | f = 0; |
886 | f = 0; |
770 | } |
|
|
771 | |
|
|
772 | if (d) |
|
|
773 | { |
|
|
774 | XftDrawDestroy (d); |
|
|
775 | d = 0; |
|
|
776 | } |
887 | } |
777 | } |
888 | } |
778 | |
889 | |
779 | rxvt_fontprop |
890 | rxvt_fontprop |
780 | rxvt_font_xft::properties () |
891 | rxvt_font_xft::properties () |
… | |
… | |
881 | |
992 | |
882 | return true; |
993 | return true; |
883 | } |
994 | } |
884 | |
995 | |
885 | bool |
996 | bool |
886 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
997 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
887 | { |
998 | { |
888 | return XftCharExists (DISPLAY, f, unicode); |
999 | return XftCharExists (DISPLAY, f, unicode); |
889 | } |
1000 | } |
890 | |
1001 | |
891 | void |
1002 | void |
892 | rxvt_font_xft::draw (int x, int y, |
1003 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
893 | const text_t *text, int len, |
1004 | const text_t *text, int len, |
894 | int fg, int bg) |
1005 | int fg, int bg) |
895 | { |
1006 | { |
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); |
1007 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
906 | |
1008 | |
907 | if (!slow && width == r->TermWin.fwidth && 0) |
1009 | if (!slow && width == r->TermWin.fwidth && 0) |
908 | { |
1010 | { |
909 | if (sizeof (text_t) == sizeof (FcChar16)) |
1011 | if (sizeof (text_t) == sizeof (FcChar16)) |
910 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
1012 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
… | |
… | |
922 | fwidth *= 2; |
1024 | fwidth *= 2; |
923 | |
1025 | |
924 | XGlyphInfo extents; |
1026 | XGlyphInfo extents; |
925 | if (sizeof (text_t) == sizeof (FcChar16)) |
1027 | if (sizeof (text_t) == sizeof (FcChar16)) |
926 | { |
1028 | { |
927 | XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); |
1029 | XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); |
928 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
1030 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
929 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
1031 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
930 | } |
1032 | } |
931 | else |
1033 | else |
932 | { |
1034 | { |
933 | XGlyphInfo extents; |
1035 | XGlyphInfo extents; |
934 | XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); |
1036 | XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); |
935 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
1037 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
936 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
1038 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
937 | } |
1039 | } |
938 | } |
1040 | } |
939 | |
1041 | |
… | |
… | |
946 | #endif |
1048 | #endif |
947 | |
1049 | |
948 | ///////////////////////////////////////////////////////////////////////////// |
1050 | ///////////////////////////////////////////////////////////////////////////// |
949 | |
1051 | |
950 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1052 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
951 | #ifdef EXPLICIT_CONTEXT |
|
|
952 | : r(r) |
1053 | : r (r) |
953 | #endif |
|
|
954 | { |
1054 | { |
955 | clear (); |
1055 | clear (); |
956 | } |
1056 | } |
957 | |
1057 | |
958 | rxvt_fontset::~rxvt_fontset () |
1058 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
961 | } |
1061 | } |
962 | |
1062 | |
963 | void |
1063 | void |
964 | rxvt_fontset::clear () |
1064 | rxvt_fontset::clear () |
965 | { |
1065 | { |
966 | for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++) |
1066 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
967 | FONT_UNREF (*i); |
1067 | FONT_UNREF (*i); |
968 | |
1068 | |
969 | fonts.clear (); |
1069 | fonts.clear (); |
970 | base_id = 0; |
1070 | base_id = 0; |
971 | base_prop.height = 0x7fffffff; |
1071 | base_prop.height = 0x7fffffff; |
… | |
… | |
998 | f = new rxvt_font_x11; |
1098 | f = new rxvt_font_x11; |
999 | } |
1099 | } |
1000 | else |
1100 | else |
1001 | f = new rxvt_font_x11; |
1101 | f = new rxvt_font_x11; |
1002 | |
1102 | |
|
|
1103 | f->fs = this; |
1003 | f->set_term (r); |
1104 | f->set_term (r); |
1004 | f->set_name (strdup (name)); |
1105 | f->set_name (strdup (name)); |
1005 | |
1106 | |
1006 | f->cs = cs; |
1107 | f->cs = cs; |
1007 | f->loaded = false; |
1108 | f->loaded = false; |
… | |
… | |
1025 | |
1126 | |
1026 | if (*desc == '[') |
1127 | if (*desc == '[') |
1027 | { |
1128 | { |
1028 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1129 | fprintf (stderr, "extra font parameters not yet supported, skipping.\n"); |
1029 | |
1130 | |
1030 | const char *extra = desc++; |
1131 | //const char *extra = desc++; // not yet used |
1031 | |
1132 | |
1032 | desc = strchr (desc, ']'); |
1133 | desc = strchr (desc, ']'); |
1033 | |
1134 | |
1034 | if (!desc) |
1135 | if (!desc) |
1035 | { |
1136 | { |
… | |
… | |
1074 | } |
1175 | } |
1075 | |
1176 | |
1076 | return true; |
1177 | return true; |
1077 | } |
1178 | } |
1078 | |
1179 | |
1079 | void |
1180 | bool |
1080 | rxvt_fontset::populate (const char *desc) |
1181 | rxvt_fontset::populate (const char *desc) |
1081 | { |
1182 | { |
1082 | clear (); |
1183 | clear (); |
1083 | |
1184 | |
1084 | fonts.push_back (new_font (0, CS_UNICODE)); |
1185 | fonts.push_back (new_font (0, CS_UNICODE)); |
… | |
… | |
1088 | |
1189 | |
1089 | if (!base_id) |
1190 | if (!base_id) |
1090 | base_id = 1; |
1191 | base_id = 1; |
1091 | |
1192 | |
1092 | // we currently need a base-font, no matter what |
1193 | // we currently need a base-font, no matter what |
1093 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1194 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1094 | { |
1195 | { |
1095 | puts ("unable to load specified font(s), falling back to 'fixed'\n"); |
1196 | puts ("unable to load specified font (s), falling back to 'fixed'\n"); |
1096 | add_fonts ("fixed"); |
1197 | add_fonts ("fixed"); |
1097 | base_id = fonts.size () - 1; |
1198 | base_id = fonts.size () - 1; |
1098 | } |
1199 | } |
1099 | |
1200 | |
1100 | if (fonts.size () <= base_id || !realize_font (base_id)) |
1201 | if ((int)fonts.size () <= base_id || !realize_font (base_id)) |
1101 | { |
1202 | return false; |
1102 | fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); |
|
|
1103 | exit (1); |
|
|
1104 | } |
|
|
1105 | |
1203 | |
1106 | base_prop = fonts[base_id]->properties (); |
1204 | base_prop = fonts[base_id]->properties (); |
|
|
1205 | |
|
|
1206 | return true; |
1107 | } |
1207 | } |
1108 | |
1208 | |
1109 | int |
1209 | int |
1110 | rxvt_fontset::find_font (uint32_t unicode) |
1210 | rxvt_fontset::find_font (unicode_t unicode) |
1111 | { |
1211 | { |
1112 | for (int i = 0; i < fonts.size (); i++) |
1212 | for (unsigned int i = 0; i < fonts.size (); i++) |
1113 | { |
1213 | { |
1114 | rxvt_font *f = fonts[i]; |
1214 | rxvt_font *f = fonts[i]; |
1115 | |
1215 | |
1116 | if (!f->loaded) |
1216 | if (!f->loaded) |
1117 | { |
1217 | { |