diff options
author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-12-19 08:59:05 +0100 |
---|---|---|
committer | Lukas Fleischer <lfleischer@calcurse.org> | 2019-05-22 01:56:59 -0400 |
commit | 1ccfe128cce8d670d12c350326bb13fbc0276d0a (patch) | |
tree | 116fd3e8861e13cc22060ce2eb47593381a8f61c /src/ui-day.c | |
parent | 066df02cbf44d58a9b1e3a30b1310dc0f460e4c4 (diff) | |
download | calcurse-1ccfe128cce8d670d12c350326bb13fbc0276d0a.tar.gz calcurse-1ccfe128cce8d670d12c350326bb13fbc0276d0a.zip |
Redesign selected-item implementation for the APP panel
The day vector, day_items, is displayed in the appointments panel; the
selected day_item object is highlighted (when the panel has the focus).
When items are inserted, edited, moved etc., and when the day is
changed, the day vector is rebuilt and displayed anew.
Problem: How shall the selection be set automatically in the context of
the new day vector?
In previous versions all of the above is mostly handled by the function
do_storage() in calcurse.c The function saves data about the selection
as needed, rebuilds the day vector, loads the listbox and sets the
selection from the saved selection data. This works well in "single
day" calcurse in cases where the selected item is present in the day
vector both before and after the rebuild, or when the item ordering in
the listbox is unaffected by the changes. But when a new item is added
the selection cannot be set to the new object by do_storage(). Instead
the necessary operations are performed by ui_day_item_add(), and
do_storage() is bypassed. In general, when an item cannot be found in
the new vector, the item which occupies the old place in the list gets
selected, e.g. when an item is deleted. When an item is turned into a
repeating one, the old item is deleted and a new is created. Here the
new selection is not always the affected item, but in any case not far
away. Generally, with only one day in the panel an erronous selection
might not be noticed or be accurate by chance.
In "multiple day" calcurse the existing scheme works less well; in
addition the day vector may now contain more than one object that refer
to the same event or appointment (recurrent items or multi-day
appointments). The scheme has therefore been modified. The do_storage()
function is no longer bypassed, but handles day vector rebuild, load of
listbox and item selection exclusively. To make that possible, data
about the selected item is no longer saved in a local automatic
variable, private to do_storage(), but in an external static variable in
day.c, which may be set not only by do_storage(). The variable is
declared as
static struct day_item sel_data;
and used as follows:
1. On startup sel_data is initialized to empty (i.e. no selection).
2. In any operation involving the appointments panel:
2.1 Do the work and if necessary set sel_data. This is the case when
deleting, adding or pasting an item, and when turning an ordinary
item into a recurrent one.
2.2 Call do_storage().
3. In do_storage():
3.1 If sel_data is empty, set it to the current selection.
3.2 Rebuild the day vector.
3.3 Set the selection from sel_data.
3.4 Set sel_data to empty.
Further remarks
---------------
The selection is found in the new day vector by searching for the saved
(order, item.<pointer>) pair. Previously the item.<pointer> alone
sufficed and in some cases it still does. In case the item cannot be
found, the selection stays in the same day as before the rebuild.
An attempt at more consistently named APP-related functions has led to:
ui_day_sel_date() replaces ui_day_sel_day() ui_day_get_sel() replaces
ui_day_selitem()
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/ui-day.c')
-rw-r--r-- | src/ui-day.c | 79 |
1 files changed, 42 insertions, 37 deletions
diff --git a/src/ui-day.c b/src/ui-day.c index 32e12bf..4b37a90 100644 --- a/src/ui-day.c +++ b/src/ui-day.c @@ -39,34 +39,35 @@ struct day_item day_cut[38] = { {0, 0, 0, {NULL}} }; /* - * Return the selected item in the APP panel. + * 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. */ -struct day_item *ui_day_selitem(void) +struct day_item *ui_day_get_sel(void) { if (day_item_count(0) <= 0) - return NULL; + return &empty_day; return day_get_item(listbox_get_sel(&lb_apt)); } /* - * Return the day (midnight) of the selected item in the APP panel. + * Set the selected item from the saved day_item. */ -time_t ui_day_selday(void) +void ui_day_find_sel(void) { - return update_time_in_date(ui_day_selitem()->order, 0, 0); -} + int n; -void ui_day_set_selitem_by_aptev_ptr(union aptev_ptr p) -{ - int n = day_get_position_by_aptev_ptr(p); - if (n >= 0) + if ((n = day_sel_index()) != -1) listbox_set_sel(&lb_apt, n); } -void ui_day_set_selitem(struct day_item *day) +/* + * Return the date (midnight) of the selected item in the APP panel. + */ +time_t ui_day_sel_date(void) { - ui_day_set_selitem_by_aptev_ptr(day->item); + return update_time_in_date(ui_day_get_sel()->order, 0, 0); } /* @@ -406,7 +407,7 @@ void ui_day_item_edit(void) if (day_item_count(0) <= 0) return; - struct day_item *p = ui_day_selitem(); + struct day_item *p = ui_day_get_sel(); switch (p->type) { case RECUR_EVNT: @@ -534,7 +535,7 @@ void ui_day_item_pipe(void) if (day_item_count(0) <= 0) return; - struct day_item *p = ui_day_selitem(); + struct day_item *p = ui_day_get_sel(); status_mesg(_("Pipe item to external command:"), ""); if (getstring(win[STA].p, cmd, BUFSIZ, 0, 1) != GETSTRING_VALID) @@ -590,7 +591,7 @@ void ui_day_item_add(void) const char *enter_str = _("Press [Enter] to continue"); char item_time[LTIME] = ""; char item_mesg[BUFSIZ] = ""; - time_t start = ui_day_selday(), end, saved = start; + time_t start = ui_day_sel_date(), end, saved = start; unsigned dur; int is_appointment = 1; union aptev_ptr item; @@ -683,9 +684,11 @@ void ui_day_item_add(void) item.ev = event_new(item_mesg, 0L, start, 1); } io_set_modified(); - day_store_items(get_slctd_day(), 1, day_get_nb()); - ui_day_load_items(); - ui_day_set_selitem_by_aptev_ptr(item); + /* Set the selected APP item. */ + struct day_item d = empty_day; + d.order = start; + d.item = item; + day_set_sel_data(&d); } ui_calendar_monthly_view_cache_set_invalid(); @@ -715,7 +718,7 @@ void ui_day_item_delete(unsigned reg) if (day_item_count(0) <= 0) return; - struct day_item *p = ui_day_selitem(); + struct day_item *p = ui_day_get_sel(); if (conf.confirm_delete) { if (status_ask_bool(del_app_str) != 1) { @@ -745,12 +748,10 @@ void ui_day_item_delete(unsigned reg) break; case 2: if (p->type == RECUR_EVNT) { - date = get_slctd_day(); - day_item_add_exc(p, date); + day_item_add_exc(p, ui_day_sel_date()); } else { - date = update_time_in_date(p->start, 0, 0); recur_apoint_find_occurrence(p->item.rapt, - date, + ui_day_sel_date(), &occurrence); day_item_add_exc(p, occurrence); } @@ -900,21 +901,25 @@ 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) { struct event *ev = p->item.ev; - recur_event_new(ev->mesg, ev->note, ev->day, ev->id, type, - freq, until, NULL); + d.item.rev = recur_event_new(ev->mesg, ev->note, ev->day, + ev->id, type, freq, until, NULL); } else if (p->type == APPT) { struct apoint *apt = p->item.apt; - ra = recur_apoint_new(apt->mesg, apt->note, apt->start, - apt->dur, apt->state, type, freq, - until, NULL); + d.item.rapt = ra = recur_apoint_new(apt->mesg, apt->note, + apt->start, apt->dur, + apt->state, type, freq, + until, NULL); if (notify_bar()) notify_check_repeated(ra); } else { EXIT(_("wrong item type")); /* NOTREACHED */ } + day_set_sel_data(&d); ui_day_item_cut_free(REG_BLACK_HOLE); p = day_cut_item(date, item_nb); @@ -960,7 +965,7 @@ void ui_day_item_copy(unsigned reg) if (day_item_count(0) <= 0 || reg == REG_BLACK_HOLE) return; - struct day_item *item = ui_day_selitem(); + struct day_item *item = ui_day_get_sel(); ui_day_item_cut_free(reg); day_item_fork(item, &day_cut[reg]); } @@ -968,15 +973,15 @@ void ui_day_item_copy(unsigned reg) /* Paste a previously cut item. */ void ui_day_item_paste(unsigned reg) { - struct day_item day; + struct day_item day = empty_day; if (reg == REG_BLACK_HOLE || !day_cut[reg].type) return; day_item_fork(&day_cut[reg], &day); - day_paste_item(&day, ui_day_selday()); + day_paste_item(&day, ui_day_sel_date()); + day_set_sel_data(&day); io_set_modified(); - ui_calendar_monthly_view_cache_set_invalid(); } @@ -1071,7 +1076,7 @@ void ui_day_popup_item(void) if (day_item_count(0) <= 0) return; - struct day_item *item = ui_day_selitem(); + struct day_item *item = ui_day_get_sel(); day_popup_item(item); } @@ -1080,7 +1085,7 @@ void ui_day_flag(void) if (day_item_count(0) <= 0) return; - struct day_item *item = ui_day_selitem(); + struct day_item *item = ui_day_get_sel(); day_item_switch_notify(item); io_set_modified(); } @@ -1090,7 +1095,7 @@ void ui_day_view_note(void) if (day_item_count(0) <= 0) return; - struct day_item *item = ui_day_selitem(); + struct day_item *item = ui_day_get_sel(); day_view_note(item, conf.pager); } @@ -1099,7 +1104,7 @@ void ui_day_edit_note(void) if (day_item_count(0) <= 0) return; - struct day_item *item = ui_day_selitem(); + struct day_item *item = ui_day_get_sel(); day_edit_note(item, conf.editor); io_set_modified(); } |