[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.256 by root, Mon Mar 24 00:24:46 2008 UTC

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