summaryrefslogtreecommitdiff
path: root/x11/xfishtank/patches/patch-aa
blob: 569c0767965cb82d230e0adf076ba7ad9091cfa6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
--- xfish.c.orig	Thu Dec 17 21:26:17 1992
+++ xfish.c	Thu Oct  9 13:05:19 1997
@@ -11,6 +11,8 @@
 
   *	Ported to monocrome by Jonathan Greenblatt (jonnyg@rover.umd.edu)
 
+  *     05/02/1996 Added TrueColor support by TJ Phan (phan@aur.alcatel.com)
+
   TODO:
 
 	Parameter parsing needs to be redone.
@@ -31,6 +33,8 @@
 #include <time.h>
 #endif
 
+#include <sys/param.h>
+
 #include <stdio.h>
 #ifdef sgi
 #define _BSD_SIGNALS
@@ -46,13 +50,24 @@
 
 /* constants are based on rand(3C) returning an integer between 0 and 32767 */
 
-#if defined(ultrix) || defined(sun) || defined(linux)
+#if defined(ultrix) || defined(sun)
 #define  RAND_I_1_16   134217728
 #define  RAND_F_1_8    268435455.875
 #define  RAND_I_1_4    536870911
 #define  RAND_I_1_2   1073741823
 #define  RAND_I_3_4   1610612735
 #define  RAND_F_MAX   2147483647.0
+#else     
+#if (defined(BSD) && BSD >= 199306)
+#include <stdlib.h>
+#include <unistd.h>
+
+#define  RAND_I_1_16   (RAND_MAX>>4)
+#define  RAND_F_1_8    ((float)(RAND_MAX>>3))
+#define  RAND_I_1_4    (RAND_MAX>>2)
+#define  RAND_I_1_2    (RAND_MAX>>1)
+#define  RAND_I_3_4    ((RAND_MAX>>2)*3)
+#define  RAND_F_MAX    ((float)RAND_MAX)
 #else
 #define  RAND_I_1_16   2048
 #define  RAND_F_1_8    4096.0
@@ -61,7 +76,7 @@
 #define  RAND_I_3_4   24575
 #define  RAND_F_MAX   32767.0
 #endif
-
+#endif
 
 extern unsigned char *ReadBitmap();
 
@@ -850,6 +865,10 @@
  * Find the closest color by allocating it, or picking an already allocated
  * color
  */
+Visual (*visual_info) = NULL;
+int r_mask, g_mask, b_mask;
+int r_shift=0, g_shift=0, b_shift=0;
+int r_bits=0, g_bits=0, b_bits=0;
 void
 FindColor(Dpy, colormap, colr)
 	Display *Dpy;
@@ -862,6 +881,58 @@
 	XColor def_colrs[256];
 	int NumCells;
 
+	if( visual_info == NULL &&  DefaultDepth(Dpy, DefaultScreen(Dpy)) >= 16 )
+	{
+	   visual_info = DefaultVisual(Dpy, DefaultScreen(Dpy));
+	   r_mask = visual_info->red_mask;
+	   while( !(r_mask & 1) )
+	   {
+	      r_mask >>= 1;
+	      r_shift++;
+	   }
+	   while( r_mask & 1 )
+	   {
+	      r_mask >>= 1;
+	      r_bits++;
+	   }
+
+	   g_mask = visual_info->green_mask;
+	   while( !(g_mask & 1) )
+	   {
+	      g_mask >>= 1;
+	      g_shift++;
+	   }
+	   while( g_mask & 1 )
+	   {
+	      g_mask >>= 1;
+	      g_bits++;
+	   }
+
+	   b_mask = visual_info->blue_mask;
+	   while( !(b_mask &1) )
+	   {
+	      b_mask >>= 1;
+	      b_shift++;
+	   }
+	   while( b_mask & 1 )
+	   {
+	      b_mask >>= 1;
+	      b_bits++;
+	   }
+	}
+
+	if( DefaultDepth(Dpy, DefaultScreen(Dpy)) > 8 )
+	{
+	   colr->red >>= 16 - r_bits;
+	   colr->green >>= 16 - g_bits;
+	   colr->blue >>= 16 - b_bits;
+
+	   colr->pixel = ((colr->red << r_shift) & visual_info->red_mask) |
+	      ((colr->green << g_shift) & visual_info->green_mask) |
+	      ((colr->blue << b_shift) & visual_info->blue_mask);
+	   return;
+	}
+
 	if (AllocCnt < climit)
 	{
 		match = XAllocColor(Dpy, colormap, colr);
@@ -982,7 +1053,6 @@
 	XColor hdef, edef;
 	struct colr_data *cdp;
 	struct colr_data colrs[256];
-	extern char *malloc();
 
 	colormap = XDefaultColormap(Dpy, screen);
 
@@ -1151,6 +1221,7 @@
 		fprintf(stderr, "Don't know how to format image for display of depth %d\n", depth);
 		exit(1);
 	}
+
 	if (BitmapBitOrder(Dpy) == LSBFirst)
 	{
 		shiftstart = 0;
@@ -1194,7 +1265,8 @@
 			}
 		}
 	}
-	bytesperline = (width + linepad) * depth / 8;
+
+	bytesperline = (width  * depth / 8 + linepad);
 	newimage = XCreateImage(Dpy, DefaultVisual(Dpy, screen), depth,
 		ZPixmap, 0, (char *)bit_data,
 		(width + linepad), height, 8, bytesperline);
@@ -1218,7 +1290,6 @@
 	unsigned char *data;
 	register int i, j, k;
 	int cnt, wcnt;
-	extern char *malloc();
 
 	cnt = 1;
 	cnt += Pcnt;
