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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
40	#define FOW_DARKNESS 32	46	#define FOW_DARKNESS 32
41		47
42	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
44		50
45	#define MIN_FONT_HEIGHT 8	51	#define MIN_FONT_HEIGHT 10
		52
		53	static struct
		54	{
		55	#define GL_FUNC(ptr,name) ptr name;
		56	#include "glfunc.h"
		57	#undef GL_FUNC
		58	} gl;
		59
		60	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		61	{
		62	if (gl.BlendFuncSeparate)
		63	gl.BlendFuncSeparate (sa, da, saa, daa);
		64	else if (gl.BlendFuncSeparateEXT)
		65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		66	else
		67	glBlendFunc (sa, da);
		68	}
46		69
47	typedef Mix_Chunk *CFClient__MixChunk;	70	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	71	typedef Mix_Music *CFClient__MixMusic;
49		72
50	typedef PangoFontDescription *CFClient__Font;	73	typedef PangoFontDescription *CFClient__Font;
51		74
52	typedef struct cf_layout {	75	typedef struct cf_layout {
53	PangoLayout *pl;	76	PangoLayout *pl; // either derived from a cairo or ft2 context
		77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		78	float r, g, b, a; // default color for rgba mode
54	int base_height;	79	int base_height;
55	CFClient__Font font;	80	CFClient__Font font;
56	} *CFClient__Layout;	81	} *CFClient__Layout;
57		82
58	static CFClient__Font default_font;	83	static CFClient__Font default_font;
59	static PangoContext *context;	84	static PangoContext ft2_context, cairo_context;
60	static PangoFontMap *fontmap;	85	static PangoFontMap ft2_fontmap, cairo_fontmap;
61		86
62	static void	87	static void
63	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
64	{	89	{
65	FcPatternAddBool (pattern, FC_HINTING , 1);	90	FcPatternAddBool (pattern, FC_HINTING , 1);
		91	#ifdef _WIN32
		92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		93	#else
66	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		95	#endif
67	}	96	}
68		97
69	static void	98	static void
70	layout_update_font (CFClient__Layout self)	99	layout_update_font (CFClient__Layout self)
71	{	100	{
…		…
83	static void	112	static void
84	layout_get_pixel_size (CFClient__Layout self, int w, int h)	113	layout_get_pixel_size (CFClient__Layout self, int w, int h)
85	{	114	{
86	pango_layout_get_pixel_size (self->pl, w, h);	115	pango_layout_get_pixel_size (self->pl, w, h);
87		116
88	w = (w + 3) & ~3;
89	if (!w) w = 1;	117	if (!w) w = 1;
90	if (!h) h = 1;	118	if (!h) h = 1;
		119
		120	w = (w + 3) & ~3;
91	}	121	}
92		122
93	typedef uint16_t mapface;	123	typedef uint16_t mapface;
94		124
95	typedef struct {	125	typedef struct {
…		…
243	}	273	}
244	}	274	}
245	}	275	}
246		276
247	static void	277	static void
248	music_finished ()	278	music_finished (void)
249	{	279	{
250	SDL_UserEvent ev;	280	SDL_UserEvent ev;
251		281
252	ev.type = SDL_USEREVENT;	282	ev.type = SDL_USEREVENT;
253	ev.code = 0;	283	ev.code = 0;
254	ev.data1 = 0;	284	ev.data1 = 0;
		285	ev.data2 = 0;
		286
		287	SDL_PushEvent ((SDL_Event *)&ev);
		288	}
		289
		290	static void
		291	channel_finished (int channel)
		292	{
		293	SDL_UserEvent ev;
		294
		295	ev.type = SDL_USEREVENT;
		296	ev.code = 1;
		297	ev.data1 = (void *)(long)channel;
255	ev.data2 = 0;	298	ev.data2 = 0;
256		299
257	SDL_PushEvent ((SDL_Event *)&ev);	300	SDL_PushEvent ((SDL_Event *)&ev);
258	}	301	}
259		302
…		…
370	# undef const_iv	413	# undef const_iv
371	};	414	};
372		415
373	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
374	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		418	}
375		419
		420	void
		421	pango_init ()
		422	CODE:
		423	{
		424	// delayed, so it can pick up new fonts added by AddFontResourceEx
376	fontmap = pango_ft2_font_map_new ();	425	ft2_fontmap = pango_ft2_font_map_new ();
377	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
378	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		428
		429	cairo_fontmap = pango_cairo_font_map_get_default ();
		430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
379	}	431	}
380		432
381	int	433	int
382	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
383		435
…		…
393	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	445	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397		449
		450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		452
398	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402		457
403	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
404	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
405	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
406		459
407	SDL_EnableUNICODE (1);	460	SDL_EnableUNICODE (1);
408	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409		462
410	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
419		472
420	++m;	473	++m;
421	}	474	}
422	}	475	}
423		476
		477	char *
		478	SDL_GetError ()
		479
424	int	480	int
425	SDL_SetVideoMode (int w, int h, int fullscreen)	481	SDL_SetVideoMode (int w, int h, int fullscreen)
426	CODE:	482	CODE:
427	RETVAL = !!SDL_SetVideoMode (	483	RETVAL = !!SDL_SetVideoMode (
428	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	484	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
429	);	485	);
		486	if (RETVAL)
		487	{
430	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	488	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		489	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		490	# include "glfunc.h"
		491	# undef GL_FUNC
		492	}
431	OUTPUT:	493	OUTPUT:
432	RETVAL	494	RETVAL
433		495
434	void	496	void
435	SDL_GL_SwapBuffers ()	497	SDL_GL_SwapBuffers ()
		498
		499	char *
		500	SDL_GetKeyName (int sym)
436		501
437	void	502	void
438	SDL_PollEvent ()	503	SDL_PollEvent ()
439	PPCODE:	504	PPCODE:
440	{	505	{
…		…
442		507
443	while (SDL_PollEvent (&ev))	508	while (SDL_PollEvent (&ev))
444	{	509	{
445	HV *hv = newHV ();	510	HV *hv = newHV ();
446	hv_store (hv, "type", 4, newSViv (ev.type), 0);	511	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		512
447	switch (ev.type)	513	switch (ev.type)
448	{	514	{
449	case SDL_KEYDOWN:	515	case SDL_KEYDOWN:
450	case SDL_KEYUP:	516	case SDL_KEYUP:
451	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	517	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
458	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	524	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	525	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460	break;	526	break;
461		527
462	case SDL_MOUSEMOTION:	528	case SDL_MOUSEMOTION:
		529	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		530
463	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	531	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	532	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	533	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	534	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	535	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468	break;	536	break;
469		537
470	case SDL_MOUSEBUTTONDOWN:	538	case SDL_MOUSEBUTTONDOWN:
471	case SDL_MOUSEBUTTONUP:	539	case SDL_MOUSEBUTTONUP:
		540	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		541
472	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	542	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	544	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	545	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		546	break;
		547
		548	case SDL_USEREVENT:
		549	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		552	break;
476	}	553	}
477		554
478	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479	}	556	}
480	}	557	}
481		558
482	int	559	int
483	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	560	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484	POSTCALL:	561	POSTCALL:
485	Mix_HookMusicFinished (music_finished);	562	Mix_HookMusicFinished (music_finished);
		563	Mix_ChannelFinished (channel_finished);
486		564
487	void	565	void
488	Mix_CloseAudio ()	566	Mix_CloseAudio ()
489		567
490	int	568	int
…		…
495	CODE:	573	CODE:
496	#ifndef _WIN32	574	#ifndef _WIN32
497	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498	#endif	576	#endif
499		577
500	char *
501	gl_version ()
502	CODE:
503	RETVAL = (char *)glGetString (GL_VERSION);
504	OUTPUT:
505	RETVAL
506
507	char *
508	gl_extensions ()
509	CODE:
510	RETVAL = (char *)glGetString (GL_EXTENSIONS);
511	OUTPUT:
512	RETVAL
513
514	void	578	void
515	add_font (char *file)	579	add_font (char *file)
516	CODE:	580	CODE:
517	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		582	#ifdef _WIN32
		583	// cairo... sigh... requires win2000
		584	AddFontResourceEx (file, FR_PRIVATE, 0);
		585	#endif
