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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.253 by root, Fri Dec 28 20:59:14 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>
…		…
63	#define MAP_EXTEND_X 32	70	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	71	#define MAP_EXTEND_Y 512
65		72
66	#define MIN_FONT_HEIGHT 10	73	#define MIN_FONT_HEIGHT 10
67		74
		75	/* mask out modifiers we are not interested in */
		76	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		77
68	#if 0	78	#if 0
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	79	# define PARACHUTE SDL_INIT_NOPARACHUTE
70	#else	80	#else
71	# define PARACHUTE 0	81	# define PARACHUTE 0
72	#endif	82	#endif
…		…
120		130
121	#include "pango-font.c"	131	#include "pango-font.c"
122	#include "pango-fontmap.c"	132	#include "pango-fontmap.c"
123	#include "pango-render.c"	133	#include "pango-render.c"
124		134
125	typedef IV CFPlus__Channel;	135	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	136	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	137	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	138	typedef Mix_Music *DC__MixMusic;
129		139
130	typedef PangoFontDescription *CFPlus__Font;	140	typedef PangoFontDescription *DC__Font;
131		141
132	static int	142	static int
133	shape_attr_p (PangoLayoutRun *run)	143	shape_attr_p (PangoLayoutRun *run)
134	{	144	{
135	GSList *attrs = run->item->analysis.extra_attrs;	145	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		159
150	typedef struct cf_layout {	160	typedef struct cf_layout {
151	PangoLayout *pl;	161	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	162	float r, g, b, a; // default color for rgba mode
153	int base_height;	163	int base_height;
154	CFPlus__Font font;	164	DC__Font font;
155	rc_t *rc;	165	rc_t *rc;
156	} *CFPlus__Layout;	166	} *DC__Layout;
157		167
158	static CFPlus__Font default_font;	168	static DC__Font default_font;
159	static PangoContext *opengl_context;	169	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	170	static PangoFontMap *opengl_fontmap;
161		171
162	static void	172	static void
163	substitute_func (FcPattern *pattern, gpointer data)	173	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	178	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	179	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	180	}
171		181
172	static void	182	static void
173	layout_update_font (CFPlus__Layout self)	183	layout_update_font (DC__Layout self)
174	{	184	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	185	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	186	* reasonably well with bitstream vera
177	*/	187	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	188	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
182		192
183	pango_layout_set_font_description (self->pl, font);	193	pango_layout_set_font_description (self->pl, font);
184	}	194	}
185		195
186	static void	196	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	197	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	198	{
189	PangoRectangle rect;	199	PangoRectangle rect;
190		200
191	// get_pixel_* wrongly rounds down	201	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	202	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	241	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	242	int texs; maptex *tex; // [tileid]
233		243
234	int32_t rows;	244	int32_t rows;
235	maprow *row;	245	maprow *row;
236	} *CFPlus__Map;	246	} *DC__Map;
237		247
238	static char *	248	static char *
239	prepend (char *ptr, int sze, int inc)	249	prepend (char *ptr, int sze, int inc)
240	{	250	{
241	char *p;	251	char *p;
…		…
279	self->texs *= 2;	289	self->texs *= 2;
280	}	290	}
281	}	291	}
282		292
283	static maprow *	293	static maprow *
284	map_get_row (CFPlus__Map self, int y)	294	map_get_row (DC__Map self, int y)
285	{	295	{
286	if (0 > y)	296	if (0 > y)
287	{	297	{
288	int extend = - y + MAP_EXTEND_Y;	298	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	299	Prepend (maprow, self->row, self->rows, extend);
…		…
327		337
328	return row->col + (x - row->c0);	338	return row->col + (x - row->c0);
329	}	339	}
330		340
331	static mapcell *	341	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	342	map_get_cell (DC__Map self, int x, int y)
333	{	343	{
334	return row_get_cell (map_get_row (self, y), x);	344	return row_get_cell (map_get_row (self, y), x);
335	}	345	}
336		346
337	static void	347	static void
338	map_clear (CFPlus__Map self)	348	map_clear (DC__Map self)
339	{	349	{
340	int r;	350	int r;
341		351
342	for (r = 0; r < self->rows; r++)	352	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	353	Safefree (self->row[r].col);
…		…
351	self->row = 0;	361	self->row = 0;
352	self->rows = 0;	362	self->rows = 0;
353	}	363	}
354		364
355	static void	365	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	366	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	367	{
358	int x, y;	368	int x, y;
359	maprow *row;	369	maprow *row;
360	mapcell *cell;	370	mapcell *cell;
361		371
…		…
498	return 0;	508	return 0;
499		509
500	return 1;	510	return 1;
501	}	511	}
502		512
503	MODULE = CFPlus PACKAGE = CFPlus	513	MODULE = Deliantra::Client PACKAGE = DC
504		514
505	PROTOTYPES: ENABLE	515	PROTOTYPES: ENABLE
506		516
507	BOOT:	517	BOOT:
508	{	518	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	519	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	520	static const struct {
511	const char *name;	521	const char *name;
512	IV iv;	522	IV iv;
513	} *civ, const_iv[] = {	523	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	524	# define const_iv(name) { # name, (IV)name }
…		…
619	const_iv (KMOD_LMETA),	629	const_iv (KMOD_LMETA),
620	const_iv (KMOD_RMETA),	630	const_iv (KMOD_RMETA),
621	const_iv (KMOD_NUM),	631	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	632	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	633	const_iv (KMOD_MODE),
		634
		635	const_iv (MIX_DEFAULT_FORMAT),
624	# undef const_iv	636	# undef const_iv
625	};	637	};
626		638
627	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
657	CODE:	669	CODE:
658	{	670	{
659	opengl_fontmap = pango_opengl_font_map_new ();	671	opengl_fontmap = pango_opengl_font_map_new ();
660	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	672	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	673	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		674	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
		675	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		676	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		677	#endif
662	}	678	}
663		679
664	char *	680	char *
665	SDL_GetError ()	681	SDL_GetError ()
666		682
…		…
698	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	714	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
699		715
700	if (m && m != (SDL_Rect **)-1)	716	if (m && m != (SDL_Rect **)-1)
701	while (*m)	717	while (*m)
702	{	718	{
703	if ((m)->w >= 640 && (m)->h >= 480)	719	if ((m)->w >= 800 && (m)->h >= 480)
704	{	720	{
705	AV *av = newAV ();	721	AV *av = newAV ();
706	av_push (av, newSViv ((*m)->w));	722	av_push (av, newSViv ((*m)->w));
707	av_push (av, newSViv ((*m)->h));	723	av_push (av, newSViv ((*m)->h));
708	av_push (av, newSViv (rgb));	724	av_push (av, newSViv (rgb));
…		…
732		748
733	if (RETVAL)	749	if (RETVAL)
734	{	750	{
735	av_clear (texture_av);	751	av_clear (texture_av);
736		752
737	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	753	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	754	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739	#include "glfunc.h"	755	#include "glfunc.h"
740	#undef GL_FUNC	756	#undef GL_FUNC
741	}	757	}
742	}	758	}
…		…
768	{	784	{
769	case SDL_KEYDOWN:	785	case SDL_KEYDOWN:
770	case SDL_KEYUP:	786	case SDL_KEYUP:
771	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	787	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	788	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	789	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
774	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	790	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
775	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	791	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776	break;	792	break;
777		793
778	case SDL_ACTIVEEVENT:	794	case SDL_ACTIVEEVENT:
779	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	795	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
797	x = ev.motion.x;	813	x = ev.motion.x;
798	y = ev.motion.y;	814	y = ev.motion.y;
799	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	815	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800	}	816	}
801		817
802	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	818	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803	hv_store (hv, "state", 5, newSViv (state), 0);	819	hv_store (hv, "state", 5, newSViv (state), 0);
804	hv_store (hv, "x", 1, newSViv (x), 0);	820	hv_store (hv, "x", 1, newSViv (x), 0);
805	hv_store (hv, "y", 1, newSViv (y), 0);	821	hv_store (hv, "y", 1, newSViv (y), 0);
806	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	822	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	823	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808	}	824	}
809	break;	825	break;
810		826
811	case SDL_MOUSEBUTTONDOWN:	827	case SDL_MOUSEBUTTONDOWN:
812	case SDL_MOUSEBUTTONUP:	828	case SDL_MOUSEBUTTONUP:
813	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	829	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814		830
815	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	831	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	832	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	833	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	834	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
823	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	839	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	840	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825	break;	841	break;
826	}	842	}
827		843
828	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	844	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829	}	845	}
830	}	846	}
831		847
832	int	848	int
833	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	849	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834	POSTCALL:	850	POSTCALL:
835	Mix_HookMusicFinished (music_finished);	851	Mix_HookMusicFinished (music_finished);
836	Mix_ChannelFinished (channel_finished);	852	Mix_ChannelFinished (channel_finished);
		853
		854	void
		855	Mix_QuerySpec ()
		856	PPCODE:
		857	{
		858	int freq, channels;
		859	Uint16 format;
		860
		861	if (Mix_QuerySpec (&freq, &format, &channels))
		862	{
		863	EXTEND (SP, 3);
		864	PUSHs (sv_2mortal (newSViv (freq)));
		865	PUSHs (sv_2mortal (newSViv (format)));
		866	PUSHs (sv_2mortal (newSViv (channels)));
		867	}
		868	}
837		869
838	void	870	void
839	Mix_CloseAudio ()	871	Mix_CloseAudio ()
840		872
841	int	873	int
…		…
975	void	1007	void
976	error (char *message)	1008	error (char *message)
977	CODE:	1009	CODE:
978	fprintf (stderr, "ERROR: %s\n", message);	1010	fprintf (stderr, "ERROR: %s\n", message);
979	#ifdef _WIN32	1011	#ifdef _WIN32
980	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1012	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
981	#endif	1013	#endif
982		1014
983	void	1015	void
984	fatal (char *message)	1016	fatal (char *message)
985	CODE:	1017	CODE:
986	fprintf (stderr, "FATAL: %s\n", message);	1018	fprintf (stderr, "FATAL: %s\n", message);
987	#ifdef _WIN32	1019	#ifdef _WIN32
988	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1020	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
989	#endif	1021	#endif
990	_exit (1);	1022	_exit (1);
991		1023
992	void	1024	void
993	_exit (int retval = 0)	1025	_exit (int retval = 0)
…		…
1005	#if DEBUG	1037	#if DEBUG
1006	VALGRIND_DO_LEAK_CHECK;	1038	VALGRIND_DO_LEAK_CHECK;
1007	#endif	1039	#endif
1008	}	1040	}
1009		1041
1010	MODULE = CFPlus PACKAGE = CFPlus::Font	1042	MODULE = Deliantra::Client PACKAGE = DC::Font
1011		1043
1012	PROTOTYPES: DISABLE	1044	PROTOTYPES: DISABLE
1013		1045
1014	CFPlus::Font	1046	DC::Font
1015	new_from_file (SV class, char path, int id = 0)	1047	new_from_file (SV class, char path, int id = 0)
1016	CODE:	1048	CODE:
1017	{	1049	{
1018	int count;	1050	int count;
1019	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1051	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1022	}	1054	}
1023	OUTPUT:	1055	OUTPUT:
1024	RETVAL	1056	RETVAL
1025		1057
1026	void	1058	void
1027	DESTROY (CFPlus::Font self)	1059	DESTROY (DC::Font self)
1028	CODE:	1060	CODE:
1029	pango_font_description_free (self);	1061	pango_font_description_free (self);
1030		1062
1031	void	1063	void
1032	make_default (CFPlus::Font self)	1064	make_default (DC::Font self)
1033	PROTOTYPE: $	1065	PROTOTYPE: $
1034	CODE:	1066	CODE:
1035	default_font = self;	1067	default_font = self;
1036		1068
1037	MODULE = CFPlus PACKAGE = CFPlus::Layout	1069	MODULE = Deliantra::Client PACKAGE = DC::Layout
1038		1070
1039	PROTOTYPES: DISABLE	1071	PROTOTYPES: DISABLE
1040		1072
1041	void	1073	void
1042	reset_glyph_cache ()	1074	glyph_cache_backup ()
1043	PROTOTYPE:	1075	PROTOTYPE:
1044	CODE:	1076	CODE:
		1077	tc_backup ();
		1078
		1079	void
		1080	glyph_cache_restore ()
		1081	PROTOTYPE:
		1082	CODE:
