head 1.4; access; symbols pkgsrc-2026Q2:1.4.0.112 pkgsrc-2026Q2-base:1.4 pkgsrc-2026Q1:1.4.0.110 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.108 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.106 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.104 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.102 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.100 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.98 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.96 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.94 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.92 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.90 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.88 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.86 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.84 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.82 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.80 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.78 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.76 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.74 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.72 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.70 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.68 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.66 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.62 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.42 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.64 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.60 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.58 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.56 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.54 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.52 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.50 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.48 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.46 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.44 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.40 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.38 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.36 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.34 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.32 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.30 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.28 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.26 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.24 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.22 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.20 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.18 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.16 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.14 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.12 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.10 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.6 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.4 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.2 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.3.0.44 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.42 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.40 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.38 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.36 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.34 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.32 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.30 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.28 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.26 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.24 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.22 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.20 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.18 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.16 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.14 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.8 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.1.1.0.34 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.32 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.30 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.28 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.26 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.24 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.22 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 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 2012.07.03.17.29.20; author joerg; state Exp; branches; next 1.3; 1.3 date 2007.08.08.21.44.14; author joerg; state Exp; branches; next 1.2; 1.2 date 2007.02.23.20.17.47; author drochner; state Exp; branches; next 1.1; 1.1 date 2000.12.17.23.32.16; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.12.17.23.32.16; author wiz; state Exp; branches; next ; desc @@ 1.4 log @Fix various callback type mismatches. @ text @$NetBSD: patch-ab,v 1.3 2007/08/08 21:44:14 joerg Exp $ --- xclock.c.orig 1995-05-22 13:47:42.000000000 +0000 +++ xclock.c @@@@ -17,9 +17,7 @@@@ * 1990 */ #include -#ifndef VMS -#include -#endif +#include #include #include #include @@@@ -264,10 +262,29 @@@@ static Boolean showSecondHand = False; static Boolean iconified = False; /* Clock iconified? */ - - - - +static void ParseGeometry(Widget, int, int, int); +static int Round(double); +static void DigitalString(char *); +static void Syntax(char *); +static void InitializeCat(Pixel, Pixel, Pixel); +static GC CreateTailGC(void); +static GC CreateEyeGC(void); +static Pixmap CreateTailPixmap(double); +static Pixmap CreateEyePixmap(double); +static void EraseHands(Widget, struct tm *); +static void HandleExpose(Widget, XtPointer, XmDrawingAreaCallbackStruct *); +static void HandleInput(Widget, XtPointer, XmDrawingAreaCallbackStruct *); +static void HandleResize(Widget, XtPointer, XmDrawingAreaCallbackStruct *); +static void Tick(Widget, int); +static void AlarmSetCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *); +static void AlarmBellCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *); +static void ChimeCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *); +static void AckAlarmCallback(Widget, XtPointer, XmPushButtonCallbackStruct *); +static void RereadAlarmCallback(Widget, Widget, XmPushButtonCallbackStruct *); +static void EditAlarmCallback(Widget, Widget, XmPushButtonCallbackStruct *); +static void ExitCallback(Widget, XtPointer, XmPushButtonCallbackStruct *); +static void MapCallback(Widget, XtPointer, XEvent *); +static void SetSeg(int, int, int, int); main(argc, argv) int argc; @@@@ -281,7 +298,6 @@@@ main(argc, argv) XGCValues gcv; u_long valueMask; XmFontList fontList = (XmFontList)NULL; - extern void ParseGeometry(); static XtResource resources[] = { @@@@ -351,7 +367,7 @@@@ main(argc, argv) { "mode", "Mode", XtRString, sizeof(char *), XtOffset(ApplicationDataPtr, modeString), - XtRImmediate, (XtPointer)"analog"}, + XtRImmediate, (XtPointer)"cat"}, { "help", "Help", XtRBoolean, sizeof(Boolean), XtOffset(ApplicationDataPtr, help), @@@@ -391,7 +407,6 @@@@ main(argc, argv) { "-help", "*help", XrmoptionNoArg, (XtPointer)"on" }, }; - extern XtEventHandler MapCallback(); /* @@@@ -403,7 +418,7 @@@@ main(argc, argv) /* * Open up the system */ - topLevel = XtAppInitialize(&appContext, "XClock", + topLevel = XtAppInitialize(&appContext, "Catclock", (XrmOptionDescList)(&options[0]), XtNumber(options), (unsigned int *)&argc, argv, NULL, @@@@ -418,7 +433,6 @@@@ main(argc, argv) * Print help message and exit if asked */ if (appData.help) { - extern void Syntax(); Syntax(argv[0]); } @@@@ -568,7 +582,6 @@@@ main(argc, argv) time_t timeValue; int stringDir; XCharStruct xCharStr; - extern void DigitalString(); /* * Padding is around time text @@@@ -794,7 +807,6 @@@@ main(argc, argv) * Create cat pixmaps, etc. if in CAT_CLOCK mode */ if (clockMode == CAT_CLOCK) { - extern void InitializeCat(); InitializeCat(appData.catColor, appData.detailColor, @@@@ -806,9 +818,6 @@@@ main(argc, argv) * Finally, install necessary callbacks */ { - extern XtCallbackProc HandleExpose(), - HandleResize(), - HandleInput(); XtAddCallback(canvas, XmNexposeCallback, HandleExpose, NULL); XtAddCallback(canvas, XmNresizeCallback, HandleResize, NULL); @@@@ -1191,7 +1200,6 @@@@ static void DrawLine(blankLength, length double fractionOfACircle; { double angle, cosAngle, sinAngle; - extern void SetSeg(); /* * A full circle is 2 M_PI radians. @@@@ -1288,7 +1296,6 @@@@ static void DrawSecond(length, width, of double ms, mc, ws, wc; int mid; int x, y; - extern void SetSeg(); /* * A full circle is 2 PI radians. @@@@ -1477,8 +1484,6 @@@@ static void InitializeCat(catColor, deta XGCValues gcv; unsigned long valueMask; GC gc1, gc2; - extern GC CreateTailGC(); - extern GC CreateEyeGC(); catPix = XCreatePixmap(dpy, root, winWidth, winHeight, @@@@ -1562,8 +1567,6 @@@@ static void InitializeCat(catColor, deta eyePixmap = (Pixmap *)malloc((appData.nTails + 1) * sizeof(Pixmap)); for (i = 0; i <= appData.nTails; i++) { - static Pixmap CreateTailPixmap(); - static Pixmap CreateEyePixmap(); tailPixmap[i] = CreateTailPixmap(i * M_PI/(appData.nTails)); eyePixmap[i] = CreateEyePixmap(i * M_PI/(appData.nTails)); @@@@ -1929,12 +1932,11 @@@@ static Widget CreatePushButton(label, p -static XtCallbackProc HandleExpose(w, clientData, callData) +static void HandleExpose(w, clientData, callData) Widget w; XtPointer clientData; XmDrawingAreaCallbackStruct *callData; { - extern XtTimerCallbackProc Tick(); /* * Ignore if more expose events for this window in the queue @@@@ -1979,7 +1981,7 @@@@ static XtCallbackProc HandleExpose(w, cl -static XtTimerCallbackProc Tick(w, add) +static void Tick(w, add) Widget w; int add; { @@@@ -2168,7 +2170,7 @@@@ static XtTimerCallbackProc Tick(w, add) -static XtCallbackProc HandleInput(w, clientData, callData) +static void HandleInput(w, clientData, callData) Widget w; XtPointer clientData; XmDrawingAreaCallbackStruct *callData; @@@@ -2180,13 +2182,6 @@@@ static XtCallbackProc HandleInput(w, cli ackW, rereadW, editW, exitW; static Widget sepW1, sepW2; - extern XtCallbackProc AlarmSetCallback(), - AlarmBellCallback(), - ChimeCallback(), - AckAlarmCallback(), - RereadAlarmCallback(), - EditAlarmCallback(), - ExitCallback(); if (callData->event->type != ButtonPress) { return; @@@@ -2262,7 +2257,7 @@@@ static XtCallbackProc HandleInput(w, cli -static XtCallbackProc AlarmSetCallback(w, clientData, callData) +static void AlarmSetCallback(w, clientData, callData) Widget w; XtPointer clientData; XmToggleButtonCallbackStruct *callData; @@@@ -2280,7 +2275,7 @@@@ static XtCallbackProc AlarmSetCallback(w -static XtCallbackProc AlarmBellCallback(w, clientData, callData) +static void AlarmBellCallback(w, clientData, callData) Widget w; XtPointer clientData; XmToggleButtonCallbackStruct *callData; @@@@ -2291,7 +2286,7 @@@@ static XtCallbackProc AlarmBellCallback( -static XtCallbackProc ChimeCallback(w, clientData, callData) +static void ChimeCallback(w, clientData, callData) Widget w; XtPointer clientData; XmToggleButtonCallbackStruct *callData; @@@@ -2301,7 +2296,7 @@@@ static XtCallbackProc ChimeCallback(w, c -static XtCallbackProc AckAlarmCallback(w, clientData, callData) +static void AckAlarmCallback(w, clientData, callData) Widget w; XtPointer clientData; XmPushButtonCallbackStruct *callData; @@@@ -2315,7 +2310,7 @@@@ static XtCallbackProc AckAlarmCallback(w -static XtCallbackProc RereadAlarmCallback(w, setW, callData) +static void RereadAlarmCallback(w, setW, callData) Widget w; Widget setW; XmPushButtonCallbackStruct *callData; @@@@ -2340,7 +2335,7 @@@@ static XtCallbackProc RereadAlarmCallbac -static XtCallbackProc EditAlarmCallback(w, setW, callData) +static void EditAlarmCallback(w, setW, callData) Widget w; Widget setW; XmPushButtonCallbackStruct *callData; @@@@ -2383,7 +2378,7 @@@@ static XtCallbackProc EditAlarmCallback( -static XtCallbackProc ExitCallback(w, clientData, callData) +static void ExitCallback(w, clientData, callData) Widget w; XtPointer clientData; XmPushButtonCallbackStruct *callData; @@@@ -2394,7 +2389,7 @@@@ static XtCallbackProc ExitCallback(w, cl -static XtCallbackProc HandleResize(w, clientData, callData) +static void HandleResize(w, clientData, callData) Widget w; XtPointer clientData; XmDrawingAreaCallbackStruct *callData; @@@@ -2527,7 +2522,7 @@@@ static void EraseHands(w, tm) } -static XtEventHandler PropertyChangeCallback(w, clientData, +static void PropertyChangeCallback(w, clientData, event, continueToDispatch) Widget w; XtPointer clientData; @@@@ -2583,7 +2578,7 @@@@ static XtEventHandler PropertyChangeCall } -static XtEventHandler MapCallback(w, clientData, event) +static void MapCallback(w, clientData, event) Widget w; XtPointer clientData; XEvent *event; @ 1.3 log @Don't use malloc.h. @ text @d1 1 a1 1 $NetBSD$ d34 12 a45 12 +static XtCallbackProc HandleExpose(Widget, XtPointer, XmDrawingAreaCallbackStruct *); +static XtCallbackProc HandleInput(Widget, XtPointer, XmDrawingAreaCallbackStruct *); +static XtCallbackProc HandleResize(Widget, XtPointer, XmDrawingAreaCallbackStruct *); +static XtTimerCallbackProc Tick(Widget, int); +static XtCallbackProc AlarmSetCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *); +static XtCallbackProc AlarmBellCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *); +static XtCallbackProc ChimeCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *); +static XtCallbackProc AckAlarmCallback(Widget, XtPointer, XmPushButtonCallbackStruct *); +static XtCallbackProc RereadAlarmCallback(Widget, Widget, XmPushButtonCallbackStruct *); +static XtCallbackProc EditAlarmCallback(Widget, Widget, XmPushButtonCallbackStruct *); +static XtCallbackProc ExitCallback(Widget, XtPointer, XmPushButtonCallbackStruct *); +static XtEventHandler MapCallback(Widget, XtPointer, XEvent *); d152 7 a158 1 @@@@ -1934,7 +1937,6 @@@@ static XtCallbackProc HandleExpose(w, cl d166 18 d198 90 @ 1.2 log @make some function declarations/prototypes consistent so that it compiles with newer gcc @ text @d3 1 a3 1 --- xclock.c.orig 1995-05-22 13:47:42.000000000 +0200 d5 12 a16 1 @@@@ -264,10 +264,29 @@@@ static Boolean showSecondHand = False; d50 1 a50 1 @@@@ -281,7 +300,6 @@@@ main(argc, argv) d58 1 a58 1 @@@@ -351,7 +369,7 @@@@ main(argc, argv) d67 1 a67 1 @@@@ -391,7 +409,6 @@@@ main(argc, argv) d75 1 a75 1 @@@@ -403,7 +420,7 @@@@ main(argc, argv) d84 1 a84 1 @@@@ -418,7 +435,6 @@@@ main(argc, argv) d92 1 a92 1 @@@@ -568,7 +584,6 @@@@ main(argc, argv) d100 1 a100 1 @@@@ -794,7 +809,6 @@@@ main(argc, argv) d108 1 a108 1 @@@@ -806,9 +820,6 @@@@ main(argc, argv) d118 1 a118 1 @@@@ -1191,7 +1202,6 @@@@ static void DrawLine(blankLength, length d126 1 a126 1 @@@@ -1288,7 +1298,6 @@@@ static void DrawSecond(length, width, of d134 1 a134 1 @@@@ -1477,8 +1486,6 @@@@ static void InitializeCat(catColor, deta d143 1 a143 1 @@@@ -1562,8 +1569,6 @@@@ static void InitializeCat(catColor, deta d152 1 a152 1 @@@@ -1934,7 +1939,6 @@@@ static XtCallbackProc HandleExpose(w, cl d160 1 a160 1 @@@@ -2180,13 +2184,6 @@@@ static XtCallbackProc HandleInput(w, cli @ 1.1 log @Initial revision @ text @d1 47 a47 4 $NetBSD: patch-ab,v 1.1.1.1 1999/09/08 20:02:02 drochner Exp $ --- xclock.c.orig Sat Sep 4 19:09:20 1999 +++ xclock.c Sat Sep 4 19:09:40 1999 @@@@ -351,7 +351,7 @@@@ d56 9 a64 1 @@@@ -403,7 +403,7 @@@@ d73 90 @ 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 @@