[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC

…		…
40	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
41		41
42	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
44		44
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	45	#define MIN_FONT_HEIGHT 10
		46
		47	#define GL_CALL(type,func,args) \
		48	{ \
		49	static int init_; \
		50	static type fptr_; \
		51	\
		52	if (!init_) \
		53	{ \
		54	init_ = 1; \
		55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		56	} \
		57	\
		58	if (fptr_) \
		59	fptr_ args; \
		60	}
46		61
47	typedef Mix_Chunk *CFClient__MixChunk;	62	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	63	typedef Mix_Music *CFClient__MixMusic;
49		64
50	static PangoContext *context;	65	typedef PangoFontDescription *CFClient__Font;
51	static PangoFontMap *fontmap;
52		66
53	typedef struct cf_layout {	67	typedef struct cf_layout {
54	PangoLayout *pl;	68	PangoLayout *pl;
55	int base_height;	69	int base_height;
		70	CFClient__Font font;
56	} *CFClient__Layout;	71	} *CFClient__Layout;
		72
		73	static CFClient__Font default_font;
		74	static PangoContext *context;
		75	static PangoFontMap *fontmap;
57		76
58	static void	77	static void
59	substitute_func (FcPattern *pattern, gpointer data)	78	substitute_func (FcPattern *pattern, gpointer data)
60	{	79	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	80	FcPatternAddBool (pattern, FC_HINTING , 1);
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	82	}
64		83
65	static void	84	static void
66	layout_update (CFClient__Layout self)	85	layout_update_font (CFClient__Layout self)
67	{	86	{
68	/* use a random scale factor to account for unknown descenders, 0.8 works	87	/* use a random scale factor to account for unknown descenders, 0.8 works
69	* reasonably well with bitstream vera	88	* reasonably well with bitstream vera
70	*/	89	*/
71	PangoFontDescription *font = pango_context_get_font_description (context);	90	PangoFontDescription *font = self->font ? self->font : default_font;
72		91
73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75	if (height < MIN_FONT_HEIGHT)
76	height = MIN_FONT_HEIGHT;
77
78	if (pango_font_description_get_size (font) != height)
79	{
80	pango_font_description_set_absolute_size (font, height);	92	pango_font_description_set_absolute_size (font,
81	pango_layout_context_changed (self->pl);	93	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
82	}	94
		95	pango_layout_set_font_description (self->pl, font);
83	}	96	}
84		97
85	static void	98	static void
86	layout_get_pixel_size (CFClient__Layout self, int w, int h)	99	layout_get_pixel_size (CFClient__Layout self, int w, int h)
87	{	100	{
88	layout_update (self);
89
90	pango_layout_get_pixel_size (self->pl, w, h);	101	pango_layout_get_pixel_size (self->pl, w, h);
91		102
92	w = (w + 3) & ~3;	103	w = (w + 3) & ~3;
93	if (!w) w = 1;	104	if (!w) w = 1;
94	if (!h) h = 1;	105	if (!h) h = 1;
…		…
254	SDL_UserEvent ev;	265	SDL_UserEvent ev;
255		266
256	ev.type = SDL_USEREVENT;	267	ev.type = SDL_USEREVENT;
257	ev.code = 0;	268	ev.code = 0;
258	ev.data1 = 0;	269	ev.data1 = 0;
		270	ev.data2 = 0;
		271
		272	SDL_PushEvent ((SDL_Event *)&ev);
		273	}
		274
		275	static void
		276	channel_finished (int channel)
		277	{
		278	SDL_UserEvent ev;
		279
		280	ev.type = SDL_USEREVENT;
		281	ev.code = 1;
		282	ev.data1 = (void *)(long)channel;
259	ev.data2 = 0;	283	ev.data2 = 0;
260		284
261	SDL_PushEvent ((SDL_Event *)&ev);	285	SDL_PushEvent ((SDL_Event *)&ev);
262	}	286	}
263		287
…		…
446		470
447	while (SDL_PollEvent (&ev))	471	while (SDL_PollEvent (&ev))
448	{	472	{
449	HV *hv = newHV ();	473	HV *hv = newHV ();
450	hv_store (hv, "type", 4, newSViv (ev.type), 0);	474	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		475
451	switch (ev.type)	476	switch (ev.type)
452	{	477	{
453	case SDL_KEYDOWN:	478	case SDL_KEYDOWN:
454	case SDL_KEYUP:	479	case SDL_KEYUP:
455	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	480	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
475	case SDL_MOUSEBUTTONUP:	500	case SDL_MOUSEBUTTONUP:
476	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
477	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
478	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
479	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		505	break;
		506
		507	case SDL_USEREVENT:
		508	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		509	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		510	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		511	break;
480	}	512	}
481		513
482	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	514	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
483	}	515	}
484	}	516	}
485		517
486	int	518	int
487	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	519	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
488	POSTCALL:	520	POSTCALL:
489	Mix_HookMusicFinished (music_finished);	521	Mix_HookMusicFinished (music_finished);
		522	Mix_ChannelFinished (channel_finished);
