Readloop remove special cases
[citadel.git] / webcit / calendar_view.c
index 05a44224dd827beca9490eeb05ecaacf714472c9..c8820b22c6333092e972889fc79f4bfaae8b7e6f 100644 (file)
 /*
- * $Id$
+ * Handles the HTML display of calendar items.
+ *
+ * Copyright (c) 1996-2011 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-/**
- * \defgroup CalHtmlHandles Handles the HTML display of calendar items.
- * \ingroup Calendaring
- */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
+#include "calendar.h"
+
+/* These define how high the hour rows are in the day view */
+#define TIMELINE       30
+#define EXTRATIMELINE  (TIMELINE / 2)
+
+void embeddable_mini_calendar(int year, int month)
+{
+       struct tm starting_tm;
+       struct tm tm;
+       time_t thetime;
+       int i;
+       time_t previous_month;
+       time_t next_month;
+       time_t colheader_time;
+       struct tm colheader_tm;
+       char colheader_label[32];
+       long weekstart = 0;
+       char url[256];
+       char div_id[256];
+
+       snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() );
+
+       /* Determine what day to start.  If an impossible value is found, start on Sunday.
+       */
+       get_pref_long("weekstart", &weekstart, 17);
+       if (weekstart > 6) weekstart = 0;
+
+       /*
+       * Now back up to the 1st of the month...
+       */
+       memset(&starting_tm, 0, sizeof(struct tm));
+
+       starting_tm.tm_year = year - 1900;
+       starting_tm.tm_mon = month - 1;
+       starting_tm.tm_mday = 1;
+       thetime = mktime(&starting_tm);
+
+       memcpy(&tm, &starting_tm, sizeof(struct tm));
+       while (tm.tm_mday != 1) {
+               thetime = thetime - (time_t)86400;      /* go back 24 hours */
+               localtime_r(&thetime, &tm);
+       }
+
+       /* Determine previous and next months ... for links */
+       previous_month = thetime - (time_t)864000L;     /* back 10 days */
+       next_month = thetime + (time_t)(31L * 86400L);  /* ahead 31 days */
+
+       /* Now back up until we're on the user's preferred start day */
+       localtime_r(&thetime, &tm);
+       while (tm.tm_wday != weekstart) {
+               thetime = thetime - (time_t)86400;      /* go back 24 hours */
+               localtime_r(&thetime, &tm);
+       }
+
+       wc_printf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
+
+       /* Previous month link */
+       localtime_r(&previous_month, &tm);
+       wc_printf("<a href=\"javascript:minical_change_month(%d,%d);\">&laquo;</a>", 
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+
+       wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
+       wc_printf("&nbsp;&nbsp;"
+               "<span class=\"mini_calendar_month_label\">"
+               "%s %d"
+               "</span>"
+               "&nbsp;&nbsp;", colheader_label, year);
+
+       /* Next month link */
+       localtime_r(&next_month, &tm);
+       wc_printf("<a href=\"javascript:minical_change_month(%d,%d);\">&raquo;</a>",
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+
+       wc_printf("<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\" class=\"mini_calendar_days\">"
+               "<tr>");
+       colheader_time = thetime;
+       for (i=0; i<7; ++i) {
+               colheader_time = thetime + (i * 86400) ;
+               localtime_r(&colheader_time, &colheader_tm);
+               wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
+               wc_printf("<th>%c</th>", colheader_label[0]);
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       }
+       wc_printf("</tr>\n");
 
-/****************************************************************************/
 
-/**
- * \brief Display one day of a whole month view of a calendar
- * \param thetime the month we want to see 
+        /* Now do 35 or 42 days */
+        for (i = 0; i < 42; ++i) {
+                localtime_r(&thetime, &tm);
+
+                if (i < 35) {
+
+                       /* Before displaying Sunday, start a new row */
+                       if ((i % 7) == 0) {
+                               wc_printf("<tr>");
+                       }
+
+                       if (tm.tm_mon == month-1) {
+                               snprintf(url, sizeof url, "readfwd?calview=day?year=%d?month=%d?day=%d",
+                                       tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday);
+                               wc_printf("<td><a href=\"%s\">%d</a></td>", url, tm.tm_mday);
+                       }
+                       else {
+                               wc_printf("<td> </td>");
+                       }
+
+                       /* After displaying one week, end the row */
+                       if ((i % 7) == 6) {
+                               wc_printf("</tr>\n");
+                       }
+
+               }
+
+               thetime += (time_t)86400;               /* ahead 24 hours */
+       }
+
+       wc_printf("</table>"                    /* end of inner table */
+               "</div>\n");
+
+       StrBufAppendPrintf(WC->trailing_javascript,
+               "       function minical_change_month(year, month) {                                    \n"
+               "               p = 'year=' + year + '&month=' + month                                  \n"
+               "                       + '&r=' + CtdlRandomString();                                   \n"
+               "               new Ajax.Updater('%s', 'mini_calendar',                                 \n"
+               "                       { method: 'get', parameters: p, evalScripts: true } );          \n"
+               "       }                                                                               \n"
+               "",
+               div_id
+       );
+
+}
+
+/*
+ * ajax embedder for the above mini calendar 
  */
-void calendar_month_view_display_events(time_t thetime) {
-       int i;
-       time_t event_tt;
-       time_t event_tt_stripped;
-       time_t event_tte;
-       struct tm event_tm;
-       struct tm today_tm;
+void ajax_mini_calendar(void) 
+{
+       embeddable_mini_calendar( ibstr("year"), ibstr("month"));
+}
+
+
+/*
+ * Display one day of a whole month view of a calendar
+ */
+void calendar_month_view_display_events(int year, int month, int day)
+{
+       long hklen;
+       const char *HashKey;
+       void *vCal;
+       HashPos *Pos;
+       disp_cal *Cal;
        icalproperty *p = NULL;
-       icalproperty *pe = NULL;
        icalproperty *q = NULL;
        struct icaltimetype t;
-       int month, day, year;
+       struct icaltimetype end_t;
+       struct icaltimetype today_start_t;
+       struct icaltimetype today_end_t;
+       struct icaltimetype today_t;
+       struct tm starting_tm;
+       struct tm ending_tm;
        int all_day_event = 0;
-       int multi_day_event = 0;
-       int fill_day_event = 0;
        int show_event = 0;
-       time_t tt;
        char buf[256];
+       wcsession *WCC = WC;
+       time_t tt;
 
-       if (WC->num_cal == 0) {
-               wprintf("<br /><br /><br />\n");
+       if (GetCount(WCC->disp_cal_items) == 0) {
+               wc_printf("<br>\n");
                return;
        }
 
-       localtime_r(&thetime, &today_tm);
-       month = today_tm.tm_mon + 1;
-       day = today_tm.tm_mday;
-       year = today_tm.tm_year + 1900;
-
-       for (i=0; i<(WC->num_cal); ++i) {
-               fill_day_event = 0;
-               multi_day_event = 0;
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                               ICAL_DTSTART_PROPERTY);
-               pe = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                     ICAL_DTEND_PROPERTY);
-               if (p != NULL) {
-                       t = icalproperty_get_dtstart(p);
-                       event_tt = icaltime_as_timet(t);
-                       if (t.is_date) all_day_event = 1;
-                       else all_day_event = 0;
+       /*
+        * Create an imaginary event which spans the 24 hours of today.  Any events which
+        * overlap with this one take place at least partially in this day.  We have to
+        * convert it from a struct tm in order to make it UTC.
+        */
+       memset(&starting_tm, 0, sizeof(struct tm));
+       starting_tm.tm_year = year - 1900;
+       starting_tm.tm_mon = month - 1;
+       starting_tm.tm_mday = day;
+       starting_tm.tm_hour = 0;
+       starting_tm.tm_min = 0;
+       today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
+       today_start_t.is_utc = 1;
+
+       memset(&ending_tm, 0, sizeof(struct tm));
+       ending_tm.tm_year = year - 1900;
+       ending_tm.tm_mon = month - 1;
+       ending_tm.tm_mday = day;
+       ending_tm.tm_hour = 23;
+       ending_tm.tm_min = 59;
+       today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
+       today_end_t.is_utc = 1;
+
+       /*
+        * Create another one without caring about the timezone for all day events.
+        */
+       today_t = icaltime_null_date();
+       today_t.year = year;
+       today_t.month = month;
+       today_t.day = day;
 
-                       if (all_day_event) {
-                               gmtime_r(&event_tt, &event_tm); 
-                               event_tm.tm_sec = 0;
-                               event_tm.tm_min = 0;
-                               event_tm.tm_hour = 0; 
-                               // are we today?
-                               event_tt_stripped = mktime (&event_tm);
-                               show_event = thetime == event_tt_stripped;
+       /*
+        * Now loop through our list of events to see which ones occur today.
+        */
+       Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+       while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+               Cal = (disp_cal*)vCal;
+               all_day_event = 0;
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+               if (q != NULL) {
+                       t = icalproperty_get_dtstart(q);
+               }
+               else {
+                       memset(&t, 0, sizeof t);
+               }
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+               if (q != NULL) {
+                       end_t = icalproperty_get_dtend(q);
+               }
+               else {
+                       memset(&end_t, 0, sizeof end_t);
+               }
+               if (t.is_date) all_day_event = 1;
+
+               if (all_day_event)
+               {
+                       show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
+               }
+               else
+               {
+                       show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
+               }
+
+               /*
+                * If we determined that this event occurs today, then display it.
+                */
+               if (show_event) {
+
+                       /* time_t logtt = icaltime_as_timet(t);
+                       syslog(LOG_DEBUG, "Match on %04d-%02d-%02d for event %x%s on %s",
+                               year, month, day,
+                               (int)Cal, ((all_day_event) ? " (all day)" : ""),
+                               ctime(&logtt)
+                       ); */
+
+                       p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
+                       if (p == NULL) {
+                               p = icalproperty_new_summary(_("Untitled Event"));
+                               icalcomponent_add_property(Cal->cal, p);
                        }
-                       else {
-                               localtime_r(&event_tt, &event_tm);
-                               // we're not interested in the hours. 
-                               // we just want the date for easy comparison.
-                               event_tm.tm_min = 0;
-                               event_tm.tm_hour = 0; 
-                               event_tt_stripped = mktime (&event_tm);
-                               if (pe != NULL)  // do we have a span?
-                               {
-                                       struct tm event_ttm;
-                                       time_t event_end_stripped;
-
-                                       t = icalproperty_get_dtend(pe);
-                                       event_tte = icaltime_as_timet(t);                                       
-                                       gmtime_r(&event_tte, &event_ttm); 
-                                       event_ttm.tm_sec = 0;
-                                       event_ttm.tm_min = 0;
-                                       event_ttm.tm_hour = 0;
-                                       event_end_stripped = mktime(&event_ttm);
-
-                                       // do we span ore than one day?
-                                       multi_day_event = event_tt_stripped != event_end_stripped;
-
-                                       // are we in the range of the event?
-                                       show_event = ((event_tt_stripped <= thetime) && 
-                                                     (event_end_stripped >= thetime));
-
-                                       // are we not start or end day?
-                                       fill_day_event = ((event_tt_stripped < thetime) && 
-                                                     (event_end_stripped > thetime));
-                               }
-                               else {
-                                       // are we today?
-                                       show_event = event_tt_stripped == thetime;
+                       if (p != NULL) {
+
+                               if (all_day_event) {
+                                       wc_printf("<table border=\"0\" cellpadding=\"2\"><TR>"
+                                               "<td bgcolor=\"#CCCCDD\">"
+                                               );
                                }
-                       }
 
-                       if (show_event) {
-                               p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-                               if (p != NULL) {
 
-                                       if (all_day_event) {
-                                               wprintf("<table border=0 cellpadding=2><TR>"
-                                                       "<td bgcolor=\"#CCCCDD\">"
-                                               );
-                                       }
+                               wc_printf("<font size=\"-1\">"
+                                       "<a class=\"event%s\" href=\"display_edit_event?"
+                                       "msgnum=%ld?calview=month?year=%d?month=%d?day=%d\">"
+                                       ,
+                                       (Cal->unread)?"_unread":"_read",
+                                       Cal->cal_msgnum,
+                                       year, month, day
+                               );
 
-                                       wprintf("<font size=-1>"
-                                               "<a href=\"display_edit_event?"
-                                               "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
-                                               " btt_tooltext=\"",
-                                               WC->disp_cal[i].cal_msgnum,
-                                               bstr("calview"),
-                                               bstr("year"),
-                                               bstr("month"),
-                                               bstr("day")
-                                       );
+                               escputs((char *) icalproperty_get_comment(p));
 
-                                       wprintf("<i>%s</i> ", _("Summary:"));
-                                       escputs((char *)icalproperty_get_comment(p));
-                                       wprintf("<br />");
-
-                                       q = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_LOCATION_PROPERTY);
-                                       if (q) {
-                                               wprintf("<i>%s</i> ", _("Location:"));
-                                               escputs((char *)icalproperty_get_comment(q));
-                                               wprintf("<br />");
-                                       }
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
+                               wc_printf("<i>%s</i> ",          _("Summary:"));
+                               escputs((char *)icalproperty_get_comment(p));
+                               wc_printf("<br>");
 
-                                       /**
-                                        * Only show start/end times if we're actually looking at the VEVENT
-                                        * component.  Otherwise it shows bogus dates for e.g. timezones
-                                        */
-                                       if (icalcomponent_isa(WC->disp_cal[i].cal) == ICAL_VEVENT_COMPONENT) {
-                               
-                                               q = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                                               ICAL_DTSTART_PROPERTY);
+                               q = icalcomponent_get_first_property(
+                                       Cal->cal,
+                                       ICAL_LOCATION_PROPERTY);
+                               if (q) {
+                                       wc_printf("<i>%s</i> ", _("Location:"));
+                                       escputs((char *)icalproperty_get_comment(q));
+                                       wc_printf("<br>");
+                               }
+
+                               /*
+                                * Only show start/end times if we're actually looking at the VEVENT
+                                * component.  Otherwise it shows bogus dates for e.g. timezones
+                                */
+                               if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) {
+
+                                       q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+                                       if (q != NULL) {
+                                               int no_end = 0;
+
+                                               t = icalproperty_get_dtstart(q);
+                                               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
                                                if (q != NULL) {
-                                                       t = icalproperty_get_dtstart(q);
-                               
-                                                       if (t.is_date) {
-                                                               struct tm d_tm;
-                                                               char d_str[32];
-                                                               memset(&d_tm, 0, sizeof d_tm);
-                                                               d_tm.tm_year = t.year - 1900;
-                                                               d_tm.tm_mon = t.month - 1;
-                                                               d_tm.tm_mday = t.day;
-                                                               wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
-                                                               wprintf("<i>%s</i> %s<br>",
-                                                                       _("Date:"), d_str);
+                                                       end_t = icalproperty_get_dtend(q);
+                                               }
+                                               else {
+                                                       /*
+                                                        * events with starting date/time equal
+                                                        * ending date/time might get only
+                                                        * DTSTART but no DTEND
+                                                        */
+                                                       no_end = 1;
+                                               }
+
+                                               if (t.is_date) {
+                                                       /* all day event */
+                                                       struct tm d_tm;
+
+                                                       if (!no_end) {
+                                                               /* end given, have to adjust it */
+                                                               icaltime_adjust(&end_t, -1, 0, 0, 0);
+                                                       }
+                                                       memset(&d_tm, 0, sizeof d_tm);
+                                                       d_tm.tm_year = t.year - 1900;
+                                                       d_tm.tm_mon = t.month - 1;
+                                                       d_tm.tm_mday = t.day;
+                                                       wc_strftime(buf, sizeof buf, "%x", &d_tm);
+
+                                                       if (no_end || !icaltime_compare(t, end_t)) {
+                                                               wc_printf("<i>%s</i> %s<br>",
+                                                                       _("Date:"), buf);
+                                                       }
+                                                       else {
+                                                               wc_printf("<i>%s</i> %s<br>",
+                                                                       _("Starting date:"), buf);
+                                                               d_tm.tm_year = end_t.year - 1900;
+                                                               d_tm.tm_mon = end_t.month - 1;
+                                                               d_tm.tm_mday = end_t.day;
+                                                               wc_strftime(buf, sizeof buf, "%x", &d_tm);
+                                                               wc_printf("<i>%s</i> %s<br>",
+                                                                       _("Ending date:"), buf);
+                                                       }
+                                               }
+                                               else {
+                                                       tt = icaltime_as_timet(t);
+                                                       webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
+                                                       if (no_end || !icaltime_compare(t, end_t)) {
+                                                               wc_printf("<i>%s</i> %s<br>",
+                                                                       _("Date/time:"), buf);
                                                        }
                                                        else {
-                                                               tt = icaltime_as_timet(t);
-                                                               fmt_date(buf, tt, 1);
-                                                               wprintf("<i>%s</i> %s<br>",
+                                                               wc_printf("<i>%s</i> %s<br>",
                                                                        _("Starting date/time:"), buf);
-
-                                                               /* Embed the 'show end date/time' loop inside here so it
-                                                                * only executes if this is NOT an all day event.
-                                                                */
-                                                               q = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                                                                       ICAL_DTEND_PROPERTY);
-                                                               if (q != NULL) {
-                                                                       t = icalproperty_get_dtend(q);
-                                                                       tt = icaltime_as_timet(t);
-                                                                       fmt_date(buf, tt, 1);
-                                                                       wprintf("<i>%s</i> %s<br>",
-                                                                               _("Ending date/time:"), buf);
-                                                               }
-
+                                                               tt = icaltime_as_timet(end_t);
+                                                               webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
+                                                               wc_printf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
                                                        }
+
                                                }
-                                       
                                        }
 
-                                       q = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_DESCRIPTION_PROPERTY);
-                                       if (q) {
-                                               wprintf("<i>%s</i> ", _("Notes:"));
-                                               escputs((char *)icalproperty_get_comment(q));
-                                               wprintf("<br />");
-                                       }
+                               }
 
-                                       wprintf("\">");
-                                       escputs((char *)
-                                               icalproperty_get_comment(p));
-                                       wprintf("</a></font><br />\n");
+                               q = icalcomponent_get_first_property(Cal->cal, ICAL_DESCRIPTION_PROPERTY);
+                               if (q) {
+                                       wc_printf("<i>%s</i> ", _("Notes:"));
+                                       escputs((char *)icalproperty_get_comment(q));
+                                       wc_printf("<br>");
+                               }
 
-                                       if (all_day_event) {
-                                               wprintf("</td></tr></table>");
-                                       }
+                               wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                               wc_printf("</a></font><br>\n");
 
+                               if (all_day_event) {
+                                       wc_printf("</td></tr></table>");
                                }
 
                        }
 
-
                }
+
+
        }
+       DeleteHashPos(&Pos);
 }
 
 
-/**
- * \brief Display one day of a whole month view of a calendar
- * \param thetime the month we want to see 
+/*
+ * Display one day of a whole month view of a calendar
  */
 void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
-       int i;
+       long hklen;
+       const char *HashKey;
+       void *vCal;
+       HashPos *Pos;
        time_t event_tt;
        time_t event_tts;
        time_t event_tte;
+       wcsession *WCC = WC;
        struct tm event_tms;
        struct tm event_tme;
        struct tm today_tm;
        icalproperty *p;
        icalproperty *e;
        struct icaltimetype t;
-       int month, day, year;
+       disp_cal *Cal;
        int all_day_event = 0;
        char *timeformat;
        int time_format;
-       
+
        time_format = get_time_format_cached ();
 
        if (time_format == WC_TIMEFORMAT_24) timeformat="%k:%M";
        else timeformat="%I:%M %p";
 
        localtime_r(&thetime, &today_tm);
-       month = today_tm.tm_mon + 1;
-       day = today_tm.tm_mday;
-       year = today_tm.tm_year + 1900;
 
-       for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                               ICAL_DTSTART_PROPERTY);
+       Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+       while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+               Cal = (disp_cal*)vCal;
+               p = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
                        event_tt = icaltime_as_timet(t);
@@ -261,88 +452,104 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
                        else {
                                localtime_r(&event_tts, &event_tms);
                        }
-                       /** \todo epoch &! daymask */
+                       /* \todo epoch &! daymask */
                        if ((event_tms.tm_year == today_tm.tm_year)
-                          && (event_tms.tm_mon == today_tm.tm_mon)
-                          && (event_tms.tm_mday == today_tm.tm_mday)) {
-                               
-                               
-                               char sbuf[255];
-                               char ebuf[255];
-
-                               p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-                               e = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal, 
-                                                       ICAL_DTEND_PROPERTY);
-                               if ((p != NULL) && (e != NULL)) {
-                                       time_t difftime;
-                                       int hours, minutes;
-                                       t = icalproperty_get_dtend(e);
-                                       event_tte = icaltime_as_timet(t);
-                                       localtime_r(&event_tte, &event_tme);
-                                       difftime=(event_tte-event_tts)/60;
-                                       hours=(int)(difftime / 60);
-                                       minutes=difftime % 60;
-                                       wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
-                                                       "<font size=-1>"
-                                                       "<a href=\"display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
-                                                       daycolor,
-                                                       hours, minutes,
-                                                       daycolor,
-                                                       WC->disp_cal[i].cal_msgnum,
-                                                       bstr("calview"),
-                                                       bstr("year"),
-                                                       bstr("month"),
-                                                       bstr("day")
-                                                       );
-
-                                       escputs((char *)
-                                                       icalproperty_get_comment(p));
-                                       /** \todo: allso ammitime format */
-                                       wc_strftime(&sbuf[0], sizeof(sbuf), timeformat, &event_tms);
-                                       wc_strftime(&ebuf[0], sizeof(sbuf), timeformat, &event_tme);
-
-                                       wprintf("</a></font></td>"
-                                                       "<td bgcolor='%s'>%s</td><td bgcolor='%s'>%s</td></tr>",
-                                                       daycolor,
-                                                       sbuf,
-                                                       daycolor,
-                                                       ebuf);
-                                       
+                               && (event_tms.tm_mon == today_tm.tm_mon)
+                       && (event_tms.tm_mday == today_tm.tm_mday)) {
+
+
+                       char sbuf[255];
+                       char ebuf[255];
+
+                       p = icalcomponent_get_first_property(
+                               Cal->cal,
+                               ICAL_SUMMARY_PROPERTY);
+                       if (p == NULL) {
+                               p = icalproperty_new_summary(_("Untitled Event"));
+                               icalcomponent_add_property(Cal->cal, p);
+                       }
+                       e = icalcomponent_get_first_property(
+                               Cal->cal, 
+                               ICAL_DTEND_PROPERTY);
+                       if ((p != NULL) && (e != NULL)) {
+                               time_t difftime;
+                               int hours, minutes;
+                               t = icalproperty_get_dtend(e);
+                               event_tte = icaltime_as_timet(t);
+                               localtime_r(&event_tte, &event_tme);
+                               difftime=(event_tte-event_tts)/60;
+                               hours=(int)(difftime / 60);
+                               minutes=difftime % 60;
+                               wc_printf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
+                                       "<font size=\"-1\">"
+                                       "<a class=\"event%s\" href=\"display_edit_event?msgnum=%ld?calview=calbrief?year=%s?month=%s?day=%s\">",
+                                       daycolor,
+                                       hours, minutes,
+                                       (Cal->unread)?"_unread":"_read",
+                                       daycolor,
+                                       Cal->cal_msgnum,
+                                       bstr("year"),
+                                       bstr("month"),
+                                       bstr("day")
+                                       );
+
+                               escputs((char *)
+                                       icalproperty_get_comment(p));
+                               /* \todo: allso ammitime format */
+                               wc_strftime(&sbuf[0], sizeof(sbuf), timeformat, &event_tms);
+                               wc_strftime(&ebuf[0], sizeof(sbuf), timeformat, &event_tme);
+
+                               wc_printf("</a></font></td>"
+                                       "<td bgcolor='%s'>%s</td><td bgcolor='%s'>%s</td></tr>",
+                                       daycolor,
+                                       sbuf,
+                                       daycolor,
+                                       ebuf);
                                }
-                               
+
                        }
-                       
-                       
+
+
                }
        }
+       DeleteHashPos(&Pos);
 }
 
 
-/**
- * \brief view one month. pretty view
- * \param year the year
- * \param month the month
- * \param day the actual day we want to see
+/*
+ * view one month. pretty view
  */
 void calendar_month_view(int year, int month, int day) {
        struct tm starting_tm;
        struct tm tm;
+       struct tm today_tm;
        time_t thetime;
        int i;
        time_t previous_month;
        time_t next_month;
        time_t colheader_time;
+       time_t today_timet;
        struct tm colheader_tm;
        char colheader_label[32];
-       int chg_month = 0;
+       long weekstart = 0;
 
-       /** Determine what day to start.
-        * First, back up to the 1st of the month...
+       /*
+        * Make sure we know which day is today.
+        */
+       today_timet = time(NULL);
+       localtime_r(&today_timet, &today_tm);
+
+       /*
+        * Determine what day to start.  If an impossible value is found, start on Sunday.
+        */
+       get_pref_long("weekstart", &weekstart, 17);
+       if (weekstart > 6) weekstart = 0;
+
+       /*
+        * Now back up to the 1st of the month...
         */
        memset(&starting_tm, 0, sizeof(struct tm));
+
        starting_tm.tm_year = year - 1900;
        starting_tm.tm_mon = month - 1;
        starting_tm.tm_mday = day;
@@ -354,134 +561,116 @@ void calendar_month_view(int year, int month, int day) {
                localtime_r(&thetime, &tm);
        }
 
-       /** Determine previous and next months ... for links */
+       /* Determine previous and next months ... for links */
        previous_month = thetime - (time_t)864000L;     /* back 10 days */
        next_month = thetime + (time_t)(31L * 86400L);  /* ahead 31 days */
 
-       /** Now back up until we're on a Sunday */
+       /* Now back up until we're on the user's preferred start day */
        localtime_r(&thetime, &tm);
-       while (tm.tm_wday != 0) {
+       while (tm.tm_wday != weekstart) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
                localtime_r(&thetime, &tm);
        }
 
-       /** Outer table (to get the background color) */
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"calendar\"> \n <tr><td>"); 
+       /* Outer table (to get the background color) */
+       wc_printf("<table class=\"calendar\"> \n <tr><td>"); 
 
