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

Rework generic item container

Browse Source 
Instead of copying all members of the individual item structures to a
generic structure containing all fields, create compulsory fields only
and set up a pointer to the actual item. This results in lower memory
footprint and lets us clean up some code.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2012-06-25 11:51:59 +02:00
parent cbc5d46880
commit 52bfc54333
3 changed files with 134 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/calcurse.h
View File

@@ -308,18 +308,6 @@ struct day_items_nb {
unsigned nb_apoints;
};
/* Generic item description (to hold appointments, events...). */
struct day_item {
long start; /* seconds since 1 jan 1970 */
long appt_dur; /* appointment duration in seconds */
int type; /* (recursive or normal) event or appointment */
int evnt_id; /* event identifier */
int appt_pos; /* real position in recurrent list */
char state; /* appointment state */
char *mesg; /* item description */
char *note; /* note attached to item */
};
struct excp {
long st; /* beggining of the considered day, in seconds */
};
@@ -361,6 +349,22 @@ struct recur_event {
char *note; /* note attached to event */
};
/* Generic pointer data type for appointments and events. */
union aptev_ptr {
struct apoint *apt;
struct event *ev;
struct recur_apoint *rapt;
struct recur_event *rev;
};
/* Generic item description (to hold appointments, events...). */
struct day_item {
int type; /* (recursive or normal) event or appointment */
long start; /* start time of the repetition occurrence */
union aptev_ptr item; /* pointer to the actual item */
int appt_pos; /* real position in recurrent list */
};
/* Available view for the calendar panel. */
enum {
CAL_MONTH_VIEW,