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

custom_color_config() made more robust

Browse Source
This commit is contained in:
Frederic Culot 2007-04-24 17:23:00 +00:00
parent bcccc254cb
commit b9257fb413
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
24 Apr 2007:
custom_color_config() made more robust regarding values returned by
pair_content()
Many thanks to Herbert for reporting bugs related to color configuration
22 Apr 2007: 22 Apr 2007:
custom_color_theme_name() updated to handle ncurses different returned custom_color_theme_name() updated to handle ncurses different returned
values (depending on if ncurses was compiled with --enable-ext-funcs) values (depending on if ncurses was compiled with --enable-ext-funcs)

12
src/custom.c
View File

@ -1,4 +1,4 @@
/* $calcurse: custom.c,v 1.9 2007/04/22 16:25:36 culot Exp $ */ /* $calcurse: custom.c,v 1.10 2007/04/24 17:23:00 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -299,6 +299,8 @@ custom_color_config(int notify_bar)
COLR_RED, COLR_GREEN, COLR_YELLOW, COLR_BLUE, COLR_RED, COLR_GREEN, COLR_YELLOW, COLR_BLUE,
COLR_MAGENTA, COLR_CYAN, COLR_DEFAULT}; COLR_MAGENTA, COLR_CYAN, COLR_DEFAULT};
mark_fore = NBUSERCOLORS;
mark_back = SIZE - 1;
bar_len = strlen(bar); bar_len = strlen(bar);
box_len = strlen(box); box_len = strlen(box);
x_offset = 5; x_offset = 5;
@ -356,7 +358,7 @@ custom_color_config(int notify_bar)
(colr_fore == DEFAULTCOLOR_EXT)) (colr_fore == DEFAULTCOLOR_EXT))
mark_fore = NBUSERCOLORS; mark_fore = NBUSERCOLORS;
else else
for (i = 0; i < NBUSERCOLORS; i++) for (i = 0; i < NBUSERCOLORS + 1; i++)
if (colr_fore == colr[i]) if (colr_fore == colr[i])
mark_fore = i; mark_fore = i;
@ -364,7 +366,7 @@ custom_color_config(int notify_bar)
(colr_back == DEFAULTCOLOR_EXT)) (colr_back == DEFAULTCOLOR_EXT))
mark_back = SIZE - 1; mark_back = SIZE - 1;
else else
for (i = 0; i < NBUSERCOLORS; i++) for (i = 0; i < NBUSERCOLORS + 1; i++)
if (colr_back == colr[NBUSERCOLORS + 1 + i]) if (colr_back == colr[NBUSERCOLORS + 1 + i])
mark_back = NBUSERCOLORS + 1 + i; mark_back = NBUSERCOLORS + 1 + i;
@ -372,10 +374,6 @@ custom_color_config(int notify_bar)
pos[mark_fore][XPOS] + 1, MARK); pos[mark_fore][XPOS] + 1, MARK);
mvwaddch(conf_win, pos[mark_back][YPOS], mvwaddch(conf_win, pos[mark_back][YPOS],
pos[mark_back][XPOS] + 1, MARK); pos[mark_back][XPOS] + 1, MARK);
} else {
mark_fore = NBUSERCOLORS;
mark_back = SIZE - 1;
} }
cursor = 0; cursor = 0;