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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 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>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
68	#if 0	88	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		90
74	static AV *texture_av;	91	static AV *texture_av;
75		92
76	static struct	93	static struct
77	{	94	{
…		…
120		137
121	#include "pango-font.c"	138	#include "pango-font.c"
122	#include "pango-fontmap.c"	139	#include "pango-fontmap.c"
123	#include "pango-render.c"	140	#include "pango-render.c"
124		141
125	typedef IV CFPlus__Channel;	142	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	143	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	144	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	145	typedef Mix_Music *DC__MixMusic;
129		146
130	typedef PangoFontDescription *CFPlus__Font;	147	typedef PangoFontDescription *DC__Font;
131		148
132	static int	149	static int
133	shape_attr_p (PangoLayoutRun *run)	150	shape_attr_p (PangoLayoutRun *run)
134	{	151	{
135	GSList *attrs = run->item->analysis.extra_attrs;	152	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		166
150	typedef struct cf_layout {	167	typedef struct cf_layout {
151	PangoLayout *pl;	168	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	169	float r, g, b, a; // default color for rgba mode
153	int base_height;	170	int base_height;
154	CFPlus__Font font;	171	DC__Font font;
155	rc_t *rc;	172	rc_t *rc;
156	} *CFPlus__Layout;	173	} *DC__Layout;
157		174
158	static CFPlus__Font default_font;	175	static DC__Font default_font;
159	static PangoContext *opengl_context;	176	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	177	static PangoFontMap *opengl_fontmap;
161		178
162	static void	179	static void
163	substitute_func (FcPattern *pattern, gpointer data)	180	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	185	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	187	}
171		188
172	static void	189	static void
173	layout_update_font (CFPlus__Layout self)	190	layout_update_font (DC__Layout self)
174	{	191	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
177	*/	194	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
179		196
180	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		199
183	pango_layout_set_font_description (self->pl, font);	200	pango_layout_set_font_description (self->pl, font);
184	}	201	}
185		202
186	static void	203	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	204	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	205	{
189	PangoRectangle rect;	206	PangoRectangle rect;
190		207
191	// get_pixel_* wrongly rounds down	208	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	209	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	248	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	249	int texs; maptex *tex; // [tileid]
233		250
234	int32_t rows;	251	int32_t rows;
235	maprow *row;	252	maprow *row;
236	} *CFPlus__Map;	253	} *DC__Map;
237		254
238	static char *	255	static char *
239	prepend (char *ptr, int sze, int inc)	256	prepend (char *ptr, int sze, int inc)
240	{	257	{
241	char *p;	258	char *p;
…		…
279	self->texs *= 2;	296	self->texs *= 2;
280	}	297	}
281	}	298	}
282		299
283	static maprow *	300	static maprow *
284	map_get_row (CFPlus__Map self, int y)	301	map_get_row (DC__Map self, int y)
285	{	302	{
286	if (0 > y)	303	if (0 > y)
287	{	304	{
288	int extend = - y + MAP_EXTEND_Y;	305	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	306	Prepend (maprow, self->row, self->rows, extend);
…		…
327		344
328	return row->col + (x - row->c0);	345	return row->col + (x - row->c0);
329	}	346	}
330		347
331	static mapcell *	348	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	349	map_get_cell (DC__Map self, int x, int y)
333	{	350	{
334	return row_get_cell (map_get_row (self, y), x);	351	return row_get_cell (map_get_row (self, y), x);
335	}	352	}
336		353
337	static void	354	static void
338	map_clear (CFPlus__Map self)	355	map_clear (DC__Map self)
339	{	356	{
340	int r;	357	int r;
341		358
342	for (r = 0; r < self->rows; r++)	359	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	360	Safefree (self->row[r].col);
…		…
351	self->row = 0;	368	self->row = 0;
352	self->rows = 0;	369	self->rows = 0;
353	}	370	}
354		371
355	static void	372	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	373	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	374	{
358	int x, y;	375	int x, y;
359	maprow *row;	376	maprow *row;
360	mapcell *cell;	377	mapcell *cell;
361		378
…		…
498	return 0;	515	return 0;
499		516
500	return 1;	517	return 1;
501	}	518	}
502		519
503	MODULE = CFPlus PACKAGE = CFPlus	520	MODULE = Deliantra::Client PACKAGE = DC
504		521
505	PROTOTYPES: ENABLE	522	PROTOTYPES: ENABLE
506		523
507	BOOT:	524	BOOT:
508	{	525	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	526	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	527	static const struct {
511	const char *name;	528	const char *name;
512	IV iv;	529	IV iv;
513	} *civ, const_iv[] = {	530	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	531	# define const_iv(name) { # name, (IV)name }
…		…
621	const_iv (KMOD_NUM),	638	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	639	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	640	const_iv (KMOD_MODE),
624		641
625	const_iv (MIX_DEFAULT_FORMAT),	642	const_iv (MIX_DEFAULT_FORMAT),
		643
		644	const_iv (SDL_INIT_TIMER),
		645	const_iv (SDL_INIT_AUDIO),
		646	const_iv (SDL_INIT_VIDEO),
		647	const_iv (SDL_INIT_CDROM),
		648	const_iv (SDL_INIT_JOYSTICK),
		649	const_iv (SDL_INIT_EVERYTHING),
		650	const_iv (SDL_INIT_NOPARACHUTE),
		651	const_iv (SDL_INIT_EVENTTHREAD),
626	# undef const_iv	652	# undef const_iv
627	};	653	};
628		654
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	655	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	656	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	685	CODE:
660	{	686	{
661	opengl_fontmap = pango_opengl_font_map_new ();	687	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	688	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	689	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		690	/pango_context_set_font_description (opengl_context, default_font);/
		691	#if PANGO_VERSION_CHECK (1, 15, 2)
		692	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		693	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		694	#endif
664	}	695	}
665		696
666	char *
667	SDL_GetError ()	697	char *SDL_GetError ()
668		698
669	int	699	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		700
672	void	701	int SDL_InitSubSystem (U32 flags)
		702
		703	void SDL_QuitSubSystem (U32 flags)
		704
673	SDL_Quit ()	705	void SDL_Quit ()
674		706
675	void	707	void
676	SDL_ListModes (int rgb, int alpha)	708	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	709	PPCODE:
678	{	710	{
…		…
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	732	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		733
702	if (m && m != (SDL_Rect **)-1)	734	if (m && m != (SDL_Rect **)-1)
703	while (*m)	735	while (*m)
704	{	736	{
705	if ((m)->w >= 640 && (m)->h >= 480)
706	{
707	AV *av = newAV ();	737	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	738	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	739	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	740	av_push (av, newSViv (rgb));
711	av_push (av, newSViv (alpha));	741	av_push (av, newSViv (alpha));
712	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	742	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
713	}
714		743
715	++m;	744	++m;
716	}	745	}
717	}	746	}
718		747
…		…
734		763
735	if (RETVAL)	764	if (RETVAL)
736	{	765	{
737	av_clear (texture_av);	766	av_clear (texture_av);
738		767
739	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	768	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	769	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741	#include "glfunc.h"	770	#include "glfunc.h"
742	#undef GL_FUNC	771	#undef GL_FUNC
743	}	772	}
744	}	773	}
…		…
751	char *	780	char *
752	SDL_GetKeyName (int sym)	781	SDL_GetKeyName (int sym)
753		782
754	int	783	int
755	SDL_GetAppState ()	784	SDL_GetAppState ()
		785
		786	int
		787	SDL_GetModState ()
