- if ((today_start_t.hour == t.hour)
- && ((event_te.tm_mday == day)
- || (event_tm.tm_mday == day)))
- {
-
- if (event_te.tm_mday != day) event_te.tm_hour = 0;
- if (event_tm.tm_mday != day) event_tm.tm_hour = 24;
-
- if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) {
- startmin = diffmin = event_te.tm_min / 6;
- endmin = ((event_tm.tm_hour == hour) ? (event_tm.tm_min / 2) : (event_tm.tm_min / 6)) ;
- top = (event_te.tm_hour * 10) + startmin -1;
- height= ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin ;
- }
- if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) {
- startmin = diffmin = event_te.tm_min / 6;
- endmin = event_tm.tm_min / 2;
- top = (event_te.tm_hour * 10) + startmin - 1;
- height = ((dstart - event_te.tm_hour) * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin - (diffmin * 3);
- }
- if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) {
- startmin = diffmin = ((event_te.tm_hour == hour) ? (event_te.tm_min / 2) : (event_te.tm_min / 6)) ;
- endmin = event_tm.tm_min / 6;
- top = (event_te.tm_hour * 10) + startmin - 1;
- height = ((dstart - event_te.tm_hour) * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10) + endmin - diffmin;
- }
- if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
- startmin = diffmin = (event_te.tm_min / 2);
- endmin = event_tm.tm_min / 2;
- top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin - 1;
- height = ((event_tm.tm_hour - event_te.tm_hour) * 30) + endmin - diffmin;
- }
- if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) {
- startmin = diffmin = (event_te.tm_min / 2);
- endmin = event_tm.tm_min / 6;
- top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + diffmin - 1;
- height = (((dend - event_te.tm_hour + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10)) + endmin - diffmin;
- }
- if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) {
- startmin = diffmin = event_te.tm_min / 6;
- endmin = event_tm.tm_min / 6;
- top = (dstart * 10) + ((dend - dstart) * 30) + ((event_tm.tm_hour - event_te.tm_hour + 1) * 10) + startmin - 1;
- height = ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin;
- }
- // TODO: we seem to end up here for some reason if we're just a one hour event. Thierry, please decide what to do then...
+
+ 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 * 10) + startmin -1;
+ }
+ else if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend)) {
+ startmin = diffmin = (event_te.tm_min / 2);
+ top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin - 1;
+ }
+ else if (event_te.tm_hour >dend) {
+ startmin = diffmin = event_te.tm_min / 6;
+ top = (dstart * 10) + ((dend - dstart) * 30) + ((event_tm.tm_hour - event_te.tm_hour + 1) * 10) + startmin - 1;
+ }
+ 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 * 10) + endmin -1;
+ }
+ else if ((event_tm.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
+ endmin = diffmin = (event_tm.tm_min / 2);
+ bottom = (dstart * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin - 1;
+ }
+ else if (event_tm.tm_hour >dend) {
+ endmin = diffmin = event_tm.tm_min / 6;
+ bottom = (dstart * 10) + ((dend - dstart) * 30) + ((event_tm.tm_hour - event_tm.tm_hour + 1) * 10) + endmin - 1;
+ }
+ else {
+ /* should never get here */
+ }
+