Commit 5abc9b90ee994d7068a704946750aaf681593302
1 parent
add2e7ba
Exists in
master
and in
1 other branch
CG character 0x20 should be blank.
Showing
1 changed file
with
2 additions
and
20 deletions
Show diff stats
src/terminal/drawing/draw.c
| @@ -257,8 +257,8 @@ static void draw_small_text(cairo_t *cr, const GdkRectangle *rect, v3270FontInfo | @@ -257,8 +257,8 @@ static void draw_small_text(cairo_t *cr, const GdkRectangle *rect, v3270FontInfo | ||
| 257 | 257 | ||
| 258 | static gboolean draw_cg(cairo_t *cr, unsigned char chr, v3270FontInfo *font, GdkRectangle *rect) | 258 | static gboolean draw_cg(cairo_t *cr, unsigned char chr, v3270FontInfo *font, GdkRectangle *rect) |
| 259 | { | 259 | { |
| 260 | - // 0x00 is always blank. | ||
| 261 | - if(!chr) | 260 | + // 0x00 & 0x20 are both blank. |
| 261 | + if(!chr || chr == 0x20) | ||
| 262 | return TRUE; | 262 | return TRUE; |
| 263 | 263 | ||
| 264 | if(chr >= 0xf0 && chr <= 0xf9) | 264 | if(chr >= 0xf0 && chr <= 0xf9) |
| @@ -275,24 +275,6 @@ static gboolean draw_cg(cairo_t *cr, unsigned char chr, v3270FontInfo *font, Gdk | @@ -275,24 +275,6 @@ static gboolean draw_cg(cairo_t *cr, unsigned char chr, v3270FontInfo *font, Gdk | ||
| 275 | return TRUE; | 275 | return TRUE; |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | - /* | ||
| 279 | - // Check for UTF-8 CG - https://unicode.org/charts/PDF/U2300.pdf | ||
| 280 | - static const struct CharList | ||
| 281 | - { | ||
| 282 | - unsigned char chr; | ||
| 283 | - const gchar * utf; | ||
| 284 | - } charlist[] = | ||
| 285 | - { | ||
| 286 | - { 0x8c, "≤" }, // CG 0xf7, less or equal "≤" | ||
| 287 | - { 0xae, "≥" }, // CG 0xd9, greater or equal "≥" | ||
| 288 | - { 0xbe, "≠" }, // CG 0xbe, not equal "≠" | ||
| 289 | - { 0xad, "[" }, // "[" | ||
| 290 | - { 0xbd, "]" }, // "]" | ||
| 291 | - { 0xb8, "÷" }, // Division Sign ÷ | ||
| 292 | - { 0x90, "⎕" }, // APL FUNCTIONAL SYMBOL QUAD | ||
| 293 | - }; | ||
| 294 | - */ | ||
| 295 | - | ||
| 296 | const gchar * utf = v3270_translate_cg_to_utf(chr); | 278 | const gchar * utf = v3270_translate_cg_to_utf(chr); |
| 297 | 279 | ||
| 298 | if(utf) | 280 | if(utf) |