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

Implemented rendering of notes in todo view

Browse Source 
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Ambika Eshwar 2020-09-29 02:16:25 -04:00 committed by Lukas Fleischer
parent 1b40844aa3
commit b144b19964
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calcurse.h
View File

@ -1019,6 +1019,7 @@ void edit_note(char **, const char *);
void view_note(const char *, const char *);
void erase_note(char **);
void note_read(char *, FILE *);
void note_read_contents(char *, size_t, FILE *);
void note_gc(void);
/* notify.c */

11
src/note.c
View File

@ -155,6 +155,17 @@ void note_read(char *buffer, FILE * fp)
buffer[MAX_NOTESIZ] = '\0';
}
/* Read the contents of a note file */
void note_read_contents(char *buffer, size_t buffer_len, FILE * fp)
{
size_t read_count = fread(buffer, 1, buffer_len, fp);
if (read_count != buffer_len)
buffer[read_count] = '\0';
else
memcpy(&buffer[buffer_len - 4], "...\0", 4);
}
static void
note_gc_extract_key(struct note_gc_hash *data, const char **key, int *len)
{

20
src/ui-todo.c
View File

@ -314,8 +314,28 @@ void ui_todo_popup_item(void)
if (!item)
return;
if (item->note) {
/* Assign a sane default note size that will cleanly
* truncate long notes */
const char *note_heading = _("Note:");
size_t note_size = 3500;
char note[note_size];
char *notepath, *msg;
FILE *fp;
asprintf(&notepath, "%s%s", path_notes, item->note);
fp = fopen(notepath, "r");
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);
asprintf(&msg, "%s\n\n%s\n%s", item->mesg, note_heading, note);
item_in_popup(NULL, NULL, msg, _("TODO:"));
mem_free(msg);
} else {
item_in_popup(NULL, NULL, item->mesg, _("TODO:"));
}
}
void ui_todo_flag(void)
{