Use a dynamic method to print events to stdout
Add a flexible helper function print_event() and use it whenever we print events to stdout. This reduces the number of copy-pasted code and eventually allows for specifying custom format strings. Following format specifiers are supported: * m: Print the description of the item * n: Print the name of the note file belonging to the item Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
parent
330ca4d3cb
commit
a9b820abbe
@ -409,9 +409,7 @@ app_arg (int add_line, struct date *day, long date, int print_note,
|
|||||||
arg_print_date (today);
|
arg_print_date (today);
|
||||||
print_date = 0;
|
print_date = 0;
|
||||||
}
|
}
|
||||||
fputs (" * ", stdout);
|
print_event (" * %m\n", today, ev);
|
||||||
fputs (ev->mesg, stdout);
|
|
||||||
fputs ("\n", stdout);
|
|
||||||
if (print_note && ev->note)
|
if (print_note && ev->note)
|
||||||
print_notefile (stdout, ev->note, 2);
|
print_notefile (stdout, ev->note, 2);
|
||||||
}
|
}
|
||||||
|
@ -923,6 +923,7 @@ int shell_exec (int *, int *, char *);
|
|||||||
int child_wait (int *, int *, int);
|
int child_wait (int *, int *, int);
|
||||||
void press_any_key (void);
|
void press_any_key (void);
|
||||||
void print_apoint (const char *, long, struct apoint *);
|
void print_apoint (const char *, long, struct apoint *);
|
||||||
|
void print_event (const char *, long, struct event *);
|
||||||
|
|
||||||
/* vars.c */
|
/* vars.c */
|
||||||
extern int col, row;
|
extern int col, row;
|
||||||
|
31
src/utils.c
31
src/utils.c
@ -1002,3 +1002,34 @@ print_apoint (const char *format, long day, struct apoint *apt)
|
|||||||
putchar (*p);
|
putchar (*p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Print a formatted event to stdout. */
|
||||||
|
void
|
||||||
|
print_event (const char *format, long day, struct event *ev)
|
||||||
|
{
|
||||||
|
const char *p;
|
||||||
|
|
||||||
|
for (p = format; *p; p++)
|
||||||
|
{
|
||||||
|
if (*p == '%') {
|
||||||
|
p++;
|
||||||
|
switch (*p)
|
||||||
|
{
|
||||||
|
case 'm':
|
||||||
|
printf ("%s", ev->mesg);
|
||||||
|
break;
|
||||||
|
case 'n':
|
||||||
|
printf ("%s", ev->note);
|
||||||
|
break;
|
||||||
|
case '\0':
|
||||||
|
return;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
putchar ('?');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
putchar (*p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user