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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.231 by root, Sun Aug 19 14:09:28 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
…		…
440	n \|= n >> 16;	450	n \|= n >> 16;
441		451
442	return n + 1;	452	return n + 1;
443	}	453	}
444		454
		455	static unsigned int
		456	popcount (unsigned int n)
		457	{
		458	n -= (n >> 1) & 0x55555555U;
		459	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		460	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		461	n *= 0x01010101U;
		462
		463	return n >> 24;
		464	}
		465
445	/* SDL should provide this, really. */	466	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	467	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	468	#define SDLK_MODIFIER_MAX 314
448		469
449	/******************************************************************************/	470	/******************************************************************************/
…		…
487	return 0;	508	return 0;
488		509
489	return 1;	510	return 1;
490	}	511	}
491		512
492	MODULE = CFPlus PACKAGE = CFPlus	513	MODULE = Deliantra::Client PACKAGE = DC
493		514
494	PROTOTYPES: ENABLE	515	PROTOTYPES: ENABLE
495		516
496	BOOT:	517	BOOT:
497	{	518	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	519	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	520	static const struct {
500	const char *name;	521	const char *name;
501	IV iv;	522	IV iv;
502	} *civ, const_iv[] = {	523	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	524	# define const_iv(name) { # name, (IV)name }
…		…
525		546
526	const_iv (SDL_APPINPUTFOCUS),	547	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	548	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	549	const_iv (SDL_APPACTIVE),
529		550
		551	const_iv (SDLK_FIRST),
		552	const_iv (SDLK_LAST),
530	const_iv (SDLK_KP0),	553	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	554	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	555	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	556	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	557	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	629	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	630	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	631	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	632	const_iv (KMOD_CAPS),
610	const_iv (KMOD_MODE),	633	const_iv (KMOD_MODE),
		634
		635	const_iv (MIX_DEFAULT_FORMAT),
611	# undef const_iv	636	# undef const_iv
612	};	637	};
613		638
614	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; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		658
634	NV floor (NV x)	659	NV floor (NV x)
635		660
636	NV ceil (NV x)	661	NV ceil (NV x)
637		662
		663	IV minpot (UV n)
		664
		665	IV popcount (UV n)
		666
