Xinqi Bao's Git

projects / st.git / diff
summary | log | commit | diff | tree
raw | patch | inline | side by side (parent: b51bcd5)
Fix crash when cursor color is truecolor
authorJules Maselbas <[email protected]>
Sun, 15 Jul 2018 11:53:37 +0000 (13:53 +0200)
committerHiltjo Posthuma <[email protected]>
Sun, 15 Jul 2018 16:16:52 +0000 (18:16 +0200)
Reported-by: Ivan Tham <[email protected]>
x.c diff | blob | history

diff --git a/x.c b/x.c
index b51821d..4155a70 100644 (file)
--- a/x.c
+++ b/x.c
@@ -1404,6 +1404,7 @@ void
 xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
 {
        Color drawcol;
 xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
 {
        Color drawcol;
+       uint32_t cc;
 
        /* remove the old cursor */
        if (selected(ox, oy))
 
        /* remove the old cursor */
        if (selected(ox, oy))
@@ -1419,14 +1420,22 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
        g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
 
        if (selected(cx, cy)) {
        g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
 
        if (selected(cx, cy)) {
-               drawcol = dc.col[g.bg];
+               cc = g.bg;
        } else {
                g.mode |= ATTR_REVERSE;
        } else {
                g.mode |= ATTR_REVERSE;
-
                if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
                if (g.mode & ATTR_BOLD && BETWEEN(g.fg, 0, 7))
-                       drawcol = dc.col[g.fg + 8];
+                       cc = g.fg + 8;
                else
                else
-                       drawcol = dc.col[g.fg];
+                       cc = g.fg;
+       }
+
+       if (IS_TRUECOL(cc)) {
+               drawcol.color.alpha = 0xffff;
+               drawcol.color.red = TRUERED(cc);
+               drawcol.color.green = TRUEGREEN(cc);
+               drawcol.color.blue = TRUEBLUE(cc);
+       } else {
+               drawcol = dc.col[cc];
        }
 
        if (IS_SET(MODE_REVERSE)) {
        }
 
        if (IS_SET(MODE_REVERSE)) {