@@ -1341,9 +1412,14 @@
 		free((char *)data);
 	}
 
+	if( DisplayPlanes(Dpy, screen) < 8 )
+	{
+
 		j = rwidth[k] * rheight[k];
 		x1A = (caddrt) malloc(rwidth[k] * rheight[k]);
 		p = (caddrt) xfishRasterA[k];
+
+
 		q = x1A;
 		for (i = 0; i < j; i++)
 		{
@@ -1389,6 +1465,67 @@
 		xfishB[k][2] = MakeImage(x1B, rwidth[k], rheight[k]);
 		xfishB[k][1] = MakeImage(x2B, rwidth[k], rheight[k]);
 
+		free((char *)x1A);
+		free((char *)x2A);
+		free((char *)x1B);
+		free((char *)x2B);
+
+	}
+	else
+	{
+		i = DisplayPlanes(Dpy, screen);
+
+		xfishA[k][2] = XGetImage(Dpy, DefaultRootWindow(Dpy), 0, 0, rwidth[k], rheight[k], 0, ZPixmap);
+
+		p = (caddrt) xfishRasterA[k];
+
+		for (j = 0; j < rheight[k]; j++)
+		{
+		   for( i = 0; i < rwidth[k]; i++ )
+		   {
+		      XPutPixel(xfishA[k][2], i, j, cmap[cnt + (int)(*p)]);
+		      p++;
+		   }
+		}
+
+		xfishB[k][2] = XGetImage(Dpy, DefaultRootWindow(Dpy), 0, 0, rwidth[k], rheight[k], 0, ZPixmap);
+
+		p = (caddrt) xfishRasterB[k];
+
+		for (j = 0; j < rheight[k]; j++)
+		{
+		   for( i = 0; i < rwidth[k]; i++ )
+		   {
+		      XPutPixel(xfishB[k][2], i, j, cmap[cnt + (int)(*p)]);
+		      p++;
+		   }
+		}
+
+		xfishA[k][1] = XGetImage(Dpy, DefaultRootWindow(Dpy), 0, 0, rwidth[k], rheight[k], 0, ZPixmap);
+
+		for (j = 0; j < rheight[k]; j++)
+		{
+		   for( i = 0; i < rwidth[k]; i++ )
+		   {
+		      XPutPixel(xfishA[k][1], i, j,
+				XGetPixel(xfishA[k][2], rwidth[k] - i -1, j));
+		   }
+		}
+
+		xfishB[k][1] = XGetImage(Dpy, DefaultRootWindow(Dpy), 0, 0, rwidth[k], rheight[k], 0, ZPixmap);
+
+		for (j = 0; j < rheight[k]; j++)
+		{
+		   for( i = 0; i < rwidth[k]; i++ )
+		   {
+		      XPutPixel(xfishB[k][1], i, j,
+				XGetPixel(xfishB[k][2], rwidth[k] - i - 1, j));
+		   }
+		}
+
+	}
+
+
 		i = DisplayPlanes(Dpy, screen);
 
 		pfishA[k][1] = XCreatePixmap(Dpy, wid,
@@ -1400,11 +1537,6 @@
 		pfishB[k][2] = XCreatePixmap(Dpy, wid,
 			rwidth[k], rheight[k], i);
 
-		free((char *)x1A);
-		free((char *)x2A);
-		free((char *)x1B);
-		free((char *)x2B);
-
 		if (pfishA[k][1])
 		{
 			XPutImage(Dpy, pfishA[k][1], gc, xfishA[k][1], 0, 0,
@@ -1465,34 +1597,6 @@
 void 
 init_signals()
 {
-	int ret;
-#ifdef linux
-	signal(SIGUSR1, toggle_secure);
-#else			
-#if defined(MOTOROLA) || defined(SCO)
-    sigset(SIGUSR1, toggle_secure);
-#else
-    struct sigvec vec;
-
-    vec.sv_handler = toggle_secure;
-    vec.sv_mask = 0;
-    vec.sv_onstack = 0;
-
-#ifndef hpux
-    ret = sigvec(SIGUSR1, &vec, &vec);
-	if (ret != 0)
-	{
-		fprintf(stderr, "sigvec call failed\n");
-	}
-	else
-	{
-		fprintf(stderr, "sigvec call OK\n");
-	}
-#else
-    sigvector(SIGUSR1, &vec, &vec);
-#endif
-#endif /* MOTOROLA */
-#endif /* LINUX */
 }
 
 
@@ -1505,7 +1609,6 @@
     XWindowAttributes winfo;
     XSetWindowAttributes attr;
     XGCValues   vals;
-    extern char *malloc();
     XSizeHints  xsh;
     XImage *pimage;
     int i, size, cnt;
@@ -1613,13 +1716,12 @@
     xsh.height = height;
     XSetNormalHints(Dpy, wid, &xsh);
 
+    XMapWindow(Dpy, wid);
     if (picname[0] != '\0')
     {
 	XPutImage(Dpy, PicMap, gc, pimage, 0, 0, 0, 0, Pwidth, Pheight);
 	XSetWindowBackgroundPixmap(Dpy, wid, PicMap);
     }
-
-    XMapWindow(Dpy, wid);
 }
 
     binfo = (bubble *) malloc(blimit * sizeof(bubble));
@@ -1965,9 +2067,15 @@
 high_res_sleep(seconds)
     double      seconds;
 {
+#if !(defined(BSD) && BSD >= 199306)
     int         fds = 0;
+#endif
     struct timeval timeout;
-
+#if (defined(BSD) && BSD >= 199306)
+    fd_set fds;
+    FD_ZERO(&fds);
+#endif    
+    
     timeout.tv_sec = seconds;
     timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0;
     select(0, &fds, &fds, &fds, &timeout);