518		586
519	void	587	void
520	load_image_inline (SV *image_)	588	load_image_inline (SV *image_)
521	ALIAS:	589	ALIAS:
522	load_image_file = 1	590	load_image_file = 1
…		…
604	PUSHs (sv_2mortal (newSViv (b / y)));	672	PUSHs (sv_2mortal (newSViv (b / y)));
605	PUSHs (sv_2mortal (newSViv (a / y)));	673	PUSHs (sv_2mortal (newSViv (a / y)));
606	}	674	}
607		675
608	void	676	void
		677	error (char *message)
		678	CODE:
		679	fprintf (stderr, "ERROR: %s\n", message);
		680	#ifdef _WIN32
		681	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		682	#endif
		683
		684	void
609	fatal (char *message)	685	fatal (char *message)
610	CODE:	686	CODE:
		687	fprintf (stderr, "FATAL: %s\n", message);
611	#ifdef _WIN32	688	#ifdef _WIN32
612	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
613	#else
614	fprintf (stderr, "FATAL: %s\n", message);
615	#endif	690	#endif
616	exit (1);	691	exit (1);
617		692
618	MODULE = CFClient PACKAGE = CFClient::Font	693	MODULE = CFClient PACKAGE = CFClient::Font
619		694
620	CFClient::Font	695	CFClient::Font
621	new_from_file (SV class, char path)	696	new_from_file (SV class, char path, int id = 0)
622	CODE:	697	CODE:
623	{	698	{
624	int count;	699	int count;
625	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
626	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	701	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627	FcPatternDestroy (pattern);	702	FcPatternDestroy (pattern);
628	}	703	}
629	OUTPUT:	704	OUTPUT:
630	RETVAL	705	RETVAL
…		…
640	default_font = self;	715	default_font = self;
641		716
642	MODULE = CFClient PACKAGE = CFClient::Layout	717	MODULE = CFClient PACKAGE = CFClient::Layout
643		718
644	CFClient::Layout	719	CFClient::Layout
645	new (SV *class, int base_height = MIN_FONT_HEIGHT)	720	new (SV *class, int rgba = 0)
646	CODE:	721	CODE:
		722	#if _WIN32
		723	//rgba = 0;//D makes text nicer, breaks TextView
		724	#endif
		725	rgba=1;//D
647	New (0, RETVAL, 1, struct cf_layout);	726	New (0, RETVAL, 1, struct cf_layout);
648	RETVAL->pl = pango_layout_new (context);	727
649	RETVAL->base_height = base_height;	728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		729	RETVAL->rgba = rgba;
		730	RETVAL->r = 1.;
		731	RETVAL->g = 1.;
		732	RETVAL->b = 1.;
		733	RETVAL->a = 1.;
		734	RETVAL->base_height = MIN_FONT_HEIGHT;
650	RETVAL->font = 0;	735	RETVAL->font = 0;
		736
651	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	737	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652	pango_layout_set_font_description (RETVAL->pl, default_font);	738	layout_update_font (RETVAL);
653	OUTPUT:	739	OUTPUT:
654	RETVAL	740	RETVAL
655		741
656	void	742	void
657	DESTROY (CFClient::Layout self)	743	DESTROY (CFClient::Layout self)
658	CODE:	744	CODE:
659	g_object_unref (self->pl);	745	g_object_unref (self->pl);
660	Safefree (self);	746	Safefree (self);
661		747
		748	int
		749	is_rgba (CFClient::Layout self)
		750	CODE:
		751	RETVAL = self->rgba;
		752	OUTPUT:
		753	RETVAL
		754
