home *** CD-ROM | disk | FTP | other *** search
Text File | 1990-02-04 | 43.6 KB | 1,458 lines |
- *** moon.icon.orig Fri Dec 15 17:19:43 1989
- --- moon.icon Fri Dec 15 17:05:01 1989
- ***************
- *** 1,4 ****
- --- 1,5 ----
- /* Format_version=1, Width=64, Height=64, Depth=1, Valid_bits_per_item=16
- + * $Header: moon.icon,v 2.1 89/12/15 17:04:59 billr Exp $
- */
- 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
- 0xFFFF,0xFF00,0x00FF,0xFFFF,0xFFFF,0xF800,0x081F,0xFFFF,
- *** /tmp/,RCSt1a16881 Fri Dec 15 17:21:59 1989
- --- PATCHLOG Fri Dec 15 17:13:47 1989
- ***************
- *** 1,4
- ! # $Header: PATCHLOG,v 2.5 89/09/19 06:17:10 billr Exp $
-
- #$Log: PATCHLOG,v $
- # Revision 2.5 89/09/19 06:17:10 billr
-
- --- 1,4 -----
- ! # $Header: PATCHLOG,v 2.6 89/12/15 17:13:23 billr Exp $
-
- #$Log: PATCHLOG,v $
- # Revision 2.6 89/12/15 17:13:23 billr
- ***************
- *** 1,6
- # $Header: PATCHLOG,v 2.5 89/09/19 06:17:10 billr Exp $
-
- #$Log: PATCHLOG,v $
- # Revision 2.5 89/09/19 06:17:10 billr
- # Patchlevel 4 of calentool. Fixes the following bug reports:
- #
-
- --- 1,58 -----
- # $Header: PATCHLOG,v 2.6 89/12/15 17:13:23 billr Exp $
-
- #$Log: PATCHLOG,v $
- + # Revision 2.6 89/12/15 17:13:23 billr
- + # Patchlevel 5 of calentool fixes the following bugs and adds features:
- + #
- + # ===========
- + # Bugs Fixed:
- + # ===========
- + # calentool -p -m misses warnings in advance if the warning and
- + # appointments are in different month. <kayhan@eve.usc.edu>
- + # Fixed bug with day/week PostScript printouts [reported by several people]
- + # Fixed bug with "-m" option [reported by several people]
- + # Corrected date for Australia Day <ajc@philabs.philips.COM>
- + # Fixed -p/-P/-m options so nothing is printed (or mailed) if there are
- + # no appointments for the day. <uunet.uu.net!xlab!milt!milt>, <brooks@ge-dab.crd.ge.COM>
- + # Fixed bug whereby entire calentool was being changed to black&white
- + # after the Moon data frame was displayed.
- + # Fixed bug in calculation of Jewish passover (on which all the other
- + # Jewish holidays are based) <smb@hector.att.COM>, <rjc@cs.brown.edu>
- + # Fixed bug that displayed previous days calendar if a day is selected from a 6 day week. <bob@omni.COM>
- + # Shortend length of an extra long entry in the dates/space file. <cdurst@aecmail.prime.com>
- + # Fixed bug in calculation of nth_day_of_month (shows up as putting election
- + # day on the wrong week). <uunet.uu.net!formtek!pen>, <att.att.COM!cbosgd!smk>
- + # Fixed bug whereby deleted repeated appointments were not always recognized.
- + # Added #define for mail program with default set to "usr/ucb/mail". The
- + # problem showed up when a user had /usr/5bin in his path before
- + # /usr/ucb. <uunet.uu.net!cjsa!jeff>
- + # Fixed bug that caused calentool to dump core on notes sections with long messages.
- + # Added dates/space entry in Makefile.
- + #
- + # =============
- + # New features:
- + # =============
- + # Modified parse_date to allow +nnn and -nnn syntax for dates relative to the
- + # current date. <peter@hadrian.uwo.ca>
- + #
- + # Add new #defines and switches for selected 12/24 time displays and either
- + # Sunday-Saturday or Monday-Sunday weeks (for some Europeans). <hk@simulina.se>
- + # Cleaner opening windows. <cdurst@aecmail.prime.com>
- + # New -B option to beep AND open calentool window. <cdurst@aecmail.prime.com>
- + # Nested includes (to 4 levels) are now allowed. (Idea from <mdf0%shemesh@gte.COM>)
- + # Allow -p/-P[dw] options to work in conjunction with -m/-M so that a
- + # weeks worth of appointments can be mailed.
- + # Added new expire option (-x) to expire (trash) all appointments older than
- + # a specified number of days.
- + # The sense of the -w option was changed. In order to get the "Working!"
- + # message, you now have to specify "-w".
- + # Changed M/D/Y dates to D/M/Y when European option (-E) selected.
- + # Optimized certain holiday calculations.
- + # New feature for appointments that repeat for a fixed interval of time
- + # e.g. 12/26/89 for 5 days.
- + # Wrote new calencheck program for checking for pending appts without having
- + # to run calentool.
- + #
- # Revision 2.5 89/09/19 06:17:10 billr
- # Patchlevel 4 of calentool. Fixes the following bug reports:
- #
- *** /tmp/,RCSt1a16886 Fri Dec 15 17:22:02 1989
- --- Bugs Fri Dec 15 17:16:39 1989
- ***************
- *** 1,8
- These aren't major, but I haven't had time to track them down...
-
- 1) The "Working!" message occasionally lingers on when it shouldn't.
- ! If it bothers you, use the "-w" option to turn off the message
- ! entirely.
-
- 2) Arrow display messes up on rare occasions. I haven't duplicated
- this often enough to track down.
-
- --- 1,7 -----
- These aren't major, but I haven't had time to track them down...
-
- 1) The "Working!" message occasionally lingers on when it shouldn't.
- ! If it bothers you, don't use this option (-w).
-
- The following bugs have been reported by various users, but I haven't
- been able to fix them, since I haven't been able to duplicate them
- ***************
- *** 4,12
- If it bothers you, use the "-w" option to turn off the message
- entirely.
-
- - 2) Arrow display messes up on rare occasions. I haven't duplicated
- - this often enough to track down.
- -
- The following bugs have been reported by various users, but I haven't
- been able to fix them, since I haven't been able to duplicate them
- (usually due to hardware/os combinations I don't have access to).
-
- --- 3,8 -----
- 1) The "Working!" message occasionally lingers on when it shouldn't.
- If it bothers you, don't use this option (-w).
-
- The following bugs have been reported by various users, but I haven't
- been able to fix them, since I haven't been able to duplicate them
- (usually due to hardware/os combinations I don't have access to).
- ***************
- *** 12,18
- (usually due to hardware/os combinations I don't have access to).
-
- *Calentool dies (seg fault) after running overnight with lockscreen <mfeblowitz@ge.com>
- - *Core dump when clicking MS-MIDDLE button on note section on 386i <jmc@ptsfa.pacbell.com>
- *Memory leakage <vicorp!sparky!scott@uunet.uu.net>
- *Popup error window only gets partially displayed (OS 4.0.3/Sun3) <rohit@sun.com>
- ?Deleting single occurrance of multiple meeting doesn't really delete it <ecm@aloft.uucp>
-
- --- 8,13 -----
- (usually due to hardware/os combinations I don't have access to).
-
- *Calentool dies (seg fault) after running overnight with lockscreen <mfeblowitz@ge.com>
- *Memory leakage <vicorp!sparky!scott@uunet.uu.net>
- *Popup error window only gets partially displayed (OS 4.0.3/Sun3) <rohit@sun.com>
- *Running calentool forces icon gravity change on 386i <lwv27%chemabs@cis.ohio-state.edu>
- ***************
- *** 15,22
- *Core dump when clicking MS-MIDDLE button on note section on 386i <jmc@ptsfa.pacbell.com>
- *Memory leakage <vicorp!sparky!scott@uunet.uu.net>
- *Popup error window only gets partially displayed (OS 4.0.3/Sun3) <rohit@sun.com>
- ! ?Deleting single occurrance of multiple meeting doesn't really delete it <ecm@aloft.uucp>
- ! ?Running calentool forces icon gravity change on 386i <lwv27%chemabs@cis.ohio-state.edu>
-
- If you fix any of these, or spot other bugs, please let me know.
-
-
- --- 10,16 -----
- *Calentool dies (seg fault) after running overnight with lockscreen <mfeblowitz@ge.com>
- *Memory leakage <vicorp!sparky!scott@uunet.uu.net>
- *Popup error window only gets partially displayed (OS 4.0.3/Sun3) <rohit@sun.com>
- ! *Running calentool forces icon gravity change on 386i <lwv27%chemabs@cis.ohio-state.edu>
-
- If you fix any of these, or spot other bugs, please let me know.
-
- ***************
- *** 23,26
- Bill Randle
- billr@saab.CNA.TEK.COM
- {most backbones}!tektronix!saab.CNA.TEK!billr
- ! August 11, 1989
-
- --- 17,20 -----
- Bill Randle
- billr@saab.CNA.TEK.COM
- {most backbones}!tektronix!saab.CNA.TEK!billr
- ! December 15, 1989
- *** /tmp/,RCSt1a16891 Fri Dec 15 17:22:06 1989
- --- INSTALL Fri Dec 15 17:16:42 1989
- ***************
- *** 1,4
- ! INSTALLATION NOTES FOR CALENTOOL - Version 2.1, April 1989
-
- 1) Edit the file "ct.h" to tailor calentool to your site. The only things
- that should really need to be "tweeked" are the define statements for:
-
- --- 1,4 -----
- ! INSTALLATION NOTES FOR CALENTOOL - Version 2.1p5, December 1989
-
- 1) Edit the file "ct.h" to tailor calentool to your site. The only things
- that should really need to be "tweeked" are the define statements for:
- ***************
- *** 11,16
- START_YEAR (first year to appear in year menu)
- NR_YEARS (total number of years to appear in year menu)
- UPDATE_RATE (rate of clock updating)
-
- If you want to make a smaller version of calentool, without certain
- features, uncomment the #defines for one or more of the following
-
- --- 11,19 -----
- START_YEAR (first year to appear in year menu)
- NR_YEARS (total number of years to appear in year menu)
- UPDATE_RATE (rate of clock updating)
- + MAILPROG (mailer for -m option)
- + HOUR_24 (for 12 or 24 hour time formats)
- + MON_FIRST (for Sun-Sat or Mon-Sun week formats)
-
- If you want to make a smaller version of calentool, without certain
- features, uncomment the #defines for one or more of the following
- ***************
- *** 58,61
-
- Bill Randle
- billr@saab.CNA.TEK.COM
- ! May 9, 1989
-
- --- 61,64 -----
-
- Bill Randle
- billr@saab.CNA.TEK.COM
- ! December 15, 1989
- *** /tmp/,RCSt1a02742 Tue Dec 19 12:26:34 1989
- --- Makefile Tue Dec 19 12:26:06 1989
- ***************
- *** 1,4
- ! # $Header: Makefile,v 2.2 89/07/19 20:32:48 billr Exp $
- #
- #DATELIB_DIR Directory containing the Date Library
- #PRINT_CMD Command to send postscript to appropriate printer
-
- --- 1,4 -----
- ! # $Header: Makefile,v 2.4 89/12/19 12:25:42 billr Exp $
- #
- #DATELIB_DIR Directory containing the Date Library
- #PRINT_CMD Command to send postscript to appropriate printer
- ***************
- *** 8,13
- #START_YEAR What is first year of calendar to display
- #NR_YEARS How many years to display.
- #UPDATE_RATE How often to perform updates (second or minute)?
- #APPT_CHECK_LIMIT What limits to check for appointments (see ct.h)
- #
- #NO_PRINTER No printing is supported
-
- --- 8,16 -----
- #START_YEAR What is first year of calendar to display
- #NR_YEARS How many years to display.
- #UPDATE_RATE How often to perform updates (second or minute)?
- + #MAILPROG Mailer for -m option
- + #HOUR_24 For 12 or 24 hour time formats
- + #MON_FIRST For Sun-Sat or Mon-Sun week formats
- #APPT_CHECK_LIMIT What limits to check for appointments (see ct.h)
- #
- #NO_PRINTER No printing is supported
- ***************
- *** 15,20
- #NO_HOLIDAYS No holiday display is supported
- #NO_SUN_MOON No sun and moon phase info is supported
- #
- #BINDIR Where to install binaries
- #LIBDIR Where to install date files and utility binaries
- #MANDIR Where to install man pages
-
- --- 18,25 -----
- #NO_HOLIDAYS No holiday display is supported
- #NO_SUN_MOON No sun and moon phase info is supported
- #
- + #CALENCHECK Ifdefs out parts of files for calencheck program
- + #
- #BINDIR Where to install binaries
- #LIBDIR Where to install date files and utility binaries
- #MANDIR Where to install man pages
- ***************
- *** 30,35
- CC = cc
- DEFINES= #-DDATELIB_DIR=\"./dates\" -DSTART_HOUR=7 -DEND_HOUR=19 -DSTART_YEAR=88
- CFLAGS= -g ${DEFINES}
- LIBS= -lsuntool -lsunwindow -lpixrect -lm
-
- DATEFILES= dates/README dates/celtic dates/computing dates/events\
-
- --- 35,41 -----
- CC = cc
- DEFINES= #-DDATELIB_DIR=\"./dates\" -DSTART_HOUR=7 -DEND_HOUR=19 -DSTART_YEAR=88
- CFLAGS= -g ${DEFINES}
- + CC_CFLAGS = ${CFLAGS} -DCALENCHECK
- LIBS= -lsuntool -lsunwindow -lpixrect -lm
-
- DATEFILES= dates/README dates/celtic dates/computing dates/events\
- ***************
- *** 36,42
- dates/lives dates/lotr dates/nature dates/popcult\
- dates/usa_holiday dates/usa_other dates/usa_states dates/world\
- dates/gdead dates/space
- ! SRCS= calentool.c datelib.o devent.c dpaint.c event.c holidays.c\
- init.c moon.c mpaint.c notify.c pcal.c ras2ps.c riseset.c tool.c utils.c\
- version.c wevent.c wpaint.c ypaint.c
- INCLUDES= ct.h event.h paint.h patchlevel.h riseset.h
-
- --- 42,48 -----
- dates/lives dates/lotr dates/nature dates/popcult\
- dates/usa_holiday dates/usa_other dates/usa_states dates/world\
- dates/gdead dates/space
- ! SRCS= calentool.c datelib.o devent.c dpaint.c event.c expire.c holidays.c\
- init.c moon.c mpaint.c notify.c pcal.c ras2ps.c riseset.c tool.c utils.c\
- version.c wevent.c wpaint.c ypaint.c
- INCLUDES= ct.h event.h paint.h patchlevel.h riseset.h
- ***************
- *** 40,47
- init.c moon.c mpaint.c notify.c pcal.c ras2ps.c riseset.c tool.c utils.c\
- version.c wevent.c wpaint.c ypaint.c
- INCLUDES= ct.h event.h paint.h patchlevel.h riseset.h
- ! OBJS= calentool.o datelib.o devent.o dpaint.o event.o holidays.o\
- ! init.o moon.o mpaint.o notify.o pcal.o ras2ps.o riseset.o tool.o utils.o\
- version.o wevent.o wpaint.o ypaint.o
-
- all: calentool conv_tools
-
- --- 46,53 -----
- init.c moon.c mpaint.c notify.c pcal.c ras2ps.c riseset.c tool.c utils.c\
- version.c wevent.c wpaint.c ypaint.c
- INCLUDES= ct.h event.h paint.h patchlevel.h riseset.h
- ! OBJS= calentool.o ct_datelib.o devent.o ct_dpaint.o event.o expire.o holidays.o\
- ! init.o moon.o mpaint.o notify.o pcal.o ras2ps.o riseset.o tool.o ct_utils.o\
- version.o wevent.o wpaint.o ypaint.o
- CC_OBJS = calencheck.o cc_datelib.o cc_dpaint.o cc_utils.o
-
- ***************
- *** 43,48
- OBJS= calentool.o datelib.o devent.o dpaint.o event.o holidays.o\
- init.o moon.o mpaint.o notify.o pcal.o ras2ps.o riseset.o tool.o utils.o\
- version.o wevent.o wpaint.o ypaint.o
-
- all: calentool conv_tools
-
-
- --- 49,55 -----
- OBJS= calentool.o ct_datelib.o devent.o ct_dpaint.o event.o expire.o holidays.o\
- init.o moon.o mpaint.o notify.o pcal.o ras2ps.o riseset.o tool.o ct_utils.o\
- version.o wevent.o wpaint.o ypaint.o
- + CC_OBJS = calencheck.o cc_datelib.o cc_dpaint.o cc_utils.o
-
- all: calentool calencheck conv_tools
-
- ***************
- *** 44,50
- init.o moon.o mpaint.o notify.o pcal.o ras2ps.o riseset.o tool.o utils.o\
- version.o wevent.o wpaint.o ypaint.o
-
- ! all: calentool conv_tools
-
- # the main program
- calentool: ${OBJS}
-
- --- 51,57 -----
- version.o wevent.o wpaint.o ypaint.o
- CC_OBJS = calencheck.o cc_datelib.o cc_dpaint.o cc_utils.o
-
- ! all: calentool calencheck conv_tools
-
- # the main program
- calentool: ${OBJS}
- ***************
- *** 51,57
- ${CC} ${CFLAGS} -o calentool ${OBJS} ${LIBS}
-
- calentool.o: calentool.c ct.h std.icon rev.icon nap.icon
- ! datelib.o: datelib.c
- devent.o: devent.c ct.h event.h
- dpaint.o: dpaint.c ct.h paint.h riseset.h
- holidays.o: holidays.c
-
- --- 58,66 -----
- ${CC} ${CFLAGS} -o calentool ${OBJS} ${LIBS}
-
- calentool.o: calentool.c ct.h std.icon rev.icon nap.icon
- ! ct_datelib.o: datelib.c
- ! ${CC} ${CFLAGS} -c datelib.c
- ! mv datelib.o ct_datelib.o
- devent.o: devent.c ct.h event.h
- ct_dpaint.o: dpaint.c ct.h paint.h riseset.h
- ${CC} ${CFLAGS} -c dpaint.c
- ***************
- *** 53,59
- calentool.o: calentool.c ct.h std.icon rev.icon nap.icon
- datelib.o: datelib.c
- devent.o: devent.c ct.h event.h
- ! dpaint.o: dpaint.c ct.h paint.h riseset.h
- holidays.o: holidays.c
- init.o: init.c ct.h
- moon.o: moon.c
-
- --- 62,71 -----
- ${CC} ${CFLAGS} -c datelib.c
- mv datelib.o ct_datelib.o
- devent.o: devent.c ct.h event.h
- ! ct_dpaint.o: dpaint.c ct.h paint.h riseset.h
- ! ${CC} ${CFLAGS} -c dpaint.c
- ! mv dpaint.o ct_dpaint.o
- ! expire.o: expire.c ct.h
- holidays.o: holidays.c
- init.o: init.c ct.h
- moon.o: moon.c
- ***************
- *** 64,70
- ras2ps.o: ras2ps.c
- riseset.o: riseset.h
- tool.o: tool.c ct.h
- ! utils.o: utils.c ct.h
- version.o: version.c
- wevent.o: wevent.c ct.h event.h
- wpaint.o: wpaint.c ct.h paint.h
-
- --- 76,84 -----
- ras2ps.o: ras2ps.c
- riseset.o: riseset.h
- tool.o: tool.c ct.h
- ! ct_utils.o: utils.c ct.h
- ! ${CC} ${CFLAGS} -c utils.c
- ! mv utils.o ct_utils.o
- version.o: version.c
- wevent.o: wevent.c ct.h event.h
- wpaint.o: wpaint.c ct.h paint.h
- ***************
- *** 70,75
- wpaint.o: wpaint.c ct.h paint.h
- ypaint.o: ypaint.c ct.h paint.h
-
- # conversion utilities
- conv_tools: cal2ct month2ct mt2ct
-
-
- --- 84,103 -----
- wpaint.o: wpaint.c ct.h paint.h
- ypaint.o: ypaint.c ct.h paint.h
-
- + # the calencheck program
- + calencheck: ${CC_OBJS}
- + ${CC} ${CC_CFLAGS} -o calencheck ${CC_OBJS} -lsunwindow -lm
- +
- + cc_utils.o: utils.c ct.h
- + ${CC} ${CC_CFLAGS} -c utils.c
- + mv utils.o cc_utils.o
- + cc_datelib.o: datelib.c
- + ${CC} ${CC_CFLAGS} -c datelib.c
- + mv datelib.o cc_datelib.o
- + cc_dpaint.o: dpaint.c ct.h
- + ${CC} ${CC_CFLAGS} -c dpaint.c
- + mv dpaint.o cc_dpaint.o
- +
- # conversion utilities
- conv_tools: cal2ct month2ct mt2ct
-
- ***************
- *** 84,89
-
- install: all
- install -s calentool ${BINDIR}
- install -c -m 444 calentool.1 ${MANDIR}/calentool.${MANEXT}
- install -c -m 444 CalenTool.d ${DEFSDIR}/CalenTool.d
- -mkdir ${LIBDIR}
-
- --- 112,118 -----
-
- install: all
- install -s calentool ${BINDIR}
- + install -s calencheck ${BINDIR}
- install -c -m 444 calentool.1 ${MANDIR}/calentool.${MANEXT}
- install -c -m 444 calencheck.1 ${MANDIR}/calencheck.${MANEXT}
- install -c -m 444 CalenTool.d ${DEFSDIR}/CalenTool.d
- ***************
- *** 85,90
- install: all
- install -s calentool ${BINDIR}
- install -c -m 444 calentool.1 ${MANDIR}/calentool.${MANEXT}
- install -c -m 444 CalenTool.d ${DEFSDIR}/CalenTool.d
- -mkdir ${LIBDIR}
- cp ${DATEFILES} ${LIBDIR}
-
- --- 114,120 -----
- install -s calentool ${BINDIR}
- install -s calencheck ${BINDIR}
- install -c -m 444 calentool.1 ${MANDIR}/calentool.${MANEXT}
- + install -c -m 444 calencheck.1 ${MANDIR}/calencheck.${MANEXT}
- install -c -m 444 CalenTool.d ${DEFSDIR}/CalenTool.d
- -mkdir ${LIBDIR}
- cp ${DATEFILES} ${LIBDIR}
- ***************
- *** 103,109
- rm -f *.o *.BAK core *~ #*#
-
- veryclean:
- ! rm -f calentool cal2ct month2ct mt2ct *.o *.BAK core *~ #*#
-
- # If you are using GNU make, the following statement will cause it to
- # ignore any (bogus) files named `clean', `all', etc.; if you are using
-
- --- 133,139 -----
- rm -f *.o *.BAK core *~ #*#
-
- veryclean:
- ! rm -f calentool calencheck cal2ct month2ct mt2ct *.o *.BAK core *~ #*#
-
- # If you are using GNU make, the following statement will cause it to
- # ignore any (bogus) files named `clean', `all', etc.; if you are using
- *** /tmp/,RCSt1a16901 Fri Dec 15 17:22:14 1989
- --- ToDo Fri Dec 15 17:16:50 1989
- ***************
- *** 1,7
- Still to do someday...
-
- 1) Convert display code and event handling, etc. to X11. Using
- ! View2 may be the way to do this.
-
- 2) Add Lunar based (e.g. Chinese, Japanese) holidays.
-
-
- --- 1,7 -----
- Still to do someday...
-
- 1) Convert display code and event handling, etc. to X11. Using
- ! XView may be the way to do this.
-
- 2) Add Lunar based (e.g. Chinese, Japanese) holidays.
-
- ***************
- *** 33,39
- =Want to come up in week display <bob@boulder.colorado.edu>
- =Want to order the notes (i.e. pick which is displayed first) <dna@emmy.umd.edu>
- =Want to see two days at a time <rohit@sun.com>
- - =Want to set duration of an appointment (e.g. gone for 4 days) <jeremy@kheops.cmi.no>
- =Want to start arbitrary process at appt time <wyle@inf.ethz.ch>
- =Want week display to show current day at left, then next 5-7 days <bob@boulder.colorado.edu>
- =Want window to open when appt time approaches <rohit@sun.com>
-
- --- 33,38 -----
- =Want to come up in week display <bob@boulder.colorado.edu>
- =Want to order the notes (i.e. pick which is displayed first) <dna@emmy.umd.edu>
- =Want to see two days at a time <rohit@sun.com>
- =Want to start arbitrary process at appt time <wyle@inf.ethz.ch>
- =Want week display to show current day at left, then next 5-7 days <bob@boulder.colorado.edu>
- =Want jump scroll for long messages
- ***************
- *** 36,39
- =Want to set duration of an appointment (e.g. gone for 4 days) <jeremy@kheops.cmi.no>
- =Want to start arbitrary process at appt time <wyle@inf.ethz.ch>
- =Want week display to show current day at left, then next 5-7 days <bob@boulder.colorado.edu>
- ! =Want window to open when appt time approaches <rohit@sun.com>
-
- --- 35,40 -----
- =Want to see two days at a time <rohit@sun.com>
- =Want to start arbitrary process at appt time <wyle@inf.ethz.ch>
- =Want week display to show current day at left, then next 5-7 days <bob@boulder.colorado.edu>
- ! =Want jump scroll for long messages
- ! =Want more features from 'sched', e.g. alarm clock, marked time events, display month current month icon <cdurst@aecmail.prime.com>
- ! =Want to be able to set all command line options from within the running tool.
- *** /tmp/,RCSt1a16906 Fri Dec 15 17:22:19 1989
- --- calentool.1 Fri Dec 15 17:16:57 1989
- ***************
- *** 1,4
- ! .\" $Header: calentool.1,v 2.4 89/09/19 06:06:11 billr Exp $
- .\"
- .TH CALENTOOL 1 "14 September 1989"
- .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2
-
- --- 1,4 -----
- ! .\" $Header: calentool.1,v 2.5 89/12/15 17:16:51 billr Exp $
- .\"
- .TH CALENTOOL 1 "14 December 1989"
- .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2
- ***************
- *** 1,6
- .\" $Header: calentool.1,v 2.4 89/09/19 06:06:11 billr Exp $
- .\"
- ! .TH CALENTOOL 1 "14 September 1989"
- .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2
- .SH NAME
- calentool - day/week/month/year-at-a-glance SunView tool (the Hacker's Almanac)
-
- --- 1,6 -----
- .\" $Header: calentool.1,v 2.5 89/12/15 17:16:51 billr Exp $
- .\"
- ! .TH CALENTOOL 1 "14 December 1989"
- .ds Ps P\s-2OST\s+2S\s-2CRIPT\s+2
- .SH NAME
- calentool - day/week/month/year-at-a-glance SunView tool (the Hacker's Almanac)
- ***************
- *** 10,15
- .B \-b
- ]
- [
- .B \-d
- .I date
- ]
-
- --- 10,18 -----
- .B \-b
- ]
- [
- + .B \-B
- + ]
- + [
- .B \-d
- .I date
- ]
- ***************
- *** 35,40
- .I userid
- ]
- [
- .B \-o
- ]
- [
-
- --- 38,47 -----
- .I userid
- ]
- [
- + .B \-M
- + .I userid
- + ]
- + [
- .B \-o
- ]
- [
- ***************
- *** 67,72
- .B \-5
- ]
- [
- .B \-7
- ]
- [
-
- --- 74,83 -----
- .B \-5
- ]
- [
- + .B \-6
- + ]
- + [
- + [
- .B \-7
- ]
- [
- ***************
- *** 70,76
- .B \-7
- ]
- [
- ! .I suntools options
- ]
- .SH DESCRIPTION
- .I Calentool
-
- --- 81,87 -----
- .B \-7
- ]
- [
- ! .B \-12
- ]
- [
- .B \-24
- ***************
- *** 72,77
- [
- .I suntools options
- ]
- .SH DESCRIPTION
- .I Calentool
- is a day/week/month/year-at-a-glance tool. It is a
-
- --- 83,104 -----
- [
- .B \-12
- ]
- + [
- + .B \-24
- + ]
- + [
- + .B \-e
- + ]
- + [
- + .B \-E
- + ]
- + [
- + .B \-x
- + .I int
- + ]
- + [
- + .I sunview options
- + ]
- .SH DESCRIPTION
- .I Calentool
- is a day/week/month/year-at-a-glance tool. It is a
- ***************
- *** 88,94
- .IR mail (1),
- and to examine colleagues appointment schedules. Daily and weekly schedules
- can be sent to a \*(Ps printer. Outdated appointments can be sent
- ! automatically to an archival file. An extensive set of files containing
- commemorative dates is included, as well as a library of routines which
- computes the dates of various holidays which do not fall on fixed days
- of the Gregorian calendar (including religious holidays and astronomical
-
- --- 115,121 -----
- .IR mail (1),
- and to examine colleagues appointment schedules. Daily and weekly schedules
- can be sent to a \*(Ps printer. Outdated appointments can be sent
- ! automatically to an archival file. An extensive set of files containing
- commemorative dates is included, as well as a library of routines which
- computes the dates of various holidays which do not fall on fixed days
- of the Gregorian calendar (including religious holidays and astronomical
- ***************
- *** 98,103
- .I calentool
- you should be operating within the SunView environment, the
- .BR \-m ,
- .B \-p
- and
- .B \-P
-
- --- 125,131 -----
- .I calentool
- you should be operating within the SunView environment, the
- .BR \-m ,
- + .BR \-M ,
- .B \-p
- and
- .B \-P
- ***************
- *** 121,127
- .SH OPTIONS
- .I Calentool
- accepts standard
- ! .I suntools
- command line options at the end of the command line.
- .TP 15
- .B \-b
-
- --- 149,155 -----
- .SH OPTIONS
- .I Calentool
- accepts standard
- ! .I sunview
- command line options at the end of the command line.
- .TP 15
- .B \-b
- ***************
- *** 133,138
- .IR nlock (1L);
- notifying passers-by of the user's current activity.
- .TP
- .BI \-d \ date
- Open the calendar at the day
- .IR date ,
-
- --- 161,174 -----
- .IR nlock (1L);
- notifying passers-by of the user's current activity.
- .TP
- + .B \-B
- + Similar to
- + .B \-b
- + except that the
- + .I calentool
- + frame is opened instead of writing to the console. If both features are
- + desired, both options may be specified.
- + .TP
- .BI \-d \ date
- Open the calendar at the day
- .IR date ,
- ***************
- *** 148,153
- MO/DD (day DD of month MO, for example 11/12 for November 12)
- .br
- MO/DD/YY (day DD of month MO, year YY, for example 9/1/88 for 1 September 1988)
- .RE
- .TP
- .BI \-f \ apptsfile
-
- --- 184,194 -----
- MO/DD (day DD of month MO, for example 11/12 for November 12)
- .br
- MO/DD/YY (day DD of month MO, year YY, for example 9/1/88 for 1 September 1988)
- + .TP
- + relative dates:
- + +n (n days from now, for example +1 for tomorrow)
- + .br
- + -n (n days ago, for example -1 for yesterday)
- .RE
- .TP
- .BI \-f \ apptsfile
- ***************
- *** 217,222
- represents the last two digits of a past year).
- .TP
- .BI \-m " userid"
- Send mail listing todays appointments to the user specified by
- .I userid
- and exit.
-
- --- 258,265 -----
- represents the last two digits of a past year).
- .TP
- .BI \-m " userid"
- + .br
- + .BI \-M " userid"
- Send mail listing todays appointments to the user specified by
- .I userid
- and exit.
- ***************
- *** 220,225
- Send mail listing todays appointments to the user specified by
- .I userid
- and exit.
- This feature is useful when calentool is run from
- .IR cron (1),
- to send yourself mail about today's appointments. No mail is
-
- --- 263,272 -----
- Send mail listing todays appointments to the user specified by
- .I userid
- and exit.
- + .B \-m
- + shows all notes, while
- + .B \-M
- + does not show notes not marked for display in the month/year displays.
- This feature is useful when calentool is run from
- .IR cron (1),
- to send yourself mail about today's appointments. No mail is
- ***************
- *** 224,229
- .IR cron (1),
- to send yourself mail about today's appointments. No mail is
- sent about today's appointments, if there are none.
- (Note: this option eliminates the need for the separate program,
- .IR calenmail (1L),
- which was distributed with earlier releases of
-
- --- 271,286 -----
- .IR cron (1),
- to send yourself mail about today's appointments. No mail is
- sent about today's appointments, if there are none.
- + The
- + .B \-p
- + and
- + .B \-P
- + options may be used with these options to mail yourself a whole weeks
- + worth of appointments, e.g.:
- + .I
- + calentool -Pw -m billr.
- + .R
- +
- (Note: this option eliminates the need for the separate program,
- .IR calenmail (1L),
- which was distributed with earlier releases of
- ***************
- *** 281,288
- seconds.
- .TP
- .B \-w
- ! Don't display the "Working!" message in the control panel during
- ! lengthy operations. The cursor still changes to an hourglass.
- .TP
- .B \-z
- Convert appointments file used by earlier versions of
-
- --- 338,345 -----
- seconds.
- .TP
- .B \-w
- ! Display the "Working!" message in the control panel during
- ! lengthy operations. The cursor also changes to an hourglass.
- .TP
- .BI \-x " int"
- Expire appointment files entries if they are older than
- ***************
- *** 284,289
- Don't display the "Working!" message in the control panel during
- lengthy operations. The cursor still changes to an hourglass.
- .TP
- .B \-z
- Convert appointments file used by earlier versions of
- .I calentool
-
- --- 341,354 -----
- Display the "Working!" message in the control panel during
- lengthy operations. The cursor also changes to an hourglass.
- .TP
- + .BI \-x " int"
- + Expire appointment files entries if they are older than
- + .I int
- + days old. Appointments in #include files are not expired. To expire
- + included appointments,
- + .I calentool
- + must be run on the included file directly.
- + .TP
- .B \-z
- Convert appointments file used by earlier versions of
- .I calentool
- ***************
- *** 293,299
- .TP
- .B \-5
- Display only five days (Monday through Friday) in the week display. This is
- ! useful if the installer has set the default display format to 7 days.
- .TP
- .B \-7
- Display all seven days in the week display. This is useful if the installer
-
- --- 358,364 -----
- .TP
- .B \-5
- Display only five days (Monday through Friday) in the week display. This is
- ! useful if the installer has set the default display format to 6 or 7 days.
- .TP
- .B \-6
- Display six days (Monday through Saturday) in the week display. This is
- ***************
- *** 295,300
- Display only five days (Monday through Friday) in the week display. This is
- useful if the installer has set the default display format to 7 days.
- .TP
- .B \-7
- Display all seven days in the week display. This is useful if the installer
- has set the default value to 5 days. The 7-day display is wider than the 5-day
-
- --- 360,369 -----
- Display only five days (Monday through Friday) in the week display. This is
- useful if the installer has set the default display format to 6 or 7 days.
- .TP
- + .B \-6
- + Display six days (Monday through Saturday) in the week display. This is
- + useful if the installer has set the default display format to 5 or 7 days.
- + .TP
- .B \-7
- Display all seven days in the week display. This is useful if the installer
- has set the default value to 5 or 6 days. The 7-day display is wider than the 5-day
- ***************
- *** 297,303
- .TP
- .B \-7
- Display all seven days in the week display. This is useful if the installer
- ! has set the default value to 5 days. The 7-day display is wider than the 5-day
- display, allowing longer messages to be displayed.
- .SH "DETAILED INSTRUCTIONS"
- .SS "Examining the calendar"
-
- --- 366,372 -----
- .TP
- .B \-7
- Display all seven days in the week display. This is useful if the installer
- ! has set the default value to 5 or 6 days. The 7-day display is wider than the 5-day
- display, allowing longer messages to be displayed.
- .TP
- .B \-12
- ***************
- *** 299,304
- Display all seven days in the week display. This is useful if the installer
- has set the default value to 5 days. The 7-day display is wider than the 5-day
- display, allowing longer messages to be displayed.
- .SH "DETAILED INSTRUCTIONS"
- .SS "Examining the calendar"
- When first opened, the tool displays the appointments for a single day (today
-
- --- 368,394 -----
- Display all seven days in the week display. This is useful if the installer
- has set the default value to 5 or 6 days. The 7-day display is wider than the 5-day
- display, allowing longer messages to be displayed.
- + .TP
- + .B \-12
- + Display time in a 12-hour AM/PM format whenever practical. This is usefful
- + if the installer has set the default time format to 24-hour time.
- + .TP
- + .B \-24
- + Display time in a 24-hour AM/PM format. This is usefful
- + if the installer has set the default time format to 12-hour time.
- + .TP
- + .B \-e
- + Set European week display format (Monday through Sunday). When 7 day
- + week display is set, the display shows the days Monday through Sunday,
- + rather than Sunday through Saturday. This also affects the month
- + and year displays.
- + .TP
- + .B \-E
- + Set all European style options. Currently, this includes:
- + .B \-24
- + and
- + .BR \-e .
- + Other options may be added in the future.
- .SH "DETAILED INSTRUCTIONS"
- .SS "Examining the calendar"
- When first opened, the tool displays the appointments for a single day (today
- ***************
- *** 459,465
- year. Alternatively,
- the appointment may be repeated at a specified interval of days. The user can
- also specify a period of days prior to the appointment for which a reminder
- ! will be printed. For example, one could specify that a meeting is to occur
- on the first and third Tuesday of the month, in perpetuity, by selecting
- the repeat options
- .BR "Selected Week" ,
-
- --- 549,556 -----
- year. Alternatively,
- the appointment may be repeated at a specified interval of days. The user can
- also specify a period of days prior to the appointment for which a reminder
- ! will be printed and how many times this appointment will be repeated.
- ! For example, one could specify that a meeting is to occur
- on the first and third Tuesday of the month, in perpetuity, by selecting
- the repeat options
- .BR "Selected Week" ,
- ***************
- *** 560,566
- \fC# CalenTool V2 - DO NOT REMOVE THIS LINE
- #include "file"
- # <comment string>
- ! YY MO DD HH MI AA [II] <WW> # \fImessage\fP
- .fi
- .SS Header line
- The first line in an
-
- --- 651,657 -----
- \fC# CalenTool V2 - DO NOT REMOVE THIS LINE
- #include "file"
- # <comment string>
- ! YY MO DD HH MI AA [II] <WW> +RR # \fImessage\fP
- .fi
- .SS Header line
- The first line in an
- ***************
- *** 644,650
- appointments. The
- .I <WW>
- field appears within broken brackets, and indicates the number of
- ! days of advance warning required.
- .SS Appointment text
- If a # character appears in front of the text, it indicates that a recurring
- appointment has been suppressed for that day.
-
- --- 735,744 -----
- appointments. The
- .I <WW>
- field appears within broken brackets, and indicates the number of
- ! days of advance warning required. The
- ! .I +RR
- ! field is preceded by a plus sign, and indicates the repetition count
- ! for a given appointment.
- .SS Appointment text
- If a # character appears in front of the text, it indicates that a recurring
- appointment has been suppressed for that day.
- ***************
- *** 660,666
- \fC** 04 01 00 01 00 April Fool's Day
- ** ** Tu 10 30 00 [1,3] Meeting on 1st and 3rd Tues. of Month
- ** ** 01 00 01 00 <1> First day of every month, one day warning
- ! 88 05 ** 00 01 00 On vacation for entire month of May 1988\fP
- .fi
- .RE
- .SH "SUPPLIED SPECIAL DATES FILES"
-
- --- 754,761 -----
- \fC** 04 01 00 01 00 April Fool's Day
- ** ** Tu 10 30 00 [1,3] Meeting on 1st and 3rd Tues. of Month
- ** ** 01 00 01 00 <1> First day of every month, one day warning
- ! 88 05 ** 00 01 00 On vacation for entire month of May 1988
- ! 89 11 06 99 00 00 +4 SigFishing Conference\fP
- .fi
- .RE
- .SH "SUPPLIED SPECIAL DATES FILES"
- ***************
- *** 779,785
- .I $HOME/.defaults
- file
- .SH "SEE ALSO"
- ! cal(1), cal2ct(1L), calendar(1), clocktool(1), cron(8),
- mail(1), month(1L), monthtool(1L), month2ct(1L), mt2ct(1L),
- nlock(1L), suntools(1), vi(1)
- .SH REFERENCES
-
- --- 874,880 -----
- .I $HOME/.defaults
- file
- .SH "SEE ALSO"
- ! cal(1), cal2ct(1L), calencheck(1L), calendar(1), clocktool(1), cron(8),
- mail(1), month(1L), monthtool(1L), month2ct(1L), mt2ct(1L),
- nlock(1L), suntools(1)
- .SH REFERENCES
- ***************
- *** 781,787
- .SH "SEE ALSO"
- cal(1), cal2ct(1L), calendar(1), clocktool(1), cron(8),
- mail(1), month(1L), monthtool(1L), month2ct(1L), mt2ct(1L),
- ! nlock(1L), suntools(1), vi(1)
- .SH REFERENCES
- An excellent compendium which describes basic terminology of time measurement,
- methods of astronomical computation, and the convoluted history of calendars:
-
- --- 876,882 -----
- .SH "SEE ALSO"
- cal(1), cal2ct(1L), calencheck(1L), calendar(1), clocktool(1), cron(8),
- mail(1), month(1L), monthtool(1L), month2ct(1L), mt2ct(1L),
- ! nlock(1L), suntools(1)
- .SH REFERENCES
- An excellent compendium which describes basic terminology of time measurement,
- methods of astronomical computation, and the convoluted history of calendars:
- *** /tmp/,RCSt1a17008 Fri Dec 15 17:24:08 1989
- --- wpaint.c Fri Dec 15 17:18:42 1989
- ***************
- *** 1,5
- /*
- ! * $Header: wpaint.c,v 2.2 89/07/19 20:32:38 billr Exp $
- */
- /*
- * wpaint.c
-
- --- 1,5 -----
- /*
- ! * $Header: wpaint.c,v 2.3 89/12/15 17:18:39 billr Exp $
- */
- /*
- * wpaint.c
- ***************
- *** 54,59
- fix_current_day();
- Save = current;
- current.tm_mday -= current.tm_wday; /* Sunday of this week */
- fix_current_day();
- if (nr_weekdays < 7) {
- current.tm_mday++;
-
- --- 54,65 -----
- fix_current_day();
- Save = current;
- current.tm_mday -= current.tm_wday; /* Sunday of this week */
- + if (monday_first) {
- + if (current.tm_wday == SUN)
- + current.tm_mday -= 7;
- + if (nr_weekdays == 7)
- + current.tm_mday++; /* start on Monday */
- + }
- fix_current_day();
- if (nr_weekdays < 7) {
- current.tm_mday++;
- ***************
- *** 127,133
- c[3] = '\0'; /* Mon Tue Wed Thu Fri */
- for (i=0; i<nr_weekdays; i++) {
- x = startx + i*weekslot_width + (weekslot_width - 2*(font->pf_defaultsize.x+2))/2;
- ! sprintf(c, "%3.3s", daynames[First.tm_wday + i]);
- pw_text(main_pixwin, x, starty-5, PIX_SRC, font, c);
- }
-
-
- --- 133,142 -----
- c[3] = '\0'; /* Mon Tue Wed Thu Fri */
- for (i=0; i<nr_weekdays; i++) {
- x = startx + i*weekslot_width + (weekslot_width - 2*(font->pf_defaultsize.x+2))/2;
- ! if (monday_first && i == 6)
- ! sprintf(c, "%3.3s", daynames[SUN]);
- ! else
- ! sprintf(c, "%3.3s", daynames[First.tm_wday + i]);
- pw_text(main_pixwin, x, starty-5, PIX_SRC, font, c);
- }
-
- ***************
- *** 135,143
- rightx = startx + nr_weekdays*weekslot_width + 10;
- for (i=0; i<N_SLOTS; i++) {
- if (i < n_tslots) {
- ! sprintf(c, "%2d:%s",
- ! (START_HOUR+(i/2))%12 == 0 ? 12 : (START_HOUR+(i/2))%12,
- ! i%2 == 0 ? "00" : "30");
- } else if (i == n_tslots) {
- sprintf(c, "Notes");
- } else {
-
- --- 144,157 -----
- rightx = startx + nr_weekdays*weekslot_width + 10;
- for (i=0; i<N_SLOTS; i++) {
- if (i < n_tslots) {
- ! if (hour24)
- ! sprintf(c, "%2d:%s",
- ! START_HOUR+(i/2),
- ! i%2 == 0 ? "00" : "30");
- ! else
- ! sprintf(c, "%2d:%s%s",
- ! (START_HOUR+(i/2))%12 == 0 ? 12 : (START_HOUR+(i/2))%12,
- ! i%2 == 0 ? "00" : "30", (START_HOUR+(i/2) < 12 ? "am" : "pm"));
- } else if (i == n_tslots) {
- sprintf(c, (hour24 ? "Notes" : " Notes"));
- } else {
- ***************
- *** 139,145
- (START_HOUR+(i/2))%12 == 0 ? 12 : (START_HOUR+(i/2))%12,
- i%2 == 0 ? "00" : "30");
- } else if (i == n_tslots) {
- ! sprintf(c, "Notes");
- } else {
- sprintf(c, " ");
- }
-
- --- 153,159 -----
- (START_HOUR+(i/2))%12 == 0 ? 12 : (START_HOUR+(i/2))%12,
- i%2 == 0 ? "00" : "30", (START_HOUR+(i/2) < 12 ? "am" : "pm"));
- } else if (i == n_tslots) {
- ! sprintf(c, (hour24 ? "Notes" : " Notes"));
- } else {
- sprintf(c, " ");
- }
- ***************
- *** 143,150
- } else {
- sprintf(c, " ");
- }
- ! pw_text(main_pixwin, startx-6*font->pf_defaultsize.x, y, PIX_SRC, font, c);
- ! pw_text(main_pixwin, rightx, y, PIX_SRC, font, c);
- y += weekslot_height;
- }
-
-
- --- 157,169 -----
- } else {
- sprintf(c, " ");
- }
- ! if (hour24) {
- ! pw_text(main_pixwin, startx-7*font->pf_defaultsize.x, y, PIX_SRC, font, c);
- ! pw_text(main_pixwin, rightx, y, PIX_SRC, font, c);
- ! } else {
- ! pw_text(main_pixwin, startx-8*font->pf_defaultsize.x, y, PIX_SRC, font, c);
- ! pw_text(main_pixwin, rightx-font->pf_defaultsize.x, y, PIX_SRC, font, c);
- ! }
- y += weekslot_height;
- }
-
- ***************
- *** 155,162
-
- /* display week dates (month, day) */
- for (i=0; i<nr_weekdays; i++) {
- ! sprintf(c, "%3.3s %2d",
- ! monthnames[current.tm_mon], current.tm_mday);
- pw_text(main_pixwin, x, y, PIX_SRC, font, c);
- x += weekslot_width;
- current.tm_mday++;
-
- --- 174,185 -----
-
- /* display week dates (month, day) */
- for (i=0; i<nr_weekdays; i++) {
- ! if (day_first)
- ! sprintf(c, "%2d %3.3s",
- ! current.tm_mday, monthnames[current.tm_mon]);
- ! else
- ! sprintf(c, "%3.3s %2d",
- ! monthnames[current.tm_mon], current.tm_mday);
- pw_text(main_pixwin, x, y, PIX_SRC, font, c);
- x += weekslot_width;
- current.tm_mday++;
- *** /tmp/,RCSt1a17013 Fri Dec 15 17:24:12 1989
- --- ypaint.c Fri Dec 15 17:18:46 1989
- ***************
- *** 1,5
- /*
- ! * $Header: ypaint.c,v 2.1 89/05/09 14:20:15 billr Exp $
- */
- /*
- * ypaint.c
-
- --- 1,5 -----
- /*
- ! * $Header: ypaint.c,v 2.2 89/12/15 17:18:43 billr Exp $
- */
- /*
- * ypaint.c
- ***************
- *** 40,45
- struct appt_entry appt;
- int read_stat;
- FILE *apts;
-
- lock_cursors();
- /* destory future appts popup, if it exists */
-
- --- 40,46 -----
- struct appt_entry appt;
- int read_stat;
- FILE *apts;
- + int runl;
-
- lock_cursors();
- /* destory future appts popup, if it exists */
- ***************
- *** 75,81
- err_rpt("can't open appointments file", FATAL);
-
- working(FALSE);
- ! while ((read_stat = get_aentry(apts, &appt)) != EOF) {
- if (read_stat)
- continue; /* read error */
- if (appt.flags & A_COMMENT)
-
- --- 76,82 -----
- err_rpt("can't open appointments file", FATAL);
-
- working(FALSE);
- ! while ((read_stat = get_aentry(apts, &appt, FALSE)) != EOF) {
- if (read_stat)
- continue; /* read error */
- if (appt.flags & A_COMMENT)
- ***************
- *** 130,139
- }
- } else {
- fix_current_day();
- ! while (ymd_compare(current, Last) <= 0) {
- ! busy_today[current.tm_yday]++;
- ! current.tm_mday += appt.repeat;
- ! fix_current_day();
- }
- }
- } else {
-
- --- 131,148 -----
- }
- } else {
- fix_current_day();
- ! if (appt.flags & RUN)
- ! runl = appt.runlength;
- ! else
- ! runl = 1;
- ! while (ymd_compare(current, Last) <= 0 && runl) {
- ! if (runl) {
- ! busy_today[current.tm_yday]++;
- ! current.tm_mday += appt.repeat;
- ! fix_current_day();
- ! if (appt.flags & RUN)
- ! --runl;
- ! }
- }
- }
- } else {
- ***************
- *** 145,153
- }
- } else if ((appt.flags & REPEAT) && !(appt.flags & EVERY_SOMEDAY)) {
- /* find 1st appt in this year */
- ! while (ymd_compare(current, First) < 0) {
- ! current.tm_mday += appt.repeat;
- ! fix_current_day();
- }
- while (ymd_compare(current, Last) <= 0) {
- busy_today[current.tm_yday]++;
-
- --- 154,170 -----
- }
- } else if ((appt.flags & REPEAT) && !(appt.flags & EVERY_SOMEDAY)) {
- /* find 1st appt in this year */
- ! if (appt.flags & RUN)
- ! runl = appt.runlength;
- ! else
- ! runl = 1;
- ! while (ymd_compare(current, First) < 0 && runl) {
- ! if (appt.flags & RUN)
- ! --runl;
- ! if (runl) {
- ! current.tm_mday += appt.repeat;
- ! fix_current_day();
- ! }
- }
- while (ymd_compare(current, Last) <= 0 && runl) {
- if (runl) {
- ***************
- *** 149,158
- current.tm_mday += appt.repeat;
- fix_current_day();
- }
- ! while (ymd_compare(current, Last) <= 0) {
- ! busy_today[current.tm_yday]++;
- ! current.tm_mday += appt.repeat;
- ! fix_current_day();
- }
- }
-
-
- --- 166,179 -----
- fix_current_day();
- }
- }
- ! while (ymd_compare(current, Last) <= 0 && runl) {
- ! if (runl) {
- ! busy_today[current.tm_yday]++;
- ! current.tm_mday += appt.repeat;
- ! fix_current_day();
- ! if (appt.flags & RUN)
- ! --runl;
- ! }
- }
- }
-
- ***************
- *** 194,202
- PIX_SRC, bigfont, title);
-
- /* display day names */
- ! strcpy(buf, "Su Mo Tu We Th Fr Sa ");
- ! strcat(buf, "Su Mo Tu We Th Fr Sa ");
- ! strcat(buf, "Su Mo Tu We Th Fr Sa");
- pw_text(main_pixwin, startx+4, starty-2, PIX_SRC, font, buf);
-
- /* draw months */
-
- --- 215,229 -----
- PIX_SRC, bigfont, title);
-
- /* display day names */
- ! if (monday_first) {
- ! strcpy(buf, "Mo Tu We Th Fr Sa Su ");
- ! strcat(buf, "Mo Tu We Th Fr Sa Su ");
- ! strcat(buf, "Mo Tu We Th Fr Sa Su");
- ! } else {
- ! strcpy(buf, "Su Mo Tu We Th Fr Sa ");
- ! strcat(buf, "Su Mo Tu We Th Fr Sa ");
- ! strcat(buf, "Su Mo Tu We Th Fr Sa");
- ! }
- pw_text(main_pixwin, startx+4, starty-2, PIX_SRC, font, buf);
-
- /* draw months */
- ***************
- *** 203,209
- monthnr = 0;
- yrday = 0;
- extra_days = 0;
- ! startbox = First.tm_wday;
- for (row=0; row<4; row++) {
- for (col=0; col<3; col++) {
- x = startx + 8*ybox_width*col;
-
- --- 230,242 -----
- monthnr = 0;
- yrday = 0;
- extra_days = 0;
- ! if (monday_first) {
- ! if (First.tm_wday == SUN)
- ! startbox = 6;
- ! else
- ! startbox = First.tm_wday - 1;
- ! } else
- ! startbox = First.tm_wday;
- for (row=0; row<4; row++) {
- for (col=0; col<3; col++) {
- x = startx + 8*ybox_width*col;
-