490		523
491	void	524	void
492	Mix_CloseAudio ()	525	Mix_CloseAudio ()
493		526
494	int	527	int
…		…
517		550
518	void	551	void
519	add_font (char *file)	552	add_font (char *file)
520	CODE:	553	CODE:
521	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	554	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
522
523	void
524	set_font (char *file)
525	CODE:
526	{
527	int count;
528	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
529	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
530	FcPatternDestroy (pattern);
531	pango_context_set_font_description (context, font);
532	}
533		555
534	void	556	void
535	load_image_inline (SV *image_)	557	load_image_inline (SV *image_)
536	ALIAS:	558	ALIAS:
537	load_image_file = 1	559	load_image_file = 1
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	641	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	642	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	643	}
622		644
623	void	645	void
		646	error (char *message)
		647	CODE:
		648	#ifdef _WIN32
		649	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		650	#else
		651	fprintf (stderr, "ERROR: %s\n", message);
		652	#endif
		653
		654	void
624	fatal (char *message)	655	fatal (char *message)
625	CODE:	656	CODE:
626	#ifdef _WIN32	657	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	658	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
628	#else	659	#else
629	fprintf (stderr, "FATAL: %s\n", message);	660	fprintf (stderr, "FATAL: %s\n", message);
630	#endif	661	#endif
631	exit (1);	662	exit (1);
632		663
		664	MODULE = CFClient PACKAGE = CFClient::Font
		665
		666	CFClient::Font
		667	new_from_file (SV class, char path, int id = 0)
		668	CODE:
		669	{
		670	int count;
		671	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		672	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		673	FcPatternDestroy (pattern);
		674	}
		675	OUTPUT:
		676	RETVAL
		677
		678	void
		679	DESTROY (CFClient::Font self)
		680	CODE:
		681	pango_font_description_free (self);
		682
		683	void
		684	make_default (CFClient::Font self)
		685	CODE:
		686	default_font = self;
		687
633	MODULE = CFClient PACKAGE = CFClient::Layout	688	MODULE = CFClient PACKAGE = CFClient::Layout
634		689
635	CFClient::Layout	690	CFClient::Layout
636	new (SV *class, int base_height = 10)	691	new (SV *class, int base_height = MIN_FONT_HEIGHT)
637	CODE:	692	CODE:
638	New (0, RETVAL, 1, struct cf_layout);	693	New (0, RETVAL, 1, struct cf_layout);
		694	RETVAL->pl = pango_layout_new (context);
639	RETVAL->base_height = base_height;	695	RETVAL->base_height = base_height;
640	RETVAL->pl = pango_layout_new (context);	696	RETVAL->font = 0;
641	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	697	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		698	pango_layout_set_font_description (RETVAL->pl, default_font);
642	OUTPUT:	699	OUTPUT:
643	RETVAL	700	RETVAL
644		701
645	void	702	void
646	DESTROY (CFClient::Layout self)	703	DESTROY (CFClient::Layout self)
…		…
675	SvUTF8_on (RETVAL);	732	SvUTF8_on (RETVAL);
676	OUTPUT:	733	OUTPUT:
677	RETVAL	734	RETVAL
678		735
679	void	736	void
		737	set_font (CFClient::Layout self, CFClient::Font font = 0)
		738	CODE:
		739	if (self->font != font)
		740	{
		741	self->font = font;
		742	layout_update_font (self);
		743	}
		744
		745	void
680	set_height (CFClient::Layout self, int base_height)	746	set_height (CFClient::Layout self, int base_height)
681	CODE:	747	CODE:
		748	if (self->base_height != base_height)
		749	{
682	self->base_height = base_height;	750	self->base_height = base_height;
		751	layout_update_font (self);
		752	}
