Line 0
Link Here
|
|
|
1 |
--- src/wmglobe.h.orig 2001-08-12 15:41:22 UTC |
2 |
+++ src/wmglobe.h |
3 |
@@ -34,7 +34,6 @@ |
4 |
#include <ctype.h> /*toupper */ |
5 |
#include <stdarg.h> |
6 |
#include <time.h> |
7 |
-#include <sys/timeb.h> |
8 |
#include <sys/time.h> |
9 |
#include <sys/types.h> |
10 |
#include <X11/Xlib.h> |
11 |
@@ -83,17 +82,17 @@ typedef struct { |
12 |
int right; |
13 |
} MOUSE_REGION; |
14 |
|
15 |
-MOUSE_REGION mouse_region[MAX_MOUSE_REGION]; |
16 |
+extern MOUSE_REGION mouse_region[MAX_MOUSE_REGION]; |
17 |
|
18 |
typedef struct MPO { |
19 |
int r, g, b; |
20 |
} MPO; |
21 |
|
22 |
-MPO *md[4], *mn[4]; |
23 |
+extern MPO *md[4], *mn[4]; |
24 |
|
25 |
-double solu[DIAMETRE][DIAMETRE][3]; |
26 |
-int tabsolu[DIAMETRE][DIAMETRE]; |
27 |
-int solution; |
28 |
+extern double solu[DIAMETRE][DIAMETRE][3]; |
29 |
+extern int tabsolu[DIAMETRE][DIAMETRE]; |
30 |
+extern int solution; |
31 |
|
32 |
typedef struct { |
33 |
Pixmap pixmap; |
34 |
@@ -102,72 +101,72 @@ typedef struct { |
35 |
} XpmIcon; |
36 |
|
37 |
|
38 |
-Display *dpy; |
39 |
+extern Display *dpy; |
40 |
|
41 |
-char *dayfile, *nightfile, *dpy_name; |
42 |
+extern char *dayfile, *nightfile, *dpy_name; |
43 |
|
44 |
-Pixmap pix, pixmask; |
45 |
+extern Pixmap pix, pixmask; |
46 |
|
47 |
-XEvent Event; |
48 |
+extern XEvent Event; |
49 |
|
50 |
-RImage *map, *small, *mapnight; |
51 |
+extern RImage *map, *small, *mapnight; |
52 |
|
53 |
-XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg; |
54 |
+extern XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg; |
55 |
|
56 |
-Window iconwin, win; |
57 |
-int onlyshape, option_iw; |
58 |
-GC NormalGC; |
59 |
+extern Window iconwin, win; |
60 |
+extern int onlyshape, option_iw; |
61 |
+extern GC NormalGC; |
62 |
|
63 |
/********* rendering********/ |
64 |
|
65 |
#if WITH_MARKERS |
66 |
-double marker[MAX_MARKERS][3]; |
67 |
-int nb_marker, sun_marker, moon_marker; |
68 |
-RColor sun_col, moon_col; |
69 |
-double moon_lat,moon_long; |
70 |
+extern double marker[MAX_MARKERS][3]; |
71 |
+extern int nb_marker, sun_marker, moon_marker; |
72 |
+extern RColor sun_col, moon_col; |
73 |
+extern double moon_lat,moon_long; |
74 |
#endif |
75 |
|
76 |
-double delay, time_multi; |
77 |
+extern double delay, time_multi; |
78 |
/* |
79 |
* struct timeval delta_tim, last_tim, next_tim, render_tim, base_tim, |
80 |
* vec_tim; |
81 |
* |
82 |
* time_t beg_time, ini_time,t1901; |
83 |
*/ |
84 |
-struct timeval tlast, tnext, trend, tdelay, tini, tbase; |
85 |
-time_t tsunpos; |
86 |
+extern struct timeval tlast, tnext, trend, tdelay, tini, tbase; |
87 |
+extern time_t tsunpos; |
88 |
|
89 |
-int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr; |
90 |
+extern int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr; |
91 |
|
92 |
-int typecadre, p_type, use_nightmap, use_default_nightmap, use_nmap_ini, |
93 |
-firstTime, stoprand, do_something, iop; |
94 |
+extern int typecadre, p_type, use_nightmap, use_default_nightmap, |
95 |
+ use_nmap_ini, firstTime, stoprand, do_something, iop; |
96 |
|
97 |
-double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long; |
98 |
-double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn; |
99 |
+extern double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long; |
100 |
+extern double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn; |
101 |
|
102 |
-double sun_lat; |
103 |
-double sun_long; |
104 |
+extern double sun_lat; |
105 |
+extern double sun_long; |
106 |
|
107 |
-double fov; |
108 |
-double radius; |
109 |
-double proj_dist; /* distance to projection plane */ |
110 |
+extern double fov; |
111 |
+extern double radius; |
112 |
+extern double proj_dist; /* distance to projection plane */ |
113 |
|
114 |
-double center_dist; /* distance to center of earth */ |
115 |
+extern double center_dist; /* distance to center of earth */ |
116 |
|
117 |
-double ambient_light; /* how dark is the dark side? */ |
118 |
+extern double ambient_light; /* how dark is the dark side? */ |
119 |
|
120 |
-double light_x, light_y, light_z; /* vector of sunlight with lengt 1 */ |
121 |
+extern double light_x, light_y, light_z; /* vector of sunlight with lengt 1 */ |
122 |
|
123 |
-double c_coef, b_coef; |
124 |
-double zoom; |
125 |
-int radius_proj, aml; /* radius of sphere on screen */ |
126 |
+extern double c_coef, b_coef; |
127 |
+extern double zoom; |
128 |
+extern int radius_proj, aml; /* radius of sphere on screen */ |
129 |
|
130 |
-RColor noir; |
131 |
+extern RColor noir; |
132 |
#ifdef DEBUG |
133 |
-double minhz; |
134 |
+extern double minhz; |
135 |
#endif |
136 |
|
137 |
-int stable; |
138 |
+extern int stable; |
139 |
|
140 |
/****************************************************************/ |
141 |
/* Function Prototypes */ |