-       wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n");
 
-       wprintf("<td align=center>");
+       wc_printf("<td align=\"center\">");
 
        localtime_r(&previous_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
-       wprintf("&nbsp;&nbsp;"
-               "<font size=+1 color=\"#FFFFFF\">"
+       wc_printf("&nbsp;&nbsp;"
+               "<font size=\"+1\" color=\"#FFFFFF\">"
                "%s %d"
                "</font>"
                "&nbsp;&nbsp;", colheader_label, year);
 
        localtime_r(&next_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
 
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
 
-       /** Inner table (the real one) */
-       wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#204B78 id=\"inner_month\"><tr>");
+       /* Inner table (the real one) */
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\" "
+               "bgcolor='#204B78' id=\"inner_month\"><tr>");
+       wc_printf("<th align=\"center\" width=\"2%%\"></th>");
        colheader_time = thetime;
        for (i=0; i<7; ++i) {
                colheader_time = thetime + (i * 86400) ;
                localtime_r(&colheader_time, &colheader_tm);
                wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm);
-               wprintf("<td align=center width=14%%>"
+               wc_printf("<th align=\"center\" width=\"14%%\">"
                        "<font color=\"#FFFFFF\">%s</font></th>", colheader_label);
 
        }
-       wprintf("</tr>\n");
-
-
-        /** Now do 35 or 42 days */
-        for (i = 0; i < 42; ++i) {
-                localtime_r(&thetime, &tm);
+       wc_printf("</tr>\n");
 
-                if ((i < 35) || (chg_month == 0)) {
 
-                        if ((i > 27) && ((tm.tm_mday == 1) || (tm.tm_mday == 31))) {
-                                chg_month = 1;
-                        }
-                        if (i > 35) {
-                                chg_month = 0;
-                        }
+        /* Now do 35 or 42 days */
+       localtime_r(&thetime, &tm);
+        for (i = 0; i<42; ++i) {
 
-                       /** Before displaying Sunday, start a new row */
-                       if ((i % 7) == 0) {
-                               wprintf("<tr>");
-                       }
+               /* Before displaying the first day of the week, start a new row */
+               if ((i % 7) == 0) {
+                       wc_printf("<tr><td class=\"week_of_year\">");
+                       wc_strftime(colheader_label, sizeof colheader_label, "%V", &tm);
+                        wc_printf("%s ", colheader_label);
+               }
 
-                       wprintf("<td class=\"cal%s\"><div class=\"day\">",
-                               ((tm.tm_mon != month-1) ? "out" :
+               wc_printf("<td class=\"cal%s\"><div class=\"day\">",
+                       ((tm.tm_mon != month-1) ? "out" :
+                               (((tm.tm_year == today_tm.tm_year) && (tm.tm_mon == today_tm.tm_mon) && (tm.tm_mday == today_tm.tm_mday)) ? "today" :
                                ((tm.tm_wday==0 || tm.tm_wday==6) ? "weekend" :
-                               "day"))
+                                       "day")))
                        );
-                       if ((i==0) || (tm.tm_mday == 1)) {
-                               wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
-                               wprintf("%s ", colheader_label);
-                       }
-                       wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
-                               "%d</a></div>",
-                               tm.tm_year + 1900,
-                               tm.tm_mon + 1,
-                               tm.tm_mday,
-                               tm.tm_mday);
-
-                       /** put the data here, stupid */
-                       calendar_month_view_display_events(thetime);
+               if ((i==0) || (tm.tm_mday == 1)) {
+                       wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm);
+                       wc_printf("%s ", colheader_label);
+               }
+               wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">"
+                       "%d</a></div>",
+                       tm.tm_year + 1900,
+                       tm.tm_mon + 1,
+                       tm.tm_mday,
+                       tm.tm_mday);
 
-                       wprintf("</td>");
+               /* put the data here, stupid */
+               calendar_month_view_display_events(
+                       tm.tm_year + 1900,
+                       tm.tm_mon + 1,
+                       tm.tm_mday
+                       );
 
-                       /** After displaying Saturday, end the row */
-                       if ((i % 7) == 6) {
-                               wprintf("</tr>\n");
-                       }
+               wc_printf("</td>");
 
+               /* After displaying the last day of the week, end the row */
+               if ((i % 7) == 6) {
+                       wc_printf("</tr>\n");
                }
 
-               thetime += (time_t)86400;               /** ahead 24 hours */
-       }
+               thetime += (time_t)86400;               /* ahead 24 hours */
+               localtime_r(&thetime, &tm);
 
-       wprintf("</table>"                      /** end of inner table */
-               "</td></tr></table>"            /** end of outer table */
-               "</div>\n");
+               if ( ((i % 7) == 6) && (tm.tm_mon != month-1) && (tm.tm_mday < 15) ) {
+                       i = 100;        /* break out of the loop */
+               }
+       }
 
