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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.259 by root, Tue May 20 02:47:21 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>
…		…
63	#define MAP_EXTEND_X 32	74	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	75	#define MAP_EXTEND_Y 512
65		76
66	#define MIN_FONT_HEIGHT 10	77	#define MIN_FONT_HEIGHT 10
67		78
		79	/* mask out modifiers we are not interested in */
		80	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		81
68	#if 0	82	#if 0
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	83	# define PARACHUTE SDL_INIT_NOPARACHUTE
70	#else	84	#else
71	# define PARACHUTE 0	85	# define PARACHUTE 0
72	#endif	86	#endif
…		…
120		134
121	#include "pango-font.c"	135	#include "pango-font.c"
122	#include "pango-fontmap.c"	136	#include "pango-fontmap.c"
123	#include "pango-render.c"	137	#include "pango-render.c"
124		138
125	typedef IV CFPlus__Channel;	139	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	140	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	141	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	142	typedef Mix_Music *DC__MixMusic;
129		143
130	typedef PangoFontDescription *CFPlus__Font;	144	typedef PangoFontDescription *DC__Font;
131		145
132	static int	146	static int
133	shape_attr_p (PangoLayoutRun *run)	147	shape_attr_p (PangoLayoutRun *run)
134	{	148	{
135	GSList *attrs = run->item->analysis.extra_attrs;	149	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		163
150	typedef struct cf_layout {	164	typedef struct cf_layout {
151	PangoLayout *pl;	165	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	166	float r, g, b, a; // default color for rgba mode
153	int base_height;	167	int base_height;
154	CFPlus__Font font;	168	DC__Font font;
155	rc_t *rc;	169	rc_t *rc;
156	} *CFPlus__Layout;	170	} *DC__Layout;
157		171
158	static CFPlus__Font default_font;	172	static DC__Font default_font;
159	static PangoContext *opengl_context;	173	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	174	static PangoFontMap *opengl_fontmap;
161		175
162	static void	176	static void
163	substitute_func (FcPattern *pattern, gpointer data)	177	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	182	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	183	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	184	}
171		185
172	static void	186	static void
173	layout_update_font (CFPlus__Layout self)	187	layout_update_font (DC__Layout self)
174	{	188	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	189	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	190	* reasonably well with dejavu/bistream fonts
177	*/	191	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	192	PangoFontDescription *font = self->font ? self->font : default_font;
179		193
180	pango_font_description_set_absolute_size (font,	194	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	195	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		196
183	pango_layout_set_font_description (self->pl, font);	197	pango_layout_set_font_description (self->pl, font);
184	}	198	}
185		199
186	static void	200	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	201	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	202	{
189	PangoRectangle rect;	203	PangoRectangle rect;
190		204
191	// get_pixel_* wrongly rounds down	205	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	206	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	245	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	246	int texs; maptex *tex; // [tileid]
233		247
234	int32_t rows;	248	int32_t rows;
235	maprow *row;	249	maprow *row;
236	} *CFPlus__Map;	250	} *DC__Map;
237		251
238	static char *	252	static char *
239	prepend (char *ptr, int sze, int inc)	253	prepend (char *ptr, int sze, int inc)
240	{	254	{
241	char *p;	255	char *p;
…		…
279	self->texs *= 2;	293	self->texs *= 2;
280	}	294	}
281	}	295	}
282		296
283	static maprow *	297	static maprow *
284	map_get_row (CFPlus__Map self, int y)	298	map_get_row (DC__Map self, int y)
285	{	299	{
286	if (0 > y)	300	if (0 > y)
287	{	301	{
288	int extend = - y + MAP_EXTEND_Y;	302	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	303	Prepend (maprow, self->row, self->rows, extend);
…		…
327		341
328	return row->col + (x - row->c0);	342	return row->col + (x - row->c0);
329	}	343	}
330		344
331	static mapcell *	345	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	346	map_get_cell (DC__Map self, int x, int y)
333	{	347	{
334	return row_get_cell (map_get_row (self, y), x);	348	return row_get_cell (map_get_row (self, y), x);
335	}	349	}
336		350
337	static void	351	static void
338	map_clear (CFPlus__Map self)	352	map_clear (DC__Map self)
339	{	353	{
340	int r;	354	int r;
341		355
342	for (r = 0; r < self->rows; r++)	356	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	357	Safefree (self->row[r].col);
…		…
351	self->row = 0;	365	self->row = 0;
352	self->rows = 0;	366	self->rows = 0;
353	}	367	}
354		368
355	static void	369	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	370	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	371	{
358	int x, y;	372	int x, y;
359	maprow *row;	373	maprow *row;
360	mapcell *cell;	374	mapcell *cell;
361		375
…		…
498	return 0;	512	return 0;
499		513
500	return 1;	514	return 1;
501	}	515	}
502		516
503	MODULE = CFPlus PACKAGE = CFPlus	517	MODULE = Deliantra::Client PACKAGE = DC
504		518
505	PROTOTYPES: ENABLE	519	PROTOTYPES: ENABLE
506		520
507	BOOT:	521	BOOT:
508	{	522	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	523	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	524	static const struct {
511	const char *name;	525	const char *name;
512	IV iv;	526	IV iv;
513	} *civ, const_iv[] = {	527	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	528	# define const_iv(name) { # name, (IV)name }
…		…
659	CODE:	673	CODE:
660	{	674	{
661	opengl_fontmap = pango_opengl_font_map_new ();	675	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	676	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);	677	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		678	/pango_context_set_font_description (opengl_context, default_font);/
		679	#if PANGO_VERSION_CHECK (1, 15, 2)
		680	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		681	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		682	#endif
664	}	683	}
665		684
666	char *	685	char *
667	SDL_GetError ()	686	SDL_GetError ()
668		687
…		…
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	719	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		720
702	if (m && m != (SDL_Rect **)-1)	721	if (m && m != (SDL_Rect **)-1)
703	while (*m)	722	while (*m)
704	{	723	{
705	if ((m)->w >= 640 && (m)->h >= 480)	724	if ((m)->w >= 800 && (m)->h >= 480)
706	{	725	{
707	AV *av = newAV ();	726	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	727	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	728	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	729	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	771	SDL_GetKeyName (int sym)
753		772
754	int	773	int
755	SDL_GetAppState ()	774	SDL_GetAppState ()
756		775
		776	int
		777	SDL_GetModState ()
		778
757	void	779	void
758	poll_events ()	780	poll_events ()
759	PPCODE:	781	PPCODE:
760	{	782	{
761	SDL_Event ev;	783	SDL_Event ev;
…		…
770	{	792	{
771	case SDL_KEYDOWN:	793	case SDL_KEYDOWN:
772	case SDL_KEYUP:	794	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	795	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	796	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	797	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 */	798	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);	799	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	800	break;
779		801
780	case SDL_ACTIVEEVENT:	802	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	803	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	821	x = ev.motion.x;
800	y = ev.motion.y;	822	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	823	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	824	}
803		825
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	826	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	827	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	828	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	829	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	830	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	831	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	832	}
811	break;	833	break;
812		834
813	case SDL_MOUSEBUTTONDOWN:	835	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	836	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	837	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		838
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	839	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	840	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	841	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	842	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	847	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	848	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	849	break;
828	}	850	}
829		851
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	852	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	853	}
832	}	854	}
833		855
834	int	856	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	857	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	916	}
895	}	917	}
896	#endif	918	#endif
897	}	919	}
898		920
899	void	921	int
900	add_font (char *file)	922	add_font (char *file)
901	CODE:	923	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	924	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		925	OUTPUT:
		926	RETVAL
903		927
904	void	928	void
905	load_image_inline (SV *image_)	929	load_image_inline (SV *image_)
906	ALIAS:	930	ALIAS:
907	load_image_file = 1	931	load_image_file = 1
…		…
993	void	1017	void
994	error (char *message)	1018	error (char *message)
995	CODE:	1019	CODE:
996	fprintf (stderr, "ERROR: %s\n", message);	1020	fprintf (stderr, "ERROR: %s\n", message);
997	#ifdef _WIN32	1021	#ifdef _WIN32
998	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1022	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
999	#endif	1023	#endif
1000		1024
1001	void	1025	void
1002	fatal (char *message)	1026	fatal (char *message)
1003	CODE:	1027	CODE:
1004	fprintf (stderr, "FATAL: %s\n", message);	1028	fprintf (stderr, "FATAL: %s\n", message);
1005	#ifdef _WIN32	1029	#ifdef _WIN32
1006	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1030	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
1007	#endif	1031	#endif
1008	_exit (1);	1032	_exit (1);
1009		1033
1010	void	1034	void
1011	_exit (int retval = 0)	1035	_exit (int retval = 0)
…		…
1023	#if DEBUG	1047	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1048	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1049	#endif
1026	}	1050	}
1027		1051
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1052	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1053
1030	PROTOTYPES: DISABLE	1054	PROTOTYPES: DISABLE
1031		1055
1032	CFPlus::Font	1056	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1057	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1058	CODE:
1035	{	1059	{
1036	int count;	1060	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1061	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1064	}
1041	OUTPUT:	1065	OUTPUT:
1042	RETVAL	1066	RETVAL
1043		1067
1044	void	1068	void
1045	DESTROY (CFPlus::Font self)	1069	DESTROY (DC::Font self)
1046	CODE:	1070	CODE:
1047	pango_font_description_free (self);	1071	pango_font_description_free (self);
1048		1072
1049	void	1073	void
1050	make_default (CFPlus::Font self)	1074	make_default (DC::Font self)
1051	PROTOTYPE: $	1075	PROTOTYPE: $
1052	CODE:	1076	CODE:
1053	default_font = self;	1077	default_font = self;
1054		1078
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1079	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1080
1057	PROTOTYPES: DISABLE	1081	PROTOTYPES: DISABLE
1058		1082
1059	void	1083	void
1060	reset_glyph_cache ()	1084	glyph_cache_backup ()
1061	PROTOTYPE:	1085	PROTOTYPE:
1062	CODE:	1086	CODE:
		1087	tc_backup ();
		1088
		1089	void
		1090	glyph_cache_restore ()
		1091	PROTOTYPE:
		1092	CODE:
1063	tc_clear ();	1093	tc_restore ();
1064		1094
1065	CFPlus::Layout	1095	DC::Layout
1066	new (SV *class)	1096	new (SV *class)
1067	CODE:	1097	CODE:
1068	New (0, RETVAL, 1, struct cf_layout);	1098	New (0, RETVAL, 1, struct cf_layout);
1069		1099
1070	RETVAL->pl = pango_layout_new (opengl_context);	1100	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1080	layout_update_font (RETVAL);	1110	layout_update_font (RETVAL);
1081	OUTPUT:	1111	OUTPUT:
1082	RETVAL	1112	RETVAL
1083		1113
1084	void	1114	void
1085	DESTROY (CFPlus::Layout self)	1115	DESTROY (DC::Layout self)
1086	CODE:	1116	CODE:
1087	g_object_unref (self->pl);	1117	g_object_unref (self->pl);
1088	rc_free (self->rc);	1118	rc_free (self->rc);
1089	Safefree (self);	1119	Safefree (self);
1090		1120
1091	void	1121	void
1092	set_text (CFPlus::Layout self, SV *text_)	1122	set_text (DC::Layout self, SV *text_)
1093	CODE:	1123	CODE:
1094	{	1124	{
1095	STRLEN textlen;	1125	STRLEN textlen;
1096	char *text = SvPVutf8 (text_, textlen);	1126	char *text = SvPVutf8 (text_, textlen);
1097		1127
1098	pango_layout_set_text (self->pl, text, textlen);	1128	pango_layout_set_text (self->pl, text, textlen);
1099	}	1129	}
1100		1130
1101	void	1131	void
1102	set_markup (CFPlus::Layout self, SV *text_)	1132	set_markup (DC::Layout self, SV *text_)
1103	CODE:	1133	CODE:
1104	{	1134	{
1105	STRLEN textlen;	1135	STRLEN textlen;
1106	char *text = SvPVutf8 (text_, textlen);	1136	char *text = SvPVutf8 (text_, textlen);
1107		1137
1108	pango_layout_set_markup (self->pl, text, textlen);	1138	pango_layout_set_markup (self->pl, text, textlen);
1109	}	1139	}
1110		1140
1111	void	1141	void
1112	set_shapes (CFPlus::Layout self, ...)	1142	set_shapes (DC::Layout self, ...)
1113	CODE:	1143	CODE:
1114	{	1144	{
1115	PangoAttrList *attrs = 0;	1145	PangoAttrList *attrs = 0;
1116	const char *text = pango_layout_get_text (self->pl);	1146	const char *text = pango_layout_get_text (self->pl);
1117	const char *pos = text;	1147	const char *pos = text;
…		…
1152	if (attrs)	1182	if (attrs)
1153	pango_layout_set_attributes (self->pl, attrs);	1183	pango_layout_set_attributes (self->pl, attrs);
1154	}	1184	}
1155		1185
1156	void	1186	void
1157	get_shapes (CFPlus::Layout self)	1187	get_shapes (DC::Layout self)
1158	PPCODE:	1188	PPCODE:
1159	{	1189	{
1160	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1190	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161		1191
1162	do	1192	do
1163	{	1193	{
1164	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1194	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165		1195
1166	if (run && shape_attr_p (run))	1196	if (run && shape_attr_p (run))
1167	{	1197	{
1168	PangoRectangle extents;	1198	PangoRectangle extents;
1169	pango_layout_iter_get_run_extents (iter, 0, &extents);	1199	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1177		1207
1178	pango_layout_iter_free (iter);	1208	pango_layout_iter_free (iter);
1179	}	1209	}
1180		1210
1181	int	1211	int
1182	has_wrapped (CFPlus::Layout self)	1212	has_wrapped (DC::Layout self)
1183	CODE:	1213	CODE:
1184	{	1214	{
1185	int lines = 1;	1215	int lines = 1;
1186	const char *text = pango_layout_get_text (self->pl);	1216	const char *text = pango_layout_get_text (self->pl);
1187		1217
…		…
1192	}	1222	}
1193	OUTPUT:	1223	OUTPUT:
1194	RETVAL	1224	RETVAL
1195		1225
1196	SV *	1226	SV *
1197	get_text (CFPlus::Layout self)	1227	get_text (DC::Layout self)
1198	CODE:	1228	CODE:
1199	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1229	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200	sv_utf8_decode (RETVAL);	1230	sv_utf8_decode (RETVAL);
1201	OUTPUT:	1231	OUTPUT:
1202	RETVAL	1232	RETVAL
1203		1233
1204	void	1234	void
1205	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1235	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206	CODE:	1236	CODE:
1207	self->r = r;	1237	self->r = r;
1208	self->g = g;	1238	self->g = g;
1209	self->b = b;	1239	self->b = b;
1210	self->a = a;	1240	self->a = a;
1211		1241
1212	void	1242	void
1213	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1243	set_font (DC::Layout self, DC::Font font = 0)
1214	CODE:	1244	CODE:
1215	if (self->font != font)	1245	if (self->font != font)
1216	{	1246	{
1217	self->font = font;	1247	self->font = font;
1218	layout_update_font (self);	1248	layout_update_font (self);
1219	}	1249	}
1220		1250
1221	void	1251	void
1222	set_height (CFPlus::Layout self, int base_height)	1252	set_height (DC::Layout self, int base_height)
1223	CODE:	1253	CODE:
1224	if (self->base_height != base_height)	1254	if (self->base_height != base_height)
1225	{	1255	{
1226	self->base_height = base_height;	1256	self->base_height = base_height;
1227	layout_update_font (self);	1257	layout_update_font (self);
1228	}	1258	}
1229		1259
1230	void	1260	void
1231	set_width (CFPlus::Layout self, int max_width = -1)	1261	set_width (DC::Layout self, int max_width = -1)
1232	CODE:	1262	CODE:
1233	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1263	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234		1264
1235	void	1265	void
1236	set_indent (CFPlus::Layout self, int indent)	1266	set_indent (DC::Layout self, int indent)
1237	CODE:	1267	CODE:
1238	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1268	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239		1269
1240	void	1270	void
1241	set_spacing (CFPlus::Layout self, int spacing)	1271	set_spacing (DC::Layout self, int spacing)
1242	CODE:	1272	CODE:
1243	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1273	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244		1274
1245	void	1275	void
1246	set_ellipsise (CFPlus::Layout self, int ellipsise)	1276	set_ellipsise (DC::Layout self, int ellipsise)
1247	CODE:	1277	CODE:
1248	pango_layout_set_ellipsize (self->pl,	1278	pango_layout_set_ellipsize (self->pl,
1249	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1279	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1280	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1281	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252	: PANGO_ELLIPSIZE_NONE	1282	: PANGO_ELLIPSIZE_NONE
1253	);	1283	);
1254		1284
1255	void	1285	void
1256	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1286	set_single_paragraph_mode (DC::Layout self, int spm)
1257	CODE:	1287	CODE:
1258	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1288	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259		1289
1260	void	1290	void
1261	size (CFPlus::Layout self)	1291	size (DC::Layout self)
1262	PPCODE:	1292	PPCODE:
1263	{	1293	{
1264	int w, h;	1294	int w, h;
1265		1295
1266	layout_get_pixel_size (self, &w, &h);	1296	layout_get_pixel_size (self, &w, &h);
…		…
1269	PUSHs (sv_2mortal (newSViv (w)));	1299	PUSHs (sv_2mortal (newSViv (w)));
1270	PUSHs (sv_2mortal (newSViv (h)));	1300	PUSHs (sv_2mortal (newSViv (h)));
1271	}	1301	}
1272		1302
1273	int	1303	int
1274	descent (CFPlus::Layout self)	1304	descent (DC::Layout self)
1275	CODE:	1305	CODE:
1276	{	1306	{
1277	PangoRectangle rect;	1307	PangoRectangle rect;
1278	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1308	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279	pango_layout_line_get_pixel_extents (line, 0, &rect);	1309	pango_layout_line_get_pixel_extents (line, 0, &rect);
1280	RETVAL = PANGO_DESCENT (rect);	1310	RETVAL = PANGO_DESCENT (rect);
1281	}	1311	}
1282	OUTPUT:	1312	OUTPUT:
1283	RETVAL	1313	RETVAL
1284		1314
1285	int	1315	int
1286	xy_to_index (CFPlus::Layout self, int x, int y)	1316	xy_to_index (DC::Layout self, int x, int y)
1287	CODE:	1317	CODE:
1288	{	1318	{
1289	int index, trailing;	1319	int index, trailing;
1290	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1320	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291	RETVAL = index + trailing;	1321	RETVAL = index + trailing;
1292	}	1322	}
1293	OUTPUT:	1323	OUTPUT:
1294	RETVAL	1324	RETVAL
1295		1325
1296	void	1326	void
1297	cursor_pos (CFPlus::Layout self, int index)	1327	cursor_pos (DC::Layout self, int index)
1298	PPCODE:	1328	PPCODE:
1299	{	1329	{
1300	PangoRectangle strong_pos;	1330	PangoRectangle pos;
1301	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1331	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302		1332
1303	EXTEND (SP, 3);	1333	EXTEND (SP, 3);
1304	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1334	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1335	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1336	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307	}	1337	}
1308		1338
1309	void	1339	void
1310	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1340	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311	PPCODE:	1341	PPCODE:
1312	{	1342	{
1313	int line, x;	1343	int line, x;
1314		1344
1315	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1345	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1346	#if !PANGO_VERSION_CHECK (1, 17, 3)
1316	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1347	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317		1348	--line;
		1349	#endif
1318	EXTEND (SP, 2);	1350	EXTEND (SP, 2);
1319	PUSHs (sv_2mortal (newSViv (line - 1)));	1351	PUSHs (sv_2mortal (newSViv (line)));
1320	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1352	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321	}	1353	}
1322		1354
1323	void	1355	void
1324	line_x_to_index (CFPlus::Layout self, int line, int x)	1356	line_x_to_index (DC::Layout self, int line, int x)
1325	PPCODE:	1357	PPCODE:
1326	{	1358	{
1327	PangoLayoutLine *lp;	1359	PangoLayoutLine *lp;
1328	int index, trailing;	1360	int index, trailing;
1329		1361
1330	if (line < 0)	1362	if (line < 0)
1331	XSRETURN_EMPTY;	1363	XSRETURN_EMPTY;
1332		1364
1333	if (!(lp = pango_layout_get_line (self->pl, line)))	1365	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334	XSRETURN_EMPTY; /* do better */	1366	XSRETURN_EMPTY; /* do better */
1335		1367
1336	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1368	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337		1369
1338	EXTEND (SP, 2);	1370	EXTEND (SP, 2);
…		…
1344	PUSHs (sv_2mortal (newSViv (trailing)));	1376	PUSHs (sv_2mortal (newSViv (trailing)));
1345	}	1377	}
1346	}	1378	}
1347		1379
1348	void	1380	void
1349	render (CFPlus::Layout self, float x, float y, int flags = 0)	1381	render (DC::Layout self, float x, float y, int flags = 0)
1350	CODE:	1382	CODE:
1351	rc_clear (self->rc);	1383	rc_clear (self->rc);
1352	pango_opengl_render_layout_subpixel (	1384	pango_opengl_render_layout_subpixel (
1353	self->pl,	1385	self->pl,
1354	self->rc,	1386	self->rc,
…		…
1359	// we assume that context_change actually clears/frees stuff	1391	// we assume that context_change actually clears/frees stuff
1360	// and does not do any recomputation...	1392	// and does not do any recomputation...
1361	pango_layout_context_changed (self->pl);	1393	pango_layout_context_changed (self->pl);
1362		1394
1363	void	1395	void
1364	draw (CFPlus::Layout self)	1396	draw (DC::Layout self)
1365	CODE:	1397	CODE:
1366	{	1398	{
1367	glEnable (GL_TEXTURE_2D);	1399	glEnable (GL_TEXTURE_2D);
1368	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1400	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369	glEnable (GL_BLEND);	1401	glEnable (GL_BLEND);
…		…
1377	glDisable (GL_ALPHA_TEST);	1409	glDisable (GL_ALPHA_TEST);
1378	glDisable (GL_BLEND);	1410	glDisable (GL_BLEND);
1379	glDisable (GL_TEXTURE_2D);	1411	glDisable (GL_TEXTURE_2D);
1380	}	1412	}
1381		1413
1382	MODULE = CFPlus PACKAGE = CFPlus::Texture	1414	MODULE = Deliantra::Client PACKAGE = DC::Texture
1383		1415
1384	PROTOTYPES: ENABLE	1416	PROTOTYPES: ENABLE
1385		1417
1386	void	1418	void
1387	pad (SV *data_, int ow, int oh, int nw, int nh)	1419	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1466	RETVAL = width > 0;	1498	RETVAL = width > 0;
1467	}	1499	}
1468	OUTPUT:	1500	OUTPUT:
1469	RETVAL	1501	RETVAL
1470		1502
1471	MODULE = CFPlus PACKAGE = CFPlus::Map	1503	MODULE = Deliantra::Client PACKAGE = DC::Map
1472		1504
1473	PROTOTYPES: DISABLE	1505	PROTOTYPES: DISABLE
1474		1506
1475	CFPlus::Map	1507	DC::Map
1476	new (SV *class)	1508	new (SV *class)
1477	CODE:	1509	CODE:
1478	New (0, RETVAL, 1, struct map);	1510	New (0, RETVAL, 1, struct map);
1479	RETVAL->x = 0;	1511	RETVAL->x = 0;
1480	RETVAL->y = 0;	1512	RETVAL->y = 0;
…		…
1488	RETVAL->row = 0;	1520	RETVAL->row = 0;
1489	OUTPUT:	1521	OUTPUT:
1490	RETVAL	1522	RETVAL
1491		1523
1492	void	1524	void
1493	DESTROY (CFPlus::Map self)	1525	DESTROY (DC::Map self)
1494	CODE:	1526	CODE:
1495	{	1527	{
1496	map_clear (self);	1528	map_clear (self);
1497	Safefree (self->face2tile);	1529	Safefree (self->face2tile);
1498	Safefree (self->tex);	1530	Safefree (self->tex);
1499	Safefree (self);	1531	Safefree (self);
1500	}	1532	}
1501		1533
1502	void	1534	void
1503	resize (CFPlus::Map self, int map_width, int map_height)	1535	resize (DC::Map self, int map_width, int map_height)
1504	CODE:	1536	CODE:
1505	self->w = map_width;	1537	self->w = map_width;
1506	self->h = map_height;	1538	self->h = map_height;
1507		1539
1508	void	1540	void
1509	clear (CFPlus::Map self)	1541	clear (DC::Map self)
1510	CODE:	1542	CODE:
1511	map_clear (self);	1543	map_clear (self);
1512		1544
1513	void	1545	void
1514	set_tileid (CFPlus::Map self, int face, int tile)	1546	set_tileid (DC::Map self, int face, int tile)
1515	CODE:	1547	CODE:
1516	{	1548	{
1517	need_facenum (self, face); self->face2tile [face] = tile;	1549	need_facenum (self, face); self->face2tile [face] = tile;
1518	need_texid (self, tile);	1550	need_texid (self, tile);
1519	}	1551	}
1520		1552
1521	void	1553	void
1522	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1554	set_smooth (DC::Map self, int face, int smooth, int level)
1523	CODE:	1555	CODE:
1524	{	1556	{
1525	tileid texid;	1557	tileid texid;
1526	maptex *tex;	1558	maptex *tex;
1527		1559
…		…
1540	tex->smoothtile = self->face2tile [smooth];	1572	tex->smoothtile = self->face2tile [smooth];
1541	tex->smoothlevel = level;	1573	tex->smoothlevel = level;
1542	}	1574	}
1543		1575
1544	void	1576	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)	1577	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:	1578	CODE:
1547	{	1579	{
1548	need_texid (self, texid);	1580	need_texid (self, texid);
1549		1581
1550	{	1582	{
…		…
1570	// from transparent color bleeding and ugly wrapping effects.	1602	// from transparent color bleeding and ugly wrapping effects.
1571	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1603	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572	}	1604	}
1573		1605
1574	int	1606	int
1575	ox (CFPlus::Map self)	1607	ox (DC::Map self)
1576	ALIAS:	1608	ALIAS:
1577	oy = 1	1609	oy = 1
1578	x = 2	1610	x = 2
1579	y = 3	1611	y = 3
1580	w = 4	1612	w = 4
…		…
1591	}	1623	}
1592	OUTPUT:	1624	OUTPUT:
1593	RETVAL	1625	RETVAL
1594		1626
1595	void	1627	void
1596	scroll (CFPlus::Map self, int dx, int dy)	1628	scroll (DC::Map self, int dx, int dy)
1597	CODE:	1629	CODE:
1598	{	1630	{
1599	if (dx > 0)	1631	if (dx > 0)
1600	map_blank (self, self->x, self->y, dx, self->h);	1632	map_blank (self, self->x, self->y, dx, self->h);
1601	else if (dx < 0)	1633	else if (dx < 0)
…		…
1617	self->y += MAP_EXTEND_Y;	1649	self->y += MAP_EXTEND_Y;
1618	}	1650	}
1619	}	1651	}
1620		1652
1621	SV *	1653	SV *
1622	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1654	map1a_update (DC::Map self, SV *data_, int extmap)
1623	CODE:	1655	CODE:
1624	{	1656	{
1625	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1657	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1626	uint8_t data_end = (uint8_t )SvEND (data_);	1658	uint8_t data_end = (uint8_t )SvEND (data_);
1627	mapcell *cell;	1659	mapcell *cell;
…		…
1716	}	1748	}
1717	OUTPUT:	1749	OUTPUT:
1718	RETVAL	1750	RETVAL
1719		1751
1720	SV *	1752	SV *
1721	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1753	mapmap (DC::Map self, int x0, int y0, int w, int h)
1722	CODE:	1754	CODE:
1723	{	1755	{
1724	int x1, x;	1756	int x1, x;
1725	int y1, y;	1757	int y1, y;
1726	int z;	1758	int z;
…		…
1771	}	1803	}
1772	OUTPUT:	1804	OUTPUT:
1773	RETVAL	1805	RETVAL
1774		1806
1775	void	1807	void
1776	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1808	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1777	CODE:	1809	CODE:
1778	{	1810	{
1779	int x, y, z;	1811	int x, y, z;
1780		1812
1781	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1813	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2052	}	2084	}
2053	}	2085	}
2054	}	2086	}
2055		2087
2056	void	2088	void
2057	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2089	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058	CODE:	2090	CODE:
2059	{	2091	{
2060	static float color[16][3] = {	2092	static float color[16][3] = {
2061	{ 0.00F, 0.00F, 0.00F },	2093	{ 0.00F, 0.00F, 0.00F },
2062	{ 1.00F, 1.00F, 1.00F },	2094	{ 1.00F, 1.00F, 1.00F },
…		…
2112	glDisable (GL_BLEND);	2144	glDisable (GL_BLEND);
2113	glDisable (GL_TEXTURE_2D);	2145	glDisable (GL_TEXTURE_2D);
2114	}	2146	}
2115		2147
2116	void	2148	void
2117	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2149	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118	PPCODE:	2150	PPCODE:
2119	{	2151	{
2120	int x, y;	2152	int x, y;
2121	int sw1 = sw + 2;	2153	int sw1 = sw + 2;
2122	int sh1 = sh + 2;	2154	int sh1 = sh + 2;
…		…
2193	PUSHs (sv_2mortal (newSViv (sh3)));	2225	PUSHs (sv_2mortal (newSViv (sh3)));
2194	PUSHs (darkness3_sv);	2226	PUSHs (darkness3_sv);
2195	}	2227	}
2196		2228
2197	SV *	2229	SV *
2198	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2230	get_rect (DC::Map self, int x0, int y0, int w, int h)
2199	CODE:	2231	CODE:
2200	{	2232	{
2201	int x, y, x1, y1;	2233	int x, y, x1, y1;
2202	SV data_sv = newSV (w h * 7 + 5);	2234	SV data_sv = newSV (w h * 7 + 5);
2203	uint8_t data = (uint8_t )SvPVX (data_sv);	2235	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2260	else	2292	else
2261	*data++ = 0;	2293	*data++ = 0;
2262	}	2294	}
2263	}	2295	}
2264		2296
		2297	if (data - (uint8_t )SvPVX (data_sv) == w h + 5)
		2298	{
		2299	SvREFCNT_dec (data_sv);
		2300	RETVAL = &PL_sv_undef;
		2301	}
		2302	else
		2303	{
2265	SvPOK_only (data_sv);	2304	SvPOK_only (data_sv);
2266	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2305	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2267	RETVAL = data_sv;	2306	RETVAL = data_sv;
		2307	}
2268	}	2308	}
2269	OUTPUT:	2309	OUTPUT:
2270	RETVAL	2310	RETVAL
2271		2311
2272	void	2312	void
2273	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2313	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274	PPCODE:	2314	PPCODE:
2275	{	2315	{
2276	int x, y, z;	2316	int x, y, z;
2277	int w, h;	2317	int w, h;
2278	int x1, y1;	2318	int x1, y1;
		2319	STRLEN len;
		2320	uint8_t data, end;
		2321
		2322	len = SvLEN (data_sv);
		2323	SvGROW (data_sv, len + 7); // reserve at least 7+ bytes more
		2324	data = SvPVbyte_nolen (data_sv);
		2325	end = data + len + 7;
		2326
		2327	if (len < 5)
		2328	XSRETURN_EMPTY;
2279		2329
2280	if (*data++ != 0)	2330	if (*data++ != 0)
2281	XSRETURN_EMPTY; /* version mismatch */	2331	XSRETURN_EMPTY; /* version mismatch */
2282		2332
2283	w = data++ << 8; w \|= data++;	2333	w = data++ << 8; w \|= data++;
…		…
2298	{	2348	{
2299	maprow *row = map_get_row (self, y);	2349	maprow *row = map_get_row (self, y);
2300		2350
2301	for (x = x0; x < x1; x++)	2351	for (x = x0; x < x1; x++)
2302	{	2352	{
		2353	uint8_t flags;
		2354
		2355	if (data + 7 >= end)
		2356	XSRETURN_EMPTY;
		2357
2303	uint8_t flags = *data++;	2358	flags = *data++;
2304		2359
2305	if (flags)	2360	if (flags)
2306	{	2361	{
2307	mapcell *cell = row_get_cell (row, x);	2362	mapcell *cell = row_get_cell (row, x);
2308	tileid tile[3] = { 0, 0, 0 };	2363	tileid tile[3] = { 0, 0, 0 };
…		…
2331	}	2386	}
2332	}	2387	}
2333	}	2388	}
2334	}	2389	}
2335		2390
2336	MODULE = CFPlus PACKAGE = CFPlus::RW	2391	MODULE = Deliantra::Client PACKAGE = DC::RW
2337		2392
2338	CFPlus::RW	2393	DC::RW
2339	new (SV class, SV data_sv)	2394	new (SV class, SV data_sv)
2340	CODE:	2395	CODE:
2341	{	2396	{
2342	STRLEN datalen;	2397	STRLEN datalen;
2343	char *data = SvPVbyte (data_sv, datalen);	2398	char *data = SvPVbyte (data_sv, datalen);
…		…
2345	RETVAL = SDL_RWFromConstMem (data, datalen);	2400	RETVAL = SDL_RWFromConstMem (data, datalen);
2346	}	2401	}
2347	OUTPUT:	2402	OUTPUT:
2348	RETVAL	2403	RETVAL
2349		2404
2350	CFPlus::RW	2405	DC::RW
2351	new_from_file (SV class, const char path, const char *mode = "rb")	2406	new_from_file (SV class, const char path, const char *mode = "rb")
2352	CODE:	2407	CODE:
2353	RETVAL = SDL_RWFromFile (path, mode);	2408	RETVAL = SDL_RWFromFile (path, mode);
2354	OUTPUT:	2409	OUTPUT:
2355	RETVAL	2410	RETVAL
2356		2411
2357	# fails on win32:	2412	# fails on win32:
2358	# CFPlus.xs(2268) : error C2059: syntax error : '('	2413	# dc.xs(2268) : error C2059: syntax error : '('
2359	#void	2414	#void
2360	#close (CFPlus::RW self)	2415	#close (DC::RW self)
2361	# CODE:	2416	# CODE:
2362	# (self->(close)) (self);	2417	# (self->(close)) (self);
2363		2418
2364	MODULE = CFPlus PACKAGE = CFPlus::Channel	2419	MODULE = Deliantra::Client PACKAGE = DC::Channel
2365		2420
2366	PROTOTYPES: DISABLE	2421	PROTOTYPES: DISABLE
2367		2422
2368	CFPlus::Channel	2423	DC::Channel
2369	find ()	2424	find ()
2370	CODE:	2425	CODE:
2371	{	2426	{
2372	RETVAL = Mix_GroupAvailable (-1);	2427	RETVAL = Mix_GroupAvailable (-1);
2373		2428
…		…
2386	}	2441	}
2387	OUTPUT:	2442	OUTPUT:
2388	RETVAL	2443	RETVAL
2389		2444
2390	void	2445	void
2391	halt (CFPlus::Channel self)	2446	halt (DC::Channel self)
2392	CODE:	2447	CODE:
2393	Mix_HaltChannel (self);	2448	Mix_HaltChannel (self);
2394		2449
2395	void	2450	void
2396	expire (CFPlus::Channel self, int ticks = -1)	2451	expire (DC::Channel self, int ticks = -1)
2397	CODE:	2452	CODE:
2398	Mix_ExpireChannel (self, ticks);	2453	Mix_ExpireChannel (self, ticks);
2399		2454
2400	void	2455	void
2401	fade_out (CFPlus::Channel self, int ticks = -1)	2456	fade_out (DC::Channel self, int ticks = -1)
2402	CODE:	2457	CODE:
2403	Mix_FadeOutChannel (self, ticks);	2458	Mix_FadeOutChannel (self, ticks);
2404		2459
2405	int	2460	int
2406	volume (CFPlus::Channel self, int volume)	2461	volume (DC::Channel self, int volume)
2407	CODE:	2462	CODE:
2408	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2463	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409	OUTPUT:	2464	OUTPUT:
2410	RETVAL	2465	RETVAL
2411		2466
2412	void	2467	void
2413	unregister_all_effects (CFPlus::Channel self)	2468	unregister_all_effects (DC::Channel self)
2414	CODE:	2469	CODE:
2415	Mix_UnregisterAllEffects (self);	2470	Mix_UnregisterAllEffects (self);
2416		2471
2417	void	2472	void
2418	set_panning (CFPlus::Channel self, int left, int right)	2473	set_panning (DC::Channel self, int left, int right)
2419	CODE:	2474	CODE:
2420	left = CLAMP (left , 0, 255);	2475	left = CLAMP (left , 0, 255);
2421	right = CLAMP (right, 0, 255);	2476	right = CLAMP (right, 0, 255);
2422	Mix_SetPanning (self, left, right);	2477	Mix_SetPanning (self, left, right);
2423		2478
2424	void	2479	void
2425	set_distance (CFPlus::Channel self, int distance)	2480	set_distance (DC::Channel self, int distance)
2426	CODE:	2481	CODE:
2427	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2482	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428		2483
2429	void	2484	void
2430	set_position (CFPlus::Channel self, int angle, int distance)	2485	set_position (DC::Channel self, int angle, int distance)
2431	CODE:	2486	CODE:
2432		2487
2433	void	2488	void
2434	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2489	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435	CODE:	2490	CODE:
2436	{	2491	{
2437	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2492	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);	2493	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2494	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440	}	2495	}
2441		2496
2442	void	2497	void
2443	set_reverse_stereo (CFPlus::Channel self, int flip)	2498	set_reverse_stereo (DC::Channel self, int flip)
2444	CODE:	2499	CODE:
2445	Mix_SetReverseStereo (self, flip);	2500	Mix_SetReverseStereo (self, flip);
2446		2501
2447	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2502	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448		2503
2449	PROTOTYPES: DISABLE	2504	PROTOTYPES: DISABLE
2450		2505
2451	CFPlus::MixChunk	2506	DC::MixChunk
2452	new (SV *class, CFPlus::RW rwops)	2507	new (SV *class, DC::RW rwops)
2453	CODE:	2508	CODE:
2454	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2509	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455	OUTPUT:	2510	OUTPUT:
2456	RETVAL	2511	RETVAL
2457		2512
2458	void	2513	void
2459	DESTROY (CFPlus::MixChunk self)	2514	DESTROY (DC::MixChunk self)
2460	CODE:	2515	CODE:
2461	Mix_FreeChunk (self);	2516	Mix_FreeChunk (self);
2462		2517
2463	int	2518	int
2464	volume (CFPlus::MixChunk self, int volume = -1)	2519	volume (DC::MixChunk self, int volume = -1)
2465	CODE:	2520	CODE:
2466	if (items > 1)	2521	if (items > 1)
2467	volume = CLAMP (volume, 0, 128);	2522	volume = CLAMP (volume, 0, 128);
2468	RETVAL = Mix_VolumeChunk (self, volume);	2523	RETVAL = Mix_VolumeChunk (self, volume);
2469	OUTPUT:	2524	OUTPUT:
2470	RETVAL	2525	RETVAL
2471		2526
2472	CFPlus::Channel	2527	DC::Channel
2473	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2528	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474	CODE:	2529	CODE:
2475	{	2530	{
2476	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2531	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477		2532
2478	if (RETVAL < 0)	2533	if (RETVAL < 0)
…		…
2485	}	2540	}
2486	}	2541	}
2487	OUTPUT:	2542	OUTPUT:
2488	RETVAL	2543	RETVAL
2489		2544
2490	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2545	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491		2546
2492	int	2547	int
2493	volume (int volume = -1)	2548	volume (int volume = -1)
2494	PROTOTYPE: ;$	2549	PROTOTYPE: ;$
2495	CODE:	2550	CODE:
…		…
2507	void	2562	void
2508	halt ()	2563	halt ()
2509	CODE:	2564	CODE:
2510	Mix_HaltMusic ();	2565	Mix_HaltMusic ();
2511		2566
2512	CFPlus::MixMusic	2567	DC::MixMusic
2513	new (SV *class, CFPlus::RW rwops)	2568	new (SV *class, DC::RW rwops)
2514	CODE:	2569	CODE:
2515	RETVAL = Mix_LoadMUS_RW (rwops);	2570	RETVAL = Mix_LoadMUS_RW (rwops);
2516	OUTPUT:	2571	OUTPUT:
2517	RETVAL	2572	RETVAL
2518		2573
2519	void	2574	void
2520	DESTROY (CFPlus::MixMusic self)	2575	DESTROY (DC::MixMusic self)
2521	CODE:	2576	CODE:
2522	Mix_FreeMusic (self);	2577	Mix_FreeMusic (self);
2523		2578
2524	int	2579	int
2525	play (CFPlus::MixMusic self, int loops = -1)	2580	play (DC::MixMusic self, int loops = -1)
2526	CODE:	2581	CODE:
2527	RETVAL = Mix_PlayMusic (self, loops);	2582	RETVAL = Mix_PlayMusic (self, loops);
2528	OUTPUT:	2583	OUTPUT:
2529	RETVAL	2584	RETVAL
2530		2585
2531	void	2586	void
2532	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2587	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533	CODE:	2588	CODE:
2534	Mix_FadeInMusicPos (self, loops, ms, position);	2589	Mix_FadeInMusicPos (self, loops, ms, position);
2535		2590
2536	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2591	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537		2592
2538	PROTOTYPES: ENABLE	2593	PROTOTYPES: ENABLE
2539		2594
2540	BOOT:	2595	BOOT:
2541	{	2596	{
2542	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2597	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543	static const struct {	2598	static const struct {
2544	const char *name;	2599	const char *name;
2545	IV iv;	2600	IV iv;
2546	} *civ, const_iv[] = {	2601	} *civ, const_iv[] = {
2547	# define const_iv(name) { # name, (IV)name }	2602	# 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)	2895	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2841	CODE:	2896	CODE:
2842	if (gl.SeparableFilter2D)	2897	if (gl.SeparableFilter2D)
2843	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2898	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844		2899
2845	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2900	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846		2901
2847	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2902	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848		2903
2849	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2904	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850		2905
…		…
2876		2931
2877	void glEndList ()	2932	void glEndList ()
2878		2933
2879	void glCallList (int list)	2934	void glCallList (int list)
2880		2935
2881	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2936	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882		2937
2883	PROTOTYPES: DISABLE	2938	PROTOTYPES: DISABLE
2884		2939
2885	void	2940	void
2886	find_widget (SV *self, NV x, NV y)	2941	find_widget (SV *self, NV x, NV y)
…		…
2890	XPUSHs (self);	2945	XPUSHs (self);
2891	}	2946	}
2892		2947
2893	BOOT:	2948	BOOT:
2894	{	2949	{
2895	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2950	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896		2951
2897	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2952	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);	2953	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);	2954	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);	2955	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901	}	2956	}
2902		2957
2903	void	2958	void
2904	draw (SV *self)	2959	draw (SV *self)
2905	CODE:	2960	CODE:
…		…
2912	SV *draw_w_sv = GvSV (draw_w_gv);	2967	SV *draw_w_sv = GvSV (draw_w_gv);
2913	SV *draw_h_sv = GvSV (draw_h_gv);	2968	SV *draw_h_sv = GvSV (draw_h_gv);
2914	double draw_x, draw_y;	2969	double draw_x, draw_y;
2915		2970
2916	if (!SvROK (self))	2971	if (!SvROK (self))
2917	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2972	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918		2973
2919	hv = (HV *)SvRV (self);	2974	hv = (HV *)SvRV (self);
2920		2975
2921	if (SvTYPE (hv) != SVt_PVHV)	2976	if (SvTYPE (hv) != SVt_PVHV)
2922	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2977	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923		2978
2924	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2979	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.;	2980	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926		2981
2927	if (!h \|\| !w)	2982	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.237 by root, Sun Oct 14 15:33:30 2007 UTC vs. Revision 1.259 by root, Tue May 20 02:47:21 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.259 by root, Tue May 20 02:47:21 2008 UTC