662	void	755	void
663	set_text (CFClient::Layout self, SV *text_)	756	set_text (CFClient::Layout self, SV *text_)
664	CODE:	757	CODE:
665	{	758	{
666	STRLEN textlen;	759	STRLEN textlen;
…		…
684	CODE:	777	CODE:
685	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686	SvUTF8_on (RETVAL);	779	SvUTF8_on (RETVAL);
687	OUTPUT:	780	OUTPUT:
688	RETVAL	781	RETVAL
		782
		783	void
		784	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		785	CODE:
		786	self->r = r;
		787	self->g = g;
		788	self->b = b;
		789	self->a = a;
689		790
690	void	791	void
691	set_font (CFClient::Layout self, CFClient::Font font = 0)	792	set_font (CFClient::Layout self, CFClient::Font font = 0)
692	CODE:	793	CODE:
693	if (self->font != font)	794	if (self->font != font)
…		…
709	set_width (CFClient::Layout self, int max_width = -1)	810	set_width (CFClient::Layout self, int max_width = -1)
710	CODE:	811	CODE:
711	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	812	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
712		813
713	void	814	void
		815	set_indent (CFClient::Layout self, int indent)
		816	CODE:
		817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		818
		819	void
		820	set_spacing (CFClient::Layout self, int spacing)
		821	CODE:
		822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		823
		824	void
		825	set_ellipsise (CFClient::Layout self, int ellipsise)
		826	CODE:
		827	pango_layout_set_ellipsize (self->pl,
		828	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		831	: PANGO_ELLIPSIZE_NONE
		832	);
		833
		834	void
		835	set_single_paragraph_mode (CFClient::Layout self, int spm)
		836	CODE:
		837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		838
		839	void
714	size (CFClient::Layout self)	840	size (CFClient::Layout self)
715	PPCODE:	841	PPCODE:
716	{	842	{
717	int w, h;	843	int w, h;
718		844
…		…
751	render (CFClient::Layout self)	877	render (CFClient::Layout self)
752	PPCODE:	878	PPCODE:
753	{	879	{
754	SV *retval;	880	SV *retval;
755	int w, h;	881	int w, h;
756	FT_Bitmap bitmap;
757		882
758	layout_get_pixel_size (self, &w, &h);	883	layout_get_pixel_size (self, &w, &h);
759		884
		885	if (self->rgba)
		886	{
		887	cairo_surface_t *surface;
		888	cairo_t *cairo;
		889
		890	retval = newSV (w * h * 4);
		891	SvPOK_only (retval);
		892	SvCUR_set (retval, w * h * 4);
		893
		894	memset (SvPVX (retval), 0, w * h * 4);
		895
		896	surface = cairo_image_surface_create_for_data (
		897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		898	cairo = cairo_create (surface);
		899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		900
		901	pango_cairo_show_layout (cairo, self->pl);
		902
		903	cairo_destroy (cairo);
		904	cairo_surface_destroy (surface);
		905
		906	// what a mess, and its premultiplied, too :(
		907	{
		908	uint32_t p = (uint32_t )SvPVX (retval);
		909	uint32_t e = p + w h;
		910
		911	while (p < e)
		912	{
		913	uint32_t rgba = *p;
		914	rgba = (rgba >> 24) \| (rgba << 8);
		915	#if 0
		916	#ifdef _WIN32
		917	{//D
		918	uint8_t r = rgba >> 24;
		919	uint8_t g = rgba >> 16;
		920	uint8_t b = rgba >> 8;
		921	uint8_t a = rgba >> 0;
		922
		923	rgba = (rgba & 0xffffff00) \| a;
		924	}
		925	#endif
		926	#endif
		927	rgba = SDL_SwapBE32 (rgba);
		928	*p++ = rgba;
		929	}
		930	}
		931
		932	EXTEND (SP, 5);
		933	PUSHs (sv_2mortal (newSViv (w)));
		934	PUSHs (sv_2mortal (newSViv (h)));
		935	PUSHs (sv_2mortal (retval));
		936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		938	}
		939	else
		940	{
		941	FT_Bitmap bitmap;
		942
760	retval = newSV (w * h);	943	retval = newSV (w * h);
761	SvPOK_only (retval);	944	SvPOK_only (retval);
762	SvCUR_set (retval, w * h);	945	SvCUR_set (retval, w * h);
763		946
764	bitmap.rows = h;	947	bitmap.rows = h;
765	bitmap.width = w;	948	bitmap.width = w;
766	bitmap.pitch = w;	949	bitmap.pitch = w;
767	bitmap.buffer = (unsigned char*)SvPVX (retval);	950	bitmap.buffer = (unsigned char*)SvPVX (retval);
768	bitmap.num_grays = 256;	951	bitmap.num_grays = 256;
769	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770		953
771	memset (bitmap.buffer, 0, w * h);	954	memset (bitmap.buffer, 0, w * h);
772		955
773	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
774		957
775	EXTEND (SP, 3);	958	EXTEND (SP, 5);
776	PUSHs (sv_2mortal (newSViv (w)));	959	PUSHs (sv_2mortal (newSViv (w)));
777	PUSHs (sv_2mortal (newSViv (h)));	960	PUSHs (sv_2mortal (newSViv (h)));
778	PUSHs (sv_2mortal (retval));	961	PUSHs (sv_2mortal (retval));
		962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		964	}
779	}	965	}
780		966
781	MODULE = CFClient PACKAGE = CFClient::Texture	967	MODULE = CFClient PACKAGE = CFClient::Texture
782		968
783	void	969	void
784	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	970	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
785	PROTOTYPE: $$$;$$	971	PROTOTYPE: $$$;$$
		972	ALIAS:
		973	draw_quad_alpha = 1
		974	draw_quad_alpha_premultiplied = 2
786	CODE:	975	CODE:
787	{	976	{
788	HV hv = (HV )SvRV (self);	977	HV hv = (HV )SvRV (self);
789	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	978	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	979	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
791	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	980	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
792	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
793		981
794	if (items < 5)	982	if (items < 5)
795	{	983	{
796	w = SvNV (*hv_fetch (hv, "w", 1, 1));	984	w = SvNV (*hv_fetch (hv, "w", 1, 1));
797	h = SvNV (*hv_fetch (hv, "h", 1, 1));	985	h = SvNV (*hv_fetch (hv, "h", 1, 1));
798	}	986	}
799		987
		988	if (ix)
		989	{
		990	glEnable (GL_BLEND);
		991
		992	if (ix == 2)
		993	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		994	else
		995	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		996	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		997
		998	glEnable (GL_ALPHA_TEST);
		999	glAlphaFunc (GL_GREATER, 0.01f);
		1000	}
		1001
800	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
801	if (wrap_mode) {	1003
802	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804	}
805	glBegin (GL_QUADS);	1004	glBegin (GL_QUADS);
806	glTexCoord2f (0, 0); glVertex2f (x , y );	1005	glTexCoord2f (0, 0); glVertex2f (x , y );
807	glTexCoord2f (0, t); glVertex2f (x , y + h);	1006	glTexCoord2f (0, t); glVertex2f (x , y + h);
808	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1007	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1008	glTexCoord2f (s, 0); glVertex2f (x + w, y );
810	glEnd ();	1009	glEnd ();
		1010
		1011	if (ix)
		1012	{
		1013	glDisable (GL_ALPHA_TEST);
		1014	glDisable (GL_BLEND);
		1015	}
811	}	1016	}
812		1017
813	MODULE = CFClient PACKAGE = CFClient::Map	1018	MODULE = CFClient PACKAGE = CFClient::Map
814		1019
815	CFClient::Map	1020	CFClient::Map
…		…
879	tex->r = r;	1084	tex->r = r;
880	tex->g = g;	1085	tex->g = g;
881	tex->b = b;	1086	tex->b = b;
882	tex->a = a;	1087	tex->a = a;
883	}	1088	}
		1089
		1090	// somewhat hackish, but for textures that require it, it really
		1091	// improves the look, and most others don't suffer.
		1092	glBindTexture (GL_TEXTURE_2D, name);
		1093	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1094	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1095	// use uglier nearest interpolation because linear suffers
		1096	// from transparent color bleeding and ugly wrapping effects.
		1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
884	}	1098	}
885		1099
886	int	1100	int
887	ox (CFClient::Map self)	1101	ox (CFClient::Map self)
888	ALIAS:	1102	ALIAS:
889	oy = 1	1103	oy = 1
		1104	x = 2
		1105	y = 3
		1106	w = 4
		1107	h = 5
890	CODE:	1108	CODE:
891	switch (ix)	1109	switch (ix)
892	{	1110	{
893	case 0: RETVAL = self->ox; break;	1111	case 0: RETVAL = self->ox; break;
894	case 1: RETVAL = self->oy; break;	1112	case 1: RETVAL = self->oy; break;
		1113	case 2: RETVAL = self->x; break;
		1114	case 3: RETVAL = self->y; break;
		1115	case 4: RETVAL = self->w; break;
		1116	case 5: RETVAL = self->h; break;
895	}	1117	}
896	OUTPUT:	1118	OUTPUT:
897	RETVAL	1119	RETVAL
898		1120
899	void	1121	void
…		…
1324	} *civ, const_iv[] = {	1546	} *civ, const_iv[] = {
1325	# define const_iv(name) { # name, (IV)name }	1547	# define const_iv(name) { # name, (IV)name }
1326	const_iv (GL_COLOR_MATERIAL),	1548	const_iv (GL_COLOR_MATERIAL),
1327	const_iv (GL_SMOOTH),	1549	const_iv (GL_SMOOTH),
1328	const_iv (GL_FLAT),	1550	const_iv (GL_FLAT),
		1551	const_iv (GL_DITHER),
1329	const_iv (GL_BLEND),	1552	const_iv (GL_BLEND),
		1553	const_iv (GL_CULL_FACE),
		1554	const_iv (GL_SCISSOR_TEST),
		1555	const_iv (GL_DEPTH_TEST),
		1556	const_iv (GL_ALPHA_TEST),
		1557	const_iv (GL_NORMALIZE),
		1558	const_iv (GL_RESCALE_NORMAL),
1330	const_iv (GL_AND),	1559	const_iv (GL_AND),
		1560	const_iv (GL_ONE),
		1561	const_iv (GL_ZERO),
1331	const_iv (GL_SRC_ALPHA),	1562	const_iv (GL_SRC_ALPHA),
		1563	const_iv (GL_DST_ALPHA),
1332	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1565	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1566	const_iv (GL_SRC_ALPHA_SATURATE),
1333	const_iv (GL_RGB),	1567	const_iv (GL_RGB),
1334	const_iv (GL_RGBA),	1568	const_iv (GL_RGBA),
1335	const_iv (GL_UNSIGNED_BYTE),	1569	const_iv (GL_UNSIGNED_BYTE),
1336	const_iv (GL_ALPHA4),	1570	const_iv (GL_UNSIGNED_SHORT),
		1571	const_iv (GL_UNSIGNED_INT),
1337	const_iv (GL_ALPHA),	1572	const_iv (GL_ALPHA),
		1573	const_iv (GL_INTENSITY),
		1574	const_iv (GL_LUMINANCE),
		1575	const_iv (GL_LUMINANCE_ALPHA),
1338	const_iv (GL_FLOAT),	1576	const_iv (GL_FLOAT),
1339	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1577	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340	const_iv (GL_COMPILE),	1578	const_iv (GL_COMPILE),
1341	const_iv (GL_TEXTURE_1D),	1579	const_iv (GL_TEXTURE_1D),
1342	const_iv (GL_TEXTURE_2D),	1580	const_iv (GL_TEXTURE_2D),
…		…
1344	const_iv (GL_TEXTURE_MAG_FILTER),	1582	const_iv (GL_TEXTURE_MAG_FILTER),
1345	const_iv (GL_TEXTURE_MIN_FILTER),	1583	const_iv (GL_TEXTURE_MIN_FILTER),
1346	const_iv (GL_TEXTURE_ENV_MODE),	1584	const_iv (GL_TEXTURE_ENV_MODE),
1347	const_iv (GL_TEXTURE_WRAP_S),	1585	const_iv (GL_TEXTURE_WRAP_S),
1348	const_iv (GL_TEXTURE_WRAP_T),	1586	const_iv (GL_TEXTURE_WRAP_T),
		1587	const_iv (GL_REPEAT),
1349	const_iv (GL_CLAMP),	1588	const_iv (GL_CLAMP),
1350	const_iv (GL_REPEAT),	1589	const_iv (GL_CLAMP_TO_EDGE),
1351	const_iv (GL_NEAREST),	1590	const_iv (GL_NEAREST),
1352	const_iv (GL_LINEAR),	1591	const_iv (GL_LINEAR),
1353	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1595	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357	const_iv (GL_GENERATE_MIPMAP),	1596	const_iv (GL_GENERATE_MIPMAP),
1358	const_iv (GL_LINEAR),
1359	const_iv (GL_MODULATE),	1597	const_iv (GL_MODULATE),
		1598	const_iv (GL_DECAL),
1360	const_iv (GL_REPLACE),	1599	const_iv (GL_REPLACE),
		1600	const_iv (GL_DEPTH_BUFFER_BIT),
1361	const_iv (GL_COLOR_BUFFER_BIT),	1601	const_iv (GL_COLOR_BUFFER_BIT),
1362	const_iv (GL_PROJECTION),	1602	const_iv (GL_PROJECTION),
1363	const_iv (GL_MODELVIEW),	1603	const_iv (GL_MODELVIEW),
1364	const_iv (GL_COLOR_LOGIC_OP),	1604	const_iv (GL_COLOR_LOGIC_OP),
		1605	const_iv (GL_SEPARABLE_2D),
1365	const_iv (GL_CONVOLUTION_2D),	1606	const_iv (GL_CONVOLUTION_2D),
1366	const_iv (GL_CONVOLUTION_BORDER_MODE),	1607	const_iv (GL_CONVOLUTION_BORDER_MODE),
1367	const_iv (GL_CONSTANT_BORDER),	1608	const_iv (GL_CONSTANT_BORDER),
1368	const_iv (GL_LINES),	1609	const_iv (GL_LINES),
		1610	const_iv (GL_LINE_LOOP),
1369	const_iv (GL_QUADS),	1611	const_iv (GL_QUADS),
1370	const_iv (GL_LINE_LOOP),	1612	const_iv (GL_QUAD_STRIP),
		1613	const_iv (GL_TRIANGLES),
		1614	const_iv (GL_TRIANGLE_STRIP),
		1615	const_iv (GL_TRIANGLE_FAN),
1371	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1616	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372	const_iv (GL_FASTEST),	1617	const_iv (GL_FASTEST),
		1618	const_iv (GL_V2F),
		1619	const_iv (GL_V3F),
		1620	const_iv (GL_T2F_V3F),
		1621	const_iv (GL_T2F_N3F_V3F),
1373	# undef const_iv	1622	# undef const_iv
1374	};	1623	};
1375		1624
1376	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1377	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1378	}	1627	}
1379		1628
		1629	char *
		1630	gl_vendor ()
		1631	CODE:
		1632	RETVAL = (char *)glGetString (GL_VENDOR);
		1633	OUTPUT:
		1634	RETVAL
		1635
		1636	char *
		1637	gl_version ()
		1638	CODE:
		1639	RETVAL = (char *)glGetString (GL_VERSION);
		1640	OUTPUT:
		1641	RETVAL
		1642
		1643	char *
		1644	gl_extensions ()
		1645	CODE:
		1646	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1647	OUTPUT:
		1648	RETVAL
		1649
1380	int glGetError ()	1650	int glGetError ()
1381		1651
1382	void glClear (int mask)	1652	void glClear (int mask)
1383		1653
1384	void glClearColor (float r, float g, float b, float a = 1.0)	1654	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1392		1662
1393	void glHint (int target, int mode)	1663	void glHint (int target, int mode)
1394		1664
1395	void glBlendFunc (int sfactor, int dfactor)	1665	void glBlendFunc (int sfactor, int dfactor)
1396		1666
		1667	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1668	CODE:
		1669	gl_BlendFuncSeparate (sa, da, saa, daa);
		1670
		1671	void glDepthMask (int flag)
		1672
1397	void glLogicOp (int opcode)	1673	void glLogicOp (int opcode)
1398		1674
		1675	void glColorMask (int red, int green, int blue, int alpha)
		1676
1399	void glMatrixMode (int mode)	1677	void glMatrixMode (int mode)
1400		1678
1401	void glPushMatrix ()	1679	void glPushMatrix ()
1402		1680
1403	void glPopMatrix ()	1681	void glPopMatrix ()
1404		1682
1405	void glLoadIdentity ()	1683	void glLoadIdentity ()
1406		1684
		1685	# near_ and far_ are due to microsofts buggy "c" compiler
		1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1687
		1688	# near_ and far_ are due to microsofts buggy "c" compiler
1407	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1689	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408		1690
1409	void glViewport (int x, int y, int width, int height)	1691	void glViewport (int x, int y, int width, int height)
		1692
		1693	void glScissor (int x, int y, int width, int height)
1410		1694
1411	void glTranslate (float x, float y, float z = 0.)	1695	void glTranslate (float x, float y, float z = 0.)
1412	CODE:	1696	CODE:
1413	glTranslatef (x, y, z);	1697	glTranslatef (x, y, z);
1414		1698
1415	void glScale (float x, float y, float z)	1699	void glScale (float x, float y, float z = 1.)
1416	CODE:	1700	CODE:
1417	glScalef (x, y, z);	1701	glScalef (x, y, z);
1418		1702
1419	void glRotate (float angle, float x, float y, float z)	1703	void glRotate (float angle, float x, float y, float z)
1420	CODE:	1704	CODE:
…		…
1424		1708
1425	void glEnd ()	1709	void glEnd ()
1426		1710
1427	void glColor (float r, float g, float b, float a = 1.0)	1711	void glColor (float r, float g, float b, float a = 1.0)
1428	PROTOTYPE: @	1712	PROTOTYPE: @
		1713	ALIAS:
		1714	glColor_premultiply = 1
1429	CODE:	1715	CODE:
1430	glColor4f (r, g, b, a);	1716	if (ix)
		1717	{
		1718	r *= a;
		1719	g *= a;
		1720	b *= a;
		1721	}
		1722	// microsoft visual "c" rounds instead of truncating...
		1723	glColor4ub (MIN ((int)(r * 256.f), 255),
		1724	MIN ((int)(g * 256.f), 255),
		1725	MIN ((int)(b * 256.f), 255),
		1726	MIN ((int)(a * 256.f), 255));
		1727
		1728	void glInterleavedArrays (int format, int stride, char *data)
		1729
		1730	void glDrawElements (int mode, int count, int type, char *indices)
		1731
		1732	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1733
		1734	void glRasterPos (float x, float y, float z = 0.)
		1735	CODE:
		1736	glRasterPos3f (0, 0, z);
		1737	glBitmap (0, 0, 0, 0, x, y, 0);