638	void	667	void
639	pango_init ()	668	pango_init ()
640	CODE:	669	CODE:
641	{	670	{
642	opengl_fontmap = pango_opengl_font_map_new ();	671	opengl_fontmap = pango_opengl_font_map_new ();
643	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);
644	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
645	}	678	}
646		679
647	char *	680	char *
648	SDL_GetError ()	681	SDL_GetError ()
649		682
…		…
681	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	714	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
682		715
683	if (m && m != (SDL_Rect **)-1)	716	if (m && m != (SDL_Rect **)-1)
684	while (*m)	717	while (*m)
685	{	718	{
686	if ((m)->w >= 640 && (m)->h >= 480)	719	if ((m)->w >= 800 && (m)->h >= 480)
687	{	720	{
688	AV *av = newAV ();	721	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	722	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	723	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	724	av_push (av, newSViv (rgb));
…		…
715		748
716	if (RETVAL)	749	if (RETVAL)
717	{	750	{
718	av_clear (texture_av);	751	av_clear (texture_av);
719		752
720	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	753	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#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);
722	#include "glfunc.h"	755	#include "glfunc.h"
723	#undef GL_FUNC	756	#undef GL_FUNC
724	}	757	}
725	}	758	}
…		…
751	{	784	{
752	case SDL_KEYDOWN:	785	case SDL_KEYDOWN:
753	case SDL_KEYUP:	786	case SDL_KEYUP:
754	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	787	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	788	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756	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);
757	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 */
758	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	791	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759	break;	792	break;
760		793
761	case SDL_ACTIVEEVENT:	794	case SDL_ACTIVEEVENT:
762	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	795	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
780	x = ev.motion.x;	813	x = ev.motion.x;
781	y = ev.motion.y;	814	y = ev.motion.y;
782	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	815	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783	}	816	}
784		817
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	818	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786	hv_store (hv, "state", 5, newSViv (state), 0);	819	hv_store (hv, "state", 5, newSViv (state), 0);
787	hv_store (hv, "x", 1, newSViv (x), 0);	820	hv_store (hv, "x", 1, newSViv (x), 0);
788	hv_store (hv, "y", 1, newSViv (y), 0);	821	hv_store (hv, "y", 1, newSViv (y), 0);
789	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	822	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	823	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791	}	824	}
792	break;	825	break;
793		826
794	case SDL_MOUSEBUTTONDOWN:	827	case SDL_MOUSEBUTTONDOWN:
795	case SDL_MOUSEBUTTONUP:	828	case SDL_MOUSEBUTTONUP:
796	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	829	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797		830
798	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	831	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	832	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	833	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	834	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	839	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	840	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	841	break;
809	}	842	}
810		843
811	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))));
812	}	845	}
813	}	846	}
814		847
815	int	848	int
816	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)
817	POSTCALL:	850	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	851	Mix_HookMusicFinished (music_finished);
819	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	}
820		869
821	void	870	void
822	Mix_CloseAudio ()	871	Mix_CloseAudio ()
823		872
824	int	873	int
…		…
958	void	1007	void
959	error (char *message)	1008	error (char *message)
960	CODE:	1009	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1010	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1011	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1012	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
964	#endif	1013	#endif
965		1014
966	void	1015	void
967	fatal (char *message)	1016	fatal (char *message)
968	CODE:	1017	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1018	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1019	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1020	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
972	#endif	1021	#endif
973	_exit (1);	1022	_exit (1);
974		1023
975	void	1024	void
976	_exit (int retval = 0)	1025	_exit (int retval = 0)
…		…
988	#if DEBUG	1037	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1038	VALGRIND_DO_LEAK_CHECK;
990	#endif	1039	#endif
991	}	1040	}
992		1041
993	MODULE = CFPlus PACKAGE = CFPlus::Font	1042	MODULE = Deliantra::Client PACKAGE = DC::Font
994		1043
995	PROTOTYPES: DISABLE	1044	PROTOTYPES: DISABLE
996		1045
997	CFPlus::Font	1046	DC::Font
998	new_from_file (SV class, char path, int id = 0)	1047	new_from_file (SV class, char path, int id = 0)
999	CODE:	1048	CODE:
1000	{	1049	{
1001	int count;	1050	int count;
1002	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1051	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1005	}	1054	}
1006	OUTPUT:	1055	OUTPUT:
1007	RETVAL	1056	RETVAL
1008		1057
1009	void	1058	void
1010	DESTROY (CFPlus::Font self)	1059	DESTROY (DC::Font self)
1011	CODE:	1060	CODE:
1012	pango_font_description_free (self);	1061	pango_font_description_free (self);
1013		1062
1014	void	1063	void
1015	make_default (CFPlus::Font self)	1064	make_default (DC::Font self)
1016	PROTOTYPE: $	1065	PROTOTYPE: $
1017	CODE:	1066	CODE:
1018	default_font = self;	1067	default_font = self;
1019		1068
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1069	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1070
1022	PROTOTYPES: DISABLE	1071	PROTOTYPES: DISABLE
1023		1072
1024	void	1073	void
1025	reset_glyph_cache ()	1074	glyph_cache_backup ()
1026	PROTOTYPE:	1075	PROTOTYPE:
1027	CODE:	1076	CODE:
		1077	tc_backup ();
		1078
		1079	void
		1080	glyph_cache_restore ()
		1081	PROTOTYPE:
		1082	CODE:
