Repositories / mmondor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4cc480d)
AnalogTerm2: don't try to uppercase with -U if in DEC Gfx mode.
authorMatthew Mondor <mmondor@pulsar-zone.net>
Wed, 26 Apr 2023 01:42:34 +0000 (01:42 +0000)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Wed, 26 Apr 2023 01:42:34 +0000 (01:42 +0000)
mmsoftware/analogterm2/src/draw.c patch | blob | blame | history
mmsoftware/analogterm2/src/font.c patch | blob | blame | history

diff --git a/mmsoftware/analogterm2/src/draw.c b/mmsoftware/analogterm2/src/draw.c
index b88bad6..134469e 100644 (file)
--- a/mmsoftware/analogterm2/src/draw.c
+++ b/mmsoftware/analogterm2/src/draw.c
@@ -386,8 +386,6 @@ draw_lines(state_t *st, screen_t *sc, int low, int high)
                        uint32_t m = st->text_mode[row][col],
                                 c = st->text_char[row][col];
 
-                       if (cfg_uppercaseview && c > 96 && c < 123)
-                               c -= 32;
                        row_modes[col] = m;
                        row_glyphs[col] = font_glyph(st, c,
                            (m & TMODE_GFX) != 0);
diff --git a/mmsoftware/analogterm2/src/font.c b/mmsoftware/analogterm2/src/font.c
index bdb5dd7..224bf21 100644 (file)
--- a/mmsoftware/analogterm2/src/font.c
+++ b/mmsoftware/analogterm2/src/font.c
@@ -527,6 +527,8 @@ font_glyph(state_t *state, uint32_t c, bool decgfx)
        /* DEC Special Graphics */
        if (decgfx && c > 95 && c < 127)
                return state->font_decgfx->glyphs[c - 96];
+       else if (cfg_uppercaseview && c > 96 && c < 123)
+               c -= 32;
 
        /* Glyph order character tables */
        for (table = state->ftable; table != NULL; table = table->next) {
MMSoftware