756		788
757	void	789	void
758	poll_events ()	790	poll_events ()
759	PPCODE:	791	PPCODE:
760	{	792	{
…		…
770	{	802	{
771	case SDL_KEYDOWN:	803	case SDL_KEYDOWN:
772	case SDL_KEYUP:	804	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	805	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	806	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	807	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	808	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	809	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	810	break;
779		811
780	case SDL_ACTIVEEVENT:	812	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	813	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	831	x = ev.motion.x;
800	y = ev.motion.y;	832	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	833	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	834	}
803		835
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	836	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	837	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	838	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	839	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	840	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	841	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	842	}
811	break;	843	break;
812		844
813	case SDL_MOUSEBUTTONDOWN:	845	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	846	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	847	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		848
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	849	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	850	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	851	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	852	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	857	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	858	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	859	break;
828	}	860	}
829		861
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	862	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	863	}
832	}	864	}
833		865
834	int	866	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	867	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	926	}
895	}	927	}
896	#endif	928	#endif
897	}	929	}
898		930
899	void	931	int
900	add_font (char *file)	932	add_font (char *file)
901	CODE:	933	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	934	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		935	OUTPUT:
		936	RETVAL
903		937
904	void	938	void
905	load_image_inline (SV *image_)	939	load_image_inline (SV *image_)
906	ALIAS:	940	ALIAS:
907	load_image_file = 1	941	load_image_file = 1
…		…
993	void	1027	void
994	error (char *message)	1028	error (char *message)
995	CODE:	1029	CODE:
996	fprintf (stderr, "ERROR: %s\n", message);	1030	fprintf (stderr, "ERROR: %s\n", message);
997	#ifdef _WIN32	1031	#ifdef _WIN32
998	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1032	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
999	#endif	1033	#endif
1000		1034
1001	void	1035	void
1002	fatal (char *message)	1036	fatal (char *message)
1003	CODE:	1037	CODE:
1004	fprintf (stderr, "FATAL: %s\n", message);	1038	fprintf (stderr, "FATAL: %s\n", message);
1005	#ifdef _WIN32	1039	#ifdef _WIN32
1006	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1040	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
1007	#endif	1041	#endif
1008	_exit (1);	1042	_exit (1);
1009		1043
1010	void	1044	void
1011	_exit (int retval = 0)	1045	_exit (int retval = 0)
…		…
1023	#if DEBUG	1057	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1058	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1059	#endif
1026	}	1060	}
1027		1061
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1062	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1063
1030	PROTOTYPES: DISABLE	1064	PROTOTYPES: DISABLE
1031		1065
1032	CFPlus::Font	1066	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1067	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1068	CODE:
1035	{	1069	{
1036	int count;	1070	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1071	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1074	}
1041	OUTPUT:	1075	OUTPUT:
1042	RETVAL	1076	RETVAL
1043		1077
1044	void	1078	void
1045	DESTROY (CFPlus::Font self)	1079	DESTROY (DC::Font self)
1046	CODE:	1080	CODE:
1047	pango_font_description_free (self);	1081	pango_font_description_free (self);
1048		1082
1049	void	1083	void
1050	make_default (CFPlus::Font self)	1084	make_default (DC::Font self)
1051	PROTOTYPE: $	1085	PROTOTYPE: $
1052	CODE:	1086	CODE:
1053	default_font = self;	1087	default_font = self;
1054		1088
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1089	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1090
1057	PROTOTYPES: DISABLE	1091	PROTOTYPES: DISABLE
1058		1092
1059	void	1093	void
1060	reset_glyph_cache ()	1094	glyph_cache_backup ()
1061	PROTOTYPE:	1095	PROTOTYPE:
1062	CODE:	1096	CODE:
		1097	tc_backup ();
		1098
		1099	void
		1100	glyph_cache_restore ()
		1101	PROTOTYPE:
		1102	CODE:
1063	tc_clear ();	1103	tc_restore ();
1064		1104
1065	CFPlus::Layout	1105	DC::Layout
1066	new (SV *class)	1106	new (SV *class)
1067	CODE:	1107	CODE:
1068	New (0, RETVAL, 1, struct cf_layout);	1108	New (0, RETVAL, 1, struct cf_layout);
1069		1109
1070	RETVAL->pl = pango_layout_new (opengl_context);	1110	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1080	layout_update_font (RETVAL);	1120	layout_update_font (RETVAL);
1081	OUTPUT:	1121	OUTPUT:
1082	RETVAL	1122	RETVAL
1083		1123
1084	void	1124	void
1085	DESTROY (CFPlus::Layout self)	1125	DESTROY (DC::Layout self)
1086	CODE:	1126	CODE:
1087	g_object_unref (self->pl);	1127	g_object_unref (self->pl);
1088	rc_free (self->rc);	1128	rc_free (self->rc);
1089	Safefree (self);	1129	Safefree (self);
1090		1130
1091	void	1131	void
1092	set_text (CFPlus::Layout self, SV *text_)	1132	set_text (DC::Layout self, SV *text_)
1093	CODE:	1133	CODE:
1094	{	1134	{
1095	STRLEN textlen;	1135	STRLEN textlen;
1096	char *text = SvPVutf8 (text_, textlen);	1136	char *text = SvPVutf8 (text_, textlen);
1097		1137
1098	pango_layout_set_text (self->pl, text, textlen);	1138	pango_layout_set_text (self->pl, text, textlen);
1099	}	1139	}
1100		1140
1101	void	1141	void
1102	set_markup (CFPlus::Layout self, SV *text_)	1142	set_markup (DC::Layout self, SV *text_)
1103	CODE:	1143	CODE:
1104	{	1144	{
1105	STRLEN textlen;	1145	STRLEN textlen;
1106	char *text = SvPVutf8 (text_, textlen);	1146	char *text = SvPVutf8 (text_, textlen);
1107		1147
1108	pango_layout_set_markup (self->pl, text, textlen);	1148	pango_layout_set_markup (self->pl, text, textlen);
1109	}	1149	}
1110		1150
1111	void	1151	void
1112	set_shapes (CFPlus::Layout self, ...)	1152	set_shapes (DC::Layout self, ...)
1113	CODE:	1153	CODE:
1114	{	1154	{
1115	PangoAttrList *attrs = 0;	1155	PangoAttrList *attrs = 0;
1116	const char *text = pango_layout_get_text (self->pl);	1156	const char *text = pango_layout_get_text (self->pl);
1117	const char *pos = text;	1157	const char *pos = text;
…		…
1152	if (attrs)	1192	if (attrs)
1153	pango_layout_set_attributes (self->pl, attrs);	1193	pango_layout_set_attributes (self->pl, attrs);
1154	}	1194	}
1155		1195
1156	void	1196	void
1157	get_shapes (CFPlus::Layout self)	1197	get_shapes (DC::Layout self)
1158	PPCODE:	1198	PPCODE:
1159	{	1199	{
1160	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1200	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161		1201
1162	do	1202	do
1163	{	1203	{
1164	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1204	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165		1205
1166	if (run && shape_attr_p (run))	1206	if (run && shape_attr_p (run))
1167	{	1207	{
1168	PangoRectangle extents;	1208	PangoRectangle extents;
1169	pango_layout_iter_get_run_extents (iter, 0, &extents);	1209	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1177		1217
1178	pango_layout_iter_free (iter);	1218	pango_layout_iter_free (iter);
1179	}	1219	}
1180		1220
1181	int	1221	int
1182	has_wrapped (CFPlus::Layout self)	1222	has_wrapped (DC::Layout self)
1183	CODE:	1223	CODE:
1184	{	1224	{
1185	int lines = 1;	1225	int lines = 1;
1186	const char *text = pango_layout_get_text (self->pl);	1226	const char *text = pango_layout_get_text (self->pl);
1187		1227
…		…
1192	}	1232	}
1193	OUTPUT:	1233	OUTPUT:
1194	RETVAL	1234	RETVAL
1195		1235
1196	SV *	1236	SV *
1197	get_text (CFPlus::Layout self)	1237	get_text (DC::Layout self)
1198	CODE:	1238	CODE:
1199	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1239	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200	sv_utf8_decode (RETVAL);	1240	sv_utf8_decode (RETVAL);
1201	OUTPUT:	1241	OUTPUT:
1202	RETVAL	1242	RETVAL
1203		1243
1204	void	1244	void
1205	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1245	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206	CODE:	1246	CODE:
1207	self->r = r;	1247	self->r = r;
1208	self->g = g;	1248	self->g = g;
1209	self->b = b;	1249	self->b = b;
1210	self->a = a;	1250	self->a = a;
1211		1251
1212	void	1252	void
1213	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1253	set_font (DC::Layout self, DC::Font font = 0)
1214	CODE:	1254	CODE:
1215	if (self->font != font)	1255	if (self->font != font)
1216	{	1256	{
1217	self->font = font;	1257	self->font = font;
1218	layout_update_font (self);	1258	layout_update_font (self);
1219	}	1259	}
1220		1260
1221	void	1261	void
1222	set_height (CFPlus::Layout self, int base_height)	1262	set_height (DC::Layout self, int base_height)
1223	CODE:	1263	CODE:
1224	if (self->base_height != base_height)	1264	if (self->base_height != base_height)
1225	{	1265	{
1226	self->base_height = base_height;	1266	self->base_height = base_height;
1227	layout_update_font (self);	1267	layout_update_font (self);
1228	}	1268	}
1229		1269
1230	void	1270	void
1231	set_width (CFPlus::Layout self, int max_width = -1)	1271	set_width (DC::Layout self, int max_width = -1)
1232	CODE:	1272	CODE:
1233	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1273	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234		1274
1235	void	1275	void
1236	set_indent (CFPlus::Layout self, int indent)	1276	set_indent (DC::Layout self, int indent)
1237	CODE:	1277	CODE:
1238	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1278	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239		1279
1240	void	1280	void
1241	set_spacing (CFPlus::Layout self, int spacing)	1281	set_spacing (DC::Layout self, int spacing)
1242	CODE:	1282	CODE:
1243	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1283	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244		1284
1245	void	1285	void
1246	set_ellipsise (CFPlus::Layout self, int ellipsise)	1286	set_ellipsise (DC::Layout self, int ellipsise)
1247	CODE:	1287	CODE:
1248	pango_layout_set_ellipsize (self->pl,	1288	pango_layout_set_ellipsize (self->pl,
1249	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1289	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1290	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1291	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252	: PANGO_ELLIPSIZE_NONE	1292	: PANGO_ELLIPSIZE_NONE
1253	);	1293	);
1254		1294
1255	void	1295	void
1256	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1296	set_single_paragraph_mode (DC::Layout self, int spm)
1257	CODE:	1297	CODE:
1258	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1298	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259		1299
1260	void	1300	void
1261	size (CFPlus::Layout self)	1301	size (DC::Layout self)
1262	PPCODE:	1302	PPCODE:
1263	{	1303	{
1264	int w, h;	1304	int w, h;
1265		1305
1266	layout_get_pixel_size (self, &w, &h);	1306	layout_get_pixel_size (self, &w, &h);
…		…
1269	PUSHs (sv_2mortal (newSViv (w)));	1309	PUSHs (sv_2mortal (newSViv (w)));
1270	PUSHs (sv_2mortal (newSViv (h)));	1310	PUSHs (sv_2mortal (newSViv (h)));
1271	}	1311	}
1272		1312
1273	int	1313	int
1274	descent (CFPlus::Layout self)	1314	descent (DC::Layout self)
1275	CODE:	1315	CODE:
1276	{	1316	{
1277	PangoRectangle rect;	1317	PangoRectangle rect;
1278	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1318	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279	pango_layout_line_get_pixel_extents (line, 0, &rect);	1319	pango_layout_line_get_pixel_extents (line, 0, &rect);
1280	RETVAL = PANGO_DESCENT (rect);	1320	RETVAL = PANGO_DESCENT (rect);
1281	}	1321	}
1282	OUTPUT:	1322	OUTPUT:
1283	RETVAL	1323	RETVAL
1284		1324
1285	int	1325	int
1286	xy_to_index (CFPlus::Layout self, int x, int y)	1326	xy_to_index (DC::Layout self, int x, int y)
1287	CODE:	1327	CODE:
1288	{	1328	{
1289	int index, trailing;	1329	int index, trailing;
1290	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1330	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291	RETVAL = index + trailing;	1331	RETVAL = index + trailing;
1292	}	1332	}
1293	OUTPUT:	1333	OUTPUT:
1294	RETVAL	1334	RETVAL
1295		1335
1296	void	1336	void
1297	cursor_pos (CFPlus::Layout self, int index)	1337	cursor_pos (DC::Layout self, int index)
1298	PPCODE:	1338	PPCODE:
1299	{	1339	{
1300	PangoRectangle strong_pos;	1340	PangoRectangle pos;
1301	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1341	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302		1342
1303	EXTEND (SP, 3);	1343	EXTEND (SP, 3);
1304	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1344	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1345	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1346	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307	}	1347	}
1308		1348
1309	void	1349	void
1310	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1350	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311	PPCODE:	1351	PPCODE:
1312	{	1352	{
1313	int line, x;	1353	int line, x;
1314		1354
1315	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1355	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1356	#if !PANGO_VERSION_CHECK (1, 17, 3)
1316	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1357	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317		1358	--line;
		1359	#endif
1318	EXTEND (SP, 2);	1360	EXTEND (SP, 2);
1319	PUSHs (sv_2mortal (newSViv (line - 1)));	1361	PUSHs (sv_2mortal (newSViv (line)));
1320	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1362	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321	}	1363	}
1322		1364
1323	void	1365	void
1324	line_x_to_index (CFPlus::Layout self, int line, int x)	1366	line_x_to_index (DC::Layout self, int line, int x)
1325	PPCODE:	1367	PPCODE:
1326	{	1368	{
1327	PangoLayoutLine *lp;	1369	PangoLayoutLine *lp;
1328	int index, trailing;	1370	int index, trailing;
1329		1371
1330	if (line < 0)	1372	if (line < 0)
1331	XSRETURN_EMPTY;	1373	XSRETURN_EMPTY;
1332		1374
1333	if (!(lp = pango_layout_get_line (self->pl, line)))	1375	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334	XSRETURN_EMPTY; /* do better */	1376	XSRETURN_EMPTY; /* do better */
1335		1377
1336	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1378	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337		1379
1338	EXTEND (SP, 2);	1380	EXTEND (SP, 2);
…		…
1344	PUSHs (sv_2mortal (newSViv (trailing)));	1386	PUSHs (sv_2mortal (newSViv (trailing)));
1345	}	1387	}
1346	}	1388	}
1347		1389
1348	void	1390	void
1349	render (CFPlus::Layout self, float x, float y, int flags = 0)	1391	render (DC::Layout self, float x, float y, int flags = 0)
1350	CODE:	1392	CODE:
1351	rc_clear (self->rc);	1393	rc_clear (self->rc);
1352	pango_opengl_render_layout_subpixel (	1394	pango_opengl_render_layout_subpixel (
1353	self->pl,	1395	self->pl,
1354	self->rc,	1396	self->rc,
…		…
1359	// we assume that context_change actually clears/frees stuff	1401	// we assume that context_change actually clears/frees stuff
1360	// and does not do any recomputation...	1402	// and does not do any recomputation...
1361	pango_layout_context_changed (self->pl);	1403	pango_layout_context_changed (self->pl);
1362		1404
1363	void	1405	void
1364	draw (CFPlus::Layout self)	1406	draw (DC::Layout self)
1365	CODE:	1407	CODE:
1366	{	1408	{
1367	glEnable (GL_TEXTURE_2D);	1409	glEnable (GL_TEXTURE_2D);
1368	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1410	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369	glEnable (GL_BLEND);	1411	glEnable (GL_BLEND);
…		…
1377	glDisable (GL_ALPHA_TEST);	1419	glDisable (GL_ALPHA_TEST);
1378	glDisable (GL_BLEND);	1420	glDisable (GL_BLEND);
1379	glDisable (GL_TEXTURE_2D);	1421	glDisable (GL_TEXTURE_2D);
1380	}	1422	}
1381		1423
1382	MODULE = CFPlus PACKAGE = CFPlus::Texture	1424	MODULE = Deliantra::Client PACKAGE = DC::Texture
1383		1425
1384	PROTOTYPES: ENABLE	1426	PROTOTYPES: ENABLE
1385		1427
1386	void	1428	void
1387	pad (SV *data_, int ow, int oh, int nw, int nh)	1429	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1466	RETVAL = width > 0;	1508	RETVAL = width > 0;
1467	}	1509	}
1468	OUTPUT:	1510	OUTPUT:
1469	RETVAL	1511	RETVAL
1470		1512
1471	MODULE = CFPlus PACKAGE = CFPlus::Map	1513	MODULE = Deliantra::Client PACKAGE = DC::Map
1472		1514
1473	PROTOTYPES: DISABLE	1515	PROTOTYPES: DISABLE
1474		1516
1475	CFPlus::Map	1517	DC::Map
1476	new (SV *class)	1518	new (SV *class)
1477	CODE:	1519	CODE:
1478	New (0, RETVAL, 1, struct map);	1520	New (0, RETVAL, 1, struct map);
1479	RETVAL->x = 0;	1521	RETVAL->x = 0;
1480	RETVAL->y = 0;	1522	RETVAL->y = 0;
…		…
1488	RETVAL->row = 0;	1530	RETVAL->row = 0;
1489	OUTPUT:	1531	OUTPUT:
1490	RETVAL	1532	RETVAL
1491		1533
1492	void	1534	void
1493	DESTROY (CFPlus::Map self)	1535	DESTROY (DC::Map self)
1494	CODE:	1536	CODE:
1495	{	1537	{
1496	map_clear (self);	1538	map_clear (self);
1497	Safefree (self->face2tile);	1539	Safefree (self->face2tile);
1498	Safefree (self->tex);	1540	Safefree (self->tex);
1499	Safefree (self);	1541	Safefree (self);
1500	}	1542	}
1501		1543
1502	void	1544	void
1503	resize (CFPlus::Map self, int map_width, int map_height)	1545	resize (DC::Map self, int map_width, int map_height)
1504	CODE:	1546	CODE:
1505	self->w = map_width;	1547	self->w = map_width;
1506	self->h = map_height;	1548	self->h = map_height;
1507		1549
1508	void	1550	void
1509	clear (CFPlus::Map self)	1551	clear (DC::Map self)
1510	CODE:	1552	CODE:
1511	map_clear (self);	1553	map_clear (self);
1512		1554
1513	void	1555	void
1514	set_tileid (CFPlus::Map self, int face, int tile)	1556	set_tileid (DC::Map self, int face, int tile)
1515	CODE:	1557	CODE:
1516	{	1558	{
1517	need_facenum (self, face); self->face2tile [face] = tile;	1559	need_facenum (self, face); self->face2tile [face] = tile;
1518	need_texid (self, tile);	1560	need_texid (self, tile);
1519	}	1561	}
1520		1562
1521	void	1563	void
1522	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1564	set_smooth (DC::Map self, int face, int smooth, int level)
1523	CODE:	1565	CODE:
1524	{	1566	{
1525	tileid texid;	1567	tileid texid;
1526	maptex *tex;	1568	maptex *tex;
1527		1569
…		…
1540	tex->smoothtile = self->face2tile [smooth];	1582	tex->smoothtile = self->face2tile [smooth];
1541	tex->smoothlevel = level;	1583	tex->smoothlevel = level;
1542	}	1584	}
1543		1585
1544	void	1586	void
1545	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)	1587	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)
1546	CODE:	1588	CODE:
1547	{	1589	{
1548	need_texid (self, texid);	1590	need_texid (self, texid);
1549		1591
1550	{	1592	{
…		…
1570	// from transparent color bleeding and ugly wrapping effects.	1612	// from transparent color bleeding and ugly wrapping effects.
1571	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1613	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572	}	1614	}
1573		1615
1574	int	1616	int
1575	ox (CFPlus::Map self)	1617	ox (DC::Map self)
1576	ALIAS:	1618	ALIAS:
1577	oy = 1	1619	oy = 1
1578	x = 2	1620	x = 2
1579	y = 3	1621	y = 3
1580	w = 4	1622	w = 4
…		…
1591	}	1633	}
1592	OUTPUT:	1634	OUTPUT:
1593	RETVAL	1635	RETVAL
1594		1636
1595	void	1637	void
1596	scroll (CFPlus::Map self, int dx, int dy)	1638	scroll (DC::Map self, int dx, int dy)
1597	CODE:	1639	CODE:
1598	{	1640	{
1599	if (dx > 0)	1641	if (dx > 0)
1600	map_blank (self, self->x, self->y, dx, self->h);	1642	map_blank (self, self->x, self->y, dx, self->h);
1601	else if (dx < 0)	1643	else if (dx < 0)
…		…
1617	self->y += MAP_EXTEND_Y;	1659	self->y += MAP_EXTEND_Y;
1618	}	1660	}
1619	}	1661	}
1620		1662
1621	SV *	1663	SV *
1622	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1664	map1a_update (DC::Map self, SV *data_, int extmap)
1623	CODE:	1665	CODE:
1624	{	1666	{
1625	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1667	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1626	uint8_t data_end = (uint8_t )SvEND (data_);	1668	uint8_t data_end = (uint8_t )SvEND (data_);
1627	mapcell *cell;	1669	mapcell *cell;
…		…
1655	uint8_t ext, cmd;	1697	uint8_t ext, cmd;
1656		1698
1657	do	1699	do
1658	{	1700	{
1659	ext = *data++;	1701	ext = *data++;
1660	cmd = ext & 0x3f;	1702	cmd = ext & 0x7f;
1661		1703
1662	if (cmd < 4)	1704	if (cmd < 4)
1663	cell->darkness = 255 - ext * 64 + 1;	1705	cell->darkness = 255 - ext * 64 + 1;
1664	else if (cmd == 5) // health	1706	else if (cmd == 5) // health
1665	{	1707	{
…		…
1668	}	1710	}
1669	else if (cmd == 6) // monster width	1711	else if (cmd == 6) // monster width
1670	cell->stat_width = *data++ + 1;	1712	cell->stat_width = *data++ + 1;
1671	else if (cmd == 0x47)	1713	else if (cmd == 0x47)
1672	{	1714	{
1673	if (*data == 4)	1715	if (*data == 1) cell->player = data [1];
1674	; // decode player count	1716	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1717	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1718	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675		1719
1676	data += *data + 1;	1720	data += *data + 1;
1677	}	1721	}
1678	else if (cmd == 8) // cell flags	1722	else if (cmd == 8) // cell flags
1679	cell->flags = *data++;	1723	cell->flags = *data++;
…		…
1716	}	1760	}
1717	OUTPUT:	1761	OUTPUT:
1718	RETVAL	1762	RETVAL
1719		1763
1720	SV *	1764	SV *
1721	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1765	mapmap (DC::Map self, int x0, int y0, int w, int h)
1722	CODE:	1766	CODE:
1723	{	1767	{
1724	int x1, x;	1768	int x1, x;
1725	int y1, y;	1769	int y1, y;
1726	int z;	1770	int z;
…		…
1771	}	1815	}
1772	OUTPUT:	1816	OUTPUT:
1773	RETVAL	1817	RETVAL
1774		1818
1775	void	1819	void
1776	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1820	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1777	CODE:	1821	CODE:
1778	{	1822	{
1779	int x, y, z;	1823	int x, y, z;
1780		1824
1781	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1825	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1782	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1826	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1827	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784	smooth_key skey;	1828	smooth_key skey;
1785		1829	int pl_x, pl_y;
		1830	maptex pl_tex;
1786	rc_t *rc = rc_alloc ();	1831	rc_t *rc = rc_alloc ();
1787	rc_key_t key;	1832	rc_key_t key;
1788	rc_array_t *arr;	1833	rc_array_t *arr;
		1834
		1835	pl_tex.name = 0;
1789		1836
1790	// thats current max. sorry.	1837	// thats current max. sorry.
1791	if (sw > 255) sw = 255;	1838	if (sw > 255) sw = 255;
1792	if (sh > 255) sh = 255;	1839	if (sh > 255) sh = 255;
1793		1840
…		…
1848	tileid tile = cell->tile [z];	1895	tileid tile = cell->tile [z];
1849		1896
1850	if (tile)	1897	if (tile)
1851	{	1898	{
1852	maptex tex = self->tex [tile];	1899	maptex tex = self->tex [tile];
1853	int px, py;	1900	int px = (x + 1) * T - tex.w;
		1901	int py = (y + 1) * T - tex.h;
1854		1902
1855	if (key.texname != tex.name)	1903	if (key.texname != tex.name)
1856	{	1904	{
1857	if (!tex.name)	1905	if (!tex.name)
1858	tex = self->tex [2]; /* missing, replace by noface */	1906	tex = self->tex [2]; /* missing, replace by noface */
1859		1907
1860	key.texname = tex.name;	1908	key.texname = tex.name;
1861	arr = rc_array (rc, &key);	1909	arr = rc_array (rc, &key);
1862	}	1910	}
1863		1911
1864	px = (x + 1) * T - tex.w;	1912	if (expect_false (cell->player == player) && expect_false (z == 2))
1865	py = (y + 1) * T - tex.h;	1913	{
		1914	pl_x = px;
		1915	pl_y = py;
		1916	pl_tex = tex;
		1917	continue;
		1918	}
1866		1919
1867	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1920	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1921	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1922	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1923	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871		1924
1872	if (cell->flags && z == 2)	1925	if (expect_false (cell->flags) && expect_false (z == 2))
1873	{	1926	{
1874	// overlays such as the speech bubble, probably more to come	1927	// overlays such as the speech bubble, probably more to come
1875	if (cell->flags & 1)	1928	if (cell->flags & 1)
1876	{	1929	{
1877	maptex tex = self->tex [1];	1930	maptex tex = self->tex [1];
…		…
2016	}	2069	}
2017		2070
2018	hv_clear (smooth);	2071	hv_clear (smooth);
2019	}	2072	}
2020		2073
		2074	if (pl_tex.name)
		2075	{
		2076	maptex tex = pl_tex;
		2077	int px = pl_x + pdx;
		2078	int py = pl_y + pdy;
		2079
		2080	key.texname = tex.name;
		2081	arr = rc_array (rc, &key);
		2082
		2083	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2084	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2085	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2086	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2087
		2088	rc_draw (rc);
		2089	}
		2090
2021	glDisable (GL_BLEND);	2091	glDisable (GL_BLEND);
2022	rc_free (rc);	2092	rc_free (rc);
2023		2093
2024	// top layer: overlays such as the health bar	2094	// top layer: overlays such as the health bar
2025	for (y = 0; y < sh; y++)	2095	for (y = 0; y < sh; y++)
…		…
2052	}	2122	}
2053	}	2123	}
2054	}	2124	}
2055		2125
2056	void	2126	void
2057	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2127	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058	CODE:	2128	CODE:
2059	{	2129	{
2060	static float color[16][3] = {	2130	static float color[16][3] = {
2061	{ 0.00F, 0.00F, 0.00F },	2131	{ 0.00F, 0.00F, 0.00F },
2062	{ 1.00F, 1.00F, 1.00F },	2132	{ 1.00F, 1.00F, 1.00F },
…		…
2112	glDisable (GL_BLEND);	2182	glDisable (GL_BLEND);
2113	glDisable (GL_TEXTURE_2D);	2183	glDisable (GL_TEXTURE_2D);
2114	}	2184	}
2115		2185
2116	void	2186	void
2117	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2187	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118	PPCODE:	2188	PPCODE:
2119	{	2189	{
2120	int x, y;	2190	int x, y;
2121	int sw1 = sw + 2;	2191	int sw1 = sw + 2;
2122	int sh1 = sh + 2;	2192	int sh1 = sh + 2;
…		…
2193	PUSHs (sv_2mortal (newSViv (sh3)));	2263	PUSHs (sv_2mortal (newSViv (sh3)));
2194	PUSHs (darkness3_sv);	2264	PUSHs (darkness3_sv);
2195	}	2265	}
2196		2266
2197	SV *	2267	SV *
2198	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2268	get_rect (DC::Map self, int x0, int y0, int w, int h)
2199	CODE:	2269	CODE:
2200	{	2270	{
2201	int x, y, x1, y1;	2271	int x, y, x1, y1;
2202	SV data_sv = newSV (w h * 7 + 5);	2272	SV data_sv = newSV (w h * 7 + 5);
2203	uint8_t data = (uint8_t )SvPVX (data_sv);	2273	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2260	else	2330	else
2261	*data++ = 0;	2331	*data++ = 0;
2262	}	2332	}
2263	}	2333	}
2264		2334
		2335	/* if size is wh + 5 then no data has been found /
		2336	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2337	{
2265	SvPOK_only (data_sv);	2338	SvPOK_only (data_sv);
2266	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2339	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2340	}
		2341
2267	RETVAL = data_sv;	2342	RETVAL = data_sv;
2268	}	2343	}
2269	OUTPUT:	2344	OUTPUT:
2270	RETVAL	2345	RETVAL
2271		2346
2272	void	2347	void
2273	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2348	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274	PPCODE:	2349	PPCODE:
2275	{	2350	{
2276	int x, y, z;	2351	int x, y, z;
2277	int w, h;	2352	int w, h;
2278	int x1, y1;	2353	int x1, y1;
		2354	STRLEN len;
		2355	uint8_t data, end;
		2356
		2357	len = SvLEN (data_sv);
		2358	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2359	data = SvPVbyte_nolen (data_sv);
		2360	end = data + len + 8;
		2361
		2362	if (len < 5)
		2363	XSRETURN_EMPTY;
2279		2364
2280	if (*data++ != 0)	2365	if (*data++ != 0)
2281	XSRETURN_EMPTY; /* version mismatch */	2366	XSRETURN_EMPTY; /* version mismatch */
2282		2367
2283	w = data++ << 8; w \|= data++;	2368	w = data++ << 8; w \|= data++;
…		…
2298	{	2383	{
2299	maprow *row = map_get_row (self, y);	2384	maprow *row = map_get_row (self, y);
2300		2385
2301	for (x = x0; x < x1; x++)	2386	for (x = x0; x < x1; x++)
2302	{	2387	{
		2388	uint8_t flags;
		2389
		2390	if (data + 7 >= end)
		2391	XSRETURN_EMPTY;
		2392
2303	uint8_t flags = *data++;	2393	flags = *data++;
2304		2394
2305	if (flags)	2395	if (flags)
2306	{	2396	{
2307	mapcell *cell = row_get_cell (row, x);	2397	mapcell *cell = row_get_cell (row, x);
2308	tileid tile[3] = { 0, 0, 0 };	2398	tileid tile[3] = { 0, 0, 0 };
…		…
2311	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2401	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2312	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2402	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2313		2403
2314	if (cell->darkness == 0)	2404	if (cell->darkness == 0)
2315	{	2405	{
2316	cell->darkness = 0;	2406	/cell->darkness = 0;/
		2407	EXTEND (SP, 3);
2317		2408
2318	for (z = 0; z <= 2; z++)	2409	for (z = 0; z <= 2; z++)
2319	{	2410	{
2320	tileid t = tile [z];	2411	tileid t = tile [z];
2321		2412
2322	if (t >= self->texs \|\| (t && !self->tex [t].name))	2413	if (t >= self->texs \|\| (t && !self->tex [t].name))
2323	{	2414	{
2324	XPUSHs (sv_2mortal (newSViv (t)));	2415	PUSHs (sv_2mortal (newSViv (t)));
2325	need_texid (self, t);	2416	need_texid (self, t);
2326	}	2417	}
2327		2418
2328	cell->tile [z] = t;	2419	cell->tile [z] = t;
2329	}	2420	}
…		…
2331	}	2422	}
2332	}	2423	}
2333	}	2424	}
2334	}	2425	}
2335		2426
2336	MODULE = CFPlus PACKAGE = CFPlus::RW	2427	MODULE = Deliantra::Client PACKAGE = DC::RW
2337		2428
2338	CFPlus::RW	2429	DC::RW
2339	new (SV class, SV data_sv)	2430	new (SV class, SV data_sv)
2340	CODE:	2431	CODE:
2341	{	2432	{
2342	STRLEN datalen;	2433	STRLEN datalen;
2343	char *data = SvPVbyte (data_sv, datalen);	2434	char *data = SvPVbyte (data_sv, datalen);
…		…
2345	RETVAL = SDL_RWFromConstMem (data, datalen);	2436	RETVAL = SDL_RWFromConstMem (data, datalen);
2346	}	2437	}
2347	OUTPUT:	2438	OUTPUT:
2348	RETVAL	2439	RETVAL
2349		2440
2350	CFPlus::RW	2441	DC::RW
2351	new_from_file (SV class, const char path, const char *mode = "rb")	2442	new_from_file (SV class, const char path, const char *mode = "rb")
2352	CODE:	2443	CODE:
2353	RETVAL = SDL_RWFromFile (path, mode);	2444	RETVAL = SDL_RWFromFile (path, mode);
2354	OUTPUT:	2445	OUTPUT:
2355	RETVAL	2446	RETVAL
2356		2447
2357	# fails on win32:	2448	# fails on win32:
2358	# CFPlus.xs(2268) : error C2059: syntax error : '('	2449	# dc.xs(2268) : error C2059: syntax error : '('
2359	#void	2450	#void
2360	#close (CFPlus::RW self)	2451	#close (DC::RW self)
2361	# CODE:	2452	# CODE:
2362	# (self->(close)) (self);	2453	# (self->(close)) (self);
2363		2454
2364	MODULE = CFPlus PACKAGE = CFPlus::Channel	2455	MODULE = Deliantra::Client PACKAGE = DC::Channel
2365		2456
2366	PROTOTYPES: DISABLE	2457	PROTOTYPES: DISABLE
2367		2458
2368	CFPlus::Channel	2459	DC::Channel
2369	find ()	2460	find ()
2370	CODE:	2461	CODE:
2371	{	2462	{
2372	RETVAL = Mix_GroupAvailable (-1);	2463	RETVAL = Mix_GroupAvailable (-1);
2373		2464
…		…
2386	}	2477	}
2387	OUTPUT:	2478	OUTPUT:
2388	RETVAL	2479	RETVAL
2389		2480
2390	void	2481	void
2391	halt (CFPlus::Channel self)	2482	halt (DC::Channel self)
2392	CODE:	2483	CODE:
2393	Mix_HaltChannel (self);	2484	Mix_HaltChannel (self);
2394		2485
2395	void	2486	void
2396	expire (CFPlus::Channel self, int ticks = -1)	2487	expire (DC::Channel self, int ticks = -1)
2397	CODE:	2488	CODE:
2398	Mix_ExpireChannel (self, ticks);	2489	Mix_ExpireChannel (self, ticks);
2399		2490
2400	void	2491	void
2401	fade_out (CFPlus::Channel self, int ticks = -1)	2492	fade_out (DC::Channel self, int ticks = -1)
2402	CODE:	2493	CODE:
2403	Mix_FadeOutChannel (self, ticks);	2494	Mix_FadeOutChannel (self, ticks);
2404		2495
2405	int	2496	int
2406	volume (CFPlus::Channel self, int volume)	2497	volume (DC::Channel self, int volume)
2407	CODE:	2498	CODE:
2408	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2499	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409	OUTPUT:	2500	OUTPUT:
2410	RETVAL	2501	RETVAL
2411		2502
2412	void	2503	void
2413	unregister_all_effects (CFPlus::Channel self)	2504	unregister_all_effects (DC::Channel self)
2414	CODE:	2505	CODE:
2415	Mix_UnregisterAllEffects (self);	2506	Mix_UnregisterAllEffects (self);
2416		2507
2417	void	2508	void
2418	set_panning (CFPlus::Channel self, int left, int right)	2509	set_panning (DC::Channel self, int left, int right)
2419	CODE:	2510	CODE:
2420	left = CLAMP (left , 0, 255);	2511	left = CLAMP (left , 0, 255);
2421	right = CLAMP (right, 0, 255);	2512	right = CLAMP (right, 0, 255);
2422	Mix_SetPanning (self, left, right);	2513	Mix_SetPanning (self, left, right);
2423		2514
2424	void	2515	void
2425	set_distance (CFPlus::Channel self, int distance)	2516	set_distance (DC::Channel self, int distance)
2426	CODE:	2517	CODE:
2427	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2518	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428		2519
2429	void	2520	void
2430	set_position (CFPlus::Channel self, int angle, int distance)	2521	set_position (DC::Channel self, int angle, int distance)
2431	CODE:	2522	CODE:
2432		2523
2433	void	2524	void
2434	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2525	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435	CODE:	2526	CODE:
2436	{	2527	{
2437	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2528	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2529	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2530	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440	}	2531	}
2441		2532
2442	void	2533	void
2443	set_reverse_stereo (CFPlus::Channel self, int flip)	2534	set_reverse_stereo (DC::Channel self, int flip)
2444	CODE:	2535	CODE:
2445	Mix_SetReverseStereo (self, flip);	2536	Mix_SetReverseStereo (self, flip);
2446		2537
2447	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2538	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448		2539
2449	PROTOTYPES: DISABLE	2540	PROTOTYPES: DISABLE
2450		2541
2451	CFPlus::MixChunk	2542	DC::MixChunk
2452	new (SV *class, CFPlus::RW rwops)	2543	new (SV *class, DC::RW rwops)
2453	CODE:	2544	CODE:
2454	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2545	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455	OUTPUT:	2546	OUTPUT:
2456	RETVAL	2547	RETVAL
2457		2548
2458	void	2549	void
2459	DESTROY (CFPlus::MixChunk self)	2550	DESTROY (DC::MixChunk self)
2460	CODE:	2551	CODE:
2461	Mix_FreeChunk (self);	2552	Mix_FreeChunk (self);
2462		2553
2463	int	2554	int
2464	volume (CFPlus::MixChunk self, int volume = -1)	2555	volume (DC::MixChunk self, int volume = -1)
2465	CODE:	2556	CODE:
2466	if (items > 1)	2557	if (items > 1)
2467	volume = CLAMP (volume, 0, 128);	2558	volume = CLAMP (volume, 0, 128);
2468	RETVAL = Mix_VolumeChunk (self, volume);	2559	RETVAL = Mix_VolumeChunk (self, volume);
2469	OUTPUT:	2560	OUTPUT:
2470	RETVAL	2561	RETVAL
2471		2562
2472	CFPlus::Channel	2563	DC::Channel
2473	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2564	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474	CODE:	2565	CODE:
2475	{	2566	{
2476	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2567	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477		2568
2478	if (RETVAL < 0)	2569	if (RETVAL < 0)
…		…
2485	}	2576	}
2486	}	2577	}
2487	OUTPUT:	2578	OUTPUT:
2488	RETVAL	2579	RETVAL
2489		2580
2490	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2581	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491		2582
2492	int	2583	int
2493	volume (int volume = -1)	2584	volume (int volume = -1)
2494	PROTOTYPE: ;$	2585	PROTOTYPE: ;$
2495	CODE:	2586	CODE:
…		…
2507	void	2598	void
2508	halt ()	2599	halt ()
2509	CODE:	2600	CODE:
2510	Mix_HaltMusic ();	2601	Mix_HaltMusic ();
2511		2602
2512	CFPlus::MixMusic	2603	DC::MixMusic
2513	new (SV *class, CFPlus::RW rwops)	2604	new (SV *class, DC::RW rwops)
2514	CODE:	2605	CODE:
2515	RETVAL = Mix_LoadMUS_RW (rwops);	2606	RETVAL = Mix_LoadMUS_RW (rwops);
2516	OUTPUT:	2607	OUTPUT:
2517	RETVAL	2608	RETVAL
2518		2609
2519	void	2610	void
2520	DESTROY (CFPlus::MixMusic self)	2611	DESTROY (DC::MixMusic self)
2521	CODE:	2612	CODE:
2522	Mix_FreeMusic (self);	2613	Mix_FreeMusic (self);
2523		2614
2524	int	2615	int
2525	play (CFPlus::MixMusic self, int loops = -1)	2616	play (DC::MixMusic self, int loops = -1)
2526	CODE:	2617	CODE:
2527	RETVAL = Mix_PlayMusic (self, loops);	2618	RETVAL = Mix_PlayMusic (self, loops);
2528	OUTPUT:	2619	OUTPUT:
2529	RETVAL	2620	RETVAL
2530		2621
2531	void	2622	void
2532	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2623	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533	CODE:	2624	CODE:
2534	Mix_FadeInMusicPos (self, loops, ms, position);	2625	Mix_FadeInMusicPos (self, loops, ms, position);
2535		2626
2536	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2627	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537		2628
2538	PROTOTYPES: ENABLE	2629	PROTOTYPES: ENABLE
2539		2630
2540	BOOT:	2631	BOOT:
2541	{	2632	{
2542	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2633	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543	static const struct {	2634	static const struct {
2544	const char *name;	2635	const char *name;
2545	IV iv;	2636	IV iv;
2546	} *civ, const_iv[] = {	2637	} *civ, const_iv[] = {
2547	# define const_iv(name) { # name, (IV)name }	2638	# define const_iv(name) { # name, (IV)name }
…		…
2840	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2931	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2841	CODE:	2932	CODE:
2842	if (gl.SeparableFilter2D)	2933	if (gl.SeparableFilter2D)
2843	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2934	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844		2935
2845	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2936	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846		2937
2847	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2938	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848		2939
2849	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2940	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850		2941
…		…
2876		2967
2877	void glEndList ()	2968	void glEndList ()
2878		2969
2879	void glCallList (int list)	2970	void glCallList (int list)
2880		2971
2881	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2972	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882		2973
2883	PROTOTYPES: DISABLE	2974	PROTOTYPES: DISABLE
2884		2975
2885	void	2976	void
2886	find_widget (SV *self, NV x, NV y)	2977	find_widget (SV *self, NV x, NV y)
…		…
2890	XPUSHs (self);	2981	XPUSHs (self);
2891	}	2982	}
2892		2983
2893	BOOT:	2984	BOOT:
2894	{	2985	{
2895	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2986	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896		2987
2897	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2988	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2989	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2990	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2991	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901	}	2992	}
2902		2993
2903	void	2994	void
2904	draw (SV *self)	2995	draw (SV *self)
2905	CODE:	2996	CODE:
…		…
2912	SV *draw_w_sv = GvSV (draw_w_gv);	3003	SV *draw_w_sv = GvSV (draw_w_gv);
2913	SV *draw_h_sv = GvSV (draw_h_gv);	3004	SV *draw_h_sv = GvSV (draw_h_gv);
2914	double draw_x, draw_y;	3005	double draw_x, draw_y;
2915		3006
2916	if (!SvROK (self))	3007	if (!SvROK (self))
2917	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3008	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918		3009
2919	hv = (HV *)SvRV (self);	3010	hv = (HV *)SvRV (self);
2920		3011
2921	if (SvTYPE (hv) != SVt_PVHV)	3012	if (SvTYPE (hv) != SVt_PVHV)
2922	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3013	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923		3014
2924	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3015	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3016	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926		3017
2927	if (!h \|\| !w)	3018	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.236 by root, Mon Oct 8 16:10:14 2007 UTC vs. Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.236 by root, Mon Oct 8 16:10:14 2007 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC