path: root/src/ui-day.c
diff options
authorLars Henriksen <LarsHenriksen@get2net.dk>2019-01-27 19:22:50 +0100
committerLukas Fleischer <lfleischer@calcurse.org>2019-05-22 01:56:59 -0400
commitf9cf5fb0c1528c006697a23813be72f69458d53d (patch)
tree3aff65b726eed45f523a73854b36fdfddfddc3e5 /src/ui-day.c
parent80ce812effec8190bfbb1986dced1b143162a4c8 (diff)
Derive selected day from selected item
Previously, with only one day visible at a time, the appointments panel displayed the details of the day selected in the calendar (slctd_day); information required for operations on items (day_items) can often be derived from the selected day. The items available are derived from the selected day. In particular, the selected item is derived from the selected day. With multiple days in the APP panel, the relation between selected day (in the calendar) and the selected item (in the APP panel) has, in a way, been turned around. The selected item may now be moved between days without explicitly changing the selected day. Implicitly it is changed when the target day of a move is unavailable. This commit draws the full consequence: the selected day in the calendar is always (set to) the day of the selected item in the APP panel. The static variable 'struct date slctd_day' lives in ui_calendar.c and is accessible through various public functions. To these are added ui_calendar_set_slctd_day() which sets slctd_day directly. The selected day retains its significance for load of the day vector (in day_store_items()): the range of loaded days begins with the selected day. Movements (up/down) in the APP panel will change the selected day as the selected item moves among the already loaded days. Only when the target of a movement is unreachable, will further days be loaded. On the other hand, if the same range of days must be reloaded because of a changed item, the selected item - and with it the selected day - must be reset to the first day item (see do_storage()). Movements in the calendar (generic-next-day, etc.) are not affected and behave as previously, i.e. they will cause a range of days to be loaded with the selected day as the first and the selected item as the first of the selected day. Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk> Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/ui-day.c')
1 files changed, 17 insertions, 6 deletions
diff --git a/src/ui-day.c b/src/ui-day.c
index f7fddef..b959c07 100644
--- a/src/ui-day.c
+++ b/src/ui-day.c
@@ -39,6 +39,14 @@
struct day_item day_cut[38] = { {0, 0, 0, {NULL}} };
+ * Set the selected day in the calendar from the selected item in the APP panel.
+ */
+static void set_slctd_day(void)
+ ui_calendar_set_slctd_day(sec2date(ui_day_get_sel()->order));
* Return the selected APP item.
* This is a pointer into the day vector and invalid after a day vector rebuild,
* but the (order, item) data may be used to refind the object.
@@ -52,7 +60,7 @@ struct day_item *ui_day_get_sel(void)
- * Set the selected item from the saved day_item.
+ * Set the selected item and day from the saved day_item.
void ui_day_find_sel(void)
@@ -60,6 +68,7 @@ void ui_day_find_sel(void)
if ((n = day_sel_index()) != -1)
listbox_set_sel(&lb_apt, n);
+ set_slctd_day();
@@ -107,6 +116,7 @@ static void daybegin(int dir)
listbox_set_sel(&lb_apt, sel);
listbox_item_in_view(&lb_apt, sel);
+ set_slctd_day();
@@ -752,7 +762,7 @@ void ui_day_item_delete(unsigned reg)
"Delete (i)tem or just its (n)ote?");
const char *note_choices = _("[in]");
const int nb_note_choices = 2;
- time_t date = 0, occurrence;
+ time_t occurrence;
if (day_item_count(0) <= 0)
@@ -808,7 +818,7 @@ void ui_day_item_delete(unsigned reg)
- p = day_cut_item(date, listbox_get_sel(&lb_apt));
+ p = day_cut_item(listbox_get_sel(&lb_apt));
day_cut[reg].type = p->type;
day_cut[reg].item = p->item;
/* Keep the selection on the same day. */
@@ -853,7 +863,7 @@ void ui_day_item_repeat(void)
int item_nb;
struct day_item *p;
struct recur_apoint *ra;
- time_t until, date;
+ time_t until;
unsigned days;
if (day_item_count(0) <= 0)
@@ -944,7 +954,6 @@ void ui_day_item_repeat(void)
- date = get_slctd_day();
/* Set the selected APP item. */
struct day_item d = empty_day;
if (p->type == EVNT) {
@@ -966,7 +975,7 @@ void ui_day_item_repeat(void)
- p = day_cut_item(date, item_nb);
+ p = day_cut_item(item_nb);
day_cut[REG_BLACK_HOLE].type = p->type;
day_cut[REG_BLACK_HOLE].item = p->item;
@@ -1040,6 +1049,7 @@ void ui_day_sel_reset(void)
/* Make the day visible. */
if (lb_apt.item_sel)
listbox_item_in_view(&lb_apt, lb_apt.item_sel - 1);
+ set_slctd_day();
int ui_day_sel_move(int delta)
@@ -1050,6 +1060,7 @@ int ui_day_sel_move(int delta)
/* When moving up, make the line above visible. */
if (delta < 0 && ret && lb_apt.item_sel)
listbox_item_in_view(&lb_apt, lb_apt.item_sel - 1);
+ set_slctd_day();
return ret;