a
/
st
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drawcol = dc.col[g.bg];

This commit is contained in:
Bakkeby 2024-03-07 23:40:50 +01:00
parent b43957b061
commit 9ddc13c0e0
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
x.c
View File

@ -2568,6 +2568,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
XRenderColor colbg; XRenderColor colbg;
#endif // DYNAMIC_CURSOR_COLOR_PATCH #endif // DYNAMIC_CURSOR_COLOR_PATCH
#if !DYNAMIC_CURSOR_COLOR_PATCH
/* remove the old cursor */ /* remove the old cursor */
if (selected(ox, oy)) if (selected(ox, oy))
#if SELECTION_COLORS_PATCH #if SELECTION_COLORS_PATCH
@ -2575,6 +2576,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
#else #else
og.mode ^= ATTR_REVERSE; og.mode ^= ATTR_REVERSE;
#endif // SELECTION_COLORS_PATCH #endif // SELECTION_COLORS_PATCH
#endif // DYNAMIC_CURSOR_COLOR_PATCH
#if LIGATURES_PATCH #if LIGATURES_PATCH
/* Redraw the line where cursor was previously. /* Redraw the line where cursor was previously.
@ -2595,11 +2597,14 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
/* /*
* Select the right color for the right mode. * Select the right color for the right mode.
*/ */
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE
#if BOXDRAW_PATCH #if BOXDRAW_PATCH
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW; |ATTR_BOXDRAW
#else
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
#endif // BOXDRAW_PATCH #endif // BOXDRAW_PATCH
#if DYNAMIC_CURSOR_COLOR_PATCH
|ATTR_REVERSE
#endif // DYNAMIC_CURSOR_COLOR_PATCH
;
if (IS_SET(MODE_REVERSE)) { if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE; g.mode |= ATTR_REVERSE;
@ -2623,23 +2628,23 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
drawcol = dc.col[defaultcs]; drawcol = dc.col[defaultcs];
#else #else
if (selected(cx, cy)) { if (selected(cx, cy)) {
#if DYNAMIC_CURSOR_COLOR_PATCH
g.mode &= ~ATTR_REVERSE;
#endif // DYNAMIC_CURSOR_COLOR_PATCH
g.fg = defaultfg; g.fg = defaultfg;
g.bg = defaultrcs; g.bg = defaultrcs;
} } else {
#if !DYNAMIC_CURSOR_COLOR_PATCH #if DYNAMIC_CURSOR_COLOR_PATCH
else {
g.fg = defaultbg;
g.bg = defaultcs;
}
drawcol = dc.col[g.bg];
#else
else if (!(og.mode & ATTR_REVERSE)) {
unsigned int tmpcol = g.bg; unsigned int tmpcol = g.bg;
g.bg = g.fg; g.bg = g.fg;
g.fg = tmpcol; g.fg = tmpcol;
#else
g.fg = defaultbg;
g.bg = defaultcs;
#endif // DYNAMIC_CURSOR_COLOR_PATCH
} }
#if DYNAMIC_CURSOR_COLOR_PATCH
if (IS_TRUECOL(g.bg)) { if (IS_TRUECOL(g.bg)) {
colbg.alpha = 0xffff; colbg.alpha = 0xffff;
colbg.red = TRUERED(g.bg); colbg.red = TRUERED(g.bg);
@ -2648,6 +2653,8 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol); XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol);
} else } else
drawcol = dc.col[g.bg]; drawcol = dc.col[g.bg];
#else
drawcol = dc.col[g.bg];
#endif // DYNAMIC_CURSOR_COLOR_PATCH #endif // DYNAMIC_CURSOR_COLOR_PATCH
#endif // SELECTION_COLORS_PATCH #endif // SELECTION_COLORS_PATCH
} }