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

Remove duplicate code in draw_monthly_view()

Browse Source 
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2016-06-27 08:57:21 +02:00
parent 203ac0aa61
commit 8fe9dd1c2b
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/ui-calendar.c
View File

@ -435,6 +435,8 @@ draw_monthly_view(struct scrollwin *sw, struct date *current_day,
} }
for (c_day = 1; c_day <= numdays; ++c_day, ++c_day_1, c_day_1 %= 7) { for (c_day = 1; c_day <= numdays; ++c_day, ++c_day_1, c_day_1 %= 7) {
unsigned attr;
check_day.dd = c_day; check_day.dd = c_day;
check_day.mm = slctd_day.mm; check_day.mm = slctd_day.mm;
check_day.yyyy = slctd_day.yyyy; check_day.yyyy = slctd_day.yyyy;
@ -453,42 +455,27 @@ draw_monthly_view(struct scrollwin *sw, struct date *current_day,
ofs_x = (w - 27) / 2 - day_1_sav - 4 * c_day; ofs_x = (w - 27) / 2 - day_1_sav - 4 * c_day;
} }
WINS_CALENDAR_LOCK;
if (c_day == current_day->dd if (c_day == current_day->dd
&& current_day->mm == slctd_day.mm && current_day->mm == slctd_day.mm
&& current_day->yyyy == slctd_day.yyyy && current_day->yyyy == slctd_day.yyyy
&& current_day->dd != slctd_day.dd) { && current_day->dd != slctd_day.dd)
/* This is today, so print it in yellow. */ attr = ATTR_LOWEST;
custom_apply_attr(sw->inner, ATTR_LOWEST); else if (c_day == slctd_day.dd)
mvwprintw(sw->inner, ofs_y + 1, attr = ATTR_HIGHEST;
ofs_x + day_1_sav + 4 * c_day + 1, "%2d", else if (item_this_day == 1)
c_day); attr = ATTR_LOW;
custom_remove_attr(sw->inner, ATTR_LOWEST); else if (item_this_day == 2)
} else if (c_day == slctd_day.dd) { attr = ATTR_TRUE;
/* This is the selected day, print it according to user's theme. */ else
custom_apply_attr(sw->inner, ATTR_HIGHEST); attr = 0;
mvwprintw(sw->inner, ofs_y + 1,
ofs_x + day_1_sav + 4 * c_day + 1, "%2d", WINS_CALENDAR_LOCK;
c_day); if (attr)
custom_remove_attr(sw->inner, ATTR_HIGHEST); custom_apply_attr(sw->inner, attr);
} else if (item_this_day == 1) { mvwprintw(sw->inner, ofs_y + 1,
custom_apply_attr(sw->inner, ATTR_LOW); ofs_x + day_1_sav + 4 * c_day + 1, "%2d", c_day);
mvwprintw(sw->inner, ofs_y + 1, if (attr)
ofs_x + day_1_sav + 4 * c_day + 1, "%2d", custom_remove_attr(sw->inner, attr);
c_day);
custom_remove_attr(sw->inner, ATTR_LOW);
} else if (item_this_day == 2) {
custom_apply_attr(sw->inner, ATTR_TRUE);
mvwprintw(sw->inner, ofs_y + 1,
ofs_x + day_1_sav + 4 * c_day + 1, "%2d",
c_day);
custom_remove_attr(sw->inner, ATTR_TRUE);
} else {
/* otherwise, print normal days in black */
mvwprintw(sw->inner, ofs_y + 1,
ofs_x + day_1_sav + 4 * c_day + 1, "%2d",
c_day);
}
WINS_CALENDAR_UNLOCK; WINS_CALENDAR_UNLOCK;
} }
@ -534,9 +521,9 @@ draw_weekly_view(struct scrollwin *sw, struct date *current_day,
&& current_day->mm == slctd_day.mm && current_day->mm == slctd_day.mm
&& current_day->yyyy == slctd_day.yyyy && current_day->yyyy == slctd_day.yyyy
&& current_day->dd != slctd_day.dd) && current_day->dd != slctd_day.dd)
attr = ATTR_LOWEST; /* today, but not selected */ attr = ATTR_LOWEST;
else if (t.tm_mday == slctd_day.dd) else if (t.tm_mday == slctd_day.dd)
attr = ATTR_HIGHEST; /* selected day */ attr = ATTR_HIGHEST;
else if (item_this_day == 1) else if (item_this_day == 1)
attr = ATTR_LOW; attr = ATTR_LOW;
else if (item_this_day == 2) else if (item_this_day == 2)