683		753
684	void	754	void
685	set_width (CFClient::Layout self, int max_width = -1)	755	set_width (CFClient::Layout self, int max_width = -1)
686	CODE:	756	CODE:
687	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	757	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
690	size (CFClient::Layout self)	760	size (CFClient::Layout self)
691	PPCODE:	761	PPCODE:
692	{	762	{
693	int w, h;	763	int w, h;
694		764
695	layout_update (self);
696	layout_get_pixel_size (self, &w, &h);	765	layout_get_pixel_size (self, &w, &h);
697		766
698	EXTEND (SP, 2);	767	EXTEND (SP, 2);
699	PUSHs (sv_2mortal (newSViv (w)));	768	PUSHs (sv_2mortal (newSViv (w)));
700	PUSHs (sv_2mortal (newSViv (h)));	769	PUSHs (sv_2mortal (newSViv (h)));
…		…
703	int	772	int
704	xy_to_index (CFClient::Layout self, int x, int y)	773	xy_to_index (CFClient::Layout self, int x, int y)
705	CODE:	774	CODE:
706	{	775	{
707	int index, trailing;	776	int index, trailing;
708
709	layout_update (self);
710	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	777	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
711
712	RETVAL = index;	778	RETVAL = index;
713	}	779	}
714	OUTPUT:	780	OUTPUT:
715	RETVAL	781	RETVAL
716		782
717	void	783	void
718	cursor_pos (CFClient::Layout self, int index)	784	cursor_pos (CFClient::Layout self, int index)
719	PPCODE:	785	PPCODE:
720	{	786	{
721	PangoRectangle strong_pos;	787	PangoRectangle strong_pos;
722	layout_update (self);
723	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	788	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724		789
725	EXTEND (SP, 3);	790	EXTEND (SP, 3);
726	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	791	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	792	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
734	{	799	{
735	SV *retval;	800	SV *retval;
736	int w, h;	801	int w, h;
737	FT_Bitmap bitmap;	802	FT_Bitmap bitmap;
738		803
739	layout_update (self);
740	layout_get_pixel_size (self, &w, &h);	804	layout_get_pixel_size (self, &w, &h);
741		805
742	retval = newSV (w * h);	806	retval = newSV (w * h);
743	SvPOK_only (retval);	807	SvPOK_only (retval);
744	SvCUR_set (retval, w * h);	808	SvCUR_set (retval, w * h);
…		…
1306	} *civ, const_iv[] = {	1370	} *civ, const_iv[] = {
1307	# define const_iv(name) { # name, (IV)name }	1371	# define const_iv(name) { # name, (IV)name }
1308	const_iv (GL_COLOR_MATERIAL),	1372	const_iv (GL_COLOR_MATERIAL),
1309	const_iv (GL_SMOOTH),	1373	const_iv (GL_SMOOTH),
1310	const_iv (GL_FLAT),	1374	const_iv (GL_FLAT),
		1375	const_iv (GL_DITHER),
1311	const_iv (GL_BLEND),	1376	const_iv (GL_BLEND),
		1377	const_iv (GL_SCISSOR_TEST),
1312	const_iv (GL_AND),	1378	const_iv (GL_AND),
		1379	const_iv (GL_ONE),
		1380	const_iv (GL_ZERO),
1313	const_iv (GL_SRC_ALPHA),	1381	const_iv (GL_SRC_ALPHA),
		1382	const_iv (GL_SRC_ALPHA_SATURATE),
1314	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1383	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1384	const_iv (GL_ONE_MINUS_DST_ALPHA),
1315	const_iv (GL_RGB),	1385	const_iv (GL_RGB),
1316	const_iv (GL_RGBA),	1386	const_iv (GL_RGBA),
1317	const_iv (GL_UNSIGNED_BYTE),	1387	const_iv (GL_UNSIGNED_BYTE),
1318	const_iv (GL_ALPHA4),
1319	const_iv (GL_ALPHA),	1388	const_iv (GL_ALPHA),
1320	const_iv (GL_FLOAT),	1389	const_iv (GL_FLOAT),
1321	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1390	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1322	const_iv (GL_COMPILE),	1391	const_iv (GL_COMPILE),
1323	const_iv (GL_TEXTURE_1D),	1392	const_iv (GL_TEXTURE_1D),
…		…
1335	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1404	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1336	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1405	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1337	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1406	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1338	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1407	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1339	const_iv (GL_GENERATE_MIPMAP),	1408	const_iv (GL_GENERATE_MIPMAP),
1340	const_iv (GL_LINEAR),
1341	const_iv (GL_MODULATE),	1409	const_iv (GL_MODULATE),
		1410	const_iv (GL_DECAL),
1342	const_iv (GL_REPLACE),	1411	const_iv (GL_REPLACE),
1343	const_iv (GL_COLOR_BUFFER_BIT),	1412	const_iv (GL_COLOR_BUFFER_BIT),
1344	const_iv (GL_PROJECTION),	1413	const_iv (GL_PROJECTION),
1345	const_iv (GL_MODELVIEW),	1414	const_iv (GL_MODELVIEW),
1346	const_iv (GL_COLOR_LOGIC_OP),	1415	const_iv (GL_COLOR_LOGIC_OP),
		1416	const_iv (GL_SEPARABLE_2D),
1347	const_iv (GL_CONVOLUTION_2D),	1417	const_iv (GL_CONVOLUTION_2D),
1348	const_iv (GL_CONVOLUTION_BORDER_MODE),	1418	const_iv (GL_CONVOLUTION_BORDER_MODE),
1349	const_iv (GL_CONSTANT_BORDER),	1419	const_iv (GL_CONSTANT_BORDER),
1350	const_iv (GL_LINES),	1420	const_iv (GL_LINES),
1351	const_iv (GL_QUADS),	1421	const_iv (GL_QUADS),
…		…
1376		1446
1377	void glBlendFunc (int sfactor, int dfactor)	1447	void glBlendFunc (int sfactor, int dfactor)
1378		1448
1379	void glLogicOp (int opcode)	1449	void glLogicOp (int opcode)
1380		1450
		1451	void glColorMask (int red, int green, int blue, int alpha)
		1452
1381	void glMatrixMode (int mode)	1453	void glMatrixMode (int mode)
1382		1454
1383	void glPushMatrix ()	1455	void glPushMatrix ()
1384		1456
1385	void glPopMatrix ()	1457	void glPopMatrix ()
1386		1458
1387	void glLoadIdentity ()	1459	void glLoadIdentity ()
1388		1460
		1461	# near and far are due to microsofts buggy c compiler
1389	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1462	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1390		1463
1391	void glViewport (int x, int y, int width, int height)	1464	void glViewport (int x, int y, int width, int height)
		1465
		1466	void glScissor (int x, int y, int width, int height)
1392		1467
1393	void glTranslate (float x, float y, float z = 0.)	1468	void glTranslate (float x, float y, float z = 0.)
1394	CODE:	1469	CODE:
1395	glTranslatef (x, y, z);	1470	glTranslatef (x, y, z);
1396		1471
1397	void glScale (float x, float y, float z)	1472	void glScale (float x, float y, float z = 1.)
1398	CODE:	1473	CODE:
1399	glScalef (x, y, z);	1474	glScalef (x, y, z);
1400		1475
1401	void glRotate (float angle, float x, float y, float z)	1476	void glRotate (float angle, float x, float y, float z)
1402	CODE:	1477	CODE:
…		…
1407	void glEnd ()	1482	void glEnd ()
1408		1483
1409	void glColor (float r, float g, float b, float a = 1.0)	1484	void glColor (float r, float g, float b, float a = 1.0)
1410	PROTOTYPE: @	1485	PROTOTYPE: @
1411	CODE:	1486	CODE:
1412	glColor4f (r, g, b, a);	1487	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1413		1488
1414	void glVertex (float x, float y, float z = 0.)	1489	void glVertex (float x, float y, float z = 0.)
1415	CODE:	1490	CODE:
1416	glVertex3f (x, y, z);	1491	glVertex3f (x, y, z);
1417		1492
…		…
1429		1504
1430	void glBindTexture (int target, int name)	1505	void glBindTexture (int target, int name)
1431		1506
1432	void glConvolutionParameter (int target, int pname, float params)	1507	void glConvolutionParameter (int target, int pname, float params)
1433	CODE:	1508	CODE:
1434	glConvolutionParameterf (target, pname, params);	1509	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1435		1510
1436	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1511	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1512	CODE:
		1513	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1514	(target, internalformat, width, height, format, type, data));
		1515
		1516	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1517	CODE:
		1518	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1519	(target, internalformat, width, height, format, type, row, column));
1437		1520
1438	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1521	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1439		1522
1440	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1524
		1525	void glRasterPos (int x, int y)
		1526	CODE:
		1527	glRasterPos2i (x, y);
		1528
		1529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1441		1530
1442	int glGenTexture ()	1531	int glGenTexture ()
1443	CODE:	1532	CODE:
1444	{	1533	{
1445	GLuint name;	1534	GLuint name;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs. Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.74 by root, Sat May 6 20:14:57 2006 UTC