felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-18 07:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for the WEEK speical.

Browse Source
This commit is contained in:
Dianne Skoll
2022-09-16 15:08:53 -04:00
parent d838c41bf2
commit 8eb6b250fb
2 changed files with 109 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/calendar.c
View File

@@ -182,6 +182,9 @@ static char const *moonphase_emojis[] = {
including termination \0 */
static char moons[32][32];
/* Week indicators */
static char weeks[32][32];
/* Background colors of each day 1-31, rgb */
static int bgcolor[32][3];
@@ -712,7 +715,7 @@ InitMoonsAndShades(void)
/* Initialize the moon array */
if (encoding_is_utf8) {
for (i=0; i<=31; i++) {
moons[i][0] = '\0';
moons[i][0] = 0;
}
}
@@ -724,6 +727,11 @@ InitMoonsAndShades(void)
bgcolor[i][2] = -1;
}
}
/* Clear weeks */
for(i=0; i<=31; i++) {
weeks[i][0] = 0;
}
}
static void
@@ -893,11 +901,19 @@ static void DoCalendarOneWeek(int nleft)
for (i=0; i<7; i++) {
FromJulian(OrigJul+i, &y, &m, &d);
char const *mon = get_month_name(m);
if (moons[d]) {
if (moons[d][0]) {
if (weeks[d][0]) {
snprintf(buf, sizeof(buf), "%d %s %s %s ", d, get_month_abbrev(mon), weeks[d], moons[d]);
} else {
snprintf(buf, sizeof(buf), "%d %s %s ", d, get_month_abbrev(mon), moons[d]);
}
} else {
if (weeks[d][0]) {
snprintf(buf, sizeof(buf), "%d %s %s ", d, get_month_abbrev(mon), weeks[d]);
} else {
snprintf(buf, sizeof(buf), "%d %s ", d, get_month_abbrev(mon));
}
}
if (OrigJul+i == RealToday)
PrintLeft(buf, ColSpaces, '*');
else
@@ -1099,11 +1115,19 @@ static int WriteCalendarRow(void)
if (i < wd || d+i-wd>DaysInMonth(m, y))
PrintLeft("", ColSpaces, ' ');
else {
if (moons[d+i-wd]) {
if (moons[d+i-wd][0]) {
if (weeks[d+i-wd][0]) {
snprintf(buf, sizeof(buf), "%d %s %s", d+i-wd, weeks[d+i-wd], moons[d+i-wd]);
} else {
snprintf(buf, sizeof(buf), "%d %s", d+i-wd, moons[d+i-wd]);
}
} else {
if (weeks[d+i-wd][0]) {
snprintf(buf, sizeof(buf), "%d %s", d+i-wd, weeks[d+i-wd]);
} else {
snprintf(buf, sizeof(buf), "%d", d+i-wd);
}
}
if (Julian(y, m, d+i-wd) == RealToday) {
PrintLeft(buf, ColSpaces-1, '*');
putchar(' ');
@@ -1886,6 +1910,19 @@ static int DoCalRem(ParsePtr p, int col)
DBufFree(&obuf);
}
}
if (!PsCal && !StrCmpi(trig.passthru, "WEEK")) {
if (jul == JulianToday) {
DBufInit(&obuf);
r = DoSubst(p, &obuf, &trig, &tim, jul, CAL_MODE);
if (r) {
DBufFree(&obuf);
FreeTrig(&trig);
return r;
}
sscanf(DBufValue(&obuf), "%31[^\x01]", weeks[DayOf(jul)]);
DBufFree(&obuf);
}
}
if (!PsCal && StrCmpi(trig.passthru, "COLOR") && StrCmpi(trig.passthru, "COLOUR") && StrCmpi(trig.passthru, "MOON")) {
FreeTrig(&trig);
return OK;