1431		1738
1432	void glVertex (float x, float y, float z = 0.)	1739	void glVertex (float x, float y, float z = 0.)
1433	CODE:	1740	CODE:
1434	glVertex3f (x, y, z);	1741	glVertex3f (x, y, z);
1435		1742
…		…
1447		1754
1448	void glBindTexture (int target, int name)	1755	void glBindTexture (int target, int name)
1449		1756
1450	void glConvolutionParameter (int target, int pname, float params)	1757	void glConvolutionParameter (int target, int pname, float params)
1451	CODE:	1758	CODE:
		1759	if (gl.ConvolutionParameterf)
1452	glConvolutionParameterf (target, pname, params);	1760	gl.ConvolutionParameterf (target, pname, params);
1453		1761
1454	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1762	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1763	CODE:
		1764	if (gl.ConvolutionFilter2D)
		1765	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		1766
		1767	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1768	CODE:
		1769	if (gl.SeparableFilter2D)
		1770	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1455		1771
1456	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1772	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457		1773
1458	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1774	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1775
		1776	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		1777
		1778	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459		1779
1460	int glGenTexture ()	1780	int glGenTexture ()
1461	CODE:	1781	CODE:
1462	{	1782	{
1463	GLuint name;	1783	GLuint name;
…		…
1488		1808
1489	void glEndList ()	1809	void glEndList ()
1490		1810
1491	void glCallList (int list)	1811	void glCallList (int list)
1492		1812
		1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs. Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC