fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Transparent cursor fix

Browse Source 
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>
This commit is contained in:
Lars Henriksen 2018-01-10 15:49:13 +01:00 committed by Lukas Fleischer
parent 65dd82a626
commit a5cc46cd55
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/custom.c
View File

@ -153,7 +153,6 @@ static void layout_selection_bar(void)
static void display_layout_config(struct window *lwin, int mark, static void display_layout_config(struct window *lwin, int mark,
int cursor) int cursor)
{ {
#define CURSOR (32 | A_REVERSE)
#define MARK 88 #define MARK 88
#define LAYOUTH 5 #define LAYOUTH 5
#define LAYOUTW 9 #define LAYOUTW 9
@ -199,8 +198,9 @@ static void display_layout_config(struct window *lwin, int mark,
custom_remove_attr(lwin->p, ATTR_HIGHEST); custom_remove_attr(lwin->p, ATTR_HIGHEST);
} }
mvwaddch(lwin->p, pos[mark][YPOS] + 2, pos[mark][XPOS] + 1, MARK); mvwaddch(lwin->p, pos[mark][YPOS] + 2, pos[mark][XPOS] + 1, MARK);
mvwaddch(lwin->p, pos[cursor][YPOS] + 2, pos[cursor][XPOS] + 1, /* print cursor */
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(); layout_selection_bar();
wnoutrefresh(win[STA].p); 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 SIZE (2 * (NBUSERCOLORS + 1))
#define DEFAULTCOLOR 255 #define DEFAULTCOLOR 255
#define DEFAULTCOLOR_EXT -1 #define DEFAULTCOLOR_EXT -1
#define CURSOR (32 | A_REVERSE)
#define MARK 88 #define MARK 88
const char *fore_txt = _("Foreground"); 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); pos[*mark_back][XPOS] + 1, MARK);
} }
mvwaddch(cwin->p, pos[cursor][YPOS], pos[cursor][XPOS] + 1, wmove(cwin->p, pos[cursor][YPOS], pos[cursor][XPOS] + 1);
CURSOR); wchgat(cwin->p, 1, A_REVERSE, (colorize ? COLR_CUSTOM : 0), NULL);
color_selection_bar(); color_selection_bar();
wnoutrefresh(win[STA].p); wnoutrefresh(win[STA].p);
wnoutrefresh(cwin->p); wnoutrefresh(cwin->p);

4
src/getstring.c
View File

@ -69,8 +69,8 @@ static void getstr_print(WINDOW * win, int x, int y,
mvwprintw(win, y, col - 2, " %c", c); mvwprintw(win, y, col - 2, " %c", c);
/* print cursor */ /* print cursor */
mvwaddch(win, y, st->ci[st->pos].dpyoff - st->ci[st->scrpos].dpyoff, wmove(win, y, st->ci[st->pos].dpyoff - st->ci[st->scrpos].dpyoff);
SPACE | A_REVERSE); wchgat(win, 1, A_REVERSE, (colorize ? COLR_CUSTOM : 0), NULL);
} }
/* Delete a character at the given position in string. */ /* Delete a character at the given position in string. */