[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.251 by root, Fri Dec 28 17:28:01 2007 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	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
		52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly
		53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
		54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
		55	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
		56	#endif
		57
51	#ifndef _WIN32	58	#ifndef _WIN32
52	# include <sys/types.h>	59	# include <sys/types.h>
53	# include <sys/socket.h>	60	# include <sys/socket.h>
54	# include <netinet/in.h>	61	# include <netinet/in.h>
55	# include <netinet/tcp.h>	62	# include <netinet/tcp.h>
…		…
120		127
121	#include "pango-font.c"	128	#include "pango-font.c"
122	#include "pango-fontmap.c"	129	#include "pango-fontmap.c"
123	#include "pango-render.c"	130	#include "pango-render.c"
124		131
125	typedef IV CFPlus__Channel;	132	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	133	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	134	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	135	typedef Mix_Music *DC__MixMusic;
129		136
130	typedef PangoFontDescription *CFPlus__Font;	137	typedef PangoFontDescription *DC__Font;
131		138
132	static int	139	static int
133	shape_attr_p (PangoLayoutRun *run)	140	shape_attr_p (PangoLayoutRun *run)
134	{	141	{
135	GSList *attrs = run->item->analysis.extra_attrs;	142	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		156
150	typedef struct cf_layout {	157	typedef struct cf_layout {
151	PangoLayout *pl;	158	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	159	float r, g, b, a; // default color for rgba mode
153	int base_height;	160	int base_height;
154	CFPlus__Font font;	161	DC__Font font;
155	rc_t *rc;	162	rc_t *rc;
156	} *CFPlus__Layout;	163	} *DC__Layout;
157		164
158	static CFPlus__Font default_font;	165	static DC__Font default_font;
159	static PangoContext *opengl_context;	166	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	167	static PangoFontMap *opengl_fontmap;
161		168
162	static void	169	static void
163	substitute_func (FcPattern *pattern, gpointer data)	170	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	175	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	176	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	177	}
171		178
172	static void	179	static void
173	layout_update_font (CFPlus__Layout self)	180	layout_update_font (DC__Layout self)
174	{	181	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	182	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	183	* reasonably well with bitstream vera
177	*/	184	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	185	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
182		189
183	pango_layout_set_font_description (self->pl, font);	190	pango_layout_set_font_description (self->pl, font);
184	}	191	}
185		192
186	static void	193	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	194	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	195	{
189	PangoRectangle rect;	196	PangoRectangle rect;
190		197
191	// get_pixel_* wrongly rounds down	198	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	199	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	238	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	239	int texs; maptex *tex; // [tileid]
233		240
234	int32_t rows;	241	int32_t rows;
235	maprow *row;	242	maprow *row;
236	} *CFPlus__Map;	243	} *DC__Map;
237		244
238	static char *	245	static char *
239	prepend (char *ptr, int sze, int inc)	246	prepend (char *ptr, int sze, int inc)
240	{	247	{
241	char *p;	248	char *p;
…		…
279	self->texs *= 2;	286	self->texs *= 2;
280	}	287	}
281	}	288	}
282		289
283	static maprow *	290	static maprow *
284	map_get_row (CFPlus__Map self, int y)	291	map_get_row (DC__Map self, int y)
285	{	292	{
286	if (0 > y)	293	if (0 > y)
287	{	294	{
288	int extend = - y + MAP_EXTEND_Y;	295	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	296	Prepend (maprow, self->row, self->rows, extend);
…		…
327		334
328	return row->col + (x - row->c0);	335	return row->col + (x - row->c0);
329	}	336	}
330		337
331	static mapcell *	338	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	339	map_get_cell (DC__Map self, int x, int y)
333	{	340	{
334	return row_get_cell (map_get_row (self, y), x);	341	return row_get_cell (map_get_row (self, y), x);
335	}	342	}
336		343
337	static void	344	static void
338	map_clear (CFPlus__Map self)	345	map_clear (DC__Map self)
339	{	346	{
340	int r;	347	int r;
341		348
342	for (r = 0; r < self->rows; r++)	349	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	350	Safefree (self->row[r].col);
…		…
351	self->row = 0;	358	self->row = 0;
352	self->rows = 0;	359	self->rows = 0;
353	}	360	}
354		361
355	static void	362	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	363	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	364	{
358	int x, y;	365	int x, y;
359	maprow *row;	366	maprow *row;
360	mapcell *cell;	367	mapcell *cell;
361		368
…		…
498	return 0;	505	return 0;
499		506
500	return 1;	507	return 1;
501	}	508	}
502		509
503	MODULE = CFPlus PACKAGE = CFPlus	510	MODULE = Deliantra::Client PACKAGE = DC
504		511
505	PROTOTYPES: ENABLE	512	PROTOTYPES: ENABLE
506		513
507	BOOT:	514	BOOT:
508	{	515	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	516	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	517	static const struct {
511	const char *name;	518	const char *name;
512	IV iv;	519	IV iv;
513	} *civ, const_iv[] = {	520	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	521	# define const_iv(name) { # name, (IV)name }
…		…
659	CODE:	666	CODE:
660	{	667	{
661	opengl_fontmap = pango_opengl_font_map_new ();	668	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	669	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);	670	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		671	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
		672	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		673	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		674	#endif
664	}	675	}
665		676
666	char *	677	char *
667	SDL_GetError ()	678	SDL_GetError ()
668		679
…		…
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	711	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		712
702	if (m && m != (SDL_Rect **)-1)	713	if (m && m != (SDL_Rect **)-1)
703	while (*m)	714	while (*m)
704	{	715	{
705	if ((m)->w >= 800 && (m)->h >= 600)	716	if ((m)->w >= 800 && (m)->h >= 480)
706	{	717	{
707	AV *av = newAV ();	718	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	719	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	720	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	721	av_push (av, newSViv (rgb));
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	836	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	837	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	838	break;
828	}	839	}
829		840
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	841	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	842	}
832	}	843	}
833		844
834	int	845	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	846	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
1023	#if DEBUG	1034	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1035	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1036	#endif
1026	}	1037	}
1027		1038
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1039	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1040
1030	PROTOTYPES: DISABLE	1041	PROTOTYPES: DISABLE
1031		1042
1032	CFPlus::Font	1043	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1044	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1045	CODE:
1035	{	1046	{
1036	int count;	1047	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1048	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1051	}
1041	OUTPUT:	1052	OUTPUT:
1042	RETVAL	1053	RETVAL
1043		1054
1044	void	1055	void
1045	DESTROY (CFPlus::Font self)	1056	DESTROY (DC::Font self)
1046	CODE:	1057	CODE:
1047	pango_font_description_free (self);	1058	pango_font_description_free (self);
1048		1059
1049	void	1060	void
1050	make_default (CFPlus::Font self)	1061	make_default (DC::Font self)
1051	PROTOTYPE: $	1062	PROTOTYPE: $
1052	CODE:	1063	CODE:
1053	default_font = self;	1064	default_font = self;
1054		1065
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1066	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1067
1057	PROTOTYPES: DISABLE	1068	PROTOTYPES: DISABLE
1058		1069
1059	void	1070	void
1060	glyph_cache_backup ()	1071	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1077	glyph_cache_restore ()
1067	PROTOTYPE:	1078	PROTOTYPE:
1068	CODE:	1079	CODE:
1069	tc_restore ();	1080	tc_restore ();
1070		1081
1071	CFPlus::Layout	1082	DC::Layout
1072	new (SV *class)	1083	new (SV *class)
1073	CODE:	1084	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1085	New (0, RETVAL, 1, struct cf_layout);
1075		1086
1076	RETVAL->pl = pango_layout_new (opengl_context);	1087	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1097	layout_update_font (RETVAL);
1087	OUTPUT:	1098	OUTPUT:
1088	RETVAL	1099	RETVAL
1089		1100
1090	void	1101	void
1091	DESTROY (CFPlus::Layout self)	1102	DESTROY (DC::Layout self)
1092	CODE:	1103	CODE:
1093	g_object_unref (self->pl);	1104	g_object_unref (self->pl);
1094	rc_free (self->rc);	1105	rc_free (self->rc);
1095	Safefree (self);	1106	Safefree (self);
1096		1107
1097	void	1108	void
1098	set_text (CFPlus::Layout self, SV *text_)	1109	set_text (DC::Layout self, SV *text_)
1099	CODE:	1110	CODE:
1100	{	1111	{
1101	STRLEN textlen;	1112	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1113	char *text = SvPVutf8 (text_, textlen);
1103		1114
1104	pango_layout_set_text (self->pl, text, textlen);	1115	pango_layout_set_text (self->pl, text, textlen);
1105	}	1116	}
1106		1117
1107	void	1118	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1119	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1120	CODE:
1110	{	1121	{
1111	STRLEN textlen;	1122	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1123	char *text = SvPVutf8 (text_, textlen);
1113		1124
1114	pango_layout_set_markup (self->pl, text, textlen);	1125	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1126	}
1116		1127
1117	void	1128	void
1118	set_shapes (CFPlus::Layout self, ...)	1129	set_shapes (DC::Layout self, ...)
1119	CODE:	1130	CODE:
1120	{	1131	{
1121	PangoAttrList *attrs = 0;	1132	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1133	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1134	const char *pos = text;
…		…
1158	if (attrs)	1169	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1170	pango_layout_set_attributes (self->pl, attrs);
1160	}	1171	}
1161		1172
1162	void	1173	void
1163	get_shapes (CFPlus::Layout self)	1174	get_shapes (DC::Layout self)
1164	PPCODE:	1175	PPCODE:
1165	{	1176	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1177	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1178
1168	do	1179	do
1169	{	1180	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1181	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1182
1172	if (run && shape_attr_p (run))	1183	if (run && shape_attr_p (run))
1173	{	1184	{
1174	PangoRectangle extents;	1185	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1186	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1194
1184	pango_layout_iter_free (iter);	1195	pango_layout_iter_free (iter);
1185	}	1196	}
1186		1197
1187	int	1198	int
1188	has_wrapped (CFPlus::Layout self)	1199	has_wrapped (DC::Layout self)
1189	CODE:	1200	CODE:
1190	{	1201	{
1191	int lines = 1;	1202	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1203	const char *text = pango_layout_get_text (self->pl);
1193		1204
…		…
1198	}	1209	}
1199	OUTPUT:	1210	OUTPUT:
1200	RETVAL	1211	RETVAL
1201		1212
1202	SV *	1213	SV *
1203	get_text (CFPlus::Layout self)	1214	get_text (DC::Layout self)
1204	CODE:	1215	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1216	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1217	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1218	OUTPUT:
1208	RETVAL	1219	RETVAL
1209		1220
1210	void	1221	void
1211	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1222	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212	CODE:	1223	CODE:
1213	self->r = r;	1224	self->r = r;
1214	self->g = g;	1225	self->g = g;
1215	self->b = b;	1226	self->b = b;
1216	self->a = a;	1227	self->a = a;
1217		1228
1218	void	1229	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1230	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1231	CODE:
1221	if (self->font != font)	1232	if (self->font != font)
1222	{	1233	{
1223	self->font = font;	1234	self->font = font;
1224	layout_update_font (self);	1235	layout_update_font (self);
1225	}	1236	}
1226		1237
1227	void	1238	void
1228	set_height (CFPlus::Layout self, int base_height)	1239	set_height (DC::Layout self, int base_height)
1229	CODE:	1240	CODE:
1230	if (self->base_height != base_height)	1241	if (self->base_height != base_height)
1231	{	1242	{
1232	self->base_height = base_height;	1243	self->base_height = base_height;
1233	layout_update_font (self);	1244	layout_update_font (self);
1234	}	1245	}
1235		1246
1236	void	1247	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1248	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1249	CODE:
1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1250	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240		1251
1241	void	1252	void
1242	set_indent (CFPlus::Layout self, int indent)	1253	set_indent (DC::Layout self, int indent)
1243	CODE:	1254	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1255	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1256
1246	void	1257	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1258	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1259	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1260	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1261
1251	void	1262	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1263	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1264	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1265	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1266	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1267	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1268	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1269	: PANGO_ELLIPSIZE_NONE
1259	);	1270	);
1260		1271
1261	void	1272	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1273	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1274	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1275	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1276
1266	void	1277	void
1267	size (CFPlus::Layout self)	1278	size (DC::Layout self)
1268	PPCODE:	1279	PPCODE:
1269	{	1280	{
1270	int w, h;	1281	int w, h;
1271		1282
1272	layout_get_pixel_size (self, &w, &h);	1283	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1286	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1287	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1288	}
1278		1289
1279	int	1290	int
1280	descent (CFPlus::Layout self)	1291	descent (DC::Layout self)
1281	CODE:	1292	CODE:
1282	{	1293	{
1283	PangoRectangle rect;	1294	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1295	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1296	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1297	RETVAL = PANGO_DESCENT (rect);
1287	}	1298	}
1288	OUTPUT:	1299	OUTPUT:
1289	RETVAL	1300	RETVAL
1290		1301
1291	int	1302	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1303	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1304	CODE:
1294	{	1305	{
1295	int index, trailing;	1306	int index, trailing;
1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1307	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297	RETVAL = index + trailing;	1308	RETVAL = index + trailing;
1298	}	1309	}
1299	OUTPUT:	1310	OUTPUT:
1300	RETVAL	1311	RETVAL
1301		1312
1302	void	1313	void
1303	cursor_pos (CFPlus::Layout self, int index)	1314	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1315	PPCODE:
1305	{	1316	{
1306	PangoRectangle strong_pos;	1317	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1318	pango_layout_get_cursor_pos (self->pl, index, 0, &pos);
1308		1319
1309	EXTEND (SP, 3);	1320	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1321	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1322	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1323	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1324	}
1314		1325
1315	void	1326	void
1316	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1327	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1328	PPCODE:
1318	{	1329	{
1319	int line, x;	1330	int line, x;
1320		1331
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1332	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1333	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1334	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1335	--line;
		1336	#endif
1324	EXTEND (SP, 2);	1337	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1338	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1339	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1340	}
1328		1341
1329	void	1342	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1343	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1344	PPCODE:
1332	{	1345	{
1333	PangoLayoutLine *lp;	1346	PangoLayoutLine *lp;
1334	int index, trailing;	1347	int index, trailing;
1335		1348
1336	if (line < 0)	1349	if (line < 0)
1337	XSRETURN_EMPTY;	1350	XSRETURN_EMPTY;
1338		1351
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1352	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1353	XSRETURN_EMPTY; /* do better */
1341		1354
1342	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1355	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343		1356
1344	EXTEND (SP, 2);	1357	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1363	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1364	}
1352	}	1365	}
1353		1366
1354	void	1367	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1368	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1369	CODE:
1357	rc_clear (self->rc);	1370	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1371	pango_opengl_render_layout_subpixel (
1359	self->pl,	1372	self->pl,
1360	self->rc,	1373	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1378	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1379	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1380	pango_layout_context_changed (self->pl);
1368		1381
1369	void	1382	void
1370	draw (CFPlus::Layout self)	1383	draw (DC::Layout self)
1371	CODE:	1384	CODE:
1372	{	1385	{
1373	glEnable (GL_TEXTURE_2D);	1386	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1387	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1388	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1396	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1397	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1398	glDisable (GL_TEXTURE_2D);
1386	}	1399	}
1387		1400
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1401	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1402
1390	PROTOTYPES: ENABLE	1403	PROTOTYPES: ENABLE
1391		1404
1392	void	1405	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1406	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1472	RETVAL = width > 0;	1485	RETVAL = width > 0;
1473	}	1486	}
1474	OUTPUT:	1487	OUTPUT:
1475	RETVAL	1488	RETVAL
1476		1489
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1490	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1491
1479	PROTOTYPES: DISABLE	1492	PROTOTYPES: DISABLE
1480		1493
1481	CFPlus::Map	1494	DC::Map
1482	new (SV *class)	1495	new (SV *class)
1483	CODE:	1496	CODE:
1484	New (0, RETVAL, 1, struct map);	1497	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1498	RETVAL->x = 0;
1486	RETVAL->y = 0;	1499	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1507	RETVAL->row = 0;
1495	OUTPUT:	1508	OUTPUT:
1496	RETVAL	1509	RETVAL
1497		1510
1498	void	1511	void
1499	DESTROY (CFPlus::Map self)	1512	DESTROY (DC::Map self)
1500	CODE:	1513	CODE:
1501	{	1514	{
1502	map_clear (self);	1515	map_clear (self);
1503	Safefree (self->face2tile);	1516	Safefree (self->face2tile);
1504	Safefree (self->tex);	1517	Safefree (self->tex);
1505	Safefree (self);	1518	Safefree (self);
1506	}	1519	}
1507		1520
1508	void	1521	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1522	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1523	CODE:
1511	self->w = map_width;	1524	self->w = map_width;
1512	self->h = map_height;	1525	self->h = map_height;
1513		1526
1514	void	1527	void
1515	clear (CFPlus::Map self)	1528	clear (DC::Map self)
1516	CODE:	1529	CODE:
1517	map_clear (self);	1530	map_clear (self);
1518		1531
1519	void	1532	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1533	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1534	CODE:
1522	{	1535	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1536	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1537	need_texid (self, tile);
1525	}	1538	}
1526		1539
1527	void	1540	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1541	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1542	CODE:
1530	{	1543	{
1531	tileid texid;	1544	tileid texid;
1532	maptex *tex;	1545	maptex *tex;
1533		1546
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1559	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1560	tex->smoothlevel = level;
1548	}	1561	}
1549		1562
1550	void	1563	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)	1564	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:	1565	CODE:
1553	{	1566	{
1554	need_texid (self, texid);	1567	need_texid (self, texid);
1555		1568
1556	{	1569	{
…		…
1576	// from transparent color bleeding and ugly wrapping effects.	1589	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1590	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1591	}
1579		1592
1580	int	1593	int
1581	ox (CFPlus::Map self)	1594	ox (DC::Map self)
1582	ALIAS:	1595	ALIAS:
1583	oy = 1	1596	oy = 1
1584	x = 2	1597	x = 2
1585	y = 3	1598	y = 3
1586	w = 4	1599	w = 4
…		…
1597	}	1610	}
1598	OUTPUT:	1611	OUTPUT:
1599	RETVAL	1612	RETVAL
1600		1613
1601	void	1614	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1615	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1616	CODE:
1604	{	1617	{
1605	if (dx > 0)	1618	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1619	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1620	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1636	self->y += MAP_EXTEND_Y;
1624	}	1637	}
1625	}	1638	}
1626		1639
1627	SV *	1640	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1641	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1642	CODE:
1630	{	1643	{
1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1644	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1632	uint8_t data_end = (uint8_t )SvEND (data_);	1645	uint8_t data_end = (uint8_t )SvEND (data_);
1633	mapcell *cell;	1646	mapcell *cell;
…		…
1722	}	1735	}
1723	OUTPUT:	1736	OUTPUT:
1724	RETVAL	1737	RETVAL
1725		1738
1726	SV *	1739	SV *
1727	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1740	mapmap (DC::Map self, int x0, int y0, int w, int h)
1728	CODE:	1741	CODE:
1729	{	1742	{
1730	int x1, x;	1743	int x1, x;
1731	int y1, y;	1744	int y1, y;
1732	int z;	1745	int z;
…		…
1777	}	1790	}
1778	OUTPUT:	1791	OUTPUT:
1779	RETVAL	1792	RETVAL
1780		1793
1781	void	1794	void
1782	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1795	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1783	CODE:	1796	CODE:
1784	{	1797	{
1785	int x, y, z;	1798	int x, y, z;
1786		1799
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1800	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2058	}	2071	}
2059	}	2072	}
2060	}	2073	}
2061		2074
2062	void	2075	void
2063	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2076	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064	CODE:	2077	CODE:
2065	{	2078	{
2066	static float color[16][3] = {	2079	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2080	{ 0.00F, 0.00F, 0.00F },
2068	{ 1.00F, 1.00F, 1.00F },	2081	{ 1.00F, 1.00F, 1.00F },
…		…
2118	glDisable (GL_BLEND);	2131	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2132	glDisable (GL_TEXTURE_2D);
2120	}	2133	}
2121		2134
2122	void	2135	void
2123	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2136	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124	PPCODE:	2137	PPCODE:
2125	{	2138	{
2126	int x, y;	2139	int x, y;
2127	int sw1 = sw + 2;	2140	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2141	int sh1 = sh + 2;
…		…
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2212	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2213	PUSHs (darkness3_sv);
2201	}	2214	}
2202		2215
2203	SV *	2216	SV *
2204	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2217	get_rect (DC::Map self, int x0, int y0, int w, int h)
2205	CODE:	2218	CODE:
2206	{	2219	{
2207	int x, y, x1, y1;	2220	int x, y, x1, y1;
2208	SV data_sv = newSV (w h * 7 + 5);	2221	SV data_sv = newSV (w h * 7 + 5);
2209	uint8_t data = (uint8_t )SvPVX (data_sv);	2222	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2274	}	2287	}
2275	OUTPUT:	2288	OUTPUT:
2276	RETVAL	2289	RETVAL
2277		2290
2278	void	2291	void
2279	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2292	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2280	PPCODE:	2293	PPCODE:
2281	{	2294	{
2282	int x, y, z;	2295	int x, y, z;
2283	int w, h;	2296	int w, h;
2284	int x1, y1;	2297	int x1, y1;
…		…
2337	}	2350	}
2338	}	2351	}
2339	}	2352	}
2340	}	2353	}
2341		2354
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2355	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2356
2344	CFPlus::RW	2357	DC::RW
2345	new (SV class, SV data_sv)	2358	new (SV class, SV data_sv)
2346	CODE:	2359	CODE:
2347	{	2360	{
2348	STRLEN datalen;	2361	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2362	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2364	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2365	}
2353	OUTPUT:	2366	OUTPUT:
2354	RETVAL	2367	RETVAL
2355		2368
2356	CFPlus::RW	2369	DC::RW
2357	new_from_file (SV class, const char path, const char *mode = "rb")	2370	new_from_file (SV class, const char path, const char *mode = "rb")
2358	CODE:	2371	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2372	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2373	OUTPUT:
2361	RETVAL	2374	RETVAL
2362		2375
2363	# fails on win32:	2376	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2377	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2378	#void
2366	#close (CFPlus::RW self)	2379	#close (DC::RW self)
2367	# CODE:	2380	# CODE:
2368	# (self->(close)) (self);	2381	# (self->(close)) (self);
2369		2382
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2383	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2384
2372	PROTOTYPES: DISABLE	2385	PROTOTYPES: DISABLE
2373		2386
2374	CFPlus::Channel	2387	DC::Channel
2375	find ()	2388	find ()
2376	CODE:	2389	CODE:
2377	{	2390	{
2378	RETVAL = Mix_GroupAvailable (-1);	2391	RETVAL = Mix_GroupAvailable (-1);
2379		2392
…		…
2392	}	2405	}
2393	OUTPUT:	2406	OUTPUT:
2394	RETVAL	2407	RETVAL
2395		2408
2396	void	2409	void
2397	halt (CFPlus::Channel self)	2410	halt (DC::Channel self)
2398	CODE:	2411	CODE:
2399	Mix_HaltChannel (self);	2412	Mix_HaltChannel (self);
2400		2413
2401	void	2414	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2415	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2416	CODE:
2404	Mix_ExpireChannel (self, ticks);	2417	Mix_ExpireChannel (self, ticks);
2405		2418
2406	void	2419	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2420	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2421	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2422	Mix_FadeOutChannel (self, ticks);
2410		2423
2411	int	2424	int
2412	volume (CFPlus::Channel self, int volume)	2425	volume (DC::Channel self, int volume)
2413	CODE:	2426	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2427	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2428	OUTPUT:
2416	RETVAL	2429	RETVAL
2417		2430
2418	void	2431	void
2419	unregister_all_effects (CFPlus::Channel self)	2432	unregister_all_effects (DC::Channel self)
2420	CODE:	2433	CODE:
2421	Mix_UnregisterAllEffects (self);	2434	Mix_UnregisterAllEffects (self);
2422		2435
2423	void	2436	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2437	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2438	CODE:
2426	left = CLAMP (left , 0, 255);	2439	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2440	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2441	Mix_SetPanning (self, left, right);
2429		2442
2430	void	2443	void
2431	set_distance (CFPlus::Channel self, int distance)	2444	set_distance (DC::Channel self, int distance)
2432	CODE:	2445	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2446	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2447
2435	void	2448	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2449	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2450	CODE:
2438		2451
2439	void	2452	void
2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2453	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441	CODE:	2454	CODE:
2442	{	2455	{
2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2456	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);	2457	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2458	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2459	}
2447		2460
2448	void	2461	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2462	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2463	CODE:
2451	Mix_SetReverseStereo (self, flip);	2464	Mix_SetReverseStereo (self, flip);
2452		2465
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2466	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2467
2455	PROTOTYPES: DISABLE	2468	PROTOTYPES: DISABLE
2456		2469
2457	CFPlus::MixChunk	2470	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2471	new (SV *class, DC::RW rwops)
2459	CODE:	2472	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2473	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2474	OUTPUT:
2462	RETVAL	2475	RETVAL
2463		2476
2464	void	2477	void
2465	DESTROY (CFPlus::MixChunk self)	2478	DESTROY (DC::MixChunk self)
2466	CODE:	2479	CODE:
2467	Mix_FreeChunk (self);	2480	Mix_FreeChunk (self);
2468		2481
2469	int	2482	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2483	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2484	CODE:
2472	if (items > 1)	2485	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2486	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2487	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2488	OUTPUT:
2476	RETVAL	2489	RETVAL
2477		2490
2478	CFPlus::Channel	2491	DC::Channel
2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2492	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480	CODE:	2493	CODE:
2481	{	2494	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2495	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2496
2484	if (RETVAL < 0)	2497	if (RETVAL < 0)
…		…
2491	}	2504	}
2492	}	2505	}
2493	OUTPUT:	2506	OUTPUT:
2494	RETVAL	2507	RETVAL
2495		2508
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2509	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2510
2498	int	2511	int
2499	volume (int volume = -1)	2512	volume (int volume = -1)
2500	PROTOTYPE: ;$	2513	PROTOTYPE: ;$
2501	CODE:	2514	CODE:
…		…
2513	void	2526	void
2514	halt ()	2527	halt ()
2515	CODE:	2528	CODE:
2516	Mix_HaltMusic ();	2529	Mix_HaltMusic ();
2517		2530
2518	CFPlus::MixMusic	2531	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2532	new (SV *class, DC::RW rwops)
2520	CODE:	2533	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2534	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2535	OUTPUT:
2523	RETVAL	2536	RETVAL
2524		2537
2525	void	2538	void
2526	DESTROY (CFPlus::MixMusic self)	2539	DESTROY (DC::MixMusic self)
2527	CODE:	2540	CODE:
2528	Mix_FreeMusic (self);	2541	Mix_FreeMusic (self);
2529		2542
2530	int	2543	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2544	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2545	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2546	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2547	OUTPUT:
2535	RETVAL	2548	RETVAL
2536		2549
2537	void	2550	void
2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2551	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539	CODE:	2552	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2553	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2554
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2555	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2556
2544	PROTOTYPES: ENABLE	2557	PROTOTYPES: ENABLE
2545		2558
2546	BOOT:	2559	BOOT:
2547	{	2560	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2561	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2562	static const struct {
2550	const char *name;	2563	const char *name;
2551	IV iv;	2564	IV iv;
2552	} *civ, const_iv[] = {	2565	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2566	# 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)	2859	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2847	CODE:	2860	CODE:
2848	if (gl.SeparableFilter2D)	2861	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2862	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		2863
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2864	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		2865
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2866	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		2867
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2868	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		2869
…		…
2882		2895
2883	void glEndList ()	2896	void glEndList ()
2884		2897
2885	void glCallList (int list)	2898	void glCallList (int list)
2886		2899
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2900	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		2901
2889	PROTOTYPES: DISABLE	2902	PROTOTYPES: DISABLE
2890		2903
2891	void	2904	void
2892	find_widget (SV *self, NV x, NV y)	2905	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	2909	XPUSHs (self);
2897	}	2910	}
2898		2911
2899	BOOT:	2912	BOOT:
2900	{	2913	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2914	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		2915
2903	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2916	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);	2917	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);	2918	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);	2919	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907	}	2920	}
2908		2921
2909	void	2922	void
2910	draw (SV *self)	2923	draw (SV *self)
2911	CODE:	2924	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	2931	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	2932	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	2933	double draw_x, draw_y;
2921		2934
2922	if (!SvROK (self))	2935	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2936	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		2937
2925	hv = (HV *)SvRV (self);	2938	hv = (HV *)SvRV (self);
2926		2939
2927	if (SvTYPE (hv) != SVt_PVHV)	2940	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2941	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		2942
2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2943	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.;	2944	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932		2945
2933	if (!h \|\| !w)	2946	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.251 by root, Fri Dec 28 17:28:01 2007 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.251 by root, Fri Dec 28 17:28:01 2007 UTC