head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.82 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.80 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.78 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.76 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.74 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.72 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.70 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.68 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.66 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.64 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.62 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.60 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.58 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.56 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.54 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.52 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.50 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.48 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.46 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.44 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.42 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.40 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.38 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.34 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.14 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.36 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.32 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.30 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.28 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.26 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.24 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.22 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.20 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.18 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.16 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.12 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.10 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.8 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.6 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.4 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.2 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.3.0.74 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.72 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.70 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.68 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.66 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.64 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.62 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.60 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.58 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.56 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.52 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.50 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.48 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.46 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.44 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.42 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.40 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.38 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.36 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.34 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.32 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.30 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.28 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.26 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.24 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.22 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.20 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.18 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.16 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.14 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.12 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.10 pkgsrc-2008Q1:1.3.0.8 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.6 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.4 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.2.0.30 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.28 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.26 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.24 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.22 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.20 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.18 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2016.03.30.09.46.37; author jperkin; state Exp; branches; next 1.3; commitid PvbnHA99kJr4lE0z; 1.3 date 2007.04.19.18.27.59; author drochner; state Exp; branches; next 1.2; 1.2 date 2003.01.07.05.48.10; author jmcneill; state Exp; branches; next 1.1; 1.1 date 2000.12.17.23.32.17; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.12.17.23.32.17; author wiz; state Exp; branches; next ; desc @@ 1.4 log @Use PKGMANDIR. Add patch comments. @ text @$NetBSD: patch-ab,v 1.3 2007/04/19 18:27:59 drochner Exp $ Various fixes. --- Dclock.c.orig 2007-04-19 18:51:51.000000000 +0200 +++ Dclock.c @@@@ -21,8 +21,6 @@@@ static void #define CLOCK_WIDTH 256 #define CLOCK_HEIGHT 80 #define DATE_FMT "%W, %M %d" -#define when break;case -#define otherwise break;default static Boolean SetValues(), show_time(); @@@@ -367,8 +365,8 @@@@ DclockWidget w; if (w->dclock.interval_id != (XtIntervalId)NULL) XtRemoveTimeOut(w->dclock.interval_id); - XtReleaseGC (w, w->dclock.foreGC); - XtReleaseGC (w, w->dclock.backGC); + XtReleaseGC ((Widget) w, w->dclock.foreGC); + XtReleaseGC ((Widget) w, w->dclock.backGC); for (n = 0; n < 10; n++) { XFreePixmap(XtDisplay(w), w->dclock.digits[n]); XFreePixmap(XtDisplay(w), w->dclock.tiny_digits[n]); @@@@ -388,7 +386,7 @@@@ DclockWidget w; Pixmap pix; GC gc = w->dclock.foreGC; - if (!XtIsRealized(w)) + if (!XtIsRealized((Widget) w)) return; winwidth = w->core.width; @@@@ -450,7 +448,7 @@@@ DclockWidget w; make_number(w, w->dclock.tiny_digits[i], gc, i, tiny_segment_pts); } else - w->dclock.tiny_digits[i] = NULL; + w->dclock.tiny_digits[i] = (Pixmap) NULL; } /* The colon[0] area is blank */ if (w->dclock.colon[0]) @@@@ -627,9 +625,9 @@@@ DclockWidget w; { Boolean save_scroll = w->dclock.scroll; Boolean save_fade = w->dclock.fade; - long t; + time_t t; - if (!XtIsRealized(w)) + if (!XtIsRealized((Widget) w)) return; if (w->dclock.interval_id != (XtIntervalId)NULL) { @@@@ -663,7 +661,7 @@@@ DclockWidget w; { char buf[11]; Boolean alarm_went_off = False; - long t = time(0); + time_t t = time(0); register struct tm *l_time = localtime(&t); int digit_w = w->dclock.digit_w; int digit_h = w->dclock.digit_h; @@@@ -802,7 +800,7 @@@@ register char *p; turn_off[i] = oldmask & ~newmask; } else - tmp_pix[i] = NULL; + tmp_pix[i] = (Pixmap) NULL; for (j = 1; j != FADE_ITER; ++j) { @@@@ -875,27 +873,36 @@@@ struct tm *now; if (*p != '%') *datep++ = *p; else switch (*++p) { - when 'M': + case 'M': datep += strlen(strcpy(datep, Months[now->tm_mon])); - when 'm': + break; + case 'm': datep += strlen(strcpy(datep, months[now->tm_mon])); - when 'W': + break; + case 'W': datep += strlen(strcpy(datep, Days[now->tm_wday])); - when 'w': + break; + case 'w': datep += strlen(strcpy(datep, days[now->tm_wday])); - when 'd': + break; + case 'd': if (now->tm_mday >= 10) *datep++ = (now->tm_mday / 10 + '0'); *datep++ = now->tm_mday % 10 + '0'; - when 'Y': - *datep++ = '1', *datep++ = '9'; - /* fall thru */ + break; + case 'Y': + *datep++ = (now->tm_year + 1900) / 1000 + '0'; + *datep++ = (now->tm_year + 1900) % 1000 / 100 + '0'; + /* FALLTHROUGH */ case 'y': - *datep++ = now->tm_year / 10 + '0'; - *datep++ = now->tm_year % 10 + '0'; - when '%': + *datep++ = now->tm_year % 100 / 10 + '0'; + *datep++ = now->tm_year % 10 + '0'; + break; + case '%': *datep++ = *p; - otherwise: ; /* nothing */ + break; + default: + break; /* nothing */ } } *datep = 0; @@@@ -906,7 +913,7 @@@@ struct tm *now; /* remove what was there in case the whole thing isn't overwritten */ XFillRectangle(XtDisplay(w), XtWindow(w), w->dclock.backGC, - 0, winheight - (w->dclock.font->ascent + w->dclock.font->descent), + 0, winheight - (w->dclock.font->ascent + BORDER), winwidth, w->dclock.font->ascent + w->dclock.font->descent); XDrawString(XtDisplay(w), XtWindow(w), w->dclock.foreGC, @@@@ -924,7 +931,8 @@@@ XtIntervalId *id; { Boolean alarm_went_off = show_time(w); w->dclock.interval_id = - XtAddTimeOut((unsigned long)((alarm_went_off || w->dclock.seconds)? 1000 : 60000), + XtAddTimeOut((unsigned long)((alarm_went_off || w->dclock.seconds) ? + 1000 : 60000 - ((time(0L) % 60) * 1000)), timeout, (XtPointer)w); } @@@@ -960,8 +968,8 @@@@ DclockWidget current, request, new; || new->dclock.tails != current->dclock.tails || new->dclock.fade != current->dclock.fade || new->dclock.miltime != current->dclock.miltime) { - XtReleaseGC (current, current->dclock.foreGC); - XtReleaseGC (current, current->dclock.backGC); + XtReleaseGC ((Widget) current, current->dclock.foreGC); + XtReleaseGC ((Widget) current, current->dclock.backGC); GetGC(new); Resize(new); /* pixmaps need to be redrawn */ do_redraw = True; @@@@ -1024,7 +1032,7 @@@@ DclockWidget w; Arg arg; XtSetArg(arg, XtNreverseVideo, !w->dclock.reverse); - XtSetValues(w, &arg, 1); + XtSetValues((Widget) w, &arg, 1); } static void @@@@ -1038,7 +1046,7 @@@@ DclockWidget w; return; } XtSetArg(arg, XtNmilitaryTime, !w->dclock.miltime); - XtSetValues(w, &arg, 1); + XtSetValues((Widget) w, &arg, 1); } static void @@@@ -1052,7 +1060,7 @@@@ DclockWidget w; return; } XtSetArg(arg, XtNseconds, !w->dclock.seconds); - XtSetValues(w, &arg, 1); + XtSetValues((Widget) w, &arg, 1); } static void @@@@ -1062,7 +1070,7 @@@@ DclockWidget w; Arg arg; XtSetArg(arg, XtNfade, !w->dclock.fade); - XtSetValues(w, &arg, 1); + XtSetValues((Widget) w, &arg, 1); if (w->dclock.fade && w->dclock.scroll) toggle_scroll(w); } @@@@ -1074,7 +1082,7 @@@@ DclockWidget w; Arg arg; XtSetArg(arg, XtNtails, !w->dclock.tails); - XtSetValues(w, &arg, 1); + XtSetValues((Widget) w, &arg, 1); } static void @@@@ -1084,7 +1092,7 @@@@ DclockWidget w; Arg arg; XtSetArg(arg, XtNalarm, !w->dclock.alarm); - XtSetValues(w, &arg, 1); + XtSetValues((Widget) w, &arg, 1); } static void @@@@ -1124,20 +1132,24 @@@@ XButtonEvent *event; int digit = w->dclock.alarm_time[i>1?i+1:i] - '0'; int mod; switch (i) { - when 0: + case 0: if (Alarm.hrs > 13 && digit == 1) digit++; mod = 3; before.tm_hour = -1; - when 1 : + break; + case 1 : mod = (Alarm.hrs < 20)? 10 : 4; before.tm_hour = -1; - when 2: + break; + case 2: mod = 6; before.tm_min = -1; - when 3 : + break; + case 3 : mod = 10; before.tm_min = -1; + break; } if (event->button == 1) digit = (digit + 1) % mod; @ 1.3 log @fix a patch which causes an "invalid lvalue" with new gcc @ text @d1 3 a3 1 $NetBSD$ @ 1.2 log @Use time_t instead of long for return value of time(). Closes pkg/19720 @ text @d3 3 a5 3 --- Dclock.c.orig Tue Jan 7 01:43:15 2003 +++ Dclock.c Tue Jan 7 01:43:49 2003 @@@@ -21,8 +21,6 @@@@ d14 1 a14 1 @@@@ -367,8 +365,8 @@@@ d25 1 a25 1 @@@@ -388,7 +386,7 @@@@ d34 1 a34 1 @@@@ -450,7 +448,7 @@@@ d39 1 a39 1 + (Widget) w->dclock.tiny_digits[i] = (Pixmap) NULL; d43 1 a43 1 @@@@ -627,9 +625,9 @@@@ d55 1 a55 1 @@@@ -663,7 +661,7 @@@@ d64 1 a64 1 @@@@ -802,7 +800,7 @@@@ d73 1 a73 1 @@@@ -875,27 +873,36 @@@@ d122 1 a122 1 @@@@ -906,7 +913,7 @@@@ d131 1 a131 1 @@@@ -924,7 +931,8 @@@@ d141 1 a141 1 @@@@ -960,8 +968,8 @@@@ d152 1 a152 1 @@@@ -1024,7 +1032,7 @@@@ d161 1 a161 1 @@@@ -1038,7 +1046,7 @@@@ d170 1 a170 1 @@@@ -1052,7 +1060,7 @@@@ d179 1 a179 1 @@@@ -1062,7 +1070,7 @@@@ d188 1 a188 1 @@@@ -1074,7 +1082,7 @@@@ d197 1 a197 1 @@@@ -1084,7 +1092,7 @@@@ d206 1 a206 1 @@@@ -1124,20 +1132,24 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2000/01/01 04:46:11 agc Exp $ d3 2 a4 6 Patch from Robert Elz to make the clock behave as a clock, rather than a sundial. itojun's y2k patch --- Dclock.c 2000/01/01 04:40:38 1.1 +++ Dclock.c 2000/01/01 04:40:53 d43 3 a45 1 @@@@ -629,7 +627,7 @@@@ d47 2 a48 1 long t; d55 9 @ 1.1.1.1 log @New category: time. Move many packages here: misc/cal, misc/cardboard-schedule, misc/ical, misc/plan, misc/py-mxDateTime, misc/remind, sysutils/logtime, and 19 more from x11. @ text @@