From a5cc46cd550b335b0de6ce7658e0c1ca5068255e Mon Sep 17 00:00:00 2001
From: Lars Henriksen <LarsHenriksen@get2net.dk>
Date: Wed, 10 Jan 2018 15:49:13 +0100
Subject: Transparent cursor fix
Commit f8e6e0d (Fix no-colour theme, 2017-12-10) partly destroyed the
cursor in getstring() by turning it into a solid block. The fix
reintroduces wchgat() which requires a color pair argument. When no
colors are wanted, color pair 0 is used.
A similar problem exists in the layout and colour customization windows
and is fixed in the same way: move to the position and apply the reverse
video attribute.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
---
src/custom.c | 11 +++++------
src/getstring.c | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/custom.c b/src/custom.c
index 4005dc3..6e57167 100644
--- a/src/custom.c
+++ b/src/custom.c
@@ -153,7 +153,6 @@ static void layout_selection_bar(void)
static void display_layout_config(struct window *lwin, int mark,
int cursor)
{
-#define CURSOR (32 | A_REVERSE)
#define MARK 88
#define LAYOUTH 5
#define LAYOUTW 9
@@ -199,8 +198,9 @@ static void display_layout_config(struct window *lwin, int mark,
custom_remove_attr(lwin->p, ATTR_HIGHEST);
}
mvwaddch(lwin->p, pos[mark][YPOS] + 2, pos[mark][XPOS] + 1, MARK);
- mvwaddch(lwin->p, pos[cursor][YPOS] + 2, pos[cursor][XPOS] + 1,
- CURSOR);
+ /* print cursor */
+ wmove(lwin->p, pos[cursor][YPOS] + 2, pos[cursor][XPOS] + 1);
+ wchgat(lwin->p, 1, A_REVERSE, (colorize ? COLR_CUSTOM : 0), NULL);
layout_selection_bar();
wnoutrefresh(win[STA].p);
@@ -334,7 +334,6 @@ display_color_config(struct window *cwin, int *mark_fore, int *mark_back,
#define SIZE (2 * (NBUSERCOLORS + 1))
#define DEFAULTCOLOR 255
#define DEFAULTCOLOR_EXT -1
-#define CURSOR (32 | A_REVERSE)
#define MARK 88
const char *fore_txt = _("Foreground");
@@ -438,8 +437,8 @@ display_color_config(struct window *cwin, int *mark_fore, int *mark_back,
pos[*mark_back][XPOS] + 1, MARK);
}
- mvwaddch(cwin->p, pos[cursor][YPOS], pos[cursor][XPOS] + 1,
- CURSOR);
+ wmove(cwin->p, pos[cursor][YPOS], pos[cursor][XPOS] + 1);
+ wchgat(cwin->p, 1, A_REVERSE, (colorize ? COLR_CUSTOM : 0), NULL);
color_selection_bar();
wnoutrefresh(win[STA].p);
wnoutrefresh(cwin->p);
diff --git a/src/getstring.c b/src/getstring.c
index 10a6f5e..d558331 100644
--- a/src/getstring.c
+++ b/src/getstring.c
@@ -69,8 +69,8 @@ static void getstr_print(WINDOW * win, int x, int y,
mvwprintw(win, y, col - 2, " %c", c);
/* print cursor */
- mvwaddch(win, y, st->ci[st->pos].dpyoff - st->ci[st->scrpos].dpyoff,
- SPACE | A_REVERSE);
+ wmove(win, y, st->ci[st->pos].dpyoff - st->ci[st->scrpos].dpyoff);
+ wchgat(win, 1, A_REVERSE, (colorize ? COLR_CUSTOM : 0), NULL);
}
/* Delete a character at the given position in string. */
--
cgit v1.2.3-70-g09d2