1045	tc_clear ();	1083	tc_restore ();
1046		1084
1047	CFPlus::Layout	1085	DC::Layout
1048	new (SV *class)	1086	new (SV *class)
1049	CODE:	1087	CODE:
1050	New (0, RETVAL, 1, struct cf_layout);	1088	New (0, RETVAL, 1, struct cf_layout);
1051		1089
1052	RETVAL->pl = pango_layout_new (opengl_context);	1090	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1062	layout_update_font (RETVAL);	1100	layout_update_font (RETVAL);
1063	OUTPUT:	1101	OUTPUT:
1064	RETVAL	1102	RETVAL
1065		1103
1066	void	1104	void
1067	DESTROY (CFPlus::Layout self)	1105	DESTROY (DC::Layout self)
1068	CODE:	1106	CODE:
1069	g_object_unref (self->pl);	1107	g_object_unref (self->pl);
1070	rc_free (self->rc);	1108	rc_free (self->rc);
1071	Safefree (self);	1109	Safefree (self);
1072		1110
1073	void	1111	void
1074	set_text (CFPlus::Layout self, SV *text_)	1112	set_text (DC::Layout self, SV *text_)
1075	CODE:	1113	CODE:
1076	{	1114	{
1077	STRLEN textlen;	1115	STRLEN textlen;
1078	char *text = SvPVutf8 (text_, textlen);	1116	char *text = SvPVutf8 (text_, textlen);
1079		1117
1080	pango_layout_set_text (self->pl, text, textlen);	1118	pango_layout_set_text (self->pl, text, textlen);
1081	}	1119	}
1082		1120
1083	void	1121	void
1084	set_markup (CFPlus::Layout self, SV *text_)	1122	set_markup (DC::Layout self, SV *text_)
1085	CODE:	1123	CODE:
1086	{	1124	{
1087	STRLEN textlen;	1125	STRLEN textlen;
1088	char *text = SvPVutf8 (text_, textlen);	1126	char *text = SvPVutf8 (text_, textlen);
1089		1127
1090	pango_layout_set_markup (self->pl, text, textlen);	1128	pango_layout_set_markup (self->pl, text, textlen);
1091	}	1129	}
1092		1130
1093	void	1131	void
1094	set_shapes (CFPlus::Layout self, ...)	1132	set_shapes (DC::Layout self, ...)
1095	CODE:	1133	CODE:
1096	{	1134	{
1097	PangoAttrList *attrs = 0;	1135	PangoAttrList *attrs = 0;
1098	const char *text = pango_layout_get_text (self->pl);	1136	const char *text = pango_layout_get_text (self->pl);
1099	const char *pos = text;	1137	const char *pos = text;
…		…
1134	if (attrs)	1172	if (attrs)
1135	pango_layout_set_attributes (self->pl, attrs);	1173	pango_layout_set_attributes (self->pl, attrs);
1136	}	1174	}
1137		1175
1138	void	1176	void
1139	get_shapes (CFPlus::Layout self)	1177	get_shapes (DC::Layout self)
1140	PPCODE:	1178	PPCODE:
1141	{	1179	{
1142	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1180	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143		1181
1144	do	1182	do
1145	{	1183	{
1146	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1184	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147		1185
1148	if (run && shape_attr_p (run))	1186	if (run && shape_attr_p (run))
1149	{	1187	{
1150	PangoRectangle extents;	1188	PangoRectangle extents;
1151	pango_layout_iter_get_run_extents (iter, 0, &extents);	1189	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1159		1197
1160	pango_layout_iter_free (iter);	1198	pango_layout_iter_free (iter);
1161	}	1199	}
1162		1200
1163	int	1201	int
1164	has_wrapped (CFPlus::Layout self)	1202	has_wrapped (DC::Layout self)
1165	CODE:	1203	CODE:
1166	{	1204	{
1167	int lines = 1;	1205	int lines = 1;
1168	const char *text = pango_layout_get_text (self->pl);	1206	const char *text = pango_layout_get_text (self->pl);
1169		1207
…		…
1174	}	1212	}
1175	OUTPUT:	1213	OUTPUT:
1176	RETVAL	1214	RETVAL
1177		1215
1178	SV *	1216	SV *
1179	get_text (CFPlus::Layout self)	1217	get_text (DC::Layout self)
1180	CODE:	1218	CODE:
1181	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1219	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182	sv_utf8_decode (RETVAL);	1220	sv_utf8_decode (RETVAL);
1183	OUTPUT:	1221	OUTPUT:
1184	RETVAL	1222	RETVAL
1185		1223
1186	void	1224	void
1187	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1225	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188	CODE:	1226	CODE:
1189	self->r = r;	1227	self->r = r;
1190	self->g = g;	1228	self->g = g;
1191	self->b = b;	1229	self->b = b;
1192	self->a = a;	1230	self->a = a;
1193		1231
1194	void	1232	void
1195	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1233	set_font (DC::Layout self, DC::Font font = 0)
1196	CODE:	1234	CODE:
1197	if (self->font != font)	1235	if (self->font != font)
1198	{	1236	{
1199	self->font = font;	1237	self->font = font;
1200	layout_update_font (self);	1238	layout_update_font (self);
1201	}	1239	}
1202		1240
1203	void	1241	void
1204	set_height (CFPlus::Layout self, int base_height)	1242	set_height (DC::Layout self, int base_height)
1205	CODE:	1243	CODE:
1206	if (self->base_height != base_height)	1244	if (self->base_height != base_height)
1207	{	1245	{
1208	self->base_height = base_height;	1246	self->base_height = base_height;
1209	layout_update_font (self);	1247	layout_update_font (self);
1210	}	1248	}
1211		1249
1212	void	1250	void
1213	set_width (CFPlus::Layout self, int max_width = -1)	1251	set_width (DC::Layout self, int max_width = -1)
1214	CODE:	1252	CODE:
1215	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1253	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216		1254
1217	void	1255	void
1218	set_indent (CFPlus::Layout self, int indent)	1256	set_indent (DC::Layout self, int indent)
1219	CODE:	1257	CODE:
1220	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1258	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221		1259
1222	void	1260	void
1223	set_spacing (CFPlus::Layout self, int spacing)	1261	set_spacing (DC::Layout self, int spacing)
1224	CODE:	1262	CODE:
1225	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1263	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226		1264
1227	void	1265	void
1228	set_ellipsise (CFPlus::Layout self, int ellipsise)	1266	set_ellipsise (DC::Layout self, int ellipsise)
1229	CODE:	1267	CODE:
1230	pango_layout_set_ellipsize (self->pl,	1268	pango_layout_set_ellipsize (self->pl,
1231	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1269	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1270	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1271	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234	: PANGO_ELLIPSIZE_NONE	1272	: PANGO_ELLIPSIZE_NONE
1235	);	1273	);
1236		1274
1237	void	1275	void
1238	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1276	set_single_paragraph_mode (DC::Layout self, int spm)
1239	CODE:	1277	CODE:
1240	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1278	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241		1279
1242	void	1280	void
1243	size (CFPlus::Layout self)	1281	size (DC::Layout self)
1244	PPCODE:	1282	PPCODE:
1245	{	1283	{
1246	int w, h;	1284	int w, h;
1247		1285
1248	layout_get_pixel_size (self, &w, &h);	1286	layout_get_pixel_size (self, &w, &h);
…		…
1251	PUSHs (sv_2mortal (newSViv (w)));	1289	PUSHs (sv_2mortal (newSViv (w)));
1252	PUSHs (sv_2mortal (newSViv (h)));	1290	PUSHs (sv_2mortal (newSViv (h)));
1253	}	1291	}
1254		1292
1255	int	1293	int
1256	descent (CFPlus::Layout self)	1294	descent (DC::Layout self)
1257	CODE:	1295	CODE:
1258	{	1296	{
1259	PangoRectangle rect;	1297	PangoRectangle rect;
1260	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1298	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261	pango_layout_line_get_pixel_extents (line, 0, &rect);	1299	pango_layout_line_get_pixel_extents (line, 0, &rect);
1262	RETVAL = PANGO_DESCENT (rect);	1300	RETVAL = PANGO_DESCENT (rect);
1263	}	1301	}
1264	OUTPUT:	1302	OUTPUT:
1265	RETVAL	1303	RETVAL
1266		1304
1267	int	1305	int
1268	xy_to_index (CFPlus::Layout self, int x, int y)	1306	xy_to_index (DC::Layout self, int x, int y)
1269	CODE:	1307	CODE:
1270	{	1308	{
1271	int index, trailing;	1309	int index, trailing;
1272	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1310	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273	RETVAL = index + trailing;	1311	RETVAL = index + trailing;
1274	}	1312	}
1275	OUTPUT:	1313	OUTPUT:
1276	RETVAL	1314	RETVAL
1277		1315
1278	void	1316	void
1279	cursor_pos (CFPlus::Layout self, int index)	1317	cursor_pos (DC::Layout self, int index)
1280	PPCODE:	1318	PPCODE:
1281	{	1319	{
1282	PangoRectangle strong_pos;	1320	PangoRectangle pos;
1283	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1321	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284		1322
1285	EXTEND (SP, 3);	1323	EXTEND (SP, 3);
1286	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1324	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1325	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1326	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289	}	1327	}
1290		1328
1291	void	1329	void
1292	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1330	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293	PPCODE:	1331	PPCODE:
1294	{	1332	{
1295	int line, x;	1333	int line, x;
1296		1334
1297	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1335	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1336	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1298	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1337	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299		1338	--line;
		1339	#endif
1300	EXTEND (SP, 2);	1340	EXTEND (SP, 2);
1301	PUSHs (sv_2mortal (newSViv (line - 1)));	1341	PUSHs (sv_2mortal (newSViv (line)));
1302	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1342	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303	}	1343	}
1304		1344
1305	void	1345	void
1306	line_x_to_index (CFPlus::Layout self, int line, int x)	1346	line_x_to_index (DC::Layout self, int line, int x)
1307	PPCODE:	1347	PPCODE:
1308	{	1348	{
1309	PangoLayoutLine *lp;	1349	PangoLayoutLine *lp;
1310	int index, trailing;	1350	int index, trailing;
1311		1351
1312	if (line < 0)	1352	if (line < 0)
1313	XSRETURN_EMPTY;	1353	XSRETURN_EMPTY;
1314		1354
1315	if (!(lp = pango_layout_get_line (self->pl, line)))	1355	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316	XSRETURN_EMPTY; /* do better */	1356	XSRETURN_EMPTY; /* do better */
1317		1357
1318	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1358	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319		1359
1320	EXTEND (SP, 2);	1360	EXTEND (SP, 2);
…		…
1326	PUSHs (sv_2mortal (newSViv (trailing)));	1366	PUSHs (sv_2mortal (newSViv (trailing)));
1327	}	1367	}
1328	}	1368	}
1329		1369
1330	void	1370	void
1331	render (CFPlus::Layout self, float x, float y, int flags = 0)	1371	render (DC::Layout self, float x, float y, int flags = 0)
1332	CODE:	1372	CODE:
1333	rc_clear (self->rc);	1373	rc_clear (self->rc);
1334	pango_opengl_render_layout_subpixel (	1374	pango_opengl_render_layout_subpixel (
1335	self->pl,	1375	self->pl,
1336	self->rc,	1376	self->rc,
…		…
1341	// we assume that context_change actually clears/frees stuff	1381	// we assume that context_change actually clears/frees stuff
1342	// and does not do any recomputation...	1382	// and does not do any recomputation...
1343	pango_layout_context_changed (self->pl);	1383	pango_layout_context_changed (self->pl);
1344		1384
1345	void	1385	void
1346	draw (CFPlus::Layout self)	1386	draw (DC::Layout self)
1347	CODE:	1387	CODE:
1348	{	1388	{
1349	glEnable (GL_TEXTURE_2D);	1389	glEnable (GL_TEXTURE_2D);
1350	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1390	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351	glEnable (GL_BLEND);	1391	glEnable (GL_BLEND);
…		…
1359	glDisable (GL_ALPHA_TEST);	1399	glDisable (GL_ALPHA_TEST);
1360	glDisable (GL_BLEND);	1400	glDisable (GL_BLEND);
1361	glDisable (GL_TEXTURE_2D);	1401	glDisable (GL_TEXTURE_2D);
1362	}	1402	}
1363		1403
1364	MODULE = CFPlus PACKAGE = CFPlus::Texture	1404	MODULE = Deliantra::Client PACKAGE = DC::Texture
1365		1405
1366	PROTOTYPES: ENABLE	1406	PROTOTYPES: ENABLE
1367		1407
1368	void	1408	void
1369	pad (SV *data_, int ow, int oh, int nw, int nh)	1409	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1448	RETVAL = width > 0;	1488	RETVAL = width > 0;
1449	}	1489	}
1450	OUTPUT:	1490	OUTPUT:
1451	RETVAL	1491	RETVAL
1452		1492
1453	MODULE = CFPlus PACKAGE = CFPlus::Map	1493	MODULE = Deliantra::Client PACKAGE = DC::Map
1454		1494
1455	PROTOTYPES: DISABLE	1495	PROTOTYPES: DISABLE
1456		1496
1457	CFPlus::Map	1497	DC::Map
1458	new (SV *class)	1498	new (SV *class)
1459	CODE:	1499	CODE:
1460	New (0, RETVAL, 1, struct map);	1500	New (0, RETVAL, 1, struct map);
1461	RETVAL->x = 0;	1501	RETVAL->x = 0;
1462	RETVAL->y = 0;	1502	RETVAL->y = 0;
…		…
1470	RETVAL->row = 0;	1510	RETVAL->row = 0;
1471	OUTPUT:	1511	OUTPUT:
1472	RETVAL	1512	RETVAL
1473		1513
1474	void	1514	void
1475	DESTROY (CFPlus::Map self)	1515	DESTROY (DC::Map self)
1476	CODE:	1516	CODE:
1477	{	1517	{
1478	map_clear (self);	1518	map_clear (self);
1479	Safefree (self->face2tile);	1519	Safefree (self->face2tile);
1480	Safefree (self->tex);	1520	Safefree (self->tex);
1481	Safefree (self);	1521	Safefree (self);
1482	}	1522	}
1483		1523
1484	void	1524	void
1485	resize (CFPlus::Map self, int map_width, int map_height)	1525	resize (DC::Map self, int map_width, int map_height)
1486	CODE:	1526	CODE:
1487	self->w = map_width;	1527	self->w = map_width;
1488	self->h = map_height;	1528	self->h = map_height;
1489		1529
1490	void	1530	void
1491	clear (CFPlus::Map self)	1531	clear (DC::Map self)
1492	CODE:	1532	CODE:
1493	map_clear (self);	1533	map_clear (self);
1494		1534
1495	void	1535	void
1496	set_tileid (CFPlus::Map self, int face, int tile)	1536	set_tileid (DC::Map self, int face, int tile)
1497	CODE:	1537	CODE:
1498	{	1538	{
1499	need_facenum (self, face); self->face2tile [face] = tile;	1539	need_facenum (self, face); self->face2tile [face] = tile;
1500	need_texid (self, tile);	1540	need_texid (self, tile);
1501	}	1541	}
1502		1542
1503	void	1543	void
1504	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1544	set_smooth (DC::Map self, int face, int smooth, int level)
1505	CODE:	1545	CODE:
1506	{	1546	{
1507	tileid texid;	1547	tileid texid;
1508	maptex *tex;	1548	maptex *tex;
1509		1549
…		…
1522	tex->smoothtile = self->face2tile [smooth];	1562	tex->smoothtile = self->face2tile [smooth];
1523	tex->smoothlevel = level;	1563	tex->smoothlevel = level;
1524	}	1564	}
1525		1565
1526	void	1566	void
1527	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)	1567	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)
1528	CODE:	1568	CODE:
1529	{	1569	{
1530	need_texid (self, texid);	1570	need_texid (self, texid);
1531		1571
1532	{	1572	{
…		…
1552	// from transparent color bleeding and ugly wrapping effects.	1592	// from transparent color bleeding and ugly wrapping effects.
1553	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1593	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554	}	1594	}
1555		1595
1556	int	1596	int
1557	ox (CFPlus::Map self)	1597	ox (DC::Map self)
1558	ALIAS:	1598	ALIAS:
1559	oy = 1	1599	oy = 1
1560	x = 2	1600	x = 2
1561	y = 3	1601	y = 3
1562	w = 4	1602	w = 4
…		…
1573	}	1613	}
1574	OUTPUT:	1614	OUTPUT:
1575	RETVAL	1615	RETVAL
1576		1616
1577	void	1617	void
1578	scroll (CFPlus::Map self, int dx, int dy)	1618	scroll (DC::Map self, int dx, int dy)
1579	CODE:	1619	CODE:
1580	{	1620	{
1581	if (dx > 0)	1621	if (dx > 0)
1582	map_blank (self, self->x, self->y, dx, self->h);	1622	map_blank (self, self->x, self->y, dx, self->h);
1583	else if (dx < 0)	1623	else if (dx < 0)
…		…
1599	self->y += MAP_EXTEND_Y;	1639	self->y += MAP_EXTEND_Y;
1600	}	1640	}
1601	}	1641	}
1602		1642
1603	SV *	1643	SV *
1604	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1644	map1a_update (DC::Map self, SV *data_, int extmap)
1605	CODE:	1645	CODE:
1606	{	1646	{
1607	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1647	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1608	uint8_t data_end = (uint8_t )SvEND (data_);	1648	uint8_t data_end = (uint8_t )SvEND (data_);
1609	mapcell *cell;	1649	mapcell *cell;
…		…
1698	}	1738	}
1699	OUTPUT:	1739	OUTPUT:
1700	RETVAL	1740	RETVAL
1701		1741
1702	SV *	1742	SV *
1703	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1743	mapmap (DC::Map self, int x0, int y0, int w, int h)
1704	CODE:	1744	CODE:
1705	{	1745	{
1706	int x1, x;	1746	int x1, x;
1707	int y1, y;	1747	int y1, y;
1708	int z;	1748	int z;
…		…
1753	}	1793	}
1754	OUTPUT:	1794	OUTPUT:
1755	RETVAL	1795	RETVAL
1756		1796
1757	void	1797	void
1758	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1798	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1759	CODE:	1799	CODE:
1760	{	1800	{
1761	int x, y, z;	1801	int x, y, z;
1762		1802
1763	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1803	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2034	}	2074	}
2035	}	2075	}
2036	}	2076	}
2037		2077
2038	void	2078	void
2039	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2079	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040	CODE:	2080	CODE:
2041	{	2081	{
2042	static float color[16][3] = {	2082	static float color[16][3] = {
2043	{ 0.00F, 0.00F, 0.00F },	2083	{ 0.00F, 0.00F, 0.00F },
2044	{ 1.00F, 1.00F, 1.00F },	2084	{ 1.00F, 1.00F, 1.00F },
…		…
2094	glDisable (GL_BLEND);	2134	glDisable (GL_BLEND);
2095	glDisable (GL_TEXTURE_2D);	2135	glDisable (GL_TEXTURE_2D);
2096	}	2136	}
2097		2137
2098	void	2138	void
2099	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2139	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100	PPCODE:	2140	PPCODE:
2101	{	2141	{
2102	int x, y;	2142	int x, y;
2103	int sw1 = sw + 2;	2143	int sw1 = sw + 2;
2104	int sh1 = sh + 2;	2144	int sh1 = sh + 2;
…		…
2175	PUSHs (sv_2mortal (newSViv (sh3)));	2215	PUSHs (sv_2mortal (newSViv (sh3)));
2176	PUSHs (darkness3_sv);	2216	PUSHs (darkness3_sv);
2177	}	2217	}
2178		2218
2179	SV *	2219	SV *
2180	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2220	get_rect (DC::Map self, int x0, int y0, int w, int h)
2181	CODE:	2221	CODE:
2182	{	2222	{
2183	int x, y, x1, y1;	2223	int x, y, x1, y1;
2184	SV data_sv = newSV (w h * 7 + 5);	2224	SV data_sv = newSV (w h * 7 + 5);
2185	uint8_t data = (uint8_t )SvPVX (data_sv);	2225	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2250	}	2290	}
2251	OUTPUT:	2291	OUTPUT:
2252	RETVAL	2292	RETVAL
2253		2293
2254	void	2294	void
2255	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2295	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2256	PPCODE:	2296	PPCODE:
2257	{	2297	{
2258	int x, y, z;	2298	int x, y, z;
2259	int w, h;	2299	int w, h;
2260	int x1, y1;	2300	int x1, y1;
…		…
2313	}	2353	}
2314	}	2354	}
2315	}	2355	}
2316	}	2356	}
2317		2357
2318	MODULE = CFPlus PACKAGE = CFPlus::RW	2358	MODULE = Deliantra::Client PACKAGE = DC::RW
2319		2359
2320	CFPlus::RW	2360	DC::RW
2321	new (SV class, SV data_sv)	2361	new (SV class, SV data_sv)
2322	CODE:	2362	CODE:
2323	{	2363	{
2324	STRLEN datalen;	2364	STRLEN datalen;
2325	char *data = SvPVbyte (data_sv, datalen);	2365	char *data = SvPVbyte (data_sv, datalen);
…		…
2327	RETVAL = SDL_RWFromConstMem (data, datalen);	2367	RETVAL = SDL_RWFromConstMem (data, datalen);
2328	}	2368	}
2329	OUTPUT:	2369	OUTPUT:
2330	RETVAL	2370	RETVAL
2331		2371
2332	CFPlus::RW	2372	DC::RW
2333	new_from_file (SV class, const char path, const char *mode = "rb")	2373	new_from_file (SV class, const char path, const char *mode = "rb")
2334	CODE:	2374	CODE:
2335	RETVAL = SDL_RWFromFile (path, mode);	2375	RETVAL = SDL_RWFromFile (path, mode);
2336	OUTPUT:	2376	OUTPUT:
2337	RETVAL	2377	RETVAL
2338		2378
2339	# fails on win32:	2379	# fails on win32:
2340	# CFPlus.xs(2268) : error C2059: syntax error : '('	2380	# dc.xs(2268) : error C2059: syntax error : '('
2341	#void	2381	#void
2342	#close (CFPlus::RW self)	2382	#close (DC::RW self)
2343	# CODE:	2383	# CODE:
2344	# (self->(close)) (self);	2384	# (self->(close)) (self);
2345		2385
2346	MODULE = CFPlus PACKAGE = CFPlus::Channel	2386	MODULE = Deliantra::Client PACKAGE = DC::Channel
2347		2387
2348	PROTOTYPES: DISABLE	2388	PROTOTYPES: DISABLE
2349		2389
2350	CFPlus::Channel	2390	DC::Channel
2351	find ()	2391	find ()
2352	CODE:	2392	CODE:
2353	{	2393	{
2354	RETVAL = Mix_GroupAvailable (-1);	2394	RETVAL = Mix_GroupAvailable (-1);
2355		2395
…		…
2368	}	2408	}
2369	OUTPUT:	2409	OUTPUT:
2370	RETVAL	2410	RETVAL
2371		2411
2372	void	2412	void
2373	halt (CFPlus::Channel self)	2413	halt (DC::Channel self)
2374	CODE:	2414	CODE:
2375	Mix_HaltChannel (self);	2415	Mix_HaltChannel (self);
2376		2416
2377	void	2417	void
2378	expire (CFPlus::Channel self, int ticks = -1)	2418	expire (DC::Channel self, int ticks = -1)
2379	CODE:	2419	CODE:
2380	Mix_ExpireChannel (self, ticks);	2420	Mix_ExpireChannel (self, ticks);
2381		2421
2382	void	2422	void
2383	fade_out (CFPlus::Channel self, int ticks = -1)	2423	fade_out (DC::Channel self, int ticks = -1)
2384	CODE:	2424	CODE:
2385	Mix_FadeOutChannel (self, ticks);	2425	Mix_FadeOutChannel (self, ticks);
2386		2426
2387	int	2427	int
2388	volume (CFPlus::Channel self, int volume)	2428	volume (DC::Channel self, int volume)
2389	CODE:	2429	CODE:
2390	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2430	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391	OUTPUT:	2431	OUTPUT:
2392	RETVAL	2432	RETVAL
2393		2433
2394	void	2434	void
2395	unregister_all_effects (CFPlus::Channel self)	2435	unregister_all_effects (DC::Channel self)
2396	CODE:	2436	CODE:
2397	Mix_UnregisterAllEffects (self);	2437	Mix_UnregisterAllEffects (self);
2398		2438
2399	void	2439	void
2400	set_panning (CFPlus::Channel self, int left, int right)	2440	set_panning (DC::Channel self, int left, int right)
2401	CODE:	2441	CODE:
2402	left = CLAMP (left , 0, 255);	2442	left = CLAMP (left , 0, 255);
2403	right = CLAMP (right, 0, 255);	2443	right = CLAMP (right, 0, 255);
2404	Mix_SetPanning (self, left, right);	2444	Mix_SetPanning (self, left, right);
2405		2445
2406	void	2446	void
2407	set_distance (CFPlus::Channel self, int distance)	2447	set_distance (DC::Channel self, int distance)
2408	CODE:	2448	CODE:
2409	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2449	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410		2450
2411	void	2451	void
2412	set_position (CFPlus::Channel self, int angle, int distance)	2452	set_position (DC::Channel self, int angle, int distance)
2413	CODE:	2453	CODE:
2414		2454
2415	void	2455	void
2416	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2456	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417	CODE:	2457	CODE:
2418	{	2458	{
2419	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2459	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2460	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2461	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422	}	2462	}
2423		2463
2424	void	2464	void
2425	set_reverse_stereo (CFPlus::Channel self, int flip)	2465	set_reverse_stereo (DC::Channel self, int flip)
2426	CODE:	2466	CODE:
2427	Mix_SetReverseStereo (self, flip);	2467	Mix_SetReverseStereo (self, flip);
2428		2468
2429	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2469	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430		2470
2431	PROTOTYPES: DISABLE	2471	PROTOTYPES: DISABLE
2432		2472
2433	CFPlus::MixChunk	2473	DC::MixChunk
2434	new (SV *class, CFPlus::RW rwops)	2474	new (SV *class, DC::RW rwops)
2435	CODE:	2475	CODE:
2436	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2476	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437	OUTPUT:	2477	OUTPUT:
2438	RETVAL	2478	RETVAL
2439		2479
2440	void	2480	void
2441	DESTROY (CFPlus::MixChunk self)	2481	DESTROY (DC::MixChunk self)
2442	CODE:	2482	CODE:
2443	Mix_FreeChunk (self);	2483	Mix_FreeChunk (self);
2444		2484
2445	int	2485	int
2446	volume (CFPlus::MixChunk self, int volume = -1)	2486	volume (DC::MixChunk self, int volume = -1)
2447	CODE:	2487	CODE:
2448	if (items > 1)	2488	if (items > 1)
2449	volume = CLAMP (volume, 0, 128);	2489	volume = CLAMP (volume, 0, 128);
2450	RETVAL = Mix_VolumeChunk (self, volume);	2490	RETVAL = Mix_VolumeChunk (self, volume);
2451	OUTPUT:	2491	OUTPUT:
2452	RETVAL	2492	RETVAL
2453		2493
2454	CFPlus::Channel	2494	DC::Channel
2455	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2495	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456	CODE:	2496	CODE:
2457	{	2497	{
2458	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2498	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459		2499
2460	if (RETVAL < 0)	2500	if (RETVAL < 0)
…		…
2467	}	2507	}
2468	}	2508	}
2469	OUTPUT:	2509	OUTPUT:
2470	RETVAL	2510	RETVAL
2471		2511
2472	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2512	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473		2513
2474	int	2514	int
2475	volume (int volume = -1)	2515	volume (int volume = -1)
2476	PROTOTYPE: ;$	2516	PROTOTYPE: ;$
2477	CODE:	2517	CODE:
…		…
2489	void	2529	void
2490	halt ()	2530	halt ()
2491	CODE:	2531	CODE:
2492	Mix_HaltMusic ();	2532	Mix_HaltMusic ();
2493		2533
2494	CFPlus::MixMusic	2534	DC::MixMusic
2495	new (SV *class, CFPlus::RW rwops)	2535	new (SV *class, DC::RW rwops)
2496	CODE:	2536	CODE:
2497	RETVAL = Mix_LoadMUS_RW (rwops);	2537	RETVAL = Mix_LoadMUS_RW (rwops);
2498	OUTPUT:	2538	OUTPUT:
2499	RETVAL	2539	RETVAL
2500		2540
2501	void	2541	void
2502	DESTROY (CFPlus::MixMusic self)	2542	DESTROY (DC::MixMusic self)
2503	CODE:	2543	CODE:
2504	Mix_FreeMusic (self);	2544	Mix_FreeMusic (self);
2505		2545
2506	int	2546	int
2507	play (CFPlus::MixMusic self, int loops = -1)	2547	play (DC::MixMusic self, int loops = -1)
2508	CODE:	2548	CODE:
2509	RETVAL = Mix_PlayMusic (self, loops);	2549	RETVAL = Mix_PlayMusic (self, loops);
2510	OUTPUT:	2550	OUTPUT:
2511	RETVAL	2551	RETVAL
2512		2552
2513	void	2553	void
2514	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2554	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515	CODE:	2555	CODE:
2516	Mix_FadeInMusicPos (self, loops, ms, position);	2556	Mix_FadeInMusicPos (self, loops, ms, position);
2517		2557
2518	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2558	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519		2559
2520	PROTOTYPES: ENABLE	2560	PROTOTYPES: ENABLE
2521		2561
2522	BOOT:	2562	BOOT:
2523	{	2563	{
2524	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2564	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525	static const struct {	2565	static const struct {
2526	const char *name;	2566	const char *name;
2527	IV iv;	2567	IV iv;
2528	} *civ, const_iv[] = {	2568	} *civ, const_iv[] = {
2529	# define const_iv(name) { # name, (IV)name }	2569	# define const_iv(name) { # name, (IV)name }
…		…
2822	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2862	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2823	CODE:	2863	CODE:
2824	if (gl.SeparableFilter2D)	2864	if (gl.SeparableFilter2D)
2825	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2865	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826		2866
2827	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2867	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828		2868
2829	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2869	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830		2870
2831	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2871	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832		2872
…		…
2858		2898
2859	void glEndList ()	2899	void glEndList ()
2860		2900
2861	void glCallList (int list)	2901	void glCallList (int list)
2862		2902
2863	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2903	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864		2904
2865	PROTOTYPES: DISABLE	2905	PROTOTYPES: DISABLE
2866		2906
2867	void	2907	void
2868	find_widget (SV *self, NV x, NV y)	2908	find_widget (SV *self, NV x, NV y)
…		…
2872	XPUSHs (self);	2912	XPUSHs (self);
2873	}	2913	}
2874		2914
2875	BOOT:	2915	BOOT:
2876	{	2916	{
2877	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2917	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878		2918
2879	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2919	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2920	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2921	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2922	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883	}	2923	}
2884		2924
2885	void	2925	void
2886	draw (SV *self)	2926	draw (SV *self)
2887	CODE:	2927	CODE:
…		…
2894	SV *draw_w_sv = GvSV (draw_w_gv);	2934	SV *draw_w_sv = GvSV (draw_w_gv);
2895	SV *draw_h_sv = GvSV (draw_h_gv);	2935	SV *draw_h_sv = GvSV (draw_h_gv);
2896	double draw_x, draw_y;	2936	double draw_x, draw_y;
2897		2937
2898	if (!SvROK (self))	2938	if (!SvROK (self))
2899	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2939	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900		2940
2901	hv = (HV *)SvRV (self);	2941	hv = (HV *)SvRV (self);
2902		2942
2903	if (SvTYPE (hv) != SVt_PVHV)	2943	if (SvTYPE (hv) != SVt_PVHV)
2904	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2944	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905		2945
2906	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2946	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2947	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908		2948
2909	if (!h \|\| !w)	2949	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs. Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC