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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.246 by root, Fri Dec 28 15:06:02 2007 UTC

…		…
120		120
121	#include "pango-font.c"	121	#include "pango-font.c"
122	#include "pango-fontmap.c"	122	#include "pango-fontmap.c"
123	#include "pango-render.c"	123	#include "pango-render.c"
124		124
125	typedef IV CFPlus__Channel;	125	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	126	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	127	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	128	typedef Mix_Music *DC__MixMusic;
129		129
130	typedef PangoFontDescription *CFPlus__Font;	130	typedef PangoFontDescription *DC__Font;
131		131
132	static int	132	static int
133	shape_attr_p (PangoLayoutRun *run)	133	shape_attr_p (PangoLayoutRun *run)
134	{	134	{
135	GSList *attrs = run->item->analysis.extra_attrs;	135	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		149
150	typedef struct cf_layout {	150	typedef struct cf_layout {
151	PangoLayout *pl;	151	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	152	float r, g, b, a; // default color for rgba mode
153	int base_height;	153	int base_height;
154	CFPlus__Font font;	154	DC__Font font;
155	rc_t *rc;	155	rc_t *rc;
156	} *CFPlus__Layout;	156	} *DC__Layout;
157		157
158	static CFPlus__Font default_font;	158	static DC__Font default_font;
159	static PangoContext *opengl_context;	159	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	160	static PangoFontMap *opengl_fontmap;
161		161
162	static void	162	static void
163	substitute_func (FcPattern *pattern, gpointer data)	163	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	168	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	170	}
171		171
172	static void	172	static void
173	layout_update_font (CFPlus__Layout self)	173	layout_update_font (DC__Layout self)
174	{	174	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	175	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	176	* reasonably well with bitstream vera
177	*/	177	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	178	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
182		182
183	pango_layout_set_font_description (self->pl, font);	183	pango_layout_set_font_description (self->pl, font);
184	}	184	}
185		185
186	static void	186	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	187	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	188	{
189	PangoRectangle rect;	189	PangoRectangle rect;
190		190
191	// get_pixel_* wrongly rounds down	191	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	192	pango_layout_get_extents (self->pl, 0, &rect);
…		…
203		203
204	typedef uint16_t tileid;	204	typedef uint16_t tileid;
205	typedef uint16_t faceid;	205	typedef uint16_t faceid;
206		206
207	typedef struct {	207	typedef struct {
208	int name;	208	GLuint name;
209	int w, h;	209	int w, h;
210	float s, t;	210	float s, t;
211	uint8_t r, g, b, a;	211	uint8_t r, g, b, a;
212	tileid smoothtile;	212	tileid smoothtile;
213	uint8_t smoothlevel;	213	uint8_t smoothlevel;
…		…
231	int faces; tileid *face2tile; // [faceid]	231	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	232	int texs; maptex *tex; // [tileid]
233		233
234	int32_t rows;	234	int32_t rows;
235	maprow *row;	235	maprow *row;
236	} *CFPlus__Map;	236	} *DC__Map;
237		237
238	static char *	238	static char *
239	prepend (char *ptr, int sze, int inc)	239	prepend (char *ptr, int sze, int inc)
240	{	240	{
241	char *p;	241	char *p;
…		…
279	self->texs *= 2;	279	self->texs *= 2;
280	}	280	}
281	}	281	}
282		282
283	static maprow *	283	static maprow *
284	map_get_row (CFPlus__Map self, int y)	284	map_get_row (DC__Map self, int y)
285	{	285	{
286	if (0 > y)	286	if (0 > y)
287	{	287	{
288	int extend = - y + MAP_EXTEND_Y;	288	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	289	Prepend (maprow, self->row, self->rows, extend);
…		…
327		327
328	return row->col + (x - row->c0);	328	return row->col + (x - row->c0);
329	}	329	}
330		330
331	static mapcell *	331	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	332	map_get_cell (DC__Map self, int x, int y)
333	{	333	{
334	return row_get_cell (map_get_row (self, y), x);	334	return row_get_cell (map_get_row (self, y), x);
335	}	335	}
336		336
337	static void	337	static void
338	map_clear (CFPlus__Map self)	338	map_clear (DC__Map self)
339	{	339	{
340	int r;	340	int r;
341		341
342	for (r = 0; r < self->rows; r++)	342	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	343	Safefree (self->row[r].col);
…		…
351	self->row = 0;	351	self->row = 0;
352	self->rows = 0;	352	self->rows = 0;
353	}	353	}
354		354
355	static void	355	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	356	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	357	{
358	int x, y;	358	int x, y;
359	maprow *row;	359	maprow *row;
360	mapcell *cell;	360	mapcell *cell;
361		361
…		…
440	n \|= n >> 16;	440	n \|= n >> 16;
441		441
442	return n + 1;	442	return n + 1;
443	}	443	}
444		444
		445	static unsigned int
		446	popcount (unsigned int n)
		447	{
		448	n -= (n >> 1) & 0x55555555U;
		449	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		450	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		451	n *= 0x01010101U;
		452
		453	return n >> 24;
		454	}
		455
445	/* SDL should provide this, really. */	456	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	457	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	458	#define SDLK_MODIFIER_MAX 314
448		459
449	/******************************************************************************/	460	/******************************************************************************/
…		…
487	return 0;	498	return 0;
488		499
489	return 1;	500	return 1;
490	}	501	}
491		502
492	MODULE = CFPlus PACKAGE = CFPlus	503	MODULE = Deliantra::Client PACKAGE = DC
493		504
494	PROTOTYPES: ENABLE	505	PROTOTYPES: ENABLE
495		506
496	BOOT:	507	BOOT:
497	{	508	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	509	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	510	static const struct {
500	const char *name;	511	const char *name;
501	IV iv;	512	IV iv;
502	} *civ, const_iv[] = {	513	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	514	# define const_iv(name) { # name, (IV)name }
…		…
525		536
526	const_iv (SDL_APPINPUTFOCUS),	537	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	538	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	539	const_iv (SDL_APPACTIVE),
529		540
		541	const_iv (SDLK_FIRST),
		542	const_iv (SDLK_LAST),
530	const_iv (SDLK_KP0),	543	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	544	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	545	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	546	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	547	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	619	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	620	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	621	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	622	const_iv (KMOD_CAPS),
610	const_iv (KMOD_MODE),	623	const_iv (KMOD_MODE),
		624
		625	const_iv (MIX_DEFAULT_FORMAT),
611	# undef const_iv	626	# undef const_iv
612	};	627	};
613		628
614	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
632	RETVAL	647	RETVAL
633		648
634	NV floor (NV x)	649	NV floor (NV x)
635		650
636	NV ceil (NV x)	651	NV ceil (NV x)
		652
		653	IV minpot (UV n)
		654
		655	IV popcount (UV n)
637		656
638	void	657	void
639	pango_init ()	658	pango_init ()
640	CODE:	659	CODE:
641	{	660	{
…		…
681	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
682		701
683	if (m && m != (SDL_Rect **)-1)	702	if (m && m != (SDL_Rect **)-1)
684	while (*m)	703	while (*m)
685	{	704	{
686	if ((m)->w >= 640 && (m)->h >= 480)	705	if ((m)->w >= 800 && (m)->h >= 480)
687	{	706	{
688	AV *av = newAV ();	707	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	708	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	709	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	710	av_push (av, newSViv (rgb));
…		…
715		734
716	if (RETVAL)	735	if (RETVAL)
717	{	736	{
718	av_clear (texture_av);	737	av_clear (texture_av);
719		738
720	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	739	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	740	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722	#include "glfunc.h"	741	#include "glfunc.h"
723	#undef GL_FUNC	742	#undef GL_FUNC
724	}	743	}
725	}	744	}
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	827	break;
809	}	828	}
810		829
811	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812	}	831	}
813	}	832	}
814		833
815	int	834	int
816	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817	POSTCALL:	836	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	837	Mix_HookMusicFinished (music_finished);
819	Mix_ChannelFinished (channel_finished);	838	Mix_ChannelFinished (channel_finished);
		839
		840	void
		841	Mix_QuerySpec ()
		842	PPCODE:
		843	{
		844	int freq, channels;
		845	Uint16 format;
		846
		847	if (Mix_QuerySpec (&freq, &format, &channels))
		848	{
		849	EXTEND (SP, 3);
		850	PUSHs (sv_2mortal (newSViv (freq)));
		851	PUSHs (sv_2mortal (newSViv (format)));
		852	PUSHs (sv_2mortal (newSViv (channels)));
		853	}
		854	}
820		855
821	void	856	void
822	Mix_CloseAudio ()	857	Mix_CloseAudio ()
823		858
824	int	859	int
…		…
958	void	993	void
959	error (char *message)	994	error (char *message)
960	CODE:	995	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	996	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	997	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	998	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
964	#endif	999	#endif
965		1000
966	void	1001	void
967	fatal (char *message)	1002	fatal (char *message)
968	CODE:	1003	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1004	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1005	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1006	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
972	#endif	1007	#endif
973	_exit (1);	1008	_exit (1);
974		1009
975	void	1010	void
976	_exit (int retval = 0)	1011	_exit (int retval = 0)
…		…
988	#if DEBUG	1023	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1024	VALGRIND_DO_LEAK_CHECK;
990	#endif	1025	#endif
991	}	1026	}
992		1027
993	MODULE = CFPlus PACKAGE = CFPlus::Font	1028	MODULE = Deliantra::Client PACKAGE = DC::Font
994		1029
995	PROTOTYPES: DISABLE	1030	PROTOTYPES: DISABLE
996		1031
997	CFPlus::Font	1032	DC::Font
998	new_from_file (SV class, char path, int id = 0)	1033	new_from_file (SV class, char path, int id = 0)
999	CODE:	1034	CODE:
1000	{	1035	{
1001	int count;	1036	int count;
1002	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1005	}	1040	}
1006	OUTPUT:	1041	OUTPUT:
1007	RETVAL	1042	RETVAL
1008		1043
1009	void	1044	void
1010	DESTROY (CFPlus::Font self)	1045	DESTROY (DC::Font self)
1011	CODE:	1046	CODE:
1012	pango_font_description_free (self);	1047	pango_font_description_free (self);
1013		1048
1014	void	1049	void
1015	make_default (CFPlus::Font self)	1050	make_default (DC::Font self)
1016	PROTOTYPE: $	1051	PROTOTYPE: $
1017	CODE:	1052	CODE:
1018	default_font = self;	1053	default_font = self;
1019		1054
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1055	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1056
1022	PROTOTYPES: DISABLE	1057	PROTOTYPES: DISABLE
1023		1058
1024	void	1059	void
1025	reset_glyph_cache ()	1060	glyph_cache_backup ()
1026	PROTOTYPE:	1061	PROTOTYPE:
1027	CODE:	1062	CODE:
		1063	tc_backup ();
		1064
		1065	void
		1066	glyph_cache_restore ()
		1067	PROTOTYPE:
		1068	CODE:
1028	tc_clear ();	1069	tc_restore ();
1029		1070
1030	CFPlus::Layout	1071	DC::Layout
1031	new (SV *class)	1072	new (SV *class)
1032	CODE:	1073	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1074	New (0, RETVAL, 1, struct cf_layout);
1034		1075
1035	RETVAL->pl = pango_layout_new (opengl_context);	1076	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1086	layout_update_font (RETVAL);
1046	OUTPUT:	1087	OUTPUT:
1047	RETVAL	1088	RETVAL
1048		1089
1049	void	1090	void
1050	DESTROY (CFPlus::Layout self)	1091	DESTROY (DC::Layout self)
1051	CODE:	1092	CODE:
1052	g_object_unref (self->pl);	1093	g_object_unref (self->pl);
1053	rc_free (self->rc);	1094	rc_free (self->rc);
1054	Safefree (self);	1095	Safefree (self);
1055		1096
1056	void	1097	void
1057	set_text (CFPlus::Layout self, SV *text_)	1098	set_text (DC::Layout self, SV *text_)
1058	CODE:	1099	CODE:
1059	{	1100	{
1060	STRLEN textlen;	1101	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1102	char *text = SvPVutf8 (text_, textlen);
1062		1103
1063	pango_layout_set_text (self->pl, text, textlen);	1104	pango_layout_set_text (self->pl, text, textlen);
1064	}	1105	}
1065		1106
1066	void	1107	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1108	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1109	CODE:
1069	{	1110	{
1070	STRLEN textlen;	1111	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1112	char *text = SvPVutf8 (text_, textlen);
1072		1113
1073	pango_layout_set_markup (self->pl, text, textlen);	1114	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1115	}
1075		1116
1076	void	1117	void
1077	set_shapes (CFPlus::Layout self, ...)	1118	set_shapes (DC::Layout self, ...)
1078	CODE:	1119	CODE:
1079	{	1120	{
1080	PangoAttrList *attrs = 0;	1121	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1122	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1123	const char *pos = text;
…		…
1117	if (attrs)	1158	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1159	pango_layout_set_attributes (self->pl, attrs);
1119	}	1160	}
1120		1161
1121	void	1162	void
1122	get_shapes (CFPlus::Layout self)	1163	get_shapes (DC::Layout self)
1123	PPCODE:	1164	PPCODE:
1124	{	1165	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1167
1127	do	1168	do
…		…
1142		1183
1143	pango_layout_iter_free (iter);	1184	pango_layout_iter_free (iter);
1144	}	1185	}
1145		1186
1146	int	1187	int
1147	has_wrapped (CFPlus::Layout self)	1188	has_wrapped (DC::Layout self)
1148	CODE:	1189	CODE:
1149	{	1190	{
1150	int lines = 1;	1191	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1192	const char *text = pango_layout_get_text (self->pl);
1152		1193
…		…
1157	}	1198	}
1158	OUTPUT:	1199	OUTPUT:
1159	RETVAL	1200	RETVAL
1160		1201
1161	SV *	1202	SV *
1162	get_text (CFPlus::Layout self)	1203	get_text (DC::Layout self)
1163	CODE:	1204	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1206	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1207	OUTPUT:
1167	RETVAL	1208	RETVAL
1168		1209
1169	void	1210	void
1170	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1211	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171	CODE:	1212	CODE:
1172	self->r = r;	1213	self->r = r;
1173	self->g = g;	1214	self->g = g;
1174	self->b = b;	1215	self->b = b;
1175	self->a = a;	1216	self->a = a;
1176		1217
1177	void	1218	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1219	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1220	CODE:
1180	if (self->font != font)	1221	if (self->font != font)
1181	{	1222	{
1182	self->font = font;	1223	self->font = font;
1183	layout_update_font (self);	1224	layout_update_font (self);
1184	}	1225	}
1185		1226
1186	void	1227	void
1187	set_height (CFPlus::Layout self, int base_height)	1228	set_height (DC::Layout self, int base_height)
1188	CODE:	1229	CODE:
1189	if (self->base_height != base_height)	1230	if (self->base_height != base_height)
1190	{	1231	{
1191	self->base_height = base_height;	1232	self->base_height = base_height;
1192	layout_update_font (self);	1233	layout_update_font (self);
1193	}	1234	}
1194		1235
1195	void	1236	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1237	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1238	CODE:
1198	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199		1240
1200	void	1241	void
1201	set_indent (CFPlus::Layout self, int indent)	1242	set_indent (DC::Layout self, int indent)
1202	CODE:	1243	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1245
1205	void	1246	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1247	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1248	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1250
1210	void	1251	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1252	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1253	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1254	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1258	: PANGO_ELLIPSIZE_NONE
1218	);	1259	);
1219		1260
1220	void	1261	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1262	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1263	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1265
1225	void	1266	void
1226	size (CFPlus::Layout self)	1267	size (DC::Layout self)
1227	PPCODE:	1268	PPCODE:
1228	{	1269	{
1229	int w, h;	1270	int w, h;
1230		1271
1231	layout_get_pixel_size (self, &w, &h);	1272	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1275	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1276	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1277	}
1237		1278
1238	int	1279	int
1239	descent (CFPlus::Layout self)	1280	descent (DC::Layout self)
1240	CODE:	1281	CODE:
1241	{	1282	{
1242	PangoRectangle rect;	1283	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1285	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1246	}	1287	}
1247	OUTPUT:	1288	OUTPUT:
1248	RETVAL	1289	RETVAL
1249		1290
1250	int	1291	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1292	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1293	CODE:
1253	{	1294	{
1254	int index, trailing;	1295	int index, trailing;
1255	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256	RETVAL = index + trailing;	1297	RETVAL = index + trailing;
1257	}	1298	}
1258	OUTPUT:	1299	OUTPUT:
1259	RETVAL	1300	RETVAL
1260		1301
1261	void	1302	void
1262	cursor_pos (CFPlus::Layout self, int index)	1303	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1304	PPCODE:
1264	{	1305	{
1265	PangoRectangle strong_pos;	1306	PangoRectangle strong_pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1267		1308
…		…
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1272	}	1313	}
1273		1314
1274	void	1315	void
1275	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1316	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276	PPCODE:	1317	PPCODE:
1277	{	1318	{
1278	int line, x;	1319	int line, x;
1279		1320
1280	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1322	#if !PANGO_VERSION_CHECK (1, 17. 3)
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1323	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1324	--line;
		1325	#endif
1283	EXTEND (SP, 2);	1326	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1327	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1328	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1329	}
1287		1330
1288	void	1331	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1332	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1333	PPCODE:
1291	{	1334	{
1292	PangoLayoutLine *lp;	1335	PangoLayoutLine *lp;
1293	int index, trailing;	1336	int index, trailing;
1294		1337
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1352	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1353	}
1311	}	1354	}
1312		1355
1313	void	1356	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1357	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1358	CODE:
1316	rc_clear (self->rc);	1359	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1360	pango_opengl_render_layout_subpixel (
1318	self->pl,	1361	self->pl,
1319	self->rc,	1362	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1367	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1368	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1369	pango_layout_context_changed (self->pl);
1327		1370
1328	void	1371	void
1329	draw (CFPlus::Layout self)	1372	draw (DC::Layout self)
1330	CODE:	1373	CODE:
1331	{	1374	{
1332	glEnable (GL_TEXTURE_2D);	1375	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1376	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1377	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1385	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1386	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1387	glDisable (GL_TEXTURE_2D);
1345	}	1388	}
1346		1389
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1390	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1391
1349	PROTOTYPES: ENABLE	1392	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1393
1353	void	1394	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1395	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1396	CODE:
1356	{	1397	{
…		…
1433	RETVAL = width > 0;	1474	RETVAL = width > 0;
1434	}	1475	}
1435	OUTPUT:	1476	OUTPUT:
1436	RETVAL	1477	RETVAL
1437		1478
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1479	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1480
1440	PROTOTYPES: DISABLE	1481	PROTOTYPES: DISABLE
1441		1482
1442	CFPlus::Map	1483	DC::Map
1443	new (SV *class)	1484	new (SV *class)
1444	CODE:	1485	CODE:
1445	New (0, RETVAL, 1, struct map);	1486	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1487	RETVAL->x = 0;
1447	RETVAL->y = 0;	1488	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1496	RETVAL->row = 0;
1456	OUTPUT:	1497	OUTPUT:
1457	RETVAL	1498	RETVAL
1458		1499
1459	void	1500	void
1460	DESTROY (CFPlus::Map self)	1501	DESTROY (DC::Map self)
1461	CODE:	1502	CODE:
1462	{	1503	{
1463	map_clear (self);	1504	map_clear (self);
1464	Safefree (self->face2tile);	1505	Safefree (self->face2tile);
1465	Safefree (self->tex);	1506	Safefree (self->tex);
1466	Safefree (self);	1507	Safefree (self);
1467	}	1508	}
1468		1509
1469	void	1510	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1511	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1512	CODE:
1472	self->w = map_width;	1513	self->w = map_width;
1473	self->h = map_height;	1514	self->h = map_height;
1474		1515
1475	void	1516	void
1476	clear (CFPlus::Map self)	1517	clear (DC::Map self)
1477	CODE:	1518	CODE:
1478	map_clear (self);	1519	map_clear (self);
1479		1520
1480	void	1521	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1522	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1523	CODE:
1483	{	1524	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1525	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1526	need_texid (self, tile);
1486	}	1527	}
1487		1528
1488	void	1529	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1530	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1531	CODE:
1491	{	1532	{
1492	tileid texid;	1533	tileid texid;
1493	maptex *tex;	1534	maptex *tex;
1494		1535
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1548	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1549	tex->smoothlevel = level;
1509	}	1550	}
1510		1551
1511	void	1552	void
1512	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)	1553	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)
1513	CODE:	1554	CODE:
1514	{	1555	{
1515	need_texid (self, texid);	1556	need_texid (self, texid);
1516		1557
1517	{	1558	{
…		…
1537	// from transparent color bleeding and ugly wrapping effects.	1578	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1579	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1580	}
1540		1581
1541	int	1582	int
1542	ox (CFPlus::Map self)	1583	ox (DC::Map self)
1543	ALIAS:	1584	ALIAS:
1544	oy = 1	1585	oy = 1
1545	x = 2	1586	x = 2
1546	y = 3	1587	y = 3
1547	w = 4	1588	w = 4
…		…
1558	}	1599	}
1559	OUTPUT:	1600	OUTPUT:
1560	RETVAL	1601	RETVAL
1561		1602
1562	void	1603	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1604	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1605	CODE:
1565	{	1606	{
1566	if (dx > 0)	1607	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1608	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1609	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1625	self->y += MAP_EXTEND_Y;
1585	}	1626	}
1586	}	1627	}
1587		1628
1588	SV *	1629	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1630	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1631	CODE:
1591	{	1632	{
1592	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1633	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1593	uint8_t data_end = (uint8_t )SvEND (data_);	1634	uint8_t data_end = (uint8_t )SvEND (data_);
1594	mapcell *cell;	1635	mapcell *cell;
…		…
1683	}	1724	}
1684	OUTPUT:	1725	OUTPUT:
1685	RETVAL	1726	RETVAL
1686		1727
1687	SV *	1728	SV *
1688	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1729	mapmap (DC::Map self, int x0, int y0, int w, int h)
1689	CODE:	1730	CODE:
1690	{	1731	{
1691	int x1, x;	1732	int x1, x;
1692	int y1, y;	1733	int y1, y;
1693	int z;	1734	int z;
…		…
1738	}	1779	}
1739	OUTPUT:	1780	OUTPUT:
1740	RETVAL	1781	RETVAL
1741		1782
1742	void	1783	void
1743	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1784	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1744	CODE:	1785	CODE:
1745	{	1786	{
1746	int x, y, z;	1787	int x, y, z;
1747		1788
1748	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1789	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1749	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1790	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1791	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	1792	smooth_key skey;
1752		1793
1753	rc_t *rc = rc_alloc ();	1794	rc_t *rc = rc_alloc ();
1754	rc_key_t key;	1795	rc_key_t key;
1755	rc_array_t *arr;	1796	rc_array_t *arr;
…		…
1817	if (tile)	1858	if (tile)
1818	{	1859	{
1819	maptex tex = self->tex [tile];	1860	maptex tex = self->tex [tile];
1820	int px, py;	1861	int px, py;
1821		1862
1822	// suppressing texture state switches here
1823	// is only moderately effective, but worth the extra effort
1824	if (key.texname != tex.name)	1863	if (key.texname != tex.name)
1825	{	1864	{
1826	if (!tex.name)	1865	if (!tex.name)
1827	tex = self->tex [2]; /* missing, replace by noface */	1866	tex = self->tex [2]; /* missing, replace by noface */
1828		1867
…		…
1911	// go through all smoothlevels, lowest to highest, then draw.	1950	// go through all smoothlevels, lowest to highest, then draw.
1912	// this is basically counting sort	1951	// this is basically counting sort
1913	{	1952	{
1914	int w, b;	1953	int w, b;
1915		1954
		1955	glEnable (GL_TEXTURE_2D);
		1956	glBegin (GL_QUADS);
1916	for (w = 0; w < 256 / 32; ++w)	1957	for (w = 0; w < 256 / 32; ++w)
1917	{	1958	{
1918	uint32_t smask = smooth_level [w];	1959	uint32_t smask = smooth_level [w];
1919	if (smask)	1960	if (smask)
1920	for (b = 0; b < 32; ++b)	1961	for (b = 0; b < 32; ++b)
…		…
1945	{	1986	{
1946	// this time avoiding texture state changes	1987	// this time avoiding texture state changes
1947	// save gobs of state changes.	1988	// save gobs of state changes.
1948	if (key.texname != tex.name)	1989	if (key.texname != tex.name)
1949	{	1990	{
		1991	glEnd ();
1950	key.texname = tex.name;	1992	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951	arr = rc_array (rc, &key);	1993	glBegin (GL_QUADS);
1952	}	1994	}
1953		1995
1954	if (border)	1996	if (border)
1955	{	1997	{
1956	float ox = border * dx;	1998	float ox = border * dx;
1957		1999
1958	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2000	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2001	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2002	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2003	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962	}	2004	}
1963		2005
1964	if (corner)	2006	if (corner)
1965	{	2007	{
1966	float ox = corner * dx;	2008	float ox = corner * dx;
1967		2009
1968	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2010	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2011	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2012	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2013	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972	}	2014	}
1973	}	2015	}
1974	}	2016	}
1975	}	2017	}
1976	}	2018	}
1977	}	2019	}
		2020
		2021	glEnd ();
		2022	glDisable (GL_TEXTURE_2D);
		2023	key.texname = -1;
1978	}	2024	}
1979		2025
1980	hv_clear (smooth);	2026	hv_clear (smooth);
1981	rc_draw (rc);
1982	rc_clear (rc);
1983	}	2027	}
1984		2028
1985	glDisable (GL_BLEND);	2029	glDisable (GL_BLEND);
1986	rc_free (rc);	2030	rc_free (rc);
1987		2031
…		…
2016	}	2060	}
2017	}	2061	}
2018	}	2062	}
2019		2063
2020	void	2064	void
2021	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2065	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022	CODE:	2066	CODE:
2023	{	2067	{
2024	static float color[16][3] = {	2068	static float color[16][3] = {
2025	{ 0.00F, 0.00F, 0.00F },	2069	{ 0.00F, 0.00F, 0.00F },
2026	{ 1.00F, 1.00F, 1.00F },	2070	{ 1.00F, 1.00F, 1.00F },
…		…
2076	glDisable (GL_BLEND);	2120	glDisable (GL_BLEND);
2077	glDisable (GL_TEXTURE_2D);	2121	glDisable (GL_TEXTURE_2D);
2078	}	2122	}
2079		2123
2080	void	2124	void
2081	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2125	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082	PPCODE:	2126	PPCODE:
2083	{	2127	{
2084	int x, y;	2128	int x, y;
2085	int sw1 = sw + 2;	2129	int sw1 = sw + 2;
2086	int sh1 = sh + 2;	2130	int sh1 = sh + 2;
…		…
2157	PUSHs (sv_2mortal (newSViv (sh3)));	2201	PUSHs (sv_2mortal (newSViv (sh3)));
2158	PUSHs (darkness3_sv);	2202	PUSHs (darkness3_sv);
2159	}	2203	}
2160		2204
2161	SV *	2205	SV *
2162	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2206	get_rect (DC::Map self, int x0, int y0, int w, int h)
2163	CODE:	2207	CODE:
2164	{	2208	{
2165	int x, y, x1, y1;	2209	int x, y, x1, y1;
2166	SV data_sv = newSV (w h * 7 + 5);	2210	SV data_sv = newSV (w h * 7 + 5);
2167	uint8_t data = (uint8_t )SvPVX (data_sv);	2211	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2232	}	2276	}
2233	OUTPUT:	2277	OUTPUT:
2234	RETVAL	2278	RETVAL
2235		2279
2236	void	2280	void
2237	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2281	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2238	PPCODE:	2282	PPCODE:
2239	{	2283	{
2240	int x, y, z;	2284	int x, y, z;
2241	int w, h;	2285	int w, h;
2242	int x1, y1;	2286	int x1, y1;
2243		2287
2244	if (*data++ != 0)	2288	if (*data++ != 0)
2245	return; /* version mismatch */	2289	XSRETURN_EMPTY; /* version mismatch */
2246		2290
2247	w = data++ << 8; w \|= data++;	2291	w = data++ << 8; w \|= data++;
2248	h = data++ << 8; h \|= data++;	2292	h = data++ << 8; h \|= data++;
2249		2293
2250	// we need to do this 'cause we don't keep an absolute coord system for rows	2294	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2295	}	2339	}
2296	}	2340	}
2297	}	2341	}
2298	}	2342	}
2299		2343
2300	MODULE = CFPlus PACKAGE = CFPlus::RW	2344	MODULE = Deliantra::Client PACKAGE = DC::RW
2301		2345
2302	CFPlus::RW	2346	DC::RW
2303	new (SV class, SV data_sv)	2347	new (SV class, SV data_sv)
2304	CODE:	2348	CODE:
2305	{	2349	{
2306	STRLEN datalen;	2350	STRLEN datalen;
2307	char *data = SvPVbyte (data_sv, datalen);	2351	char *data = SvPVbyte (data_sv, datalen);
…		…
2309	RETVAL = SDL_RWFromConstMem (data, datalen);	2353	RETVAL = SDL_RWFromConstMem (data, datalen);
2310	}	2354	}
2311	OUTPUT:	2355	OUTPUT:
2312	RETVAL	2356	RETVAL
2313		2357
2314	CFPlus::RW	2358	DC::RW
2315	new_from_file (SV class, const char path, const char *mode = "rb")	2359	new_from_file (SV class, const char path, const char *mode = "rb")
2316	CODE:	2360	CODE:
2317	RETVAL = SDL_RWFromFile (path, mode);	2361	RETVAL = SDL_RWFromFile (path, mode);
2318	OUTPUT:	2362	OUTPUT:
2319	RETVAL	2363	RETVAL
2320		2364
2321	# fails on win32:	2365	# fails on win32:
2322	# CFPlus.xs(2268) : error C2059: syntax error : '('	2366	# dc.xs(2268) : error C2059: syntax error : '('
2323	#void	2367	#void
2324	#close (CFPlus::RW self)	2368	#close (DC::RW self)
2325	# CODE:	2369	# CODE:
2326	# (self->(close)) (self);	2370	# (self->(close)) (self);
2327		2371
2328	MODULE = CFPlus PACKAGE = CFPlus::Channel	2372	MODULE = Deliantra::Client PACKAGE = DC::Channel
2329		2373
2330	PROTOTYPES: DISABLE	2374	PROTOTYPES: DISABLE
2331		2375
2332	CFPlus::Channel	2376	DC::Channel
2333	find ()	2377	find ()
2334	CODE:	2378	CODE:
2335	{	2379	{
2336	RETVAL = Mix_GroupAvailable (-1);	2380	RETVAL = Mix_GroupAvailable (-1);
2337		2381
…		…
2350	}	2394	}
2351	OUTPUT:	2395	OUTPUT:
2352	RETVAL	2396	RETVAL
2353		2397
2354	void	2398	void
2355	halt (CFPlus::Channel self)	2399	halt (DC::Channel self)
2356	CODE:	2400	CODE:
2357	Mix_HaltChannel (self);	2401	Mix_HaltChannel (self);
2358		2402
2359	void	2403	void
2360	expire (CFPlus::Channel self, int ticks = -1)	2404	expire (DC::Channel self, int ticks = -1)
2361	CODE:	2405	CODE:
2362	Mix_ExpireChannel (self, ticks);	2406	Mix_ExpireChannel (self, ticks);
2363		2407
2364	void	2408	void
2365	fade_out (CFPlus::Channel self, int ticks = -1)	2409	fade_out (DC::Channel self, int ticks = -1)
2366	CODE:	2410	CODE:
2367	Mix_FadeOutChannel (self, ticks);	2411	Mix_FadeOutChannel (self, ticks);
2368		2412
2369	int	2413	int
2370	volume (CFPlus::Channel self, int volume)	2414	volume (DC::Channel self, int volume)
2371	CODE:	2415	CODE:
2372	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2416	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373	OUTPUT:	2417	OUTPUT:
2374	RETVAL	2418	RETVAL
2375		2419
2376	void	2420	void
2377	unregister_all_effects (CFPlus::Channel self)	2421	unregister_all_effects (DC::Channel self)
2378	CODE:	2422	CODE:
2379	Mix_UnregisterAllEffects (self);	2423	Mix_UnregisterAllEffects (self);
2380		2424
2381	void	2425	void
2382	set_panning (CFPlus::Channel self, int left, int right)	2426	set_panning (DC::Channel self, int left, int right)
2383	CODE:	2427	CODE:
2384	left = CLAMP (left , 0, 255);	2428	left = CLAMP (left , 0, 255);
2385	right = CLAMP (right, 0, 255);	2429	right = CLAMP (right, 0, 255);
2386	Mix_SetPanning (self, left, right);	2430	Mix_SetPanning (self, left, right);
2387		2431
2388	void	2432	void
2389	set_distance (CFPlus::Channel self, int distance)	2433	set_distance (DC::Channel self, int distance)
2390	CODE:	2434	CODE:
2391	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2435	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392		2436
2393	void	2437	void
2394	set_position (CFPlus::Channel self, int angle, int distance)	2438	set_position (DC::Channel self, int angle, int distance)
2395	CODE:	2439	CODE:
2396		2440
2397	void	2441	void
2398	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2442	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399	CODE:	2443	CODE:
2400	{	2444	{
2401	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2445	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2446	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2447	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404	}	2448	}
2405		2449
2406	void	2450	void
2407	set_reverse_stereo (CFPlus::Channel self, int flip)	2451	set_reverse_stereo (DC::Channel self, int flip)
2408	CODE:	2452	CODE:
2409	Mix_SetReverseStereo (self, flip);	2453	Mix_SetReverseStereo (self, flip);
2410		2454
2411	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2455	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412		2456
2413	PROTOTYPES: DISABLE	2457	PROTOTYPES: DISABLE
2414		2458
2415	CFPlus::MixChunk	2459	DC::MixChunk
2416	new (SV *class, CFPlus::RW rwops)	2460	new (SV *class, DC::RW rwops)
2417	CODE:	2461	CODE:
2418	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2462	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419	OUTPUT:	2463	OUTPUT:
2420	RETVAL	2464	RETVAL
2421		2465
2422	void	2466	void
2423	DESTROY (CFPlus::MixChunk self)	2467	DESTROY (DC::MixChunk self)
2424	CODE:	2468	CODE:
2425	Mix_FreeChunk (self);	2469	Mix_FreeChunk (self);
2426		2470
2427	int	2471	int
2428	volume (CFPlus::MixChunk self, int volume = -1)	2472	volume (DC::MixChunk self, int volume = -1)
2429	CODE:	2473	CODE:
2430	if (items > 1)	2474	if (items > 1)
2431	volume = CLAMP (volume, 0, 128);	2475	volume = CLAMP (volume, 0, 128);
2432	RETVAL = Mix_VolumeChunk (self, volume);	2476	RETVAL = Mix_VolumeChunk (self, volume);
2433	OUTPUT:	2477	OUTPUT:
2434	RETVAL	2478	RETVAL
2435		2479
2436	CFPlus::Channel	2480	DC::Channel
2437	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2481	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438	CODE:	2482	CODE:
2439	{	2483	{
2440	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2484	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441		2485
2442	if (RETVAL < 0)	2486	if (RETVAL < 0)
…		…
2449	}	2493	}
2450	}	2494	}
2451	OUTPUT:	2495	OUTPUT:
2452	RETVAL	2496	RETVAL
2453		2497
2454	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2498	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455		2499
2456	int	2500	int
2457	volume (int volume = -1)	2501	volume (int volume = -1)
2458	PROTOTYPE: ;$	2502	PROTOTYPE: ;$
2459	CODE:	2503	CODE:
…		…
2471	void	2515	void
2472	halt ()	2516	halt ()
2473	CODE:	2517	CODE:
2474	Mix_HaltMusic ();	2518	Mix_HaltMusic ();
2475		2519
2476	CFPlus::MixMusic	2520	DC::MixMusic
2477	new (SV *class, CFPlus::RW rwops)	2521	new (SV *class, DC::RW rwops)
2478	CODE:	2522	CODE:
2479	RETVAL = Mix_LoadMUS_RW (rwops);	2523	RETVAL = Mix_LoadMUS_RW (rwops);
2480	OUTPUT:	2524	OUTPUT:
2481	RETVAL	2525	RETVAL
2482		2526
2483	void	2527	void
2484	DESTROY (CFPlus::MixMusic self)	2528	DESTROY (DC::MixMusic self)
2485	CODE:	2529	CODE:
2486	Mix_FreeMusic (self);	2530	Mix_FreeMusic (self);
2487		2531
2488	int	2532	int
2489	play (CFPlus::MixMusic self, int loops = -1)	2533	play (DC::MixMusic self, int loops = -1)
2490	CODE:	2534	CODE:
2491	RETVAL = Mix_PlayMusic (self, loops);	2535	RETVAL = Mix_PlayMusic (self, loops);
2492	OUTPUT:	2536	OUTPUT:
2493	RETVAL	2537	RETVAL
2494		2538
2495	void	2539	void
2496	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2540	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497	CODE:	2541	CODE:
2498	Mix_FadeInMusicPos (self, loops, ms, position);	2542	Mix_FadeInMusicPos (self, loops, ms, position);
2499		2543
2500	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2544	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501		2545
2502	PROTOTYPES: ENABLE	2546	PROTOTYPES: ENABLE
2503		2547
2504	BOOT:	2548	BOOT:
2505	{	2549	{
2506	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2550	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507	static const struct {	2551	static const struct {
2508	const char *name;	2552	const char *name;
2509	IV iv;	2553	IV iv;
2510	} *civ, const_iv[] = {	2554	} *civ, const_iv[] = {
2511	# define const_iv(name) { # name, (IV)name }	2555	# define const_iv(name) { # name, (IV)name }
…		…
2546	const_iv (GL_INTENSITY),	2590	const_iv (GL_INTENSITY),
2547	const_iv (GL_LUMINANCE),	2591	const_iv (GL_LUMINANCE),
2548	const_iv (GL_LUMINANCE_ALPHA),	2592	const_iv (GL_LUMINANCE_ALPHA),
2549	const_iv (GL_FLOAT),	2593	const_iv (GL_FLOAT),
2550	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2594	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2595	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2596	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2597	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2598	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2599	const_iv (GL_COMPRESSED_RGB_ARB),
		2600	const_iv (GL_COMPRESSED_RGBA_ARB),
2551	const_iv (GL_COMPILE),	2601	const_iv (GL_COMPILE),
2552	const_iv (GL_PROXY_TEXTURE_1D),	2602	const_iv (GL_PROXY_TEXTURE_1D),
2553	const_iv (GL_PROXY_TEXTURE_2D),	2603	const_iv (GL_PROXY_TEXTURE_2D),
2554	const_iv (GL_TEXTURE_1D),	2604	const_iv (GL_TEXTURE_1D),
2555	const_iv (GL_TEXTURE_2D),	2605	const_iv (GL_TEXTURE_2D),
…		…
2594	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2644	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595	const_iv (GL_POINT_SMOOTH_HINT),	2645	const_iv (GL_POINT_SMOOTH_HINT),
2596	const_iv (GL_LINE_SMOOTH_HINT),	2646	const_iv (GL_LINE_SMOOTH_HINT),
2597	const_iv (GL_POLYGON_SMOOTH_HINT),	2647	const_iv (GL_POLYGON_SMOOTH_HINT),
2598	const_iv (GL_GENERATE_MIPMAP_HINT),	2648	const_iv (GL_GENERATE_MIPMAP_HINT),
		2649	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599	const_iv (GL_FASTEST),	2650	const_iv (GL_FASTEST),
2600	const_iv (GL_DONT_CARE),	2651	const_iv (GL_DONT_CARE),
2601	const_iv (GL_NICEST),	2652	const_iv (GL_NICEST),
2602	const_iv (GL_V2F),	2653	const_iv (GL_V2F),
2603	const_iv (GL_V3F),	2654	const_iv (GL_V3F),
…		…
2611		2662
2612	texture_av = newAV ();	2663	texture_av = newAV ();
2613	AvREAL_off (texture_av);	2664	AvREAL_off (texture_av);
2614	}	2665	}
2615		2666
		2667	void
		2668	disable_GL_EXT_blend_func_separate ()
		2669	CODE:
		2670	gl.BlendFuncSeparate = 0;
		2671	gl.BlendFuncSeparateEXT = 0;
		2672
2616	char *	2673	char *
2617	gl_vendor ()	2674	gl_vendor ()
2618	CODE:	2675	CODE:
2619	RETVAL = (char *)glGetString (GL_VENDOR);	2676	RETVAL = (char *)glGetString (GL_VENDOR);
2620	OUTPUT:	2677	OUTPUT:
…		…
2741		2798
2742	void glRect (float x1, float y1, float x2, float y2)	2799	void glRect (float x1, float y1, float x2, float y2)
2743	CODE:	2800	CODE:
2744	glRectf (x1, y1, x2, y2);	2801	glRectf (x1, y1, x2, y2);
2745		2802
		2803	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2804	CODE:
		2805	glBegin (GL_LINE_LOOP);
		2806	glVertex2f (x1, y1);
		2807	glVertex2f (x2, y1);
		2808	glVertex2f (x2, y2);
		2809	glVertex2f (x1, y2);
		2810	glEnd ();
		2811
2746	PROTOTYPES: ENABLE	2812	PROTOTYPES: ENABLE
2747		2813
2748	void glBegin (int mode)	2814	void glBegin (int mode)
2749		2815
2750	void glEnd ()	2816	void glEnd ()
…		…
2782	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2848	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2783	CODE:	2849	CODE:
2784	if (gl.SeparableFilter2D)	2850	if (gl.SeparableFilter2D)
2785	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2851	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786		2852
2787	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2853	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788		2854
2789	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2855	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790		2856
2791	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2857	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792		2858
…		…
2818		2884
2819	void glEndList ()	2885	void glEndList ()
2820		2886
2821	void glCallList (int list)	2887	void glCallList (int list)
2822		2888
2823	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2889	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824		2890
2825	PROTOTYPES: DISABLE	2891	PROTOTYPES: DISABLE
2826		2892
2827	void	2893	void
2828	find_widget (SV *self, NV x, NV y)	2894	find_widget (SV *self, NV x, NV y)
…		…
2832	XPUSHs (self);	2898	XPUSHs (self);
2833	}	2899	}
2834		2900
2835	BOOT:	2901	BOOT:
2836	{	2902	{
2837	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2903	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838		2904
2839	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2905	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2906	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2907	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2908	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843	}	2909	}
2844		2910
2845	void	2911	void
2846	draw (SV *self)	2912	draw (SV *self)
2847	CODE:	2913	CODE:
…		…
2851	NV x, y, w, h;	2917	NV x, y, w, h;
2852	SV *draw_x_sv = GvSV (draw_x_gv);	2918	SV *draw_x_sv = GvSV (draw_x_gv);
2853	SV *draw_y_sv = GvSV (draw_y_gv);	2919	SV *draw_y_sv = GvSV (draw_y_gv);
2854	SV *draw_w_sv = GvSV (draw_w_gv);	2920	SV *draw_w_sv = GvSV (draw_w_gv);
2855	SV *draw_h_sv = GvSV (draw_h_gv);	2921	SV *draw_h_sv = GvSV (draw_h_gv);
2856	SV *hover;
2857	double draw_x, draw_y, draw_w, draw_h;	2922	double draw_x, draw_y;
2858		2923
2859	if (!SvROK (self))	2924	if (!SvROK (self))
2860	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2925	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861		2926
2862	hv = (HV *)SvRV (self);	2927	hv = (HV *)SvRV (self);
2863		2928
2864	if (SvTYPE (hv) != SVt_PVHV)	2929	if (SvTYPE (hv) != SVt_PVHV)
2865	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2930	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866		2931
2867	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2932	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2933	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869		2934
2870	if (!h \|\| !w)	2935	if (!h \|\| !w)
…		…
2890	{	2955	{
2891	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2956	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892		2957
2893	if (svp && SvTRUE (*svp))	2958	if (svp && SvTRUE (*svp))
2894	{	2959	{
2895	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2960	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896	glEnable (GL_BLEND);	2961	glEnable (GL_BLEND);
2897	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2962	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898	glBegin (GL_QUADS);	2963	glBegin (GL_QUADS);
2899	glVertex2f (0, 0);	2964	glVertex2f (0, 0);
2900	glVertex2f (w, 0);	2965	glVertex2f (w, 0);
…		…
2903	glEnd ();	2968	glEnd ();
2904	glDisable (GL_BLEND);	2969	glDisable (GL_BLEND);
2905	}	2970	}
2906	}	2971	}
2907	#if 0	2972	#if 0
2908	if ($ENV{CFPLUS_DEBUG} & 1) {	2973	// draw borders, for debugging
2909	glPushMatrix;	2974	glPushMatrix ();
2910	glColor 1, 1, 0, 1;	2975	glColor4f (1., 1., 0., 1.);
2911	glTranslate 0.375, 0.375;	2976	glTranslatef (.5, .5, 0.);
2912	glBegin GL_LINE_LOOP;	2977	glBegin (GL_LINE_LOOP);
2913	glVertex 0 , 0;	2978	glVertex2f (0 , 0);
2914	glVertex $self->{w} - 1, 0;	2979	glVertex2f (w - 1, 0);
2915	glVertex $self->{w} - 1, $self->{h} - 1;	2980	glVertex2f (w - 1, h - 1);
2916	glVertex 0 , $self->{h} - 1;	2981	glVertex2f (0 , h - 1);
2917	glEnd;	2982	glEnd ();
2918	glPopMatrix;	2983	glPopMatrix ();
2919	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920	}
2921	#endif	2984	#endif
2922	PUSHMARK (SP);	2985	PUSHMARK (SP);
2923	XPUSHs (self);	2986	XPUSHs (self);
2924	PUTBACK;	2987	PUTBACK;
2925	call_method ("_draw", G_VOID \| G_DISCARD);	2988	call_method ("_draw", G_VOID \| G_DISCARD);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs. Revision 1.246 by root, Fri Dec 28 15:06:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.246 by root, Fri Dec 28 15:06:02 2007 UTC