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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
		61
51	#ifndef _WIN32	62	#ifndef _WIN32
52	# include <sys/types.h>	63	# include <sys/types.h>
53	# include <sys/socket.h>	64	# include <sys/socket.h>
54	# include <netinet/in.h>	65	# include <netinet/in.h>
55	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
		88	/* mask out modifiers we are not interested in */
		89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		90
68	#if 0	91	#if 1
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	92	# define PARACHUTE SDL_INIT_NOPARACHUTE
70	#else	93	#else
71	# define PARACHUTE 0	94	# define PARACHUTE 0
72	#endif	95	#endif
73		96
…		…
120		143
121	#include "pango-font.c"	144	#include "pango-font.c"
122	#include "pango-fontmap.c"	145	#include "pango-fontmap.c"
123	#include "pango-render.c"	146	#include "pango-render.c"
124		147
125	typedef IV CFPlus__Channel;	148	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	149	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	150	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	151	typedef Mix_Music *DC__MixMusic;
129		152
130	typedef PangoFontDescription *CFPlus__Font;	153	typedef PangoFontDescription *DC__Font;
131		154
132	static int	155	static int
133	shape_attr_p (PangoLayoutRun *run)	156	shape_attr_p (PangoLayoutRun *run)
134	{	157	{
135	GSList *attrs = run->item->analysis.extra_attrs;	158	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		172
150	typedef struct cf_layout {	173	typedef struct cf_layout {
151	PangoLayout *pl;	174	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	175	float r, g, b, a; // default color for rgba mode
153	int base_height;	176	int base_height;
154	CFPlus__Font font;	177	DC__Font font;
155	rc_t *rc;	178	rc_t *rc;
156	} *CFPlus__Layout;	179	} *DC__Layout;
157		180
158	static CFPlus__Font default_font;	181	static DC__Font default_font;
159	static PangoContext *opengl_context;	182	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	183	static PangoFontMap *opengl_fontmap;
161		184
162	static void	185	static void
163	substitute_func (FcPattern *pattern, gpointer data)	186	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	191	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	192	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	193	}
171		194
172	static void	195	static void
173	layout_update_font (CFPlus__Layout self)	196	layout_update_font (DC__Layout self)
174	{	197	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	198	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	199	* reasonably well with dejavu/bistream fonts
177	*/	200	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	201	PangoFontDescription *font = self->font ? self->font : default_font;
179		202
180	pango_font_description_set_absolute_size (font,	203	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	204	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		205
183	pango_layout_set_font_description (self->pl, font);	206	pango_layout_set_font_description (self->pl, font);
184	}	207	}
185		208
186	static void	209	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	210	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	211	{
189	PangoRectangle rect;	212	PangoRectangle rect;
190		213
191	// get_pixel_* wrongly rounds down	214	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	215	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	254	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	255	int texs; maptex *tex; // [tileid]
233		256
234	int32_t rows;	257	int32_t rows;
235	maprow *row;	258	maprow *row;
236	} *CFPlus__Map;	259	} *DC__Map;
237		260
238	static char *	261	static char *
239	prepend (char *ptr, int sze, int inc)	262	prepend (char *ptr, int sze, int inc)
240	{	263	{
241	char *p;	264	char *p;
…		…
279	self->texs *= 2;	302	self->texs *= 2;
280	}	303	}
281	}	304	}
282		305
283	static maprow *	306	static maprow *
284	map_get_row (CFPlus__Map self, int y)	307	map_get_row (DC__Map self, int y)
285	{	308	{
286	if (0 > y)	309	if (0 > y)
287	{	310	{
288	int extend = - y + MAP_EXTEND_Y;	311	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	312	Prepend (maprow, self->row, self->rows, extend);
…		…
327		350
328	return row->col + (x - row->c0);	351	return row->col + (x - row->c0);
329	}	352	}
330		353
331	static mapcell *	354	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	355	map_get_cell (DC__Map self, int x, int y)
333	{	356	{
334	return row_get_cell (map_get_row (self, y), x);	357	return row_get_cell (map_get_row (self, y), x);
335	}	358	}
336		359
337	static void	360	static void
338	map_clear (CFPlus__Map self)	361	map_clear (DC__Map self)
339	{	362	{
340	int r;	363	int r;
341		364
342	for (r = 0; r < self->rows; r++)	365	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	366	Safefree (self->row[r].col);
…		…
351	self->row = 0;	374	self->row = 0;
352	self->rows = 0;	375	self->rows = 0;
353	}	376	}
354		377
355	static void	378	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	379	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	380	{
358	int x, y;	381	int x, y;
359	maprow *row;	382	maprow *row;
360	mapcell *cell;	383	mapcell *cell;
361		384
…		…
498	return 0;	521	return 0;
499		522
500	return 1;	523	return 1;
501	}	524	}
502		525
503	MODULE = CFPlus PACKAGE = CFPlus	526	MODULE = Deliantra::Client PACKAGE = DC
504		527
505	PROTOTYPES: ENABLE	528	PROTOTYPES: ENABLE
506		529
507	BOOT:	530	BOOT:
508	{	531	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	532	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	533	static const struct {
511	const char *name;	534	const char *name;
512	IV iv;	535	IV iv;
513	} *civ, const_iv[] = {	536	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	537	# define const_iv(name) { # name, (IV)name }
…		…
659	CODE:	682	CODE:
660	{	683	{
661	opengl_fontmap = pango_opengl_font_map_new ();	684	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	685	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	686	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		687	/pango_context_set_font_description (opengl_context, default_font);/
		688	#if PANGO_VERSION_CHECK (1, 15, 2)
		689	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		690	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		691	#endif
664	}	692	}
665		693
666	char *	694	char *
667	SDL_GetError ()	695	SDL_GetError ()
668		696
…		…
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	728	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		729
702	if (m && m != (SDL_Rect **)-1)	730	if (m && m != (SDL_Rect **)-1)
703	while (*m)	731	while (*m)
704	{	732	{
705	if ((m)->w >= 800 && (m)->h >= 600)	733	if ((m)->w >= 800 && (m)->h >= 480)
706	{	734	{
707	AV *av = newAV ();	735	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	736	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	737	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	738	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	780	SDL_GetKeyName (int sym)
753		781
754	int	782	int
755	SDL_GetAppState ()	783	SDL_GetAppState ()
756		784
		785	int
		786	SDL_GetModState ()
		787
757	void	788	void
758	poll_events ()	789	poll_events ()
759	PPCODE:	790	PPCODE:
760	{	791	{
761	SDL_Event ev;	792	SDL_Event ev;
…		…
770	{	801	{
771	case SDL_KEYDOWN:	802	case SDL_KEYDOWN:
772	case SDL_KEYUP:	803	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	804	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	805	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	806	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	807	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	808	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	809	break;
779		810
780	case SDL_ACTIVEEVENT:	811	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	812	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	830	x = ev.motion.x;
800	y = ev.motion.y;	831	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	832	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	833	}
803		834
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	835	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	836	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	837	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	838	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	839	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	840	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	841	}
811	break;	842	break;
812		843
813	case SDL_MOUSEBUTTONDOWN:	844	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	845	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	846	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		847
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	848	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	849	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	850	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	851	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	856	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	857	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	858	break;
828	}	859	}
829		860
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	861	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	862	}
832	}	863	}
833		864
834	int	865	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	866	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	925	}
895	}	926	}
896	#endif	927	#endif
897	}	928	}
898		929
899	void	930	int
900	add_font (char *file)	931	add_font (char *file)
901	CODE:	932	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	933	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		934	OUTPUT:
		935	RETVAL
903		936
904	void	937	void
905	load_image_inline (SV *image_)	938	load_image_inline (SV *image_)
906	ALIAS:	939	ALIAS:
907	load_image_file = 1	940	load_image_file = 1
…		…
993	void	1026	void
994	error (char *message)	1027	error (char *message)
995	CODE:	1028	CODE:
996	fprintf (stderr, "ERROR: %s\n", message);	1029	fprintf (stderr, "ERROR: %s\n", message);
997	#ifdef _WIN32	1030	#ifdef _WIN32
998	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1031	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
999	#endif	1032	#endif
1000		1033
1001	void	1034	void
1002	fatal (char *message)	1035	fatal (char *message)
1003	CODE:	1036	CODE:
1004	fprintf (stderr, "FATAL: %s\n", message);	1037	fprintf (stderr, "FATAL: %s\n", message);
1005	#ifdef _WIN32	1038	#ifdef _WIN32
1006	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1039	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
1007	#endif	1040	#endif
1008	_exit (1);	1041	_exit (1);
1009		1042
1010	void	1043	void
1011	_exit (int retval = 0)	1044	_exit (int retval = 0)
…		…
1023	#if DEBUG	1056	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1057	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1058	#endif
1026	}	1059	}
1027		1060
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1061	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1062
1030	PROTOTYPES: DISABLE	1063	PROTOTYPES: DISABLE
1031		1064
1032	CFPlus::Font	1065	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1066	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1067	CODE:
1035	{	1068	{
1036	int count;	1069	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1070	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1073	}
1041	OUTPUT:	1074	OUTPUT:
1042	RETVAL	1075	RETVAL
1043		1076
1044	void	1077	void
1045	DESTROY (CFPlus::Font self)	1078	DESTROY (DC::Font self)
1046	CODE:	1079	CODE:
1047	pango_font_description_free (self);	1080	pango_font_description_free (self);
1048		1081
1049	void	1082	void
1050	make_default (CFPlus::Font self)	1083	make_default (DC::Font self)
1051	PROTOTYPE: $	1084	PROTOTYPE: $
1052	CODE:	1085	CODE:
1053	default_font = self;	1086	default_font = self;
1054		1087
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1088	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1089
1057	PROTOTYPES: DISABLE	1090	PROTOTYPES: DISABLE
1058		1091
1059	void	1092	void
1060	reset_glyph_cache ()	1093	glyph_cache_backup ()
1061	PROTOTYPE:	1094	PROTOTYPE:
1062	CODE:	1095	CODE:
		1096	tc_backup ();
		1097
		1098	void
		1099	glyph_cache_restore ()
		1100	PROTOTYPE:
		1101	CODE:
1063	tc_clear ();	1102	tc_restore ();
1064		1103
1065	CFPlus::Layout	1104	DC::Layout
1066	new (SV *class)	1105	new (SV *class)
1067	CODE:	1106	CODE:
1068	New (0, RETVAL, 1, struct cf_layout);	1107	New (0, RETVAL, 1, struct cf_layout);
1069		1108
1070	RETVAL->pl = pango_layout_new (opengl_context);	1109	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1080	layout_update_font (RETVAL);	1119	layout_update_font (RETVAL);
1081	OUTPUT:	1120	OUTPUT:
1082	RETVAL	1121	RETVAL
1083		1122
1084	void	1123	void
1085	DESTROY (CFPlus::Layout self)	1124	DESTROY (DC::Layout self)
1086	CODE:	1125	CODE:
1087	g_object_unref (self->pl);	1126	g_object_unref (self->pl);
1088	rc_free (self->rc);	1127	rc_free (self->rc);
1089	Safefree (self);	1128	Safefree (self);
1090		1129
1091	void	1130	void
1092	set_text (CFPlus::Layout self, SV *text_)	1131	set_text (DC::Layout self, SV *text_)
1093	CODE:	1132	CODE:
1094	{	1133	{
1095	STRLEN textlen;	1134	STRLEN textlen;
1096	char *text = SvPVutf8 (text_, textlen);	1135	char *text = SvPVutf8 (text_, textlen);
1097		1136
1098	pango_layout_set_text (self->pl, text, textlen);	1137	pango_layout_set_text (self->pl, text, textlen);
1099	}	1138	}
1100		1139
1101	void	1140	void
1102	set_markup (CFPlus::Layout self, SV *text_)	1141	set_markup (DC::Layout self, SV *text_)
1103	CODE:	1142	CODE:
1104	{	1143	{
1105	STRLEN textlen;	1144	STRLEN textlen;
1106	char *text = SvPVutf8 (text_, textlen);	1145	char *text = SvPVutf8 (text_, textlen);
1107		1146
1108	pango_layout_set_markup (self->pl, text, textlen);	1147	pango_layout_set_markup (self->pl, text, textlen);
1109	}	1148	}
1110		1149
1111	void	1150	void
1112	set_shapes (CFPlus::Layout self, ...)	1151	set_shapes (DC::Layout self, ...)
1113	CODE:	1152	CODE:
1114	{	1153	{
1115	PangoAttrList *attrs = 0;	1154	PangoAttrList *attrs = 0;
1116	const char *text = pango_layout_get_text (self->pl);	1155	const char *text = pango_layout_get_text (self->pl);
1117	const char *pos = text;	1156	const char *pos = text;
…		…
1152	if (attrs)	1191	if (attrs)
1153	pango_layout_set_attributes (self->pl, attrs);	1192	pango_layout_set_attributes (self->pl, attrs);
1154	}	1193	}
1155		1194
1156	void	1195	void
1157	get_shapes (CFPlus::Layout self)	1196	get_shapes (DC::Layout self)
1158	PPCODE:	1197	PPCODE:
1159	{	1198	{
1160	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1199	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161		1200
1162	do	1201	do
1163	{	1202	{
1164	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1203	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165		1204
1166	if (run && shape_attr_p (run))	1205	if (run && shape_attr_p (run))
1167	{	1206	{
1168	PangoRectangle extents;	1207	PangoRectangle extents;
1169	pango_layout_iter_get_run_extents (iter, 0, &extents);	1208	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1177		1216
1178	pango_layout_iter_free (iter);	1217	pango_layout_iter_free (iter);
1179	}	1218	}
1180		1219
1181	int	1220	int
1182	has_wrapped (CFPlus::Layout self)	1221	has_wrapped (DC::Layout self)
1183	CODE:	1222	CODE:
1184	{	1223	{
1185	int lines = 1;	1224	int lines = 1;
1186	const char *text = pango_layout_get_text (self->pl);	1225	const char *text = pango_layout_get_text (self->pl);
1187		1226
…		…
1192	}	1231	}
1193	OUTPUT:	1232	OUTPUT:
1194	RETVAL	1233	RETVAL
1195		1234
1196	SV *	1235	SV *
1197	get_text (CFPlus::Layout self)	1236	get_text (DC::Layout self)
1198	CODE:	1237	CODE:
1199	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1238	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200	sv_utf8_decode (RETVAL);	1239	sv_utf8_decode (RETVAL);
1201	OUTPUT:	1240	OUTPUT:
1202	RETVAL	1241	RETVAL
1203		1242
1204	void	1243	void
1205	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1244	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206	CODE:	1245	CODE:
1207	self->r = r;	1246	self->r = r;
1208	self->g = g;	1247	self->g = g;
1209	self->b = b;	1248	self->b = b;
1210	self->a = a;	1249	self->a = a;
1211		1250
1212	void	1251	void
1213	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1252	set_font (DC::Layout self, DC::Font font = 0)
1214	CODE:	1253	CODE:
1215	if (self->font != font)	1254	if (self->font != font)
1216	{	1255	{
1217	self->font = font;	1256	self->font = font;
1218	layout_update_font (self);	1257	layout_update_font (self);
1219	}	1258	}
1220		1259
1221	void	1260	void
1222	set_height (CFPlus::Layout self, int base_height)	1261	set_height (DC::Layout self, int base_height)
1223	CODE:	1262	CODE:
1224	if (self->base_height != base_height)	1263	if (self->base_height != base_height)
1225	{	1264	{
1226	self->base_height = base_height;	1265	self->base_height = base_height;
1227	layout_update_font (self);	1266	layout_update_font (self);
1228	}	1267	}
1229		1268
1230	void	1269	void
1231	set_width (CFPlus::Layout self, int max_width = -1)	1270	set_width (DC::Layout self, int max_width = -1)
1232	CODE:	1271	CODE:
1233	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1272	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234		1273
1235	void	1274	void
1236	set_indent (CFPlus::Layout self, int indent)	1275	set_indent (DC::Layout self, int indent)
1237	CODE:	1276	CODE:
1238	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1277	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239		1278
1240	void	1279	void
1241	set_spacing (CFPlus::Layout self, int spacing)	1280	set_spacing (DC::Layout self, int spacing)
1242	CODE:	1281	CODE:
1243	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1282	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244		1283
1245	void	1284	void
1246	set_ellipsise (CFPlus::Layout self, int ellipsise)	1285	set_ellipsise (DC::Layout self, int ellipsise)
1247	CODE:	1286	CODE:
1248	pango_layout_set_ellipsize (self->pl,	1287	pango_layout_set_ellipsize (self->pl,
1249	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1288	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1289	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1290	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252	: PANGO_ELLIPSIZE_NONE	1291	: PANGO_ELLIPSIZE_NONE
1253	);	1292	);
1254		1293
1255	void	1294	void
1256	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1295	set_single_paragraph_mode (DC::Layout self, int spm)
1257	CODE:	1296	CODE:
1258	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1297	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259		1298
1260	void	1299	void
1261	size (CFPlus::Layout self)	1300	size (DC::Layout self)
1262	PPCODE:	1301	PPCODE:
1263	{	1302	{
1264	int w, h;	1303	int w, h;
1265		1304
1266	layout_get_pixel_size (self, &w, &h);	1305	layout_get_pixel_size (self, &w, &h);
…		…
1269	PUSHs (sv_2mortal (newSViv (w)));	1308	PUSHs (sv_2mortal (newSViv (w)));
1270	PUSHs (sv_2mortal (newSViv (h)));	1309	PUSHs (sv_2mortal (newSViv (h)));
1271	}	1310	}
1272		1311
1273	int	1312	int
1274	descent (CFPlus::Layout self)	1313	descent (DC::Layout self)
1275	CODE:	1314	CODE:
1276	{	1315	{
1277	PangoRectangle rect;	1316	PangoRectangle rect;
1278	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1317	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279	pango_layout_line_get_pixel_extents (line, 0, &rect);	1318	pango_layout_line_get_pixel_extents (line, 0, &rect);
1280	RETVAL = PANGO_DESCENT (rect);	1319	RETVAL = PANGO_DESCENT (rect);
1281	}	1320	}
1282	OUTPUT:	1321	OUTPUT:
1283	RETVAL	1322	RETVAL
1284		1323
1285	int	1324	int
1286	xy_to_index (CFPlus::Layout self, int x, int y)	1325	xy_to_index (DC::Layout self, int x, int y)
1287	CODE:	1326	CODE:
1288	{	1327	{
1289	int index, trailing;	1328	int index, trailing;
1290	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1329	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291	RETVAL = index + trailing;	1330	RETVAL = index + trailing;
1292	}	1331	}
1293	OUTPUT:	1332	OUTPUT:
1294	RETVAL	1333	RETVAL
1295		1334
1296	void	1335	void
1297	cursor_pos (CFPlus::Layout self, int index)	1336	cursor_pos (DC::Layout self, int index)
1298	PPCODE:	1337	PPCODE:
1299	{	1338	{
1300	PangoRectangle strong_pos;	1339	PangoRectangle pos;
1301	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1340	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302		1341
1303	EXTEND (SP, 3);	1342	EXTEND (SP, 3);
1304	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1343	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1344	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1345	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307	}	1346	}
1308		1347
1309	void	1348	void
1310	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1349	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311	PPCODE:	1350	PPCODE:
1312	{	1351	{
1313	int line, x;	1352	int line, x;
1314		1353
1315	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1354	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1355	#if !PANGO_VERSION_CHECK (1, 17, 3)
1316	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1356	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317		1357	--line;
		1358	#endif
1318	EXTEND (SP, 2);	1359	EXTEND (SP, 2);
1319	PUSHs (sv_2mortal (newSViv (line - 1)));	1360	PUSHs (sv_2mortal (newSViv (line)));
1320	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1361	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321	}	1362	}
1322		1363
1323	void	1364	void
1324	line_x_to_index (CFPlus::Layout self, int line, int x)	1365	line_x_to_index (DC::Layout self, int line, int x)
1325	PPCODE:	1366	PPCODE:
1326	{	1367	{
1327	PangoLayoutLine *lp;	1368	PangoLayoutLine *lp;
1328	int index, trailing;	1369	int index, trailing;
1329		1370
1330	if (line < 0)	1371	if (line < 0)
1331	XSRETURN_EMPTY;	1372	XSRETURN_EMPTY;
1332		1373
1333	if (!(lp = pango_layout_get_line (self->pl, line)))	1374	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334	XSRETURN_EMPTY; /* do better */	1375	XSRETURN_EMPTY; /* do better */
1335		1376
1336	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1377	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337		1378
1338	EXTEND (SP, 2);	1379	EXTEND (SP, 2);
…		…
1344	PUSHs (sv_2mortal (newSViv (trailing)));	1385	PUSHs (sv_2mortal (newSViv (trailing)));
1345	}	1386	}
1346	}	1387	}
1347		1388
1348	void	1389	void
1349	render (CFPlus::Layout self, float x, float y, int flags = 0)	1390	render (DC::Layout self, float x, float y, int flags = 0)
1350	CODE:	1391	CODE:
1351	rc_clear (self->rc);	1392	rc_clear (self->rc);
1352	pango_opengl_render_layout_subpixel (	1393	pango_opengl_render_layout_subpixel (
1353	self->pl,	1394	self->pl,
1354	self->rc,	1395	self->rc,
…		…
1359	// we assume that context_change actually clears/frees stuff	1400	// we assume that context_change actually clears/frees stuff
1360	// and does not do any recomputation...	1401	// and does not do any recomputation...
1361	pango_layout_context_changed (self->pl);	1402	pango_layout_context_changed (self->pl);
1362		1403
1363	void	1404	void
1364	draw (CFPlus::Layout self)	1405	draw (DC::Layout self)
1365	CODE:	1406	CODE:
1366	{	1407	{
1367	glEnable (GL_TEXTURE_2D);	1408	glEnable (GL_TEXTURE_2D);
1368	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1409	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369	glEnable (GL_BLEND);	1410	glEnable (GL_BLEND);
…		…
1377	glDisable (GL_ALPHA_TEST);	1418	glDisable (GL_ALPHA_TEST);
1378	glDisable (GL_BLEND);	1419	glDisable (GL_BLEND);
1379	glDisable (GL_TEXTURE_2D);	1420	glDisable (GL_TEXTURE_2D);
1380	}	1421	}
1381		1422
1382	MODULE = CFPlus PACKAGE = CFPlus::Texture	1423	MODULE = Deliantra::Client PACKAGE = DC::Texture
1383		1424
1384	PROTOTYPES: ENABLE	1425	PROTOTYPES: ENABLE
1385		1426
1386	void	1427	void
1387	pad (SV *data_, int ow, int oh, int nw, int nh)	1428	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1466	RETVAL = width > 0;	1507	RETVAL = width > 0;
1467	}	1508	}
1468	OUTPUT:	1509	OUTPUT:
1469	RETVAL	1510	RETVAL
1470		1511
1471	MODULE = CFPlus PACKAGE = CFPlus::Map	1512	MODULE = Deliantra::Client PACKAGE = DC::Map
1472		1513
1473	PROTOTYPES: DISABLE	1514	PROTOTYPES: DISABLE
1474		1515
1475	CFPlus::Map	1516	DC::Map
1476	new (SV *class)	1517	new (SV *class)
1477	CODE:	1518	CODE:
1478	New (0, RETVAL, 1, struct map);	1519	New (0, RETVAL, 1, struct map);
1479	RETVAL->x = 0;	1520	RETVAL->x = 0;
1480	RETVAL->y = 0;	1521	RETVAL->y = 0;
…		…
1488	RETVAL->row = 0;	1529	RETVAL->row = 0;
1489	OUTPUT:	1530	OUTPUT:
1490	RETVAL	1531	RETVAL
1491		1532
1492	void	1533	void
1493	DESTROY (CFPlus::Map self)	1534	DESTROY (DC::Map self)
1494	CODE:	1535	CODE:
1495	{	1536	{
1496	map_clear (self);	1537	map_clear (self);
1497	Safefree (self->face2tile);	1538	Safefree (self->face2tile);
1498	Safefree (self->tex);	1539	Safefree (self->tex);
1499	Safefree (self);	1540	Safefree (self);
1500	}	1541	}
1501		1542
1502	void	1543	void
1503	resize (CFPlus::Map self, int map_width, int map_height)	1544	resize (DC::Map self, int map_width, int map_height)
1504	CODE:	1545	CODE:
1505	self->w = map_width;	1546	self->w = map_width;
1506	self->h = map_height;	1547	self->h = map_height;
1507		1548
1508	void	1549	void
1509	clear (CFPlus::Map self)	1550	clear (DC::Map self)
1510	CODE:	1551	CODE:
1511	map_clear (self);	1552	map_clear (self);
1512		1553
1513	void	1554	void
1514	set_tileid (CFPlus::Map self, int face, int tile)	1555	set_tileid (DC::Map self, int face, int tile)
1515	CODE:	1556	CODE:
1516	{	1557	{
1517	need_facenum (self, face); self->face2tile [face] = tile;	1558	need_facenum (self, face); self->face2tile [face] = tile;
1518	need_texid (self, tile);	1559	need_texid (self, tile);
1519	}	1560	}
1520		1561
1521	void	1562	void
1522	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1563	set_smooth (DC::Map self, int face, int smooth, int level)
1523	CODE:	1564	CODE:
1524	{	1565	{
1525	tileid texid;	1566	tileid texid;
1526	maptex *tex;	1567	maptex *tex;
1527		1568
…		…
1540	tex->smoothtile = self->face2tile [smooth];	1581	tex->smoothtile = self->face2tile [smooth];
1541	tex->smoothlevel = level;	1582	tex->smoothlevel = level;
1542	}	1583	}
1543		1584
1544	void	1585	void
1545	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1586	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1546	CODE:	1587	CODE:
1547	{	1588	{
1548	need_texid (self, texid);	1589	need_texid (self, texid);
1549		1590
1550	{	1591	{
…		…
1570	// from transparent color bleeding and ugly wrapping effects.	1611	// from transparent color bleeding and ugly wrapping effects.
1571	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1612	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572	}	1613	}
1573		1614
1574	int	1615	int
1575	ox (CFPlus::Map self)	1616	ox (DC::Map self)
1576	ALIAS:	1617	ALIAS:
1577	oy = 1	1618	oy = 1
1578	x = 2	1619	x = 2
1579	y = 3	1620	y = 3
1580	w = 4	1621	w = 4
…		…
1591	}	1632	}
1592	OUTPUT:	1633	OUTPUT:
1593	RETVAL	1634	RETVAL
1594		1635
1595	void	1636	void
1596	scroll (CFPlus::Map self, int dx, int dy)	1637	scroll (DC::Map self, int dx, int dy)
1597	CODE:	1638	CODE:
1598	{	1639	{
1599	if (dx > 0)	1640	if (dx > 0)
1600	map_blank (self, self->x, self->y, dx, self->h);	1641	map_blank (self, self->x, self->y, dx, self->h);
1601	else if (dx < 0)	1642	else if (dx < 0)
…		…
1617	self->y += MAP_EXTEND_Y;	1658	self->y += MAP_EXTEND_Y;
1618	}	1659	}
1619	}	1660	}
1620		1661
1621	SV *	1662	SV *
1622	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1663	map1a_update (DC::Map self, SV *data_, int extmap)
1623	CODE:	1664	CODE:
1624	{	1665	{
1625	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1666	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1626	uint8_t data_end = (uint8_t )SvEND (data_);	1667	uint8_t data_end = (uint8_t )SvEND (data_);
1627	mapcell *cell;	1668	mapcell *cell;
…		…
1655	uint8_t ext, cmd;	1696	uint8_t ext, cmd;
1656		1697
1657	do	1698	do
1658	{	1699	{
1659	ext = *data++;	1700	ext = *data++;
1660	cmd = ext & 0x3f;	1701	cmd = ext & 0x7f;
1661		1702
1662	if (cmd < 4)	1703	if (cmd < 4)
1663	cell->darkness = 255 - ext * 64 + 1;	1704	cell->darkness = 255 - ext * 64 + 1;
1664	else if (cmd == 5) // health	1705	else if (cmd == 5) // health
1665	{	1706	{
…		…
1668	}	1709	}
1669	else if (cmd == 6) // monster width	1710	else if (cmd == 6) // monster width
1670	cell->stat_width = *data++ + 1;	1711	cell->stat_width = *data++ + 1;
1671	else if (cmd == 0x47)	1712	else if (cmd == 0x47)
1672	{	1713	{
1673	if (*data == 4)	1714	if (*data == 1) cell->player = data [1];
1674	; // decode player count	1715	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1716	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1717	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675		1718
1676	data += *data + 1;	1719	data += *data + 1;
1677	}	1720	}
1678	else if (cmd == 8) // cell flags	1721	else if (cmd == 8) // cell flags
1679	cell->flags = *data++;	1722	cell->flags = *data++;
…		…
1716	}	1759	}
1717	OUTPUT:	1760	OUTPUT:
1718	RETVAL	1761	RETVAL
1719		1762
1720	SV *	1763	SV *
1721	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1764	mapmap (DC::Map self, int x0, int y0, int w, int h)
1722	CODE:	1765	CODE:
1723	{	1766	{
1724	int x1, x;	1767	int x1, x;
1725	int y1, y;	1768	int y1, y;
1726	int z;	1769	int z;
…		…
1771	}	1814	}
1772	OUTPUT:	1815	OUTPUT:
1773	RETVAL	1816	RETVAL
1774		1817
1775	void	1818	void
1776	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1819	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1777	CODE:	1820	CODE:
1778	{	1821	{
1779	int x, y, z;	1822	int x, y, z;
1780		1823
1781	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1824	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1782	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1825	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1826	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784	smooth_key skey;	1827	smooth_key skey;
1785		1828	int pl_x, pl_y;
		1829	maptex pl_tex;
1786	rc_t *rc = rc_alloc ();	1830	rc_t *rc = rc_alloc ();
1787	rc_key_t key;	1831	rc_key_t key;
1788	rc_array_t *arr;	1832	rc_array_t *arr;
		1833
		1834	pl_tex.name = 0;
1789		1835
1790	// thats current max. sorry.	1836	// thats current max. sorry.
1791	if (sw > 255) sw = 255;	1837	if (sw > 255) sw = 255;
1792	if (sh > 255) sh = 255;	1838	if (sh > 255) sh = 255;
1793		1839
…		…
1848	tileid tile = cell->tile [z];	1894	tileid tile = cell->tile [z];
1849		1895
1850	if (tile)	1896	if (tile)
1851	{	1897	{
1852	maptex tex = self->tex [tile];	1898	maptex tex = self->tex [tile];
1853	int px, py;	1899	int px = (x + 1) * T - tex.w;
		1900	int py = (y + 1) * T - tex.h;
1854		1901
1855	if (key.texname != tex.name)	1902	if (key.texname != tex.name)
1856	{	1903	{
1857	if (!tex.name)	1904	if (!tex.name)
1858	tex = self->tex [2]; /* missing, replace by noface */	1905	tex = self->tex [2]; /* missing, replace by noface */
1859		1906
1860	key.texname = tex.name;	1907	key.texname = tex.name;
1861	arr = rc_array (rc, &key);	1908	arr = rc_array (rc, &key);
1862	}	1909	}
1863		1910
1864	px = (x + 1) * T - tex.w;	1911	if (expect_false (cell->player == player) && expect_false (z == 2))
1865	py = (y + 1) * T - tex.h;	1912	{
		1913	pl_x = px;
		1914	pl_y = py;
		1915	pl_tex = tex;
		1916	continue;
		1917	}
1866		1918
1867	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1919	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1920	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1921	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1922	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871		1923
1872	if (cell->flags && z == 2)	1924	if (expect_false (cell->flags) && expect_false (z == 2))
1873	{	1925	{
1874	// overlays such as the speech bubble, probably more to come	1926	// overlays such as the speech bubble, probably more to come
1875	if (cell->flags & 1)	1927	if (cell->flags & 1)
1876	{	1928	{
1877	maptex tex = self->tex [1];	1929	maptex tex = self->tex [1];
…		…
2016	}	2068	}
2017		2069
2018	hv_clear (smooth);	2070	hv_clear (smooth);
2019	}	2071	}
2020		2072
		2073	if (pl_tex.name)
		2074	{
		2075	maptex tex = pl_tex;
		2076	int px = pl_x + pdx;
		2077	int py = pl_y + pdy;
		2078
		2079	key.texname = tex.name;
		2080	arr = rc_array (rc, &key);
		2081
		2082	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2083	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2084	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2085	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2086
		2087	rc_draw (rc);
		2088	}
		2089
2021	glDisable (GL_BLEND);	2090	glDisable (GL_BLEND);
2022	rc_free (rc);	2091	rc_free (rc);
2023		2092
2024	// top layer: overlays such as the health bar	2093	// top layer: overlays such as the health bar
2025	for (y = 0; y < sh; y++)	2094	for (y = 0; y < sh; y++)
…		…
2052	}	2121	}
2053	}	2122	}
2054	}	2123	}
2055		2124
2056	void	2125	void
2057	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2126	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058	CODE:	2127	CODE:
2059	{	2128	{
2060	static float color[16][3] = {	2129	static float color[16][3] = {
2061	{ 0.00F, 0.00F, 0.00F },	2130	{ 0.00F, 0.00F, 0.00F },
2062	{ 1.00F, 1.00F, 1.00F },	2131	{ 1.00F, 1.00F, 1.00F },
…		…
2112	glDisable (GL_BLEND);	2181	glDisable (GL_BLEND);
2113	glDisable (GL_TEXTURE_2D);	2182	glDisable (GL_TEXTURE_2D);
2114	}	2183	}
2115		2184
2116	void	2185	void
2117	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2186	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118	PPCODE:	2187	PPCODE:
2119	{	2188	{
2120	int x, y;	2189	int x, y;
2121	int sw1 = sw + 2;	2190	int sw1 = sw + 2;
2122	int sh1 = sh + 2;	2191	int sh1 = sh + 2;
…		…
2193	PUSHs (sv_2mortal (newSViv (sh3)));	2262	PUSHs (sv_2mortal (newSViv (sh3)));
2194	PUSHs (darkness3_sv);	2263	PUSHs (darkness3_sv);
2195	}	2264	}
2196		2265
2197	SV *	2266	SV *
2198	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2267	get_rect (DC::Map self, int x0, int y0, int w, int h)
2199	CODE:	2268	CODE:
2200	{	2269	{
2201	int x, y, x1, y1;	2270	int x, y, x1, y1;
2202	SV data_sv = newSV (w h * 7 + 5);	2271	SV data_sv = newSV (w h * 7 + 5);
2203	uint8_t data = (uint8_t )SvPVX (data_sv);	2272	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2260	else	2329	else
2261	*data++ = 0;	2330	*data++ = 0;
2262	}	2331	}
2263	}	2332	}
2264		2333
		2334	/* if size is wh + 5 then no data has been found /
		2335	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2336	{
2265	SvPOK_only (data_sv);	2337	SvPOK_only (data_sv);
2266	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2338	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2339	}
		2340
2267	RETVAL = data_sv;	2341	RETVAL = data_sv;
2268	}	2342	}
2269	OUTPUT:	2343	OUTPUT:
2270	RETVAL	2344	RETVAL
2271		2345
2272	void	2346	void
2273	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2347	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274	PPCODE:	2348	PPCODE:
2275	{	2349	{
2276	int x, y, z;	2350	int x, y, z;
2277	int w, h;	2351	int w, h;
2278	int x1, y1;	2352	int x1, y1;
		2353	STRLEN len;
		2354	uint8_t data, end;
		2355
		2356	len = SvLEN (data_sv);
		2357	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2358	data = SvPVbyte_nolen (data_sv);
		2359	end = data + len + 8;
		2360
		2361	if (len < 5)
		2362	XSRETURN_EMPTY;
2279		2363
2280	if (*data++ != 0)	2364	if (*data++ != 0)
2281	XSRETURN_EMPTY; /* version mismatch */	2365	XSRETURN_EMPTY; /* version mismatch */
2282		2366
2283	w = data++ << 8; w \|= data++;	2367	w = data++ << 8; w \|= data++;
…		…
2298	{	2382	{
2299	maprow *row = map_get_row (self, y);	2383	maprow *row = map_get_row (self, y);
2300		2384
2301	for (x = x0; x < x1; x++)	2385	for (x = x0; x < x1; x++)
2302	{	2386	{
		2387	uint8_t flags;
		2388
		2389	if (data + 7 >= end)
		2390	XSRETURN_EMPTY;
		2391
2303	uint8_t flags = *data++;	2392	flags = *data++;
2304		2393
2305	if (flags)	2394	if (flags)
2306	{	2395	{
2307	mapcell *cell = row_get_cell (row, x);	2396	mapcell *cell = row_get_cell (row, x);
2308	tileid tile[3] = { 0, 0, 0 };	2397	tileid tile[3] = { 0, 0, 0 };
…		…
2311	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2400	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2312	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2401	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2313		2402
2314	if (cell->darkness == 0)	2403	if (cell->darkness == 0)
2315	{	2404	{
2316	cell->darkness = 0;	2405	/cell->darkness = 0;/
		2406	EXTEND (SP, 3);
2317		2407
2318	for (z = 0; z <= 2; z++)	2408	for (z = 0; z <= 2; z++)
2319	{	2409	{
2320	tileid t = tile [z];	2410	tileid t = tile [z];
2321		2411
2322	if (t >= self->texs \|\| (t && !self->tex [t].name))	2412	if (t >= self->texs \|\| (t && !self->tex [t].name))
2323	{	2413	{
2324	XPUSHs (sv_2mortal (newSViv (t)));	2414	PUSHs (sv_2mortal (newSViv (t)));
2325	need_texid (self, t);	2415	need_texid (self, t);
2326	}	2416	}
2327		2417
2328	cell->tile [z] = t;	2418	cell->tile [z] = t;
2329	}	2419	}
…		…
2331	}	2421	}
2332	}	2422	}
2333	}	2423	}
2334	}	2424	}
2335		2425
2336	MODULE = CFPlus PACKAGE = CFPlus::RW	2426	MODULE = Deliantra::Client PACKAGE = DC::RW
2337		2427
2338	CFPlus::RW	2428	DC::RW
2339	new (SV class, SV data_sv)	2429	new (SV class, SV data_sv)
2340	CODE:	2430	CODE:
2341	{	2431	{
2342	STRLEN datalen;	2432	STRLEN datalen;
2343	char *data = SvPVbyte (data_sv, datalen);	2433	char *data = SvPVbyte (data_sv, datalen);
…		…
2345	RETVAL = SDL_RWFromConstMem (data, datalen);	2435	RETVAL = SDL_RWFromConstMem (data, datalen);
2346	}	2436	}
2347	OUTPUT:	2437	OUTPUT:
2348	RETVAL	2438	RETVAL
2349		2439
2350	CFPlus::RW	2440	DC::RW
2351	new_from_file (SV class, const char path, const char *mode = "rb")	2441	new_from_file (SV class, const char path, const char *mode = "rb")
2352	CODE:	2442	CODE:
2353	RETVAL = SDL_RWFromFile (path, mode);	2443	RETVAL = SDL_RWFromFile (path, mode);
2354	OUTPUT:	2444	OUTPUT:
2355	RETVAL	2445	RETVAL
2356		2446
2357	# fails on win32:	2447	# fails on win32:
2358	# CFPlus.xs(2268) : error C2059: syntax error : '('	2448	# dc.xs(2268) : error C2059: syntax error : '('
2359	#void	2449	#void
2360	#close (CFPlus::RW self)	2450	#close (DC::RW self)
2361	# CODE:	2451	# CODE:
2362	# (self->(close)) (self);	2452	# (self->(close)) (self);
2363		2453
2364	MODULE = CFPlus PACKAGE = CFPlus::Channel	2454	MODULE = Deliantra::Client PACKAGE = DC::Channel
2365		2455
2366	PROTOTYPES: DISABLE	2456	PROTOTYPES: DISABLE
2367		2457
2368	CFPlus::Channel	2458	DC::Channel
2369	find ()	2459	find ()
2370	CODE:	2460	CODE:
2371	{	2461	{
2372	RETVAL = Mix_GroupAvailable (-1);	2462	RETVAL = Mix_GroupAvailable (-1);
2373		2463
…		…
2386	}	2476	}
2387	OUTPUT:	2477	OUTPUT:
2388	RETVAL	2478	RETVAL
2389		2479
2390	void	2480	void
2391	halt (CFPlus::Channel self)	2481	halt (DC::Channel self)
2392	CODE:	2482	CODE:
2393	Mix_HaltChannel (self);	2483	Mix_HaltChannel (self);
2394		2484
2395	void	2485	void
2396	expire (CFPlus::Channel self, int ticks = -1)	2486	expire (DC::Channel self, int ticks = -1)
2397	CODE:	2487	CODE:
2398	Mix_ExpireChannel (self, ticks);	2488	Mix_ExpireChannel (self, ticks);
2399		2489
2400	void	2490	void
2401	fade_out (CFPlus::Channel self, int ticks = -1)	2491	fade_out (DC::Channel self, int ticks = -1)
2402	CODE:	2492	CODE:
2403	Mix_FadeOutChannel (self, ticks);	2493	Mix_FadeOutChannel (self, ticks);
2404		2494
2405	int	2495	int
2406	volume (CFPlus::Channel self, int volume)	2496	volume (DC::Channel self, int volume)
2407	CODE:	2497	CODE:
2408	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2498	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409	OUTPUT:	2499	OUTPUT:
2410	RETVAL	2500	RETVAL
2411		2501
2412	void	2502	void
2413	unregister_all_effects (CFPlus::Channel self)	2503	unregister_all_effects (DC::Channel self)
2414	CODE:	2504	CODE:
2415	Mix_UnregisterAllEffects (self);	2505	Mix_UnregisterAllEffects (self);
2416		2506
2417	void	2507	void
2418	set_panning (CFPlus::Channel self, int left, int right)	2508	set_panning (DC::Channel self, int left, int right)
2419	CODE:	2509	CODE:
2420	left = CLAMP (left , 0, 255);	2510	left = CLAMP (left , 0, 255);
2421	right = CLAMP (right, 0, 255);	2511	right = CLAMP (right, 0, 255);
2422	Mix_SetPanning (self, left, right);	2512	Mix_SetPanning (self, left, right);
2423		2513
2424	void	2514	void
2425	set_distance (CFPlus::Channel self, int distance)	2515	set_distance (DC::Channel self, int distance)
2426	CODE:	2516	CODE:
2427	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2517	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428		2518
2429	void	2519	void
2430	set_position (CFPlus::Channel self, int angle, int distance)	2520	set_position (DC::Channel self, int angle, int distance)
2431	CODE:	2521	CODE:
2432		2522
2433	void	2523	void
2434	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2524	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435	CODE:	2525	CODE:
2436	{	2526	{
2437	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2527	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2528	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2529	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440	}	2530	}
2441		2531
2442	void	2532	void
2443	set_reverse_stereo (CFPlus::Channel self, int flip)	2533	set_reverse_stereo (DC::Channel self, int flip)
2444	CODE:	2534	CODE:
2445	Mix_SetReverseStereo (self, flip);	2535	Mix_SetReverseStereo (self, flip);
2446		2536
2447	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2537	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448		2538
2449	PROTOTYPES: DISABLE	2539	PROTOTYPES: DISABLE
2450		2540
2451	CFPlus::MixChunk	2541	DC::MixChunk
2452	new (SV *class, CFPlus::RW rwops)	2542	new (SV *class, DC::RW rwops)
2453	CODE:	2543	CODE:
2454	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2544	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455	OUTPUT:	2545	OUTPUT:
2456	RETVAL	2546	RETVAL
2457		2547
2458	void	2548	void
2459	DESTROY (CFPlus::MixChunk self)	2549	DESTROY (DC::MixChunk self)
2460	CODE:	2550	CODE:
2461	Mix_FreeChunk (self);	2551	Mix_FreeChunk (self);
2462		2552
2463	int	2553	int
2464	volume (CFPlus::MixChunk self, int volume = -1)	2554	volume (DC::MixChunk self, int volume = -1)
2465	CODE:	2555	CODE:
2466	if (items > 1)	2556	if (items > 1)
2467	volume = CLAMP (volume, 0, 128);	2557	volume = CLAMP (volume, 0, 128);
2468	RETVAL = Mix_VolumeChunk (self, volume);	2558	RETVAL = Mix_VolumeChunk (self, volume);
2469	OUTPUT:	2559	OUTPUT:
2470	RETVAL	2560	RETVAL
2471		2561
2472	CFPlus::Channel	2562	DC::Channel
2473	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2563	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474	CODE:	2564	CODE:
2475	{	2565	{
2476	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2566	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477		2567
2478	if (RETVAL < 0)	2568	if (RETVAL < 0)
…		…
2485	}	2575	}
2486	}	2576	}
2487	OUTPUT:	2577	OUTPUT:
2488	RETVAL	2578	RETVAL
2489		2579
2490	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2580	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491		2581
2492	int	2582	int
2493	volume (int volume = -1)	2583	volume (int volume = -1)
2494	PROTOTYPE: ;$	2584	PROTOTYPE: ;$
2495	CODE:	2585	CODE:
…		…
2507	void	2597	void
2508	halt ()	2598	halt ()
2509	CODE:	2599	CODE:
2510	Mix_HaltMusic ();	2600	Mix_HaltMusic ();
2511		2601
2512	CFPlus::MixMusic	2602	DC::MixMusic
2513	new (SV *class, CFPlus::RW rwops)	2603	new (SV *class, DC::RW rwops)
2514	CODE:	2604	CODE:
2515	RETVAL = Mix_LoadMUS_RW (rwops);	2605	RETVAL = Mix_LoadMUS_RW (rwops);
2516	OUTPUT:	2606	OUTPUT:
2517	RETVAL	2607	RETVAL
2518		2608
2519	void	2609	void
2520	DESTROY (CFPlus::MixMusic self)	2610	DESTROY (DC::MixMusic self)
2521	CODE:	2611	CODE:
2522	Mix_FreeMusic (self);	2612	Mix_FreeMusic (self);
2523		2613
2524	int	2614	int
2525	play (CFPlus::MixMusic self, int loops = -1)	2615	play (DC::MixMusic self, int loops = -1)
2526	CODE:	2616	CODE:
2527	RETVAL = Mix_PlayMusic (self, loops);	2617	RETVAL = Mix_PlayMusic (self, loops);
2528	OUTPUT:	2618	OUTPUT:
2529	RETVAL	2619	RETVAL
2530		2620
2531	void	2621	void
2532	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2622	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533	CODE:	2623	CODE:
2534	Mix_FadeInMusicPos (self, loops, ms, position);	2624	Mix_FadeInMusicPos (self, loops, ms, position);
2535		2625
2536	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2626	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537		2627
2538	PROTOTYPES: ENABLE	2628	PROTOTYPES: ENABLE
2539		2629
2540	BOOT:	2630	BOOT:
2541	{	2631	{
2542	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2632	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543	static const struct {	2633	static const struct {
2544	const char *name;	2634	const char *name;
2545	IV iv;	2635	IV iv;
2546	} *civ, const_iv[] = {	2636	} *civ, const_iv[] = {
2547	# define const_iv(name) { # name, (IV)name }	2637	# define const_iv(name) { # name, (IV)name }
…		…
2840	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2930	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2841	CODE:	2931	CODE:
2842	if (gl.SeparableFilter2D)	2932	if (gl.SeparableFilter2D)
2843	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2933	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844		2934
2845	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2935	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846		2936
2847	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2937	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848		2938
2849	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2939	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850		2940
…		…
2876		2966
2877	void glEndList ()	2967	void glEndList ()
2878		2968
2879	void glCallList (int list)	2969	void glCallList (int list)
2880		2970
2881	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2971	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882		2972
2883	PROTOTYPES: DISABLE	2973	PROTOTYPES: DISABLE
2884		2974
2885	void	2975	void
2886	find_widget (SV *self, NV x, NV y)	2976	find_widget (SV *self, NV x, NV y)
…		…
2890	XPUSHs (self);	2980	XPUSHs (self);
2891	}	2981	}
2892		2982
2893	BOOT:	2983	BOOT:
2894	{	2984	{
2895	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2985	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896		2986
2897	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2987	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2988	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2989	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2990	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901	}	2991	}
2902		2992
2903	void	2993	void
2904	draw (SV *self)	2994	draw (SV *self)
2905	CODE:	2995	CODE:
…		…
2912	SV *draw_w_sv = GvSV (draw_w_gv);	3002	SV *draw_w_sv = GvSV (draw_w_gv);
2913	SV *draw_h_sv = GvSV (draw_h_gv);	3003	SV *draw_h_sv = GvSV (draw_h_gv);
2914	double draw_x, draw_y;	3004	double draw_x, draw_y;
2915		3005
2916	if (!SvROK (self))	3006	if (!SvROK (self))
2917	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3007	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918		3008
2919	hv = (HV *)SvRV (self);	3009	hv = (HV *)SvRV (self);
2920		3010
2921	if (SvTYPE (hv) != SVt_PVHV)	3011	if (SvTYPE (hv) != SVt_PVHV)
2922	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3012	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923		3013
2924	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3014	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3015	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926		3016
2927	if (!h \|\| !w)	3017	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC vs. Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC