Skip to content

Commit d50ebee

Browse files
committed
dynamic cursor color: trying out JuanScerriE's proposed amendment for the patch ref. #10
1 parent 5452c4f commit d50ebee

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

x.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,18 +2034,21 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
20342034
if (selected(cx, cy)) {
20352035
g.fg = defaultfg;
20362036
g.bg = defaultrcs;
2037-
} else {
2038-
#if DYNAMIC_CURSOR_COLOR_PATCH
2037+
}
2038+
#if !DYNAMIC_CURSOR_COLOR_PATCH
2039+
else {
2040+
g.fg = defaultbg;
2041+
g.bg = defaultcs;
2042+
}
2043+
2044+
drawcol = dc.col[g.bg];
2045+
#else
2046+
else if (!(og.mode & ATTR_REVERSE)) {
20392047
unsigned int tmpcol = g.bg;
20402048
g.bg = g.fg;
20412049
g.fg = tmpcol;
2042-
#else
2043-
g.fg = defaultbg;
2044-
g.bg = defaultcs;
2045-
#endif // DYNAMIC_CURSOR_COLOR_PATCH
20462050
}
20472051

2048-
#if DYNAMIC_CURSOR_COLOR_PATCH
20492052
if (IS_TRUECOL(g.bg)) {
20502053
colbg.alpha = 0xffff;
20512054
colbg.red = TRUERED(g.bg);
@@ -2054,8 +2057,6 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
20542057
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol);
20552058
} else
20562059
drawcol = dc.col[g.bg];
2057-
#else
2058-
drawcol = dc.col[g.bg];
20592060
#endif // DYNAMIC_CURSOR_COLOR_PATCH
20602061
}
20612062

0 commit comments

Comments
 (0)