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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 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
…		…
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	glyph_cache_backup ()	1093	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1099	glyph_cache_restore ()
1067	PROTOTYPE:	1100	PROTOTYPE:
1068	CODE:	1101	CODE:
1069	tc_restore ();	1102	tc_restore ();
1070		1103
1071	CFPlus::Layout	1104	DC::Layout
1072	new (SV *class)	1105	new (SV *class)
1073	CODE:	1106	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1107	New (0, RETVAL, 1, struct cf_layout);
1075		1108
1076	RETVAL->pl = pango_layout_new (opengl_context);	1109	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1119	layout_update_font (RETVAL);
1087	OUTPUT:	1120	OUTPUT:
1088	RETVAL	1121	RETVAL
1089		1122
1090	void	1123	void
1091	DESTROY (CFPlus::Layout self)	1124	DESTROY (DC::Layout self)
1092	CODE:	1125	CODE:
1093	g_object_unref (self->pl);	1126	g_object_unref (self->pl);
1094	rc_free (self->rc);	1127	rc_free (self->rc);
1095	Safefree (self);	1128	Safefree (self);
1096		1129
1097	void	1130	void
1098	set_text (CFPlus::Layout self, SV *text_)	1131	set_text (DC::Layout self, SV *text_)
1099	CODE:	1132	CODE:
1100	{	1133	{
1101	STRLEN textlen;	1134	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1135	char *text = SvPVutf8 (text_, textlen);
1103		1136
1104	pango_layout_set_text (self->pl, text, textlen);	1137	pango_layout_set_text (self->pl, text, textlen);
1105	}	1138	}
1106		1139
1107	void	1140	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1141	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1142	CODE:
1110	{	1143	{
1111	STRLEN textlen;	1144	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1145	char *text = SvPVutf8 (text_, textlen);
1113		1146
1114	pango_layout_set_markup (self->pl, text, textlen);	1147	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1148	}
1116		1149
1117	void	1150	void
1118	set_shapes (CFPlus::Layout self, ...)	1151	set_shapes (DC::Layout self, ...)
1119	CODE:	1152	CODE:
1120	{	1153	{
1121	PangoAttrList *attrs = 0;	1154	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1155	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1156	const char *pos = text;
…		…
1158	if (attrs)	1191	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1192	pango_layout_set_attributes (self->pl, attrs);
1160	}	1193	}
1161		1194
1162	void	1195	void
1163	get_shapes (CFPlus::Layout self)	1196	get_shapes (DC::Layout self)
1164	PPCODE:	1197	PPCODE:
1165	{	1198	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1199	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1200
1168	do	1201	do
1169	{	1202	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1203	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1204
1172	if (run && shape_attr_p (run))	1205	if (run && shape_attr_p (run))
1173	{	1206	{
1174	PangoRectangle extents;	1207	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1208	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1216
1184	pango_layout_iter_free (iter);	1217	pango_layout_iter_free (iter);
1185	}	1218	}
1186		1219
1187	int	1220	int
1188	has_wrapped (CFPlus::Layout self)	1221	has_wrapped (DC::Layout self)
1189	CODE:	1222	CODE:
1190	{	1223	{
1191	int lines = 1;	1224	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1225	const char *text = pango_layout_get_text (self->pl);
1193		1226
…		…
1198	}	1231	}
1199	OUTPUT:	1232	OUTPUT:
1200	RETVAL	1233	RETVAL
1201		1234
1202	SV *	1235	SV *
1203	get_text (CFPlus::Layout self)	1236	get_text (DC::Layout self)
1204	CODE:	1237	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1238	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1239	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1240	OUTPUT:
1208	RETVAL	1241	RETVAL
1209		1242
1210	void	1243	void
1211	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.)
1212	CODE:	1245	CODE:
1213	self->r = r;	1246	self->r = r;
1214	self->g = g;	1247	self->g = g;
1215	self->b = b;	1248	self->b = b;
1216	self->a = a;	1249	self->a = a;
1217		1250
1218	void	1251	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1252	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1253	CODE:
1221	if (self->font != font)	1254	if (self->font != font)
1222	{	1255	{
1223	self->font = font;	1256	self->font = font;
1224	layout_update_font (self);	1257	layout_update_font (self);
1225	}	1258	}
1226		1259
1227	void	1260	void
1228	set_height (CFPlus::Layout self, int base_height)	1261	set_height (DC::Layout self, int base_height)
1229	CODE:	1262	CODE:
1230	if (self->base_height != base_height)	1263	if (self->base_height != base_height)
1231	{	1264	{
1232	self->base_height = base_height;	1265	self->base_height = base_height;
1233	layout_update_font (self);	1266	layout_update_font (self);
1234	}	1267	}
1235		1268
1236	void	1269	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1270	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1271	CODE:
1239	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);
1240		1273
1241	void	1274	void
1242	set_indent (CFPlus::Layout self, int indent)	1275	set_indent (DC::Layout self, int indent)
1243	CODE:	1276	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1277	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1278
1246	void	1279	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1280	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1281	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1282	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1283
1251	void	1284	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1285	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1286	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1287	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1288	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1289	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1290	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1291	: PANGO_ELLIPSIZE_NONE
1259	);	1292	);
1260		1293
1261	void	1294	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1295	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1296	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1297	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1298
1266	void	1299	void
1267	size (CFPlus::Layout self)	1300	size (DC::Layout self)
1268	PPCODE:	1301	PPCODE:
1269	{	1302	{
1270	int w, h;	1303	int w, h;
1271		1304
1272	layout_get_pixel_size (self, &w, &h);	1305	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1308	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1309	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1310	}
1278		1311
1279	int	1312	int
1280	descent (CFPlus::Layout self)	1313	descent (DC::Layout self)
1281	CODE:	1314	CODE:
1282	{	1315	{
1283	PangoRectangle rect;	1316	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1317	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1318	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1319	RETVAL = PANGO_DESCENT (rect);
1287	}	1320	}
1288	OUTPUT:	1321	OUTPUT:
1289	RETVAL	1322	RETVAL
1290		1323
1291	int	1324	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1325	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1326	CODE:
1294	{	1327	{
1295	int index, trailing;	1328	int index, trailing;
1296	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);
1297	RETVAL = index + trailing;	1330	RETVAL = index + trailing;
1298	}	1331	}
1299	OUTPUT:	1332	OUTPUT:
1300	RETVAL	1333	RETVAL
1301		1334
1302	void	1335	void
1303	cursor_pos (CFPlus::Layout self, int index)	1336	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1337	PPCODE:
1305	{	1338	{
1306	PangoRectangle strong_pos;	1339	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1340	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1341
1309	EXTEND (SP, 3);	1342	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1343	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1344	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1345	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1346	}
1314		1347
1315	void	1348	void
1316	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)
1317	PPCODE:	1350	PPCODE:
1318	{	1351	{
1319	int line, x;	1352	int line, x;
1320		1353
1321	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)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1356	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1357	--line;
		1358	#endif
1324	EXTEND (SP, 2);	1359	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1360	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1361	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1362	}
1328		1363
1329	void	1364	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1365	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1366	PPCODE:
1332	{	1367	{
1333	PangoLayoutLine *lp;	1368	PangoLayoutLine *lp;
1334	int index, trailing;	1369	int index, trailing;
1335		1370
1336	if (line < 0)	1371	if (line < 0)
1337	XSRETURN_EMPTY;	1372	XSRETURN_EMPTY;
1338		1373
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1374	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1375	XSRETURN_EMPTY; /* do better */
1341		1376
1342	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);
1343		1378
1344	EXTEND (SP, 2);	1379	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1385	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1386	}
1352	}	1387	}
1353		1388
1354	void	1389	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1390	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1391	CODE:
1357	rc_clear (self->rc);	1392	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1393	pango_opengl_render_layout_subpixel (
1359	self->pl,	1394	self->pl,
1360	self->rc,	1395	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1400	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1401	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1402	pango_layout_context_changed (self->pl);
1368		1403
1369	void	1404	void
1370	draw (CFPlus::Layout self)	1405	draw (DC::Layout self)
1371	CODE:	1406	CODE:
1372	{	1407	{
1373	glEnable (GL_TEXTURE_2D);	1408	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1409	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1410	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1418	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1419	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1420	glDisable (GL_TEXTURE_2D);
1386	}	1421	}
1387		1422
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1423	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1424
1390	PROTOTYPES: ENABLE	1425	PROTOTYPES: ENABLE
1391		1426
1392	void	1427	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1428	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1472	RETVAL = width > 0;	1507	RETVAL = width > 0;
1473	}	1508	}
1474	OUTPUT:	1509	OUTPUT:
1475	RETVAL	1510	RETVAL
1476		1511
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1512	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1513
1479	PROTOTYPES: DISABLE	1514	PROTOTYPES: DISABLE
1480		1515
1481	CFPlus::Map	1516	DC::Map
1482	new (SV *class)	1517	new (SV *class)
1483	CODE:	1518	CODE:
1484	New (0, RETVAL, 1, struct map);	1519	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1520	RETVAL->x = 0;
1486	RETVAL->y = 0;	1521	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1529	RETVAL->row = 0;
1495	OUTPUT:	1530	OUTPUT:
1496	RETVAL	1531	RETVAL
1497		1532
1498	void	1533	void
1499	DESTROY (CFPlus::Map self)	1534	DESTROY (DC::Map self)
1500	CODE:	1535	CODE:
1501	{	1536	{
1502	map_clear (self);	1537	map_clear (self);
1503	Safefree (self->face2tile);	1538	Safefree (self->face2tile);
1504	Safefree (self->tex);	1539	Safefree (self->tex);
1505	Safefree (self);	1540	Safefree (self);
1506	}	1541	}
1507		1542
1508	void	1543	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1544	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1545	CODE:
1511	self->w = map_width;	1546	self->w = map_width;
1512	self->h = map_height;	1547	self->h = map_height;
1513		1548
1514	void	1549	void
1515	clear (CFPlus::Map self)	1550	clear (DC::Map self)
1516	CODE:	1551	CODE:
1517	map_clear (self);	1552	map_clear (self);
1518		1553
1519	void	1554	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1555	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1556	CODE:
1522	{	1557	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1558	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1559	need_texid (self, tile);
1525	}	1560	}
1526		1561
1527	void	1562	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1563	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1564	CODE:
1530	{	1565	{
1531	tileid texid;	1566	tileid texid;
1532	maptex *tex;	1567	maptex *tex;
1533		1568
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1581	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1582	tex->smoothlevel = level;
1548	}	1583	}
1549		1584
1550	void	1585	void
1551	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)
1552	CODE:	1587	CODE:
1553	{	1588	{
1554	need_texid (self, texid);	1589	need_texid (self, texid);
1555		1590
1556	{	1591	{
…		…
1576	// from transparent color bleeding and ugly wrapping effects.	1611	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1612	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1613	}
1579		1614
1580	int	1615	int
1581	ox (CFPlus::Map self)	1616	ox (DC::Map self)
1582	ALIAS:	1617	ALIAS:
1583	oy = 1	1618	oy = 1
1584	x = 2	1619	x = 2
1585	y = 3	1620	y = 3
1586	w = 4	1621	w = 4
…		…
1597	}	1632	}
1598	OUTPUT:	1633	OUTPUT:
1599	RETVAL	1634	RETVAL
1600		1635
1601	void	1636	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1637	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1638	CODE:
1604	{	1639	{
1605	if (dx > 0)	1640	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1641	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1642	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1658	self->y += MAP_EXTEND_Y;
1624	}	1659	}
1625	}	1660	}
1626		1661
1627	SV *	1662	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1663	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1664	CODE:
1630	{	1665	{
1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1666	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1632	uint8_t data_end = (uint8_t )SvEND (data_);	1667	uint8_t data_end = (uint8_t )SvEND (data_);
1633	mapcell *cell;	1668	mapcell *cell;
…		…
1661	uint8_t ext, cmd;	1696	uint8_t ext, cmd;
1662		1697
1663	do	1698	do
1664	{	1699	{
1665	ext = *data++;	1700	ext = *data++;
1666	cmd = ext & 0x3f;	1701	cmd = ext & 0x7f;
1667		1702
1668	if (cmd < 4)	1703	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	1704	cell->darkness = 255 - ext * 64 + 1;
1670	else if (cmd == 5) // health	1705	else if (cmd == 5) // health
1671	{	1706	{
…		…
1674	}	1709	}
1675	else if (cmd == 6) // monster width	1710	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	1711	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	1712	else if (cmd == 0x47)
1678	{	1713	{
1679	if (*data == 4)	1714	if (*data == 1) cell->player = data [1];
1680	; // 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);
1681		1718
1682	data += *data + 1;	1719	data += *data + 1;
1683	}	1720	}
1684	else if (cmd == 8) // cell flags	1721	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	1722	cell->flags = *data++;
…		…
1722	}	1759	}
1723	OUTPUT:	1760	OUTPUT:
1724	RETVAL	1761	RETVAL
1725		1762
1726	SV *	1763	SV *
1727	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)
1728	CODE:	1765	CODE:
1729	{	1766	{
1730	int x1, x;	1767	int x1, x;
1731	int y1, y;	1768	int y1, y;
1732	int z;	1769	int z;
…		…
1777	}	1814	}
1778	OUTPUT:	1815	OUTPUT:
1779	RETVAL	1816	RETVAL
1780		1817
1781	void	1818	void
1782	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)
1783	CODE:	1820	CODE:
1784	{	1821	{
1785	int x, y, z;	1822	int x, y, z;
1786		1823
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1824	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1788	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
1789	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)
1790	smooth_key skey;	1827	smooth_key skey;
		1828	int pl_x, pl_y;
		1829	maptex pl_tex;
		1830
		1831	pl_tex.name = 0;
1791		1832
1792	rc_t *rc = rc_alloc ();	1833	rc_t *rc = rc_alloc ();
1793	rc_key_t key;	1834	rc_key_t key;
1794	rc_array_t *arr;	1835	rc_array_t *arr;
1795		1836
…		…
1854	tileid tile = cell->tile [z];	1895	tileid tile = cell->tile [z];
1855		1896
1856	if (tile)	1897	if (tile)
1857	{	1898	{
1858	maptex tex = self->tex [tile];	1899	maptex tex = self->tex [tile];
1859	int px, py;	1900	int px = (x + 1) * T - tex.w;
		1901	int py = (y + 1) * T - tex.h;
1860		1902
1861	if (key.texname != tex.name)	1903	if (key.texname != tex.name)
1862	{	1904	{
1863	if (!tex.name)	1905	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	1906	tex = self->tex [2]; /* missing, replace by noface */
1865		1907
1866	key.texname = tex.name;	1908	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	1909	arr = rc_array (rc, &key);
1868	}	1910	}
1869		1911
1870	px = (x + 1) * T - tex.w;	1912	if (expect_false (cell->player == player) && expect_false (z == 2))
1871	py = (y + 1) * T - tex.h;	1913	{
		1914	pl_x = px;
		1915	pl_y = py;
		1916	pl_tex = tex;
		1917	continue;
		1918	}
1872		1919
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1920	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1921	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1922	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1923	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877		1924
1878	if (cell->flags && z == 2)	1925	if (expect_false (cell->flags) && expect_false (z == 2))
1879	{	1926	{
1880	// overlays such as the speech bubble, probably more to come	1927	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)	1928	if (cell->flags & 1)
1882	{	1929	{
1883	maptex tex = self->tex [1];	1930	maptex tex = self->tex [1];
…		…
2022	}	2069	}
2023		2070
2024	hv_clear (smooth);	2071	hv_clear (smooth);
2025	}	2072	}
2026		2073
		2074	if (pl_tex.name)
		2075	{
		2076	maptex tex = pl_tex;
		2077	int px = pl_x + pdx;
		2078	int py = pl_y + pdy;
		2079
		2080	key.texname = tex.name;
		2081	arr = rc_array (rc, &key);
		2082
		2083	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2084	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2085	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2086	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2087
		2088	rc_draw (rc);
		2089	}
		2090
2027	glDisable (GL_BLEND);	2091	glDisable (GL_BLEND);
2028	rc_free (rc);	2092	rc_free (rc);
2029		2093
2030	// top layer: overlays such as the health bar	2094	// top layer: overlays such as the health bar
2031	for (y = 0; y < sh; y++)	2095	for (y = 0; y < sh; y++)
…		…
2058	}	2122	}
2059	}	2123	}
2060	}	2124	}
2061		2125
2062	void	2126	void
2063	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2127	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064	CODE:	2128	CODE:
2065	{	2129	{
2066	static float color[16][3] = {	2130	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2131	{ 0.00F, 0.00F, 0.00F },
2068	{ 1.00F, 1.00F, 1.00F },	2132	{ 1.00F, 1.00F, 1.00F },
…		…
2118	glDisable (GL_BLEND);	2182	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2183	glDisable (GL_TEXTURE_2D);
2120	}	2184	}
2121		2185
2122	void	2186	void
2123	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2187	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124	PPCODE:	2188	PPCODE:
2125	{	2189	{
2126	int x, y;	2190	int x, y;
2127	int sw1 = sw + 2;	2191	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2192	int sh1 = sh + 2;
…		…
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2263	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2264	PUSHs (darkness3_sv);
2201	}	2265	}
2202		2266
2203	SV *	2267	SV *
2204	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2268	get_rect (DC::Map self, int x0, int y0, int w, int h)
2205	CODE:	2269	CODE:
2206	{	2270	{
2207	int x, y, x1, y1;	2271	int x, y, x1, y1;
2208	SV data_sv = newSV (w h * 7 + 5);	2272	SV data_sv = newSV (w h * 7 + 5);
2209	uint8_t data = (uint8_t )SvPVX (data_sv);	2273	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2266	else	2330	else
2267	*data++ = 0;	2331	*data++ = 0;
2268	}	2332	}
2269	}	2333	}
2270		2334
		2335	/* if size is wh + 5 then no data has been found /
		2336	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2337	{
2271	SvPOK_only (data_sv);	2338	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2339	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2340	}
		2341
2273	RETVAL = data_sv;	2342	RETVAL = data_sv;
2274	}	2343	}
2275	OUTPUT:	2344	OUTPUT:
2276	RETVAL	2345	RETVAL
2277		2346
2278	void	2347	void
2279	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2348	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280	PPCODE:	2349	PPCODE:
2281	{	2350	{
2282	int x, y, z;	2351	int x, y, z;
2283	int w, h;	2352	int w, h;
2284	int x1, y1;	2353	int x1, y1;
		2354	STRLEN len;
		2355	uint8_t data, end;
		2356
		2357	len = SvLEN (data_sv);
		2358	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2359	data = SvPVbyte_nolen (data_sv);
		2360	end = data + len + 8;
		2361
		2362	if (len < 5)
		2363	XSRETURN_EMPTY;
2285		2364
2286	if (*data++ != 0)	2365	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2366	XSRETURN_EMPTY; /* version mismatch */
2288		2367
2289	w = data++ << 8; w \|= data++;	2368	w = data++ << 8; w \|= data++;
…		…
2304	{	2383	{
2305	maprow *row = map_get_row (self, y);	2384	maprow *row = map_get_row (self, y);
2306		2385
2307	for (x = x0; x < x1; x++)	2386	for (x = x0; x < x1; x++)
2308	{	2387	{
		2388	uint8_t flags;
		2389
		2390	if (data + 7 >= end)
		2391	XSRETURN_EMPTY;
		2392
2309	uint8_t flags = *data++;	2393	flags = *data++;
2310		2394
2311	if (flags)	2395	if (flags)
2312	{	2396	{
2313	mapcell *cell = row_get_cell (row, x);	2397	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2398	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2401	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2318	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2402	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2319		2403
2320	if (cell->darkness == 0)	2404	if (cell->darkness == 0)
2321	{	2405	{
2322	cell->darkness = 0;	2406	/cell->darkness = 0;/
		2407	EXTEND (SP, 3);
2323		2408
2324	for (z = 0; z <= 2; z++)	2409	for (z = 0; z <= 2; z++)
2325	{	2410	{
2326	tileid t = tile [z];	2411	tileid t = tile [z];
2327		2412
2328	if (t >= self->texs \|\| (t && !self->tex [t].name))	2413	if (t >= self->texs \|\| (t && !self->tex [t].name))
2329	{	2414	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2415	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2416	need_texid (self, t);
2332	}	2417	}
2333		2418
2334	cell->tile [z] = t;	2419	cell->tile [z] = t;
2335	}	2420	}
…		…
2337	}	2422	}
2338	}	2423	}
2339	}	2424	}
2340	}	2425	}
2341		2426
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2427	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2428
2344	CFPlus::RW	2429	DC::RW
2345	new (SV class, SV data_sv)	2430	new (SV class, SV data_sv)
2346	CODE:	2431	CODE:
2347	{	2432	{
2348	STRLEN datalen;	2433	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2434	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2436	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2437	}
2353	OUTPUT:	2438	OUTPUT:
2354	RETVAL	2439	RETVAL
2355		2440
2356	CFPlus::RW	2441	DC::RW
2357	new_from_file (SV class, const char path, const char *mode = "rb")	2442	new_from_file (SV class, const char path, const char *mode = "rb")
2358	CODE:	2443	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2444	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2445	OUTPUT:
2361	RETVAL	2446	RETVAL
2362		2447
2363	# fails on win32:	2448	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2449	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2450	#void
2366	#close (CFPlus::RW self)	2451	#close (DC::RW self)
2367	# CODE:	2452	# CODE:
2368	# (self->(close)) (self);	2453	# (self->(close)) (self);
2369		2454
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2455	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2456
2372	PROTOTYPES: DISABLE	2457	PROTOTYPES: DISABLE
2373		2458
2374	CFPlus::Channel	2459	DC::Channel
2375	find ()	2460	find ()
2376	CODE:	2461	CODE:
2377	{	2462	{
2378	RETVAL = Mix_GroupAvailable (-1);	2463	RETVAL = Mix_GroupAvailable (-1);
2379		2464
…		…
2392	}	2477	}
2393	OUTPUT:	2478	OUTPUT:
2394	RETVAL	2479	RETVAL
2395		2480
2396	void	2481	void
2397	halt (CFPlus::Channel self)	2482	halt (DC::Channel self)
2398	CODE:	2483	CODE:
2399	Mix_HaltChannel (self);	2484	Mix_HaltChannel (self);
2400		2485
2401	void	2486	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2487	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2488	CODE:
2404	Mix_ExpireChannel (self, ticks);	2489	Mix_ExpireChannel (self, ticks);
2405		2490
2406	void	2491	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2492	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2493	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2494	Mix_FadeOutChannel (self, ticks);
2410		2495
2411	int	2496	int
2412	volume (CFPlus::Channel self, int volume)	2497	volume (DC::Channel self, int volume)
2413	CODE:	2498	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2499	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2500	OUTPUT:
2416	RETVAL	2501	RETVAL
2417		2502
2418	void	2503	void
2419	unregister_all_effects (CFPlus::Channel self)	2504	unregister_all_effects (DC::Channel self)
2420	CODE:	2505	CODE:
2421	Mix_UnregisterAllEffects (self);	2506	Mix_UnregisterAllEffects (self);
2422		2507
2423	void	2508	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2509	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2510	CODE:
2426	left = CLAMP (left , 0, 255);	2511	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2512	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2513	Mix_SetPanning (self, left, right);
2429		2514
2430	void	2515	void
2431	set_distance (CFPlus::Channel self, int distance)	2516	set_distance (DC::Channel self, int distance)
2432	CODE:	2517	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2518	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2519
2435	void	2520	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2521	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2522	CODE:
2438		2523
2439	void	2524	void
2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2525	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441	CODE:	2526	CODE:
2442	{	2527	{
2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2528	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2529	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2530	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2531	}
2447		2532
2448	void	2533	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2534	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2535	CODE:
2451	Mix_SetReverseStereo (self, flip);	2536	Mix_SetReverseStereo (self, flip);
2452		2537
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2538	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2539
2455	PROTOTYPES: DISABLE	2540	PROTOTYPES: DISABLE
2456		2541
2457	CFPlus::MixChunk	2542	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2543	new (SV *class, DC::RW rwops)
2459	CODE:	2544	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2545	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2546	OUTPUT:
2462	RETVAL	2547	RETVAL
2463		2548
2464	void	2549	void
2465	DESTROY (CFPlus::MixChunk self)	2550	DESTROY (DC::MixChunk self)
2466	CODE:	2551	CODE:
2467	Mix_FreeChunk (self);	2552	Mix_FreeChunk (self);
2468		2553
2469	int	2554	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2555	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2556	CODE:
2472	if (items > 1)	2557	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2558	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2559	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2560	OUTPUT:
2476	RETVAL	2561	RETVAL
2477		2562
2478	CFPlus::Channel	2563	DC::Channel
2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2564	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480	CODE:	2565	CODE:
2481	{	2566	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2567	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2568
2484	if (RETVAL < 0)	2569	if (RETVAL < 0)
…		…
2491	}	2576	}
2492	}	2577	}
2493	OUTPUT:	2578	OUTPUT:
2494	RETVAL	2579	RETVAL
2495		2580
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2581	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2582
2498	int	2583	int
2499	volume (int volume = -1)	2584	volume (int volume = -1)
2500	PROTOTYPE: ;$	2585	PROTOTYPE: ;$
2501	CODE:	2586	CODE:
…		…
2513	void	2598	void
2514	halt ()	2599	halt ()
2515	CODE:	2600	CODE:
2516	Mix_HaltMusic ();	2601	Mix_HaltMusic ();
2517		2602
2518	CFPlus::MixMusic	2603	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2604	new (SV *class, DC::RW rwops)
2520	CODE:	2605	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2606	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2607	OUTPUT:
2523	RETVAL	2608	RETVAL
2524		2609
2525	void	2610	void
2526	DESTROY (CFPlus::MixMusic self)	2611	DESTROY (DC::MixMusic self)
2527	CODE:	2612	CODE:
2528	Mix_FreeMusic (self);	2613	Mix_FreeMusic (self);
2529		2614
2530	int	2615	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2616	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2617	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2618	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2619	OUTPUT:
2535	RETVAL	2620	RETVAL
2536		2621
2537	void	2622	void
2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2623	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539	CODE:	2624	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2625	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2626
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2627	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2628
2544	PROTOTYPES: ENABLE	2629	PROTOTYPES: ENABLE
2545		2630
2546	BOOT:	2631	BOOT:
2547	{	2632	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2633	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2634	static const struct {
2550	const char *name;	2635	const char *name;
2551	IV iv;	2636	IV iv;
2552	} *civ, const_iv[] = {	2637	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2638	# define const_iv(name) { # name, (IV)name }
…		…
2846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2931	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2847	CODE:	2932	CODE:
2848	if (gl.SeparableFilter2D)	2933	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2934	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		2935
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2936	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		2937
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2938	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		2939
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2940	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		2941
…		…
2882		2967
2883	void glEndList ()	2968	void glEndList ()
2884		2969
2885	void glCallList (int list)	2970	void glCallList (int list)
2886		2971
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2972	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		2973
2889	PROTOTYPES: DISABLE	2974	PROTOTYPES: DISABLE
2890		2975
2891	void	2976	void
2892	find_widget (SV *self, NV x, NV y)	2977	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	2981	XPUSHs (self);
2897	}	2982	}
2898		2983
2899	BOOT:	2984	BOOT:
2900	{	2985	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2986	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		2987
2903	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2988	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2989	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2990	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2991	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907	}	2992	}
2908		2993
2909	void	2994	void
2910	draw (SV *self)	2995	draw (SV *self)
2911	CODE:	2996	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	3003	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	3004	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	3005	double draw_x, draw_y;
2921		3006
2922	if (!SvROK (self))	3007	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3008	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		3009
2925	hv = (HV *)SvRV (self);	3010	hv = (HV *)SvRV (self);
2926		3011
2927	if (SvTYPE (hv) != SVt_PVHV)	3012	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3013	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		3014
2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3015	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3016	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932		3017
2933	if (!h \|\| !w)	3018	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs. Revision 1.261 by root, Sun Jul 13 12:17:00 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 2008 UTC