| … | |
… | |
| 96 | { CS_UNICODE, "xft:FreeMono" }, |
96 | { CS_UNICODE, "xft:FreeMono" }, |
| 97 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
97 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
| 98 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
98 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
| 99 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
99 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
| 100 | |
100 | |
|
|
101 | #if UNICODE_3 && XFT |
|
|
102 | { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters |
|
|
103 | #endif |
|
|
104 | |
| 101 | { CS_UNKNOWN, 0 } |
105 | { CS_UNKNOWN, 0 } |
| 102 | }; |
106 | }; |
| 103 | |
107 | |
| 104 | ///////////////////////////////////////////////////////////////////////////// |
108 | ///////////////////////////////////////////////////////////////////////////// |
| 105 | |
109 | |
| … | |
… | |
| 271 | |
275 | |
| 272 | bool has_codepoint (uint32_t unicode) |
276 | bool has_codepoint (uint32_t unicode) |
| 273 | { |
277 | { |
| 274 | if (unicode <= 0x001f) |
278 | if (unicode <= 0x001f) |
| 275 | return true; |
279 | return true; |
|
|
280 | |
| 276 | if (unicode >= 0x0080 && unicode <= 0x009f) |
281 | if (unicode >= 0x0080 && unicode <= 0x009f) |
| 277 | return true; |
282 | return true; |
| 278 | |
283 | |
| 279 | if (unicode >= 0x2500 && unicode <= 0x257f |
284 | if (unicode >= 0x2500 && unicode <= 0x257f |
| 280 | && linedraw_cmds[unicode - 0x2500]) |
285 | && linedraw_cmds[unicode - 0x2500]) |
|
|
286 | return true; |
|
|
287 | |
|
|
288 | if (IS_PSEUDO (unicode)) |
| 281 | return true; |
289 | return true; |
| 282 | |
290 | |
| 283 | switch (unicode) |
291 | switch (unicode) |
| 284 | { |
292 | { |
| 285 | case ZERO_WIDTH_CHAR: |
293 | case ZERO_WIDTH_CHAR: |
| … | |
… | |
| 310 | // is it in our linedrawing table? |
318 | // is it in our linedrawing table? |
| 311 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
319 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
| 312 | { |
320 | { |
| 313 | const char *p = linedraw_cmds[t - 0x2500]; |
321 | const char *p = linedraw_cmds[t - 0x2500]; |
| 314 | |
322 | |
| 315 | int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; |
323 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
| 316 | int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; |
324 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
| 317 | |
325 | |
| 318 | XGCValues gcv; |
326 | XGCValues gcv; |
| 319 | |
327 | |
| 320 | while (*p) |
328 | while (*p) |
| 321 | { |
329 | { |
| … | |
… | |
| 340 | } |
348 | } |
| 341 | } |
349 | } |
| 342 | |
350 | |
| 343 | gcv.line_width = 0; |
351 | gcv.line_width = 0; |
| 344 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
352 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
353 | } |
|
|
354 | else if (IS_PSEUDO (t)) |
|
|
355 | { |
|
|
356 | const compose_char &cc = r->composite (t); |
|
|
357 | (void)0; //D ADD pseudo handling here |
| 345 | } |
358 | } |
| 346 | else |
359 | else |
| 347 | switch (t) |
360 | switch (t) |
| 348 | { |
361 | { |
| 349 | case ZERO_WIDTH_CHAR: |
362 | case ZERO_WIDTH_CHAR: |