1028	tc_clear ();	1083	tc_restore ();
1029		1084
1030	CFPlus::Layout	1085	DC::Layout
1031	new (SV *class)	1086	new (SV *class)
1032	CODE:	1087	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1088	New (0, RETVAL, 1, struct cf_layout);
1034		1089
1035	RETVAL->pl = pango_layout_new (opengl_context);	1090	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1100	layout_update_font (RETVAL);
1046	OUTPUT:	1101	OUTPUT:
1047	RETVAL	1102	RETVAL
1048		1103
1049	void	1104	void
1050	DESTROY (CFPlus::Layout self)	1105	DESTROY (DC::Layout self)
1051	CODE:	1106	CODE:
1052	g_object_unref (self->pl);	1107	g_object_unref (self->pl);
1053	rc_free (self->rc);	1108	rc_free (self->rc);
1054	Safefree (self);	1109	Safefree (self);
1055		1110
1056	void	1111	void
1057	set_text (CFPlus::Layout self, SV *text_)	1112	set_text (DC::Layout self, SV *text_)
1058	CODE:	1113	CODE:
1059	{	1114	{
1060	STRLEN textlen;	1115	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1116	char *text = SvPVutf8 (text_, textlen);
1062		1117
1063	pango_layout_set_text (self->pl, text, textlen);	1118	pango_layout_set_text (self->pl, text, textlen);
1064	}	1119	}
1065		1120
1066	void	1121	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1122	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1123	CODE:
1069	{	1124	{
1070	STRLEN textlen;	1125	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1126	char *text = SvPVutf8 (text_, textlen);
1072		1127
1073	pango_layout_set_markup (self->pl, text, textlen);	1128	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1129	}
1075		1130
1076	void	1131	void
1077	set_shapes (CFPlus::Layout self, ...)	1132	set_shapes (DC::Layout self, ...)
1078	CODE:	1133	CODE:
1079	{	1134	{
1080	PangoAttrList *attrs = 0;	1135	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1136	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1137	const char *pos = text;
…		…
1117	if (attrs)	1172	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1173	pango_layout_set_attributes (self->pl, attrs);
1119	}	1174	}
1120		1175
1121	void	1176	void
1122	get_shapes (CFPlus::Layout self)	1177	get_shapes (DC::Layout self)
1123	PPCODE:	1178	PPCODE:
1124	{	1179	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1180	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1181
1127	do	1182	do
1128	{	1183	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1184	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1185
1131	if (run && shape_attr_p (run))	1186	if (run && shape_attr_p (run))
1132	{	1187	{
1133	PangoRectangle extents;	1188	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1189	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1197
1143	pango_layout_iter_free (iter);	1198	pango_layout_iter_free (iter);
1144	}	1199	}
1145		1200
1146	int	1201	int
1147	has_wrapped (CFPlus::Layout self)	1202	has_wrapped (DC::Layout self)
1148	CODE:	1203	CODE:
1149	{	1204	{
1150	int lines = 1;	1205	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1206	const char *text = pango_layout_get_text (self->pl);
1152		1207
…		…
1157	}	1212	}
1158	OUTPUT:	1213	OUTPUT:
1159	RETVAL	1214	RETVAL
1160		1215
1161	SV *	1216	SV *
1162	get_text (CFPlus::Layout self)	1217	get_text (DC::Layout self)
1163	CODE:	1218	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1219	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1220	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1221	OUTPUT:
1167	RETVAL	1222	RETVAL
1168		1223
1169	void	1224	void
1170	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.)
1171	CODE:	1226	CODE:
1172	self->r = r;	1227	self->r = r;
1173	self->g = g;	1228	self->g = g;
1174	self->b = b;	1229	self->b = b;
1175	self->a = a;	1230	self->a = a;
1176		1231
1177	void	1232	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1233	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1234	CODE:
1180	if (self->font != font)	1235	if (self->font != font)
1181	{	1236	{
1182	self->font = font;	1237	self->font = font;
1183	layout_update_font (self);	1238	layout_update_font (self);
1184	}	1239	}
1185		1240
1186	void	1241	void
1187	set_height (CFPlus::Layout self, int base_height)	1242	set_height (DC::Layout self, int base_height)
1188	CODE:	1243	CODE:
1189	if (self->base_height != base_height)	1244	if (self->base_height != base_height)
1190	{	1245	{
1191	self->base_height = base_height;	1246	self->base_height = base_height;
1192	layout_update_font (self);	1247	layout_update_font (self);
1193	}	1248	}
1194		1249
1195	void	1250	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1251	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1252	CODE:
1198	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);
1199		1254
1200	void	1255	void
1201	set_indent (CFPlus::Layout self, int indent)	1256	set_indent (DC::Layout self, int indent)
1202	CODE:	1257	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1258	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1259
1205	void	1260	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1261	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1262	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1263	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1264
1210	void	1265	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1266	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1267	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1268	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1269	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1270	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1271	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1272	: PANGO_ELLIPSIZE_NONE
1218	);	1273	);
1219		1274
1220	void	1275	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1276	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1277	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1278	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1279
1225	void	1280	void
1226	size (CFPlus::Layout self)	1281	size (DC::Layout self)
1227	PPCODE:	1282	PPCODE:
1228	{	1283	{
1229	int w, h;	1284	int w, h;
1230		1285
1231	layout_get_pixel_size (self, &w, &h);	1286	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1289	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1290	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1291	}
1237		1292
1238	int	1293	int
1239	descent (CFPlus::Layout self)	1294	descent (DC::Layout self)
1240	CODE:	1295	CODE:
1241	{	1296	{
1242	PangoRectangle rect;	1297	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1298	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1299	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1300	RETVAL = PANGO_DESCENT (rect);
1246	}	1301	}
1247	OUTPUT:	1302	OUTPUT:
1248	RETVAL	1303	RETVAL
1249		1304
1250	int	1305	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1306	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1307	CODE:
1253	{	1308	{
1254	int index, trailing;	1309	int index, trailing;
1255	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);
1256	RETVAL = index + trailing;	1311	RETVAL = index + trailing;
1257	}	1312	}
1258	OUTPUT:	1313	OUTPUT:
1259	RETVAL	1314	RETVAL
1260		1315
1261	void	1316	void
1262	cursor_pos (CFPlus::Layout self, int index)	1317	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1318	PPCODE:
1264	{	1319	{
1265	PangoRectangle strong_pos;	1320	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1321	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267		1322
1268	EXTEND (SP, 3);	1323	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1324	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1325	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1326	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1327	}
1273		1328
1274	void	1329	void
1275	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)
1276	PPCODE:	1331	PPCODE:
1277	{	1332	{
1278	int line, x;	1333	int line, x;
1279		1334
1280	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))
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1337	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1338	--line;
		1339	#endif