-       /**
-        * Initialize the bubble tooltips.
-        *
-        * Yes, this is as stupid as it looks.  Instead of just making the call
-        * to btt_enableTooltips() straight away, we have to create a timer event
-        * and let it initialize as an event after 1 millisecond.  This is to
-        * work around a bug in Internet Explorer that causes it to crash if we
-        * manipulate the innerHTML of various DOM nodes while the page is still
-        * being rendered.  See http://www.shaftek.org/blog/archives/000212.html
-        * for more information.
-        */ 
-       wprintf("<script type=\"text/javascript\">"
-               " setTimeout(\"btt_enableTooltips('inner_month')\", 1); "
-               "</script>\n"
+       wc_printf("</table>"                    /* end of inner table */
+               "</td></tr></table>\n"          /* end of outer table */
        );
 }
 
-/**
- * \brief view one month. brief view
- * \param year the year
- * \param month the month
- * \param day the actual day we want to see
+/*
+ * view one month. brief view
  */
 void calendar_brief_month_view(int year, int month, int day) {
        struct tm starting_tm;
@@ -492,7 +681,7 @@ void calendar_brief_month_view(int year, int month, int day) {
        time_t next_month;
        char month_label[32];
 
-       /** Determine what day to start.
+       /* Determine what day to start.
         * First, back up to the 1st of the month...
         */
        memset(&starting_tm, 0, sizeof(struct tm));
@@ -507,52 +696,51 @@ void calendar_brief_month_view(int year, int month, int day) {
                localtime_r(&thetime, &tm);
        }
 
-       /** Determine previous and next months ... for links */
+       /* Determine previous and next months ... for links */
        previous_month = thetime - (time_t)864000L;     /* back 10 days */
        next_month = thetime + (time_t)(31L * 86400L);  /* ahead 31 days */
 
-       /** Now back up until we're on a Sunday */
+       /* Now back up until we're on a Sunday */
        localtime_r(&thetime, &tm);
        while (tm.tm_wday != 0) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
                localtime_r(&thetime, &tm);
        }
 
-       /** Outer table (to get the background color) */
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#204B78><TR><TD>\n");
+       /* Outer table (to get the background color) */
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" "
+               "bgcolor=#204B78><tr><td>\n");
 
-       wprintf("<table width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n");
 
-       wprintf("<td align=center>");
+       wc_printf("<td align=\"center\">");
 
        localtime_r(&previous_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
        wc_strftime(month_label, sizeof month_label, "%B", &tm);
-       wprintf("&nbsp;&nbsp;"
-               "<font size=+1 color=\"#FFFFFF\">"
+       wc_printf("&nbsp;&nbsp;"
+               "<font size=\"+1\" color=\"#FFFFFF\">"
                "%s %d"
                "</font>"
                "&nbsp;&nbsp;", month_label, year);
 
        localtime_r(&next_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
 
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
 
-       /** Inner table (the real one) */
-       wprintf("<table width=100%% border=0 cellpadding=1 cellspacing=1 "
+       /* Inner table (the real one) */
+       wc_printf("<table width=\"100%%\" border=\"0\" cellpadding=\"1\" cellspacing=\"1\" "
                "bgcolor=#EEEECC><TR>");
-       wprintf("</tr>\n");
-       wprintf("<tr><td colspan=\"100%\">\n");
+       wc_printf("</tr>\n");
+       wc_printf("<tr><td colspan=\"100%%\">\n");
 
-       /** Now do 35 days */
+       /* Now do 35 days */
        for (i = 0; i < 35; ++i) {
                char weeknumber[255];
                char weekday_name[32];
@@ -560,213 +748,408 @@ void calendar_brief_month_view(int year, int month, int day) {
                localtime_r(&thetime, &tm);
 
 
-               /** Before displaying Sunday, start a new CELL */
+               /* Before displaying Sunday, start a new CELL */
                if ((i % 7) == 0) {
                        wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm);
-                       wprintf("<table border='0' bgcolor=\"#EEEECC\" width='100%'> <tr><th colspan='4'>%s %s</th></tr>"
-                                       "   <tr><td>%s</td><td width=70%%>%s</td><td>%s</td><td>%s</td></tr>\n",
-                                       _("Week"), 
-                                       weeknumber,
-                                       _("Hours"),
-                                       _("Subject"),
-                                       _("Start"),
-                                       _("End")
-                                       );
+                       wc_printf("<table border='0' bgcolor=\"#EEEECC\" width='100%%'> <tr><th colspan='4'>%s %s</th></tr>"
+                               "   <tr><td>%s</td><td width='70%%'>%s</td><td>%s</td><td>%s</td></tr>\n",
+                               _("Week"),
+                               weeknumber,
+                               _("Hours"),
+                               _("Subject"),
+                               _("Start"),
+                               _("End")
+                               );
                }
-               
+
                daycolor=((tm.tm_mon != month-1) ? "DDDDDD" :
-                                 ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
-                                  "FFFFFF"));
-               
-               /** Day Header */
+                       ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
+                               "FFFFFF"));
+
+               /* Day Header */
                wc_strftime(weekday_name, sizeof weekday_name, "%A", &tm);
-               wprintf("<tr><td bgcolor='%s' colspan='1' align='left'> %s,%i."
-                               "</td><td bgcolor='%s' colspan='3'><hr></td></tr>\n",
-                               daycolor,
-                               weekday_name,tm.tm_mday,
-                               daycolor);
+               wc_printf("<tr><td bgcolor='%s' colspan='1' align='left'> %s,%i."
+                       "</td><td bgcolor='%s' colspan='3'><hr></td></tr>\n",
+                       daycolor,
+                       weekday_name,tm.tm_mday,
+                       daycolor);
 
-               /** put the data of one day  here, stupid */
+               /* put the data of one day  here, stupid */
                calendar_month_view_brief_events(thetime, daycolor);
 
 
-               /** After displaying Saturday, end the row */
+               /* After displaying Saturday, end the row */
                if ((i % 7) == 6) {
-                       wprintf("</td></tr></table>\n");
+                       wc_printf("</td></tr></table>\n");
                }
 
-               thetime += (time_t)86400;               /** ahead 24 hours */
+               thetime += (time_t)86400;               /* ahead 24 hours */
        }
 
-       wprintf("</table>"                      /** end of inner table */
-               "</td></tr></table>"            /** end of outer table */
-               "</div>\n");
+       wc_printf("</table>"                    /* end of inner table */
+               "</td></tr></table>\n"          /* end of outer table */
+       );
 }
 
-/** 
- * \brief view one week
- * this should view just one week, but it's not here yet.
- * \todo ny implemented
- * \param year the year
- * \param month the month
- * \param day the day which we want to see the week around
+/*
+ * Calendar week view -- not implemented yet, this is a stub function
  */
 void calendar_week_view(int year, int month, int day) {
-       wprintf("<center><i>week view FIXME</i></center><br />\n");
+       wc_printf("<center><i>week view FIXME</i></center><br>\n");
 }
 
 
-/**
- * \brief display one day
+/*
+ * display one day
  * Display events for a particular hour of a particular day.
  * (Specify hour < 0 to show "all day" events)
- * \param year the year
- * \param month the month
- * \param day the day
- * \param hour the hour we want to start displaying
- * \param inner a flag to display between daystart and dayend
- * (Specify inner to 1 to show inner events)
- * (Specify inner to 0 to show "all day events and events after dayend)
- * \param dstart daystart 
+ *
+ * dstart and dend indicate which hours our "daytime" begins and end
  */
-void calendar_day_view_display_events(int year, int month,
-                                       int day, int hour,
-                                       int inner, int dstart) {
-       int i;
-       icalproperty *p;
-       icalproperty *pe = NULL;
-       struct icaltimetype t;
-       struct icaltimetype te;
+void calendar_day_view_display_events(time_t thetime,
+       int year,
+       int month,
+       int day,
+       int notime_events,
+       int dstart,
+       int dend)
+{
+       long hklen;
+       const char *HashKey;
+       void *vCal;
+       HashPos *Pos;
+       icalproperty *p = NULL;
+       icalproperty *q = NULL;
        time_t event_tt;
        time_t event_tte;
        struct tm event_te;
        struct tm event_tm;
+       int show_event = 0;
        int all_day_event = 0;
-
-       if (WC->num_cal == 0) {
-               // \todo FIXME wprintf("<br /><br /><br />\n");
+       int ongoing_event = 0;
+       wcsession *WCC = WC;
+       disp_cal *Cal;
+       struct icaltimetype t;
+       struct icaltimetype end_t;
+       struct icaltimetype today_start_t;
+       struct icaltimetype today_end_t;
+       struct icaltimetype today_t;
+       struct tm starting_tm;
+       struct tm ending_tm;
+       int top = 0;
+       int bottom = 0;
+       int gap = 1;
+       int startmin = 0;
+       int diffmin = 0;
+       int endmin = 0;
+
+        char buf[256];
+
+       if (GetCount(WCC->disp_cal_items) == 0) {
+               /* nothing to display */
                return;
        }
 
-       for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                               ICAL_DTSTART_PROPERTY);
-               pe = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                     ICAL_DTEND_PROPERTY);
-               if (p != NULL) {
-                       t = icalproperty_get_dtstart(p);
+       /* Create an imaginary event which spans the current day.  Any events which
+        * overlap with this one take place at least partially in this day.
+        */
+       memset(&starting_tm, 0, sizeof(struct tm));
+       starting_tm.tm_year = year - 1900;
+       starting_tm.tm_mon = month - 1;
+       starting_tm.tm_mday = day;
+       starting_tm.tm_hour = 0;
+       starting_tm.tm_min = 0;
+       today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
+       today_start_t.is_utc = 1;
+
+       memset(&ending_tm, 0, sizeof(struct tm));
+       ending_tm.tm_year = year - 1900;
+       ending_tm.tm_mon = month - 1;
+       ending_tm.tm_mday = day;
+       ending_tm.tm_hour = 23;
+       ending_tm.tm_min = 59;
+       today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
+       today_end_t.is_utc = 1;
+
+       /*
+        * Create another one without caring about the timezone for all day events.
+        */
+       today_t = icaltime_null_date();
+       today_t.year = year;
+       today_t.month = month;
+       today_t.day = day;
+
+       /* Now loop through our list of events to see which ones occur today.
+        */
+       Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+       while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+               Cal = (disp_cal*)vCal;
+
+               all_day_event = 0;
+               ongoing_event=0;
+
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+               if (q != NULL) {
+                       t = icalproperty_get_dtstart(q);
                        event_tt = icaltime_as_timet(t);
-                       if (t.is_date) {
-                               all_day_event = 1;
-                       }
-                       else {
-                               all_day_event = 0;
-                       }
+                       localtime_r(&event_tt, &event_te);
+               }
+               else {
+                       memset(&t, 0, sizeof t);
+               }
 
-                       if (all_day_event) {
-                               gmtime_r(&event_tt, &event_tm);
-                               gmtime_r(&event_tt, &event_te);
-                       }
-                       else {
-                               localtime_r(&event_tt, &event_tm);
-                               if (pe != NULL)
-                               {
-                                       te = icalproperty_get_dtend(pe);
-                                       event_tte = icaltime_as_timet(te);
-                                       localtime_r(&event_tte, &event_te);
-                               }
-                               else 
-                                       localtime_r(&event_tt, &event_te);
+               if (t.is_date) all_day_event = 1;
+
+               q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+               if (q != NULL) {
+                       end_t = icalproperty_get_dtend(q);
+               }
+               else {
+                       /* no end given means end = start */
+                       memcpy(&end_t, &t, sizeof(struct icaltimetype));
+               }
+
+               if (all_day_event)
+               {
+                       show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
+                       if (icaltime_compare(t, end_t)) {
+                               /*
+                                * the end date is non-inclusive so adjust it by one
+                                * day because our test is inclusive, note that a day is
+                                * not to much because we are talking about all day
+                                * events
+                                */
+                               icaltime_adjust(&end_t, -1, 0, 0, 0);
                        }
+               }
+               else
+               {
+                       show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
+               }
+
+               event_tte = icaltime_as_timet(end_t);
+               localtime_r(&event_tte, &event_tm);
 
-                       if (((event_tm.tm_year <= (year-1900))
-                            && (event_tm.tm_mon <= (month-1))
-                            && (event_tm.tm_mday <= day)
-                            && (event_te.tm_year >= (year-1900))
-                            && (event_te.tm_mon >= (month-1))
-                            && (event_te.tm_mday >= day))
-                           && (
-                                 // are we in the start hour?
-                                   ((event_tm.tm_mday == day)
-                                    && (event_tm.tm_hour == hour) 
-                                    && (!t.is_date)) 
-                                 // are we an all day event?
-                                   || ((hour<0)&&(t.is_date))
-                                 // does it span multible days and we're not at the start day?
-                                   || ((hour<0)
-                                       && (event_tm.tm_mday < day) 
-                                       && (event_te.tm_mday >= day))
-                                   ))
+               /* If we determined that this event occurs today, then display it.
+                */
+               p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY);
+               if (p == NULL) {
+                       p = icalproperty_new_summary(_("Untitled Event"));
+                       icalcomponent_add_property(Cal->cal, p);
+               }
+
+               if ((show_event) && (p != NULL)) {
+
+                       if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1; 
+
+                       if (all_day_event && notime_events)
                        {
-                               p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-                               if (p != NULL) {
-
-                                       if (all_day_event) {
-                                        wprintf("<dd><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
-                                                WC->disp_cal[i].cal_msgnum,
-                                                year, month, day, hour
-                                        );
-                                        escputs((char *)
-                                                icalproperty_get_comment(p));
-                                        wprintf("</a></dd>\n");
-                                       }
-                                       else {
-                                               if (inner) {
-                                                               wprintf("<dd  class=\"event\" "
-                                                                       "style=\"position: absolute; "
-                                                                       "top:%dpx; left:100px; "
-                                                                       "height:%dpx; \" >",
-                                                                       (1 + (event_te.tm_hour - hour) + (hour * 30) - (dstart * 30)),
-                                                                       ((event_te.tm_hour - hour) * 30)
-                                                       );
-                                               }
-                                               else {
-                                                       wprintf("<dd>");
-                                               }
-                                               wprintf("<a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
-                                                               WC->disp_cal[i].cal_msgnum,
-                                                               year, month, day, hour
-                                               );
-                                               escputs((char *)
-                                                               icalproperty_get_comment(p));
-                                               wprintf("</a></dd>\n");
-                                                 
-                                       }
+                               wc_printf("<li class=\"event_framed%s\"> "
+                                       "<a href=\"display_edit_event?"
+                                       "msgnum=%ld?calview=day?year=%d?month=%d?day=%d\" "
+                                       " class=\"event_title\">"
+                                       ,
+                                       (Cal->unread)?"_unread":"_read",
+                                        Cal->cal_msgnum, year, month, day
+                               );
+                                escputs((char *) icalproperty_get_comment(p));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+                                wc_printf("<i>%s</i><br>",      _("All day event"));
+                               wc_printf("<i>%s: %s</i><br>",  _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",           _("Summary:"));
+                                escputs((char *) icalproperty_get_comment(p));
+                                wc_printf("<br>");
+                               q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+                                if (q) {
+                                        wc_printf("<i>%s</i> ", _("Location:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wc_printf("<br>");
+                               }
+                               if (!icaltime_compare(t, end_t)) { /* one day only */
+                                       webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
+                                       wc_printf("<i>%s</i> %s<br>", _("Date:"), buf);
                                }
+                               else {
+                                       webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
+                                       wc_printf("<i>%s</i> %s<br>", _("Starting date:"), buf);
+                                       webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE);
+                                       wc_printf("<i>%s</i> %s<br>", _("Ending date:"), buf);
+                               }
+                               q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
+                                if (q) {
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wc_printf("<br>");
+                                }
+                               wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                                wc_printf("</a> <span>(");
+                                wc_printf(_("All day event"));
+                                wc_printf(")</span></li>\n");
+                       }
+                       else if (ongoing_event && notime_events) 
+                       {
+                               wc_printf("<li class=\"event_framed%s\"> "
+                                       "<a href=\"display_edit_event?"
+                                       "msgnum=%ld&calview=day?year=%d?month=%d?day=%d\" "
+                                       " class=\"event_title\">" 
+                                       ,
+                                       (Cal->unread)?"_unread":"_read",
+                                       Cal->cal_msgnum, year, month, day
+                               );
+                               escputs((char *) icalproperty_get_comment(p));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+                                wc_printf("<i>%s</i><br>",     _("Ongoing event"));
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",          _("Summary:"));
+                                escputs((char *) icalproperty_get_comment(p));
+                                wc_printf("<br>");
+                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+                                if (q) {
+                                        wc_printf("<i>%s</i> ", _("Location:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wc_printf("<br>");
+                                                               }
+                                webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+                                wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
+                                wc_printf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                                q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
+                                if (q) {
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wc_printf("<br>");
+                                }
+                                wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                               wc_printf("</a> <span>(");
+                               wc_printf(_("Ongoing event"));
+                               wc_printf(")</span></li>\n");
                        }
+                       else if (!all_day_event && !notime_events)
+                       {
+                               gap++;
+
+                               if (event_te.tm_mday != day) event_te.tm_hour = 0;
+                               if (event_tm.tm_mday != day) event_tm.tm_hour = 24;
+
+                               /* Calculate the location of the top of the box */
+                               if (event_te.tm_hour < dstart) {
+                                       startmin = diffmin = event_te.tm_min / 6;
+                                       top = (event_te.tm_hour * EXTRATIMELINE) + startmin;
+                               }
+                               else if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend)) {
+                                       startmin = diffmin = (event_te.tm_min / 2);
+                                       top = (dstart * EXTRATIMELINE) + ((event_te.tm_hour - dstart) * TIMELINE) + startmin;
+                               }
+                               else if (event_te.tm_hour >dend) {
+                                       startmin = diffmin = event_te.tm_min / 6;
+                                       top = (dstart * EXTRATIMELINE) + ((dend - dstart - 1) * TIMELINE) + ((event_tm.tm_hour - dend + 1) * EXTRATIMELINE) + startmin ;
+                               }
+                               else {
+                                       /* should never get here */
+                               }
+
+                               /* Calculate the location of the bottom of the box */
+                               if (event_tm.tm_hour < dstart) {
+                                       endmin = diffmin = event_tm.tm_min / 6;
+                                       bottom = (event_tm.tm_hour * EXTRATIMELINE) + endmin;
+                               }
+                               else if ((event_tm.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+                                       endmin = diffmin = (event_tm.tm_min / 2);
+                                       bottom = (dstart * EXTRATIMELINE) + ((event_tm.tm_hour - dstart) * TIMELINE) + endmin ;
+                               }
+                               else if (event_tm.tm_hour >dend) {
+                                       endmin = diffmin = event_tm.tm_min / 6;
+                                       bottom = (dstart * EXTRATIMELINE) + ((dend - dstart + 1) * TIMELINE) + ((event_tm.tm_hour - dend - 1) * EXTRATIMELINE) + endmin;
+                               }
+                               else {
+                                       /* should never get here */
+                               }
 
+                               wc_printf("<dd  class=\"event_framed%s\" "
+                                       "style=\"position: absolute; "
+                                       "top:%dpx; left:%dpx; "
+                                       "height:%dpx; \" >",
+                                       (Cal->unread)?"_unread":"_read",
+                                       top, (gap * 40), (bottom-top)
+                                       );
+                               wc_printf("<a href=\"display_edit_event?"
+                                       "msgnum=%ld?calview=day?year=%d?month=%d?day=%d?hour=%d\" "
+                                       "class=\"event_title\">"
+                                       ,
+                                       Cal->cal_msgnum, year, month, day, t.hour
+                               );
+                               escputs((char *) icalproperty_get_comment(p));
+                               wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
+                               wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
+                                wc_printf("<i>%s</i> ",          _("Summary:"));
+                                escputs((char *) icalproperty_get_comment(p));
+                                wc_printf("<br>");
+                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
+                                if (q) {
+                                        wc_printf("<i>%s</i> ", _("Location:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wc_printf("<br>");
+                                                               }
+                               if (!icaltime_compare(t, end_t)) { /* one day only */
+                                       webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+                                       wc_printf("<i>%s</i> %s<br>", _("Date/time:"), buf);
+                               }
+                               else {
+                                       webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+                                       wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+                                       webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
+                                       wc_printf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+                               }
+                               q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
+                                if (q) {
+                                        wc_printf("<i>%s</i> ", _("Notes:"));
+                                        escputs((char *)icalproperty_get_comment(q));
+                                        wc_printf("<br>");
+                                }
+                               wc_printf("</span><span class=\"bttbottom\"></span></span>");
+                               wc_printf("</a></dd>\n");
+                       }
                }
        }
+       DeleteHashPos(&Pos);
 }
 
-
-
-/**
- * \brief view one day
- * \param year the year
- * \param month the month 
- * \param day the day we want to display
+/*
+ * view one day
  */
 void calendar_day_view(int year, int month, int day) {
        int hour;
        struct icaltimetype today, yesterday, tomorrow;
-       int daystart = 8;
-       int dayend = 17;
-       char daystart_str[16], dayend_str[16];
+       long daystart;
+       long dayend;
        struct tm d_tm;
-       char d_str[128];
+       char d_str[160];
        int time_format;
-       
+       time_t today_t;
+       int timeline = TIMELINE;
+       int extratimeline = EXTRATIMELINE;
+       int gap = 0;
+       int hourlabel;
+       int extrahourlabel;
+
        time_format = get_time_format_cached ();
-       get_preference("daystart", daystart_str, sizeof daystart_str);
-       if (!IsEmptyStr(daystart_str)) daystart = atoi(daystart_str);
-       get_preference("dayend", dayend_str, sizeof dayend_str);
-       if (!IsEmptyStr(dayend_str)) dayend = atoi(dayend_str);
-       
+       get_pref_long("daystart", &daystart, 8);
+       get_pref_long("dayend", &dayend, 17);
+
+       /* when loading daystart/dayend, replace missing, corrupt, or impossible values with defaults */
+       if ((daystart < 0) || (dayend < 2) || (daystart >= 23) || (dayend > 23) || (dayend <= daystart)) {
+               daystart = 9;
+               dayend = 17;
+       }
 
-       /** Figure out the dates for "yesterday" and "tomorrow" links */
+       /* Today's date */
+       memset(&d_tm, 0, sizeof d_tm);
+       d_tm.tm_year = year - 1900;
+       d_tm.tm_mon = month - 1;
+       d_tm.tm_mday = day;
+       today_t = mktime(&d_tm); 
+
+       /* Figure out the dates for "yesterday" and "tomorrow" links */
 
        memset(&today, 0, sizeof(struct icaltimetype));
        today.year = year;
@@ -782,135 +1165,170 @@ void calendar_day_view(int year, int month, int day) {
        ++tomorrow.day;
        tomorrow = icaltime_normalize(tomorrow);
 
-       wprintf("<div class=\"fix_scrollbar_bug\">");
-
-       /** Inner table (the real one) */
-       wprintf("<table class=\"calendar\"><tr> \n");
-
-       /** Innermost cell (contains hours etc.) */
-       wprintf("<td class=\"middle_of_the_day\">");
-               wprintf("<dl style=\" "
-               "       padding:0 ;"
-               "       margin: 0;"
-               "       position: absolute ;"
-               "       top: 0;"
-               "        left: 0;"
-               "        width: 500px;"
-               "        clip: rect(0px 500px %dpx 0px);"
-               "        clip: rect(0px, 500px, %dpx, 0px);"
-               "\">",
-       (dayend - daystart) * 30,
-       (dayend - daystart) * 30
-       ); 
-       /** Now the middle of the day... */     
-       for (hour = 0; hour <= dayend; ++hour) {        /* could do HEIGHT=xx */
-               if (hour >= daystart) {
-                       wprintf("<dt><a href=\"display_edit_event?msgnum=0"
-                               "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
-                               year, month, day, hour
+       /* Inner table (the real one) */
+       wc_printf("<table class=\"calendar\" id=\"inner_day\"><tr> \n");
+
+       /* Innermost cell (contains hours etc.) */
+       wc_printf("<td class=\"events_of_the_day\" >");
+               wc_printf("<dl class=\"events\" >");
+
+       /* Now the middle of the day... */
+
+       extrahourlabel = extratimeline - 2;
+       hourlabel = extrahourlabel * 150 / 100;
+       if (hourlabel > (timeline - 2)) hourlabel = timeline - 2;
+
+       for (hour = 0; hour < daystart; ++hour) {       /* could do HEIGHT=xx */
+               wc_printf("<dt class=\"extrahour\">"
+                       "<a href=\"display_edit_event?msgnum=0"
+                       "?calview=day?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/* TODO: what have these been used for?
+                       (hour * extratimeline ),
+                       extratimeline,
+                       extrahourlabel,
+*/
+                       year, month, day, hour
                        );
 
-                       if (time_format == WC_TIMEFORMAT_24) {
-                               wprintf("%2d:00</a> ", hour);
-                       }
-                       else {
-                               wprintf("%d:00%s</a> ",
-                                       (hour <= 12 ? hour : hour-12),
-                                       (hour < 12 ? "am" : "pm")
+               if (time_format == WC_TIMEFORMAT_24) {
+                       wc_printf("%2d:00</a> ", hour);
+               }
+               else {
+                       wc_printf("%d:00%s</a> ",
+                               ((hour == 0) ? 12 : (hour <= 12 ? hour : hour-12)),
+                               (hour < 12 ? "am" : "pm")
                                );
-                       }
-
-               wprintf("</dt>");
                }
 
-               /* put the data here, stupid */
-               calendar_day_view_display_events(year, month, day, hour, 1 , daystart);
-
+               wc_printf("</dt>");
        }
 
-               wprintf("</dl>");
-       wprintf("</td>");                       /* end of innermost table */
-
-       /** Extra events on the middle */
-        wprintf("<td class=\"extra_events\">");
-
-        wprintf("<dl>");
+       gap = daystart * extratimeline;
+
+        for (hour = daystart; hour <= dayend; ++hour) {       /* could do HEIGHT=xx */
+                wc_printf("<dt class=\"hour\">"
+                        "<a href=\"display_edit_event?msgnum=0?calview=day"
+                        "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/*TODO: what have these been used for?
+                        gap + ((hour - daystart) * timeline ),
+                       timeline,
+                       hourlabel,
+*/
+                        year, month, day, hour
+                       );
 
-        /** Display all-day events) */
-       wprintf("<dt>All day events</dt>");
-                calendar_day_view_display_events(year, month, day, -1, 0 , daystart);
+                if (time_format == WC_TIMEFORMAT_24) {
+                        wc_printf("%2d:00</a> ", hour);
+                }
+                else {
+                        wc_printf("%d:00%s</a> ",
+                                (hour <= 12 ? hour : hour-12),
+                                (hour < 12 ? "am" : "pm")
+                                               );
+                }
 
-        /** Display events before daystart */
-       wprintf("<dt>Before day start</dt>");
-        for (hour = 0; hour <= (daystart-1); ++hour) {
-                calendar_day_view_display_events(year, month, day, hour, 0, daystart );
+                wc_printf("</dt>");
         }
 
-        /** Display events after dayend... */
-       wprintf("<dt>After</dt>");
-        for (hour = (dayend+1); hour <= 23; ++hour) {
-                calendar_day_view_display_events(year, month, day, hour, 0, daystart );
+       gap = gap + ((dayend - daystart + 1) * timeline);
+
+        for (hour = (dayend + 1); hour < 24; ++hour) {       /* could do HEIGHT=xx */
+                wc_printf("<dt class=\"extrahour\">"
+                        "<a href=\"display_edit_event?msgnum=0?calview=day"
+                        "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/*TODO: what have these been used for?
+                        gap + ((hour - dayend - 1) * extratimeline ),
+                       extratimeline,
+                       extrahourlabel,
+*/
+                        year, month, day, hour
+                );
+
+                if (time_format == WC_TIMEFORMAT_24) {
+                        wc_printf("%2d:00</a> ", hour);
+                }
+                else {
+                        wc_printf("%d:00%s</a> ",
+                                (hour <= 12 ? hour : hour-12),
+                                (hour < 12 ? "am" : "pm")
+                        );
+                }
+
+                wc_printf("</dt>");
         }
 
-        wprintf("</dl>");
+       /* Display events with start and end times on this day */
+       calendar_day_view_display_events(today_t, year, month, day, 0, daystart, dayend);
+
+               wc_printf("</dl>");
+       wc_printf("</td>");                     /* end of innermost table */
+
+       /* Display extra events (start/end times not present or not today) in the middle column */
+        wc_printf("<td class=\"extra_events\">");
+
+        wc_printf("<ul>");
+
+        /* Display all-day events */
+       calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend);
+
+        wc_printf("</ul>");
 
-       wprintf("</td>");       /** end extra on the middle */
+       wc_printf("</td>");     /* end extra on the middle */
 
-       wprintf("<td width=20%% valign=top>");  /** begin stuff-on-the-right */
+       wc_printf("<td width='20%%' align=\"center\" valign=top>");     /* begin stuff-on-the-right */
 
-       /** Begin todays-date-with-left-and-right-arrows */
-       wprintf("<table border=0 width=100%% "
-               "cellspacing=0 cellpadding=0 bgcolor=\"#FFFFFF\">\n");
-       wprintf("<tr>");
+       /* Begin todays-date-with-left-and-right-arrows */
+       wc_printf("<table border=\"0\" width=\"100%%\" "
+               "cellspacing=\"0\" cellpadding=\"0\" bgcolor=\"#FFFFFF\">\n");
+       wc_printf("<tr>");
 
-       /** Left arrow */       
-       wprintf("<td align=center>");
-       wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+       /* Left arrow */
+       wc_printf("<td align=\"center\">");
+       wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                yesterday.year, yesterday.month, yesterday.day);
-       wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>");
-       wprintf("</td>");
+       wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>");
+       wc_printf("</td>");
 
-       /** Today's date */
-       memset(&d_tm, 0, sizeof d_tm);
-       d_tm.tm_year = year - 1900;
-       d_tm.tm_mon = month - 1;
-       d_tm.tm_mday = day;
        wc_strftime(d_str, sizeof d_str,
-               "<td align=center>"
-               "<font size=+2>%B</font><br />"
-               "<font size=+3>%d</font><br />"
-               "<font size=+2>%Y</font><br />"
+               "<td align=\"center\">"
+               "<font size='+2'>%A</font><br>"
+               "<font size='+2'>%B</font><br>"
+               "<font size='+3'>%d</font><br>"
+               "<font size='+2'>%Y</font><br>"
                "</td>",
                &d_tm
-       );
-       wprintf("%s", d_str);
+               );
+       wc_printf("%s", d_str);
 
-       /** Right arrow */
-       wprintf("<td align=center>");
-       wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+       /* Right arrow */
+       wc_printf("<td align=\"center\">");
+       wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
                tomorrow.year, tomorrow.month, tomorrow.day);
-       wprintf("<img align=middle src=\"static/nextdate_32x.gif\""
-               " border=0></a>\n");
-       wprintf("</td>");
+       wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\""
+               " border=\"0\"></a>\n", _("next"));
+       wc_printf("</td>");
 
-       wprintf("</tr></table>\n");
-       /** End todays-date-with-left-and-right-arrows */
+       wc_printf("</tr></table>\n");
+       /* End todays-date-with-left-and-right-arrows */
 
-       /** \todo In the future we might want to put a month-o-matic here */
+       /* Embed a mini month calendar in this space */
+       wc_printf("<br>\n");
+       embeddable_mini_calendar(year, month);
 
-       wprintf("</font></center>\n");
-
-       wprintf("</td></tr>");                  /** end stuff-on-the-right */
+       wc_printf("</td></tr>");                        /* end stuff-on-the-right */
+       wc_printf("</table>\n");                        /* end of inner table */
+}
 
-       wprintf("</table>"                      /** end of inner table */
-               "</div>");
 
-}
-/**
- * \brief Display today's events.
+/*
+ * Display today's events.  Returns the number of items displayed.
  */
-void calendar_summary_view(void) {
-       int i;
+int calendar_summary_view(void) {
+       long hklen;
+       const char *HashKey;
+       void *vCal;
+       HashPos *Pos;
+       disp_cal *Cal;
        icalproperty *p;
        struct icaltimetype t;
        time_t event_tt;
@@ -919,17 +1337,20 @@ void calendar_summary_view(void) {
        time_t now;
        int all_day_event = 0;
        char timestring[SIZ];
+       wcsession *WCC = WC;
+       int num_displayed = 0;
 
-       if (WC->num_cal == 0) {
-               return;
+       if (GetCount(WC->disp_cal_items) == 0) {
+               return(0);
        }
 
        now = time(NULL);
        localtime_r(&now, &today_tm);
 
-       for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                               ICAL_DTSTART_PROPERTY);
+       Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+       while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+               Cal = (disp_cal*)vCal;
+               p = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
                        event_tt = icaltime_as_timet(t);
@@ -939,7 +1360,7 @@ void calendar_summary_view(void) {
                        else {
                                all_day_event = 0;
                        }
-                       fmt_time(timestring, event_tt);
+                       fmt_time(timestring, SIZ, event_tt);
 
                        if (all_day_event) {
                                gmtime_r(&event_tt, &event_tm);
@@ -949,232 +1370,179 @@ void calendar_summary_view(void) {
                        }
 
                        if ( (event_tm.tm_year == today_tm.tm_year)
-                          && (event_tm.tm_mon == today_tm.tm_mon)
-                          && (event_tm.tm_mday == today_tm.tm_mday)
-                          ) {
-
-
-                               p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-                               if (p != NULL) {
-                                       escputs((char *)
-                                               icalproperty_get_comment(p));
-                                       wprintf(" (%s)<br />\n", timestring);
+                               && (event_tm.tm_mon == today_tm.tm_mon)
+                               && (event_tm.tm_mday == today_tm.tm_mday)
+                       ) {
+
+                               p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
+                               if (p == NULL) {
+                                       p = icalproperty_new_summary(_("Untitled Task"));
+                                       icalcomponent_add_property(Cal->cal, p);
+                               }
+                               if (p != NULL)
+                               {
+                                       if (WCC->CurRoom.view == VIEW_TASKS) {
+                                               wc_printf("<a href=\"display_edit_task"
+                                                       "?msgnum=%ld"
+                                                       "?return_to_summary=1"
+                                                       "?go=",
+                                                       Cal->cal_msgnum
+                                               );
+                                               escputs(ChrPtr(WCC->CurRoom.name));
+                                               wc_printf("\">");
+                                       }
+                                       else {
+                                               wc_printf("<a href=\"display_edit_event"
+                                                       "?msgnum=%ld"
+                                                       "?calview=summary"
+                                                       "?year=%d"
+                                                       "?month=%d"
+                                                       "?day=%d"
+                                                       "?go=",
+                                                       Cal->cal_msgnum,
+                                                       today_tm.tm_year + 1900,
+                                                       today_tm.tm_mon + 1,
+                                                       today_tm.tm_mday
+                                               );
+                                               escputs(ChrPtr(WCC->CurRoom.name));
+                                               wc_printf("\">");
+                                       }
+                                       escputs((char *) icalproperty_get_comment(p));
+                                       if (!all_day_event) {
+                                               wc_printf(" (%s)", timestring);
+                                       }
+                                       wc_printf("</a><br>\n");
+                                       ++num_displayed;
                                }
                        }
                }
        }
-       free_calendar_buffer();
+       DeleteHashPos(&Pos);
+       DeleteHash(&WC->disp_cal_items);
+       return(num_displayed);
 }
 
-
-/**
- * \brief clean up ical memory
- * \todo this could get troubel with future ical versions
+/*
+ * Parse the URL variables in order to determine the scope and display of a calendar view
  */
-void free_calendar_buffer(void) {
-       int i;
-       if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) {
-               icalcomponent_free(WC->disp_cal[i].cal);
-       }
-       WC->num_cal = 0;
-       free(WC->disp_cal);
-       WC->disp_cal = NULL;
-}
+int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
+                                   void **ViewSpecific,
+                                   long oper,
+                                   char *cmd,
+                                   long len,
+                                   char *filter,
+                                   long flen)
+{
+       wcsession *WCC = WC;
+       calview *c;
+       time_t now;
+       struct tm tm;
+       char cv[32];
 
+       int span = 3888000;
 
+       c = (calview*) malloc(sizeof(calview));
+       memset(c, 0, sizeof(calview));
+       *ViewSpecific = (void*)c;
 
-/**
- * \brief do the whole calendar page
- * view any part of the calender. decide which way, etc.
- */
-void do_calendar_view(void) {
-       time_t now;
-       struct tm tm;
-       int year, month, day;
-       char calview[SIZ];
+       Stat->load_seen = 1;
+       strcpy(cmd, "MSGS ALL");
+       Stat->maxmsgs = 32767;
 
-       /** In case no date was specified, go with today */
+       /* In case no date was specified, go with today */
        now = time(NULL);
        localtime_r(&now, &tm);
-       year = tm.tm_year + 1900;
-       month = tm.tm_mon + 1;
-       day = tm.tm_mday;
-
-       /** Now see if a date was specified */
-       if (!IsEmptyStr(bstr("year"))) year = atoi(bstr("year"));
-       if (!IsEmptyStr(bstr("month"))) month = atoi(bstr("month"));
-       if (!IsEmptyStr(bstr("day"))) day = atoi(bstr("day"));
-
-       /** How would you like that cooked? */
-       if (!IsEmptyStr(bstr("calview"))) {
-               strcpy(calview, bstr("calview"));
+       c->year = tm.tm_year + 1900;
+       c->month = tm.tm_mon + 1;
+       c->day = tm.tm_mday;
+
+       /* Now see if a date was specified */
+       if (havebstr("year")) c->year = ibstr("year");
+       if (havebstr("month")) c->month = ibstr("month");
+       if (havebstr("day")) c->day = ibstr("day");
+
+       /* How would you like that cooked? */
+       if (havebstr("calview")) {
+               strcpy(cv, bstr("calview"));
        }
        else {
-               strcpy(calview, "month");
+               strcpy(cv, "month");
        }
 
-       /** Display the selected view */
-       if (!strcasecmp(calview, "day")) {
-               calendar_day_view(year, month, day);
+       /* Display the selected view */
+       if (!strcasecmp(cv, "day")) {
+               c->view = calview_day;
+       }
+       else if (!strcasecmp(cv, "week")) {
+               c->view = calview_week;
        }
-       else if (!strcasecmp(calview, "week")) {
-               calendar_week_view(year, month, day);
+       else if (!strcasecmp(cv, "summary")) {  /* shouldn't ever happen, but just in case */
+               c->view = calview_day;
        }
        else {
-               if (WC->wc_view == VIEW_CALBRIEF) {
-                       calendar_brief_month_view(year, month, day);
+               if (WCC->CurRoom.view == VIEW_CALBRIEF) {
+                       c->view = calview_brief;
                }
                else {
-                       calendar_month_view(year, month, day);
+                       c->view = calview_month;
                }
        }
 
-       /** Free the calendar stuff */
-       free_calendar_buffer();
-
-}
-
-
-/**
- * \brief get task due date
- * Helper function for do_tasks_view().  
- * \param vtodo a task to get the due date
- * \return the date/time due.
- */
-time_t get_task_due_date(icalcomponent *vtodo) {
-       icalproperty *p;
-
-       if (vtodo == NULL) {
-               return(0L);
-       }
-
-       /**
-        * If we're looking at a fully encapsulated VCALENDAR
-        * rather than a VTODO component, recurse into the data
-        * structure until we get a VTODO.
+       /* Now try and set the lower and upper bounds so that we don't
+        * burn too many cpu cycles parsing data way in the past or future
         */
-       if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
-               return get_task_due_date(
-                       icalcomponent_get_first_component(
-                               vtodo, ICAL_VTODO_COMPONENT
-                       )
-               );
-       }
-
-       p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
-       if (p != NULL) {
-               return(icaltime_as_timet(icalproperty_get_due(p)));
-       }
-       else {
-               return(0L);
-       }
-}
-
 
-/**
- * \brief Compare the due dates of two tasks (this is for sorting)
- * \param task1 first task to compare
- * \param task2 second task to compare
- */
-int task_due_cmp(const void *task1, const void *task2) {
-       time_t t1;
-       time_t t2;
+       tm.tm_year = c->year - 1900;
+       tm.tm_mon = c->month - 1;
+       tm.tm_mday = c->day;
+       now = mktime(&tm);
 
-       t1 =  get_task_due_date(((struct disp_cal *)task1)->cal);
-       t2 =  get_task_due_date(((struct disp_cal *)task2)->cal);
+       if (c->view == calview_month)   span = 3888000;
+       if (c->view == calview_brief)   span = 3888000;
+       if (c->view == calview_week)    span = 604800;
+       if (c->view == calview_day)     span = 86400;
+       if (c->view == calview_summary) span = 86400;
 
-       if (t1 < t2) return(-1);
-       if (t1 > t2) return(1);
-       return(0);
+       c->lower_bound = now - span;
+       c->upper_bound = now + span;
+       return 200;
 }
 
 
 
-
-/**
- * \brief do the whole task view stuff
+/*
+ * Render a calendar view from data previously loaded into memory
  */
-void do_tasks_view(void) {
-       int i;
-       time_t due;
-       int bg = 0;
-       char buf[SIZ];
-       icalproperty *p;
-
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"calendar_view_background\">\n<tr>\n"
-               "<th>");
-       wprintf(_("Name of task"));
-       wprintf("</th><th>");
-       wprintf(_("Date due"));
-       wprintf("</th></tr>\n"
-       );
-
-       /** Sort them if necessary */
-       if (WC->num_cal > 1) {
-               qsort(WC->disp_cal,
-                       WC->num_cal,
-                       sizeof(struct disp_cal),
-                       task_due_cmp
-               );
+int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
+                               void **ViewSpecific,
+                               long oper)
+{
+       wcsession *WCC = WC;
+       calview *c = (calview*) *ViewSpecific;
+
+       if (c->view == calview_day) {
+               calendar_day_view(c->year, c->month, c->day);
        }
-
-       if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) {
-
-               bg = 1 - bg;
-               wprintf("<tr bgcolor=\"#%s\"><td>",
-                       (bg ? "DDDDDD" : "FFFFFF")
-               );
-
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                       ICAL_SUMMARY_PROPERTY);
-               wprintf("<a href=\"display_edit_task?msgnum=%ld&taskrm=",
-                       WC->disp_cal[i].cal_msgnum );
-               urlescputs(WC->wc_roomname);
-               wprintf("\">");
-               wprintf("<img align=middle "
-                       "src=\"static/taskmanag_16x.gif\" border=0>&nbsp;");
-               if (p != NULL) {
-                       escputs((char *)icalproperty_get_comment(p));
+       else if (c->view == calview_week) {
+               calendar_week_view(c->year, c->month, c->day);
+       }
+       else {
+               if (WCC->CurRoom.view == VIEW_CALBRIEF) {
+                       calendar_brief_month_view(c->year, c->month, c->day);
                }
-               wprintf("</a>\n");
-               wprintf("</td>\n");
-
-               due = get_task_due_date(WC->disp_cal[i].cal);
-               fmt_date(buf, due, 0);
-               wprintf("<td><font");
-               if (due < time(NULL)) {
-                       wprintf(" color=\"#FF0000\"");
+               else {
+                       calendar_month_view(c->year, c->month, c->day);
                }
-               wprintf(">%s</font></td></tr>\n", buf);
        }
 
-       wprintf("</table></div>\n");
-
-       /** Free the list */
-       free_calendar_buffer();
-
+       /* Free the in-memory list of calendar items */
+       DeleteHash(&WC->disp_cal_items);
+       return 0;
 }
 
-#else  /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/**\brief stub for non-libical builds */
-void do_calendar_view(void) {
-       wprintf("<center><i>");
-       wprintf(_("The calendar view is not available."));
-       wprintf("</i></center><br />\n");
-}
-
-/**\brief stub for non-libical builds */
-void do_tasks_view(void) {     
-       wprintf("<center><I>");
-       wprintf(_("The tasks view is not available."));
-       wprintf("</i></center><br />\n");
+void 
+InitModule_CALENDAR_VIEW
+(void)
+{
+       WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
 }
-
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/** @} */