[Pkg-wmaker-commits] [wmmoonclock] 19/23: Import Upstream version 1.28
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 14 22:54:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmmoonclock.
commit 3e86f9d6adf295451a3e3328b8db11de80818456
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Mon Aug 14 18:52:26 2017 -0400
Import Upstream version 1.28
---
BUGS | 2 +-
changelog | 104 +++++++++++++++++++++++++++++++++
{Src => src}/CalcEphem.c | 18 ++----
{Src => src}/CalcEphem.h | 3 +
{Src => src}/Makefile | 13 +++--
{Src => src}/Moon.c | 19 +++---
src/Moon.h | 6 ++
{Src => src}/MoonRise.c | 21 +++++--
src/MoonRise.h | 8 +++
{Src => src}/wmMoonClock.1 | 18 +++---
{Src => src}/wmMoonClock.c | 30 ++++++----
{Src => src}/wmMoonClock_mask.xbm | 0
{Src => src}/wmMoonClock_master.xpm | 0
{Src => src}/wmMoonClock_masterLow.xpm | 0
{Src => src}/xutils.c | 0
{Src => src}/xutils.h | 0
16 files changed, 189 insertions(+), 53 deletions(-)
diff --git a/BUGS b/BUGS
index 32f5c37..dd6ac25 100644
--- a/BUGS
+++ b/BUGS
@@ -1 +1 @@
-Please send bug reports to mghenderson at lanl.gov
+Please send bug reports to wmaker-dev at lists.windowmaker.info
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..12ca7a2
--- /dev/null
+++ b/changelog
@@ -0,0 +1,104 @@
+/*
+ *
+ * wmMoonClock-1.26 (C) 1998, 1999 Mike Henderson (mghenderson at lanl.gov)
+ *
+ * - Shows Moon Phase....
+ *
+ *
+ *
+ *
+ *
+ * This program is free 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 2, 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 (see the file COPYING); if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA
+ *
+ * Things TODO:
+ * - clean up code!
+ * - more detailed documentation.
+ * - reduce size of pixmap! Dont need it in one pixmap.
+ * Aslo, does the hi-color pixmap really need all those colors?
+ * - add rotation of moon so user sees it as they would in reality?
+ * - eclipses. The calcs are quite acurate so this should be easily doable.
+ * (Note the Sun position calcs in CalcEphem are low precision -- high is not
+ * as costly as the Moon calcs.) Sun posiiton is calculated but not used yet...
+ * - Next new moons, next full moons, next quarters, etc...
+ * - Moon names. I.e. Harvest, Blue, etc...
+ *
+ * Changes:
+ * Version 1.28 - released September 20, 2011.
+ * Debian patches added to the upstream version. These patches are included:
+ * 01_all_previous_diff.diff, 02_update_time.diff, 03_add_southern_hemisphere_support.diff
+ * 03_add_southern_hemisphere_support.diff and 04_fix_hyphen_used_as_minus_sign.diff
+ * BUGS file updated to report to wmaker-dev at lists.windowmaker.info
+ * Source is now at http://repo.or.cz/w/dockapps.git
+ * Updated by Rodolfo García Peñas (kix) <kix at kix.es>
+ *
+ * Version 1.27 - released June 7, 1999.
+ * fixed a minor bug in computation of azimuth (A in Horizon Coords). Thanks to
+ * Dan Moraru for spotting this one. (There were two SinGlat factors instead of one).
+ *
+ * Version 1.26 - released April 22, 1999 (?).
+ * Version 1.25 - released March 22, 1999.
+ * Now auto-detects 8-bit display and forces the LowColor pixmap to
+ * be used. The -low option still works if you need to conserve colors
+ * even on high-color displays.
+ *
+ * Added 3 command line options + code to change colors of the data
+ * entries:
+ *
+ * -bc <Color> to change background color.
+ * -lc <Color> to change color of labels and headers.
+ * -dc <Color> to change color of data values.
+ *
+ * Version 1.24 - released February 9, 1999.
+ * Added low color support via the -low command line option.
+ *
+ * Version 1.23 - released February 4, 1999.
+ * cosmetic for AfterStep users. removed spurious black line at RHS edge an mask.
+ *
+ * Version 1.22 - released January 8, 1999.
+ *
+ * + Changed PI2 to TwoPi in Moon.c -- Linux Pyth. had probs because
+ * PI2 was defined in <math.h>.
+ *
+ * Version 1.21 - released January 7, 1999.
+ *
+ * + minor bug fixes in Makefile and manpage.
+ *
+ * Version 1.2 - released January 3, 1999.
+ * Added:
+ *
+ * + Local Time/ Universal Time display.
+ * + Visible: Yes/No to indicate if Moon is up or not.
+ * + Frac (percent through orbit -- this is NOT a simple
+ * conversion of AGE....).
+ * + Horizon Coords. Altitude is measured up from horizon to
+ * Moon in degrees. Azimuth is in degrees from due south.
+ *
+ * Also shuffled things around a bit...
+ *
+ *
+ *
+ * Version 1.1 - released December 24, 1998.
+ * Fixed bug in AGE calculation. It now should be highly accurate.
+ * Note that AGE is not the same as Phase*29.530589 ...
+ * I have checked with the Astronomical Almanac and it agrees very
+ * well....
+ *
+ *
+ * Version 1.0 - released December 16, 1998.
+ *
+ *
+ *
+ */
diff --git a/Src/CalcEphem.c b/src/CalcEphem.c
similarity index 95%
rename from Src/CalcEphem.c
rename to src/CalcEphem.c
index 5d57286..97d9ca9 100644
--- a/Src/CalcEphem.c
+++ b/src/CalcEphem.c
@@ -1,13 +1,12 @@
+#include <string.h>
#include "CalcEphem.h"
-CalcEphem(date, UT, c)
+void CalcEphem(date, UT, c)
long int date; /* integer containing the date (e.g. 960829) */
double UT; /* Universal Time */
CTrans *c; /* structure containing all the relevent coord trans info */
{
-double vv;
-int dd, mm, ss;
int year, month, day;
double TU, TU2, TU3, T0, gmst;
@@ -16,12 +15,7 @@ int dd, mm, ss;
double days, M, E, nu, lambnew;
double r0, earth_sun_distance;
double RA, DEC, RA_Moon, DEC_Moon;
- double dt, g0_1, g1_1, h1_1, gclat, glon, psi;
- double TDT, Lmoon_0, P0, N0, Imoon, Lmoon, Mmoon_m, Nmoon, Cmoon;
- double Emoon_nu, Amoon_e, Amoon_3, Mmoon_mp, Emoon_c, amoon, emoon, AGE;
- double Amoon_4, Lmoon_p, Vmoon, Lmoon_pp, Nmoon_p, LambdaMoon, BetaMoon, R;
- Vector S, K, Y, Z, D, Dgei, Dgsm;
- int i, j;
+ double TDT, AGE, LambdaMoon, BetaMoon, R;
double jd(), hour24(), angle2pi(), angle360(), kepler(), Moon(), NewMoon();
double Ta, Tb, Tc, frac();
double SinGlat, CosGlat, SinGlon, CosGlon, Tau, lmst, x, y, z;
@@ -237,7 +231,7 @@ int year, month, day;
char dowstr[];
{
double JD, A, Afrac, jd();
- int n, iday, iA;
+ int n, iA;
JD = jd(year, month, day, 0.0);
A = (JD + 1.5)/7.0;
@@ -282,7 +276,7 @@ double jd(ny, nm, nd, UT)
int ny, nm, nd;
double UT;
{
- double A, B, C, D, JD, MJD, day;
+ double A, B, C, D, JD, day;
day = nd + UT/24.0;
@@ -372,7 +366,7 @@ double angle;
}
-Radec_to_Cart(ra, dec, r)
+void Radec_to_Cart(ra, dec, r)
double ra, dec; /* RA and DEC */
Vector *r; /* returns corresponding cartesian unit vector */
{
diff --git a/Src/CalcEphem.h b/src/CalcEphem.h
similarity index 95%
rename from Src/CalcEphem.h
rename to src/CalcEphem.h
index 4e907bb..7ed5bde 100644
--- a/Src/CalcEphem.h
+++ b/src/CalcEphem.h
@@ -54,4 +54,7 @@ typedef struct CTrans {
int Visible; /* Wether or not moon is above horizon */
} CTrans;
+void CalcEphem(long int, double, CTrans*);
+int DayofWeek(int, int, int, char*);
+int DayofYear(int, int, int);
diff --git a/Src/Makefile b/src/Makefile
old mode 100644
new mode 100755
similarity index 58%
rename from Src/Makefile
rename to src/Makefile
index f8a8241..b31bdfc
--- a/Src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,14 @@
CC = gcc
-CFLAGS = -O2
+# CFLAGS = -O2
INCDIR = -I/usr/X11R6/include/X11
DESTDIR= /usr/X11R6
LIBDIR = -L/usr/X11R6/lib
# for Linux
-LIBS = -lXpm -lX11 -lXext
+LIBS = -lXpm -lX11 -lXext -lm
# for Solaris
-# LIBS = -lXpm -lX11 -lXext -lsocket
+# LIBS = -lXpm -lX11 -lXext -lm -lsocket
OBJS = wmMoonClock.o CalcEphem.o Moon.o MoonRise.o \
xutils.o
@@ -22,7 +22,7 @@ all: wmMoonClock.o wmMoonClock
wmMoonClock.o: wmMoonClock_master.xpm wmMoonClock_mask.xbm CalcEphem.h
wmMoonClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -lm -o wmMoonClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
+ $(CC) $(CFLAGS) $(SYSTEM) -o wmMoonClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
clean:
for i in $(OBJS) ; do \
@@ -31,6 +31,7 @@ clean:
rm -f wmMoonClock
install:: wmMoonClock
- install -s -m 0755 wmMoonClock $(DESTDIR)/bin
- install -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1
+ install -d -m 0755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1
+ install -m 0755 wmMoonClock $(DESTDIR)/usr/bin
+ install -m 0644 wmMoonClock.1 $(DESTDIR)/usr/share/man/man1
diff --git a/Src/Moon.c b/src/Moon.c
similarity index 95%
rename from Src/Moon.c
rename to src/Moon.c
index 64552a9..f7e001d 100644
--- a/Src/Moon.c
+++ b/src/Moon.c
@@ -8,6 +8,10 @@
double angle360();
+void addthe(double, double, double, double, double*, double*);
+void addsol(double, double, double, double, int, int, int, int);
+void addn(double, int, int, int, int);
+void term(int, int, int, int, double*, double*);
double TwoPi = 6.283185308;
double ARC = 206264.81;
@@ -25,8 +29,8 @@ double T2;
double S1, S2, S3, S4, S5, S6, S7;
double DL0, DL, DD, DGAM, DLS, DF;
double L0, L, LS, F, D;
-double ARG, FAC;
-int MAX, i, j;
+double ARG = 0.0, FAC = 0.0;
+int MAX = 0, i, j;
double S;
@@ -274,7 +278,7 @@ double frac(double x){
-addsol(double COEFFL, double COEFFS, double COEFFG, double COEFFP, int P, int Q, int R, int S){
+void addsol(double COEFFL, double COEFFS, double COEFFG, double COEFFP, int P, int Q, int R, int S){
double X, Y;
@@ -289,7 +293,7 @@ addsol(double COEFFL, double COEFFS, double COEFFG, double COEFFP, int P, int Q,
-term(int P, int Q, int R, int S, double *X, double *Y){
+void term(int P, int Q, int R, int S, double *X, double *Y){
double XX, YY;
int k, I[5];
@@ -307,7 +311,7 @@ term(int P, int Q, int R, int S, double *X, double *Y){
-addthe(double C1, double S1, double C2, double S2, double *C, double *S){
+void addthe(double C1, double S1, double C2, double S2, double *C, double *S){
*C = C1*C2 - S1*S2;
*S = S1*C2 + C1*S2;
@@ -316,7 +320,7 @@ addthe(double C1, double S1, double C2, double S2, double *C, double *S){
}
-addn(double COEFFN, int P, int Q, int R, int S){
+void addn(double COEFFN, int P, int Q, int R, int S){
double X, Y;
@@ -381,7 +385,7 @@ double NewMoon(double ax, double bx, double cx){
* DEC: declination (in deg; equinox of date)
*
*/
-MiniMoon(double T, double *RA, double *DEC){
+void MiniMoon(double T, double *RA, double *DEC){
double L0,L,LS,F,D,H,S,N,DL,CB,L_MOON,B_MOON,V,W,X,Y,Z,RHO;
double frac(), cosEPS, sinEPS, P2, ARC;
@@ -424,7 +428,6 @@ MiniMoon(double T, double *RA, double *DEC){
*RA = ( 48.0/P2)*atan2(Y, X+RHO);
if (*RA<0.0) *RA += 24.0;
- return(0);
}
diff --git a/src/Moon.h b/src/Moon.h
new file mode 100644
index 0000000..e8616dc
--- /dev/null
+++ b/src/Moon.h
@@ -0,0 +1,6 @@
+#ifndef MOON_H
+#define MOON_H
+
+void MiniMoon(double, double*, double*);
+
+#endif
diff --git a/Src/MoonRise.c b/src/MoonRise.c
similarity index 84%
rename from Src/MoonRise.c
rename to src/MoonRise.c
index d079f8d..2ecc105 100644
--- a/Src/MoonRise.c
+++ b/src/MoonRise.c
@@ -1,5 +1,7 @@
#include <stdio.h>
#include <math.h>
+#include "MoonRise.h"
+#include "Moon.h"
#define DegPerRad 57.29577951308232087680
#define RadPerDeg 0.01745329251994329576
@@ -7,7 +9,7 @@
extern double Glon, SinGlat, CosGlat, TimeZone;
-MoonRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
+void MoonRise(int year, int month, int day, double LocalHour, double *UTRise, double *UTSet){
double UT, ym, y0, yp, SinH0;
double xe, ye, z1, z2, SinH(), hour24();
@@ -76,7 +78,7 @@ MoonRise(int year, int month, int day, double LocalHour, double *UTRise, double
}
-UTTohhmm(double UT, int *h, int *m){
+void UTTohhmm(double UT, int *h, int *m){
if (UT < 0.0) {
@@ -85,6 +87,14 @@ UTTohhmm(double UT, int *h, int *m){
} else {
*h = (int)UT;
*m = (int)((UT-(double)(*h))*60.0+0.5);
+ if (*m == 60) {
+ /*
+ * If it was 23:60 this should become 24:00
+ * I prefer this designation to 00:00. So dont reset h to 0 when it goes above 24.
+ */
+ *h += 1;
+ *m = 0;
+ }
}
}
@@ -94,7 +104,7 @@ UTTohhmm(double UT, int *h, int *m){
-Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
+void Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, double *z2, int *nz){
double a, b, c, d, dx;
@@ -115,7 +125,6 @@ Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, doub
if (*z1 < -1.0) *z1 = *z2;
}
- return(0);
}
@@ -125,8 +134,8 @@ Interp(double ym, double y0, double yp, double *xe, double *ye, double *z1, doub
double SinH(int year, int month, int day, double UT){
- double TU, TU2, TU3, LambdaMoon, BetaMoon, R, AGE, frac(), jd();
- double RA_Moon, DEC_Moon, T0, gmst, lmst, Tau, epsilon, Moon();
+ double TU, frac(), jd();
+ double RA_Moon, DEC_Moon, gmst, lmst, Tau, Moon();
double angle2pi();
TU = (jd(year, month, day, UT) - 2451545.0)/36525.0;
diff --git a/src/MoonRise.h b/src/MoonRise.h
new file mode 100644
index 0000000..d263d2e
--- /dev/null
+++ b/src/MoonRise.h
@@ -0,0 +1,8 @@
+#ifndef MOONRISE_H
+#define MOONRISE_H
+
+void MoonRise(int, int, int, double, double*, double*);
+void UTTohhmm(double, int*, int*);
+void Interp(double, double, double, double*, double*, double*, double*, int*);
+
+#endif
diff --git a/Src/wmMoonClock.1 b/src/wmMoonClock.1
similarity index 82%
rename from Src/wmMoonClock.1
rename to src/wmMoonClock.1
index 63a5ec3..cd6bdf8 100644
--- a/Src/wmMoonClock.1
+++ b/src/wmMoonClock.1
@@ -3,11 +3,11 @@
WMMOONCLOCK \- Dockable Moon Phase Clock
.SH SYNOPSIS
.B wmMoonClock
-[-display <Display>] [-bc <Color>] [-lc <Color>] [-dc <Color>] [-low] [-lat <Latitude>] [-lon <Longitude>] [-h]
+[\-display <Display>] [\-bc <Color>] [\-lc <Color>] [\-dc <Color>] [\-low] [\-lat <Latitude>] [\-lon <Longitude>] [\-h]
.SH DESCRIPTION
.PP
wmMoonClock displays the current phase of the moon. Clicking on the icon
-brings up different displays -- there are 5 in all. The different "pages"
+brings up different displays \-\- there are 5 in all. The different "pages"
are;
.TP
@@ -25,8 +25,8 @@ it above the horizon?).
.B Third Page
Shows the Rise and Set times for yesterday (first line), today (middle line), and
tommorrow (last line). If the Moon does not rise or set on a given day a `null
-time' is shown (--:--). Note that these times should still be good for high
-latitude observers. Also note that there will always be at least one (--:--)
+time' is shown (\-\-:\-\-). Note that these times should still be good for high
+latitude observers. Also note that there will always be at least one (\-\-:\-\-)
showing up per month. This is because once per month the Moon will rise (set) on
a given day but will set (rise) in the very early portion of the next day.
.TP
@@ -58,19 +58,19 @@ Set color of text labels.
Set color of data values.
.TP
.B \-low
-Conserve colors. For 8-bit displays, a lower-color pixmap will be used automatically,
-but you can also force its use on higher-color displays if necessary.
+Conserve colors. For 8\-bit displays, a lower\-color pixmap will be used automatically,
+but you can also force its use on higher\-color displays if necessary.
.TP
-.B -lat <Latitude>
+.B \-lat <Latitude>
Observers Latitude in degrees. Positive in northern hemisphere, negative in southern hemisphere.
.TP
-.B -lon <Longitude>
+.B \-lon <Longitude>
Observers Longitude in degrees. Greenwich is 0.0, and longitude increases positively
toward the west. (Alternatively, negative numbers can also be used to specify
longitudes to the east of Greenwich).
.TP
.B \-h
-Display list of command-line options.
+Display list of command\-line options.
.SH BUGS
Who knows? (Let me know if you find any).
.SH AUTHOR
diff --git a/Src/wmMoonClock.c b/src/wmMoonClock.c
similarity index 97%
rename from Src/wmMoonClock.c
rename to src/wmMoonClock.c
index 7fe749e..87861e6 100644
--- a/Src/wmMoonClock.c
+++ b/src/wmMoonClock.c
@@ -112,6 +112,7 @@
#include <X11/X.h>
#include <X11/xpm.h>
#include "CalcEphem.h"
+#include "MoonRise.h"
#include "xutils.h"
#include "wmMoonClock_master.xpm"
#include "wmMoonClock_masterLow.xpm"
@@ -122,7 +123,7 @@
/*
* Delay between refreshes (in microseconds)
*/
-#define DELAY 10000L
+#define DELAY 1000000L
#define WMMOONCLOCK_VERSION "1.27"
@@ -159,14 +160,13 @@ int main(int argc, char *argv[]) {
struct tm *GMTTime, *LocalTime;
XEvent event;
- int i, n, k, j, ImageNumber;
- int Year, Month, DayOfWeek, DayOfMonth;
- int Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
+ int i, n, j, ImageNumber, Year, Month, DayOfMonth, digit;
long CurrentLocalTime, CurrentGMTTime, date;
double UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24();
int D, H, M, S, sgn, A, B, q;
- char str[10];
CTrans c;
+ struct timeval timeout;
+ fd_set xfdset;
@@ -244,6 +244,7 @@ int main(int argc, char *argv[]) {
nMAX = 1000;
ImageNumber = (int)(c.MoonPhase * 60.0 + 0.5);
if (ImageNumber > 59) ImageNumber = 0;
+ if (Glat < 0) ImageNumber = 59 - ImageNumber; /* add southern hemisphere support, closes: #537480 */
j = ImageNumber/10;
i = ImageNumber%10;
copyXPMArea(67+58*i, 2+58*j, 54, 54, 5, 5);
@@ -254,8 +255,8 @@ int main(int argc, char *argv[]) {
* Update Numerical Display
*/
-
- nMAX = 500;
+ /* This requires second precision for LT and UT */
+ nMAX = 0;
/*
@@ -371,7 +372,7 @@ int main(int argc, char *argv[]) {
*/
- nMAX = 500;
+ nMAX = 60;
/*
* Clear plotting area
@@ -478,7 +479,7 @@ int main(int argc, char *argv[]) {
- nMAX = 500;
+ nMAX = 3;
/*
* Clear plotting area
@@ -580,7 +581,7 @@ int main(int argc, char *argv[]) {
- nMAX = 500;
+ nMAX = 3;
/*
* Clear plotting area
@@ -705,6 +706,11 @@ int main(int argc, char *argv[]) {
+ /*
+ * Add X display to file descriptor set for polling.
+ */
+ FD_ZERO(&xfdset);
+ FD_SET(ConnectionNumber(display), &xfdset);
@@ -734,7 +740,9 @@ int main(int argc, char *argv[]) {
* Redraw and wait for next update
*/
RedrawWindow();
- usleep(DELAY);
+ timeout.tv_sec = DELAY / 1000000L;
+ timeout.tv_usec = DELAY % 1000000L;
+ select(ConnectionNumber(display) + 1, &xfdset, NULL, NULL, &timeout);
}
diff --git a/Src/wmMoonClock_mask.xbm b/src/wmMoonClock_mask.xbm
similarity index 100%
rename from Src/wmMoonClock_mask.xbm
rename to src/wmMoonClock_mask.xbm
diff --git a/Src/wmMoonClock_master.xpm b/src/wmMoonClock_master.xpm
similarity index 100%
rename from Src/wmMoonClock_master.xpm
rename to src/wmMoonClock_master.xpm
diff --git a/Src/wmMoonClock_masterLow.xpm b/src/wmMoonClock_masterLow.xpm
similarity index 100%
rename from Src/wmMoonClock_masterLow.xpm
rename to src/wmMoonClock_masterLow.xpm
diff --git a/Src/xutils.c b/src/xutils.c
similarity index 100%
rename from Src/xutils.c
rename to src/xutils.c
diff --git a/Src/xutils.h b/src/xutils.h
similarity index 100%
rename from Src/xutils.h
rename to src/xutils.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmoonclock.git
More information about the Pkg-wmaker-commits
mailing list