1283	EXTEND (SP, 2);	1340	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1341	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1342	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1343	}
1287		1344
1288	void	1345	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1346	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1347	PPCODE:
1291	{	1348	{
1292	PangoLayoutLine *lp;	1349	PangoLayoutLine *lp;
1293	int index, trailing;	1350	int index, trailing;
1294		1351
1295	if (line < 0)	1352	if (line < 0)
1296	XSRETURN_EMPTY;	1353	XSRETURN_EMPTY;
1297		1354
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1355	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1356	XSRETURN_EMPTY; /* do better */
1300		1357
1301	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);
1302		1359
1303	EXTEND (SP, 2);	1360	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1366	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1367	}
1311	}	1368	}
1312		1369
1313	void	1370	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1371	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1372	CODE:
1316	rc_clear (self->rc);	1373	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1374	pango_opengl_render_layout_subpixel (
1318	self->pl,	1375	self->pl,
1319	self->rc,	1376	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1381	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1382	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1383	pango_layout_context_changed (self->pl);
1327		1384
1328	void	1385	void
1329	draw (CFPlus::Layout self)	1386	draw (DC::Layout self)
1330	CODE:	1387	CODE:
1331	{	1388	{
1332	glEnable (GL_TEXTURE_2D);	1389	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1390	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1391	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1399	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1400	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1401	glDisable (GL_TEXTURE_2D);
1345	}	1402	}
1346		1403
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1404	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1405
1349	PROTOTYPES: ENABLE	1406	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1407
1353	void	1408	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1409	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1410	CODE:
1356	{	1411	{
…		…
1433	RETVAL = width > 0;	1488	RETVAL = width > 0;
1434	}	1489	}
1435	OUTPUT:	1490	OUTPUT:
1436	RETVAL	1491	RETVAL
1437		1492
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1493	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1494
1440	PROTOTYPES: DISABLE	1495	PROTOTYPES: DISABLE
1441		1496
1442	CFPlus::Map	1497	DC::Map
1443	new (SV *class)	1498	new (SV *class)
1444	CODE:	1499	CODE:
1445	New (0, RETVAL, 1, struct map);	1500	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1501	RETVAL->x = 0;
1447	RETVAL->y = 0;	1502	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1510	RETVAL->row = 0;
1456	OUTPUT:	1511	OUTPUT:
1457	RETVAL	1512	RETVAL
1458		1513
1459	void	1514	void
1460	DESTROY (CFPlus::Map self)	1515	DESTROY (DC::Map self)
1461	CODE:	1516	CODE:
1462	{	1517	{
1463	map_clear (self);	1518	map_clear (self);
1464	Safefree (self->face2tile);	1519	Safefree (self->face2tile);
1465	Safefree (self->tex);	1520	Safefree (self->tex);
1466	Safefree (self);	1521	Safefree (self);
1467	}	1522	}
1468		1523
1469	void	1524	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1525	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1526	CODE:
1472	self->w = map_width;	1527	self->w = map_width;
1473	self->h = map_height;	1528	self->h = map_height;
1474		1529
1475	void	1530	void
1476	clear (CFPlus::Map self)	1531	clear (DC::Map self)
1477	CODE:	1532	CODE:
1478	map_clear (self);	1533	map_clear (self);
1479		1534
1480	void	1535	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1536	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1537	CODE:
1483	{	1538	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1539	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1540	need_texid (self, tile);
1486	}	1541	}
1487		1542
1488	void	1543	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1544	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1545	CODE:
1491	{	1546	{
1492	tileid texid;	1547	tileid texid;
1493	maptex *tex;	1548	maptex *tex;
1494		1549
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1562	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1563	tex->smoothlevel = level;
1509	}	1564	}
1510		1565
1511	void	1566	void
1512	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	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)
1513	CODE:	1568	CODE:
1514	{	1569	{
1515	need_texid (self, texid);	1570	need_texid (self, texid);
1516		1571
1517	{	1572	{
…		…
1537	// from transparent color bleeding and ugly wrapping effects.	1592	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1593	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1594	}
1540		1595
1541	int	1596	int
1542	ox (CFPlus::Map self)	1597	ox (DC::Map self)
1543	ALIAS:	1598	ALIAS:
1544	oy = 1	1599	oy = 1
1545	x = 2	1600	x = 2
1546	y = 3	1601	y = 3
1547	w = 4	1602	w = 4
…		…
1558	}	1613	}
1559	OUTPUT:	1614	OUTPUT:
1560	RETVAL	1615	RETVAL
1561		1616
1562	void	1617	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1618	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1619	CODE:
1565	{	1620	{
1566	if (dx > 0)	1621	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1622	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1623	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1639	self->y += MAP_EXTEND_Y;
1585	}	1640	}
1586	}	1641	}
1587		1642
1588	SV *	1643	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1644	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1645	CODE:
1591	{	1646	{
1592	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1647	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1593	uint8_t data_end = (uint8_t )SvEND (data_);	1648	uint8_t data_end = (uint8_t )SvEND (data_);
1594	mapcell *cell;	1649	mapcell *cell;
…		…
1683	}	1738	}
1684	OUTPUT:	1739	OUTPUT:
1685	RETVAL	1740	RETVAL
1686		1741
1687	SV *	1742	SV *
1688	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)
1689	CODE:	1744	CODE:
1690	{	1745	{
1691	int x1, x;	1746	int x1, x;
1692	int y1, y;	1747	int y1, y;
1693	int z;	1748	int z;
…		…
1738	}	1793	}
1739	OUTPUT:	1794	OUTPUT:
1740	RETVAL	1795	RETVAL
1741		1796
1742	void	1797	void
1743	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)
1744	CODE:	1799	CODE:
1745	{	1800	{
1746	int x, y, z;	1801	int x, y, z;
1747		1802
1748	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1803	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2019	}	2074	}
2020	}	2075	}
2021	}	2076	}
2022		2077
2023	void	2078	void
2024	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)
2025	CODE:	2080	CODE:
2026	{	2081	{
2027	static float color[16][3] = {	2082	static float color[16][3] = {
2028	{ 0.00F, 0.00F, 0.00F },	2083	{ 0.00F, 0.00F, 0.00F },
2029	{ 1.00F, 1.00F, 1.00F },	2084	{ 1.00F, 1.00F, 1.00F },
…		…
2079	glDisable (GL_BLEND);	2134	glDisable (GL_BLEND);
2080	glDisable (GL_TEXTURE_2D);	2135	glDisable (GL_TEXTURE_2D);
2081	}	2136	}
2082		2137
2083	void	2138	void
2084	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)
2085	PPCODE:	2140	PPCODE:
2086	{	2141	{
2087	int x, y;	2142	int x, y;
2088	int sw1 = sw + 2;	2143	int sw1 = sw + 2;
2089	int sh1 = sh + 2;	2144	int sh1 = sh + 2;
…		…
2160	PUSHs (sv_2mortal (newSViv (sh3)));	2215	PUSHs (sv_2mortal (newSViv (sh3)));
2161	PUSHs (darkness3_sv);	2216	PUSHs (darkness3_sv);
2162	}	2217	}
2163		2218
2164	SV *	2219	SV *
2165	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)
2166	CODE:	2221	CODE:
2167	{	2222	{
2168	int x, y, x1, y1;	2223	int x, y, x1, y1;
2169	SV data_sv = newSV (w h * 7 + 5);	2224	SV data_sv = newSV (w h * 7 + 5);
2170	uint8_t data = (uint8_t )SvPVX (data_sv);	2225	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2235	}	2290	}
2236	OUTPUT:	2291	OUTPUT:
2237	RETVAL	2292	RETVAL
2238		2293
2239	void	2294	void
2240	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)
2241	PPCODE:	2296	PPCODE:
2242	{	2297	{
2243	int x, y, z;	2298	int x, y, z;
2244	int w, h;	2299	int w, h;
2245	int x1, y1;	2300	int x1, y1;
…		…
2298	}	2353	}
2299	}	2354	}
2300	}	2355	}
2301	}	2356	}
2302		2357
2303	MODULE = CFPlus PACKAGE = CFPlus::RW	2358	MODULE = Deliantra::Client PACKAGE = DC::RW
2304		2359
2305	CFPlus::RW	2360	DC::RW
2306	new (SV class, SV data_sv)	2361	new (SV class, SV data_sv)
2307	CODE:	2362	CODE:
2308	{	2363	{
2309	STRLEN datalen;	2364	STRLEN datalen;
2310	char *data = SvPVbyte (data_sv, datalen);	2365	char *data = SvPVbyte (data_sv, datalen);
…		…
2312	RETVAL = SDL_RWFromConstMem (data, datalen);	2367	RETVAL = SDL_RWFromConstMem (data, datalen);
2313	}	2368	}
2314	OUTPUT:	2369	OUTPUT:
2315	RETVAL	2370	RETVAL
2316		2371
2317	CFPlus::RW	2372	DC::RW
2318	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")
2319	CODE:	2374	CODE:
2320	RETVAL = SDL_RWFromFile (path, mode);	2375	RETVAL = SDL_RWFromFile (path, mode);
2321	OUTPUT:	2376	OUTPUT:
2322	RETVAL	2377	RETVAL
2323		2378
2324	# fails on win32:	2379	# fails on win32:
2325	# CFPlus.xs(2268) : error C2059: syntax error : '('	2380	# dc.xs(2268) : error C2059: syntax error : '('
2326	#void	2381	#void
2327	#close (CFPlus::RW self)	2382	#close (DC::RW self)
2328	# CODE:	2383	# CODE:
2329	# (self->(close)) (self);	2384	# (self->(close)) (self);
2330		2385
2331	MODULE = CFPlus PACKAGE = CFPlus::Channel	2386	MODULE = Deliantra::Client PACKAGE = DC::Channel
2332		2387
2333	PROTOTYPES: DISABLE	2388	PROTOTYPES: DISABLE
2334		2389
2335	CFPlus::Channel	2390	DC::Channel
2336	find ()	2391	find ()
2337	CODE:	2392	CODE:
2338	{	2393	{
2339	RETVAL = Mix_GroupAvailable (-1);	2394	RETVAL = Mix_GroupAvailable (-1);
2340		2395
…		…
2353	}	2408	}
2354	OUTPUT:	2409	OUTPUT:
2355	RETVAL	2410	RETVAL
2356		2411
2357	void	2412	void
2358	halt (CFPlus::Channel self)	2413	halt (DC::Channel self)
2359	CODE:	2414	CODE:
2360	Mix_HaltChannel (self);	2415	Mix_HaltChannel (self);
2361		2416
2362	void	2417	void
2363	expire (CFPlus::Channel self, int ticks = -1)	2418	expire (DC::Channel self, int ticks = -1)
2364	CODE:	2419	CODE:
2365	Mix_ExpireChannel (self, ticks);	2420	Mix_ExpireChannel (self, ticks);
2366		2421
2367	void	2422	void
2368	fade_out (CFPlus::Channel self, int ticks = -1)	2423	fade_out (DC::Channel self, int ticks = -1)
2369	CODE:	2424	CODE:
2370	Mix_FadeOutChannel (self, ticks);	2425	Mix_FadeOutChannel (self, ticks);
2371		2426
2372	int	2427	int
2373	volume (CFPlus::Channel self, int volume)	2428	volume (DC::Channel self, int volume)
2374	CODE:	2429	CODE:
2375	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2430	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376	OUTPUT:	2431	OUTPUT:
2377	RETVAL	2432	RETVAL
2378		2433
2379	void	2434	void
2380	unregister_all_effects (CFPlus::Channel self)	2435	unregister_all_effects (DC::Channel self)
2381	CODE:	2436	CODE:
2382	Mix_UnregisterAllEffects (self);	2437	Mix_UnregisterAllEffects (self);
2383		2438
2384	void	2439	void
2385	set_panning (CFPlus::Channel self, int left, int right)	2440	set_panning (DC::Channel self, int left, int right)
2386	CODE:	2441	CODE:
2387	left = CLAMP (left , 0, 255);	2442	left = CLAMP (left , 0, 255);
2388	right = CLAMP (right, 0, 255);	2443	right = CLAMP (right, 0, 255);
2389	Mix_SetPanning (self, left, right);	2444	Mix_SetPanning (self, left, right);
2390		2445
2391	void	2446	void
2392	set_distance (CFPlus::Channel self, int distance)	2447	set_distance (DC::Channel self, int distance)
2393	CODE:	2448	CODE:
2394	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2449	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395		2450
2396	void	2451	void
2397	set_position (CFPlus::Channel self, int angle, int distance)	2452	set_position (DC::Channel self, int angle, int distance)
2398	CODE:	2453	CODE:
2399		2454
2400	void	2455	void
2401	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)
2402	CODE:	2457	CODE:
2403	{	2458	{
2404	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));
2405	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);
2406	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2461	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407	}	2462	}
2408		2463
2409	void	2464	void
2410	set_reverse_stereo (CFPlus::Channel self, int flip)	2465	set_reverse_stereo (DC::Channel self, int flip)
2411	CODE:	2466	CODE:
2412	Mix_SetReverseStereo (self, flip);	2467	Mix_SetReverseStereo (self, flip);
2413		2468
2414	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2469	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415		2470
2416	PROTOTYPES: DISABLE	2471	PROTOTYPES: DISABLE
2417		2472
2418	CFPlus::MixChunk	2473	DC::MixChunk
2419	new (SV *class, CFPlus::RW rwops)	2474	new (SV *class, DC::RW rwops)
2420	CODE:	2475	CODE:
2421	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2476	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422	OUTPUT:	2477	OUTPUT:
2423	RETVAL	2478	RETVAL
2424		2479
2425	void	2480	void
2426	DESTROY (CFPlus::MixChunk self)	2481	DESTROY (DC::MixChunk self)
2427	CODE:	2482	CODE:
2428	Mix_FreeChunk (self);	2483	Mix_FreeChunk (self);
2429		2484
2430	int	2485	int
2431	volume (CFPlus::MixChunk self, int volume = -1)	2486	volume (DC::MixChunk self, int volume = -1)
2432	CODE:	2487	CODE:
2433	if (items > 1)	2488	if (items > 1)
2434	volume = CLAMP (volume, 0, 128);	2489	volume = CLAMP (volume, 0, 128);
2435	RETVAL = Mix_VolumeChunk (self, volume);	2490	RETVAL = Mix_VolumeChunk (self, volume);
2436	OUTPUT:	2491	OUTPUT:
2437	RETVAL	2492	RETVAL
2438		2493
2439	CFPlus::Channel	2494	DC::Channel
2440	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)
2441	CODE:	2496	CODE:
2442	{	2497	{
2443	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2498	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444		2499
2445	if (RETVAL < 0)	2500	if (RETVAL < 0)
…		…
2452	}	2507	}
2453	}	2508	}
2454	OUTPUT:	2509	OUTPUT:
2455	RETVAL	2510	RETVAL
2456		2511
2457	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2512	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458		2513
2459	int	2514	int
2460	volume (int volume = -1)	2515	volume (int volume = -1)
2461	PROTOTYPE: ;$	2516	PROTOTYPE: ;$
2462	CODE:	2517	CODE:
…		…
2474	void	2529	void
2475	halt ()	2530	halt ()
2476	CODE:	2531	CODE:
2477	Mix_HaltMusic ();	2532	Mix_HaltMusic ();
2478		2533
2479	CFPlus::MixMusic	2534	DC::MixMusic
2480	new (SV *class, CFPlus::RW rwops)	2535	new (SV *class, DC::RW rwops)
2481	CODE:	2536	CODE:
2482	RETVAL = Mix_LoadMUS_RW (rwops);	2537	RETVAL = Mix_LoadMUS_RW (rwops);
2483	OUTPUT:	2538	OUTPUT:
2484	RETVAL	2539	RETVAL
2485		2540
2486	void	2541	void
2487	DESTROY (CFPlus::MixMusic self)	2542	DESTROY (DC::MixMusic self)
2488	CODE:	2543	CODE:
2489	Mix_FreeMusic (self);	2544	Mix_FreeMusic (self);
2490		2545
2491	int	2546	int
2492	play (CFPlus::MixMusic self, int loops = -1)	2547	play (DC::MixMusic self, int loops = -1)
2493	CODE:	2548	CODE:
2494	RETVAL = Mix_PlayMusic (self, loops);	2549	RETVAL = Mix_PlayMusic (self, loops);
2495	OUTPUT:	2550	OUTPUT:
2496	RETVAL	2551	RETVAL
2497		2552
2498	void	2553	void
2499	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)
2500	CODE:	2555	CODE:
2501	Mix_FadeInMusicPos (self, loops, ms, position);	2556	Mix_FadeInMusicPos (self, loops, ms, position);
2502		2557
2503	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2558	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504		2559
2505	PROTOTYPES: ENABLE	2560	PROTOTYPES: ENABLE
2506		2561
2507	BOOT:	2562	BOOT:
2508	{	2563	{
2509	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2564	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510	static const struct {	2565	static const struct {
2511	const char *name;	2566	const char *name;
2512	IV iv;	2567	IV iv;
2513	} *civ, const_iv[] = {	2568	} *civ, const_iv[] = {
2514	# define const_iv(name) { # name, (IV)name }	2569	# define const_iv(name) { # name, (IV)name }
…		…
2603	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2658	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2604	const_iv (GL_POINT_SMOOTH_HINT),	2659	const_iv (GL_POINT_SMOOTH_HINT),
2605	const_iv (GL_LINE_SMOOTH_HINT),	2660	const_iv (GL_LINE_SMOOTH_HINT),
2606	const_iv (GL_POLYGON_SMOOTH_HINT),	2661	const_iv (GL_POLYGON_SMOOTH_HINT),
2607	const_iv (GL_GENERATE_MIPMAP_HINT),	2662	const_iv (GL_GENERATE_MIPMAP_HINT),
		2663	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2608	const_iv (GL_FASTEST),	2664	const_iv (GL_FASTEST),
2609	const_iv (GL_DONT_CARE),	2665	const_iv (GL_DONT_CARE),
2610	const_iv (GL_NICEST),	2666	const_iv (GL_NICEST),
2611	const_iv (GL_V2F),	2667	const_iv (GL_V2F),
2612	const_iv (GL_V3F),	2668	const_iv (GL_V3F),
…		…
2756		2812
2757	void glRect (float x1, float y1, float x2, float y2)	2813	void glRect (float x1, float y1, float x2, float y2)
2758	CODE:	2814	CODE:
2759	glRectf (x1, y1, x2, y2);	2815	glRectf (x1, y1, x2, y2);
2760		2816
		2817	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2818	CODE:
		2819	glBegin (GL_LINE_LOOP);
		2820	glVertex2f (x1, y1);
		2821	glVertex2f (x2, y1);
		2822	glVertex2f (x2, y2);
		2823	glVertex2f (x1, y2);
		2824	glEnd ();
		2825
2761	PROTOTYPES: ENABLE	2826	PROTOTYPES: ENABLE
2762		2827
2763	void glBegin (int mode)	2828	void glBegin (int mode)
2764		2829
2765	void glEnd ()	2830	void glEnd ()
…		…
2797	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)
2798	CODE:	2863	CODE:
2799	if (gl.SeparableFilter2D)	2864	if (gl.SeparableFilter2D)
2800	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2865	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2801		2866
2802	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)
2803		2868
2804	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)
2805		2870
2806	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)
2807		2872
…		…
2833		2898
2834	void glEndList ()	2899	void glEndList ()
2835		2900
2836	void glCallList (int list)	2901	void glCallList (int list)
2837		2902
2838	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2903	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2839		2904
2840	PROTOTYPES: DISABLE	2905	PROTOTYPES: DISABLE
2841		2906
2842	void	2907	void
2843	find_widget (SV *self, NV x, NV y)	2908	find_widget (SV *self, NV x, NV y)
…		…
2847	XPUSHs (self);	2912	XPUSHs (self);
2848	}	2913	}
2849		2914
2850	BOOT:	2915	BOOT:
2851	{	2916	{
2852	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2917	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2853		2918
2854	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);
2855	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);
2856	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);
2857	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);
2858	}	2923	}
2859		2924
2860	void	2925	void
2861	draw (SV *self)	2926	draw (SV *self)
2862	CODE:	2927	CODE:
…		…
2869	SV *draw_w_sv = GvSV (draw_w_gv);	2934	SV *draw_w_sv = GvSV (draw_w_gv);
2870	SV *draw_h_sv = GvSV (draw_h_gv);	2935	SV *draw_h_sv = GvSV (draw_h_gv);
2871	double draw_x, draw_y;	2936	double draw_x, draw_y;
2872		2937
2873	if (!SvROK (self))	2938	if (!SvROK (self))
2874	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2939	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2875		2940
2876	hv = (HV *)SvRV (self);	2941	hv = (HV *)SvRV (self);
2877		2942
2878	if (SvTYPE (hv) != SVt_PVHV)	2943	if (SvTYPE (hv) != SVt_PVHV)
2879	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2944	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2880		2945
2881	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.;
2882	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.;
2883		2948
2884	if (!h \|\| !w)	2949	if (!h \|\| !w)
…		…
2917	glEnd ();	2982	glEnd ();
2918	glDisable (GL_BLEND);	2983	glDisable (GL_BLEND);
2919	}	2984	}
2920	}	2985	}
2921	#if 0	2986	#if 0
2922	if ($ENV{CFPLUS_DEBUG} & 1) {	2987	// draw borders, for debugging
2923	glPushMatrix;	2988	glPushMatrix ();
2924	glColor 1, 1, 0, 1;	2989	glColor4f (1., 1., 0., 1.);
2925	glTranslate 0.375, 0.375;	2990	glTranslatef (.5, .5, 0.);
2926	glBegin GL_LINE_LOOP;	2991	glBegin (GL_LINE_LOOP);
2927	glVertex 0 , 0;	2992	glVertex2f (0 , 0);
2928	glVertex $self->{w} - 1, 0;	2993	glVertex2f (w - 1, 0);
2929	glVertex $self->{w} - 1, $self->{h} - 1;	2994	glVertex2f (w - 1, h - 1);
2930	glVertex 0 , $self->{h} - 1;	2995	glVertex2f (0 , h - 1);
2931	glEnd;	2996	glEnd ();
2932	glPopMatrix;	2997	glPopMatrix ();
2933	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2934	}
2935	#endif	2998	#endif
2936	PUSHMARK (SP);	2999	PUSHMARK (SP);
2937	XPUSHs (self);	3000	XPUSHs (self);
2938	PUTBACK;	3001	PUTBACK;
2939	call_method ("_draw", G_VOID \| G_DISCARD);	3002	call_method ("_draw", G_VOID \| G_DISCARD);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.231 by root, Sun Aug 19 14:09:28 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.231 by root, Sun Aug 19 14:09:28 2007 UTC vs.
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC