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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 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),
		652
		653	const_iv (SDL_GL_RED_SIZE),
		654	const_iv (SDL_GL_GREEN_SIZE),
		655	const_iv (SDL_GL_BLUE_SIZE),
		656	const_iv (SDL_GL_ALPHA_SIZE),
		657	const_iv (SDL_GL_DOUBLEBUFFER),
		658	const_iv (SDL_GL_BUFFER_SIZE),
		659	const_iv (SDL_GL_DEPTH_SIZE),
		660	const_iv (SDL_GL_STENCIL_SIZE),
		661	const_iv (SDL_GL_ACCUM_RED_SIZE),
		662	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		663	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		664	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		665	const_iv (SDL_GL_STEREO),
		666	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		667	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		668	const_iv (SDL_GL_ACCELERATED_VISUAL),
		669	const_iv (SDL_GL_SWAP_CONTROL)
626	# undef const_iv	670	# undef const_iv
627	};	671	};
628		672
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	673	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	674	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	703	CODE:
660	{	704	{
661	opengl_fontmap = pango_opengl_font_map_new ();	705	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	706	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);	707	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		708	/pango_context_set_font_description (opengl_context, default_font);/
		709	#if PANGO_VERSION_CHECK (1, 15, 2)
		710	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		711	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		712	#endif
664	}	713	}
665		714
666	char *
667	SDL_GetError ()	715	char *SDL_GetError ()
668		716
669	int	717	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		718
672	void	719	int SDL_InitSubSystem (U32 flags)
		720
		721	void SDL_QuitSubSystem (U32 flags)
		722
673	SDL_Quit ()	723	void SDL_Quit ()
		724
		725	int SDL_GL_SetAttribute (int attr, int value)
		726
		727	int SDL_GL_GetAttribute (int attr)
		728	CODE:
		729	if (SDL_GL_GetAttribute (attr, &RETVAL))
		730	XSRETURN_UNDEF;
		731	OUTPUT:
		732	RETVAL
674		733
675	void	734	void
676	SDL_ListModes (int rgb, int alpha)	735	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	736	PPCODE:
678	{	737	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	749	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	750	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	751	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		752
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	753	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695	#if SDL_VERSION_ATLEAST(1,2,10)
696	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	754	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		755
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	756	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		757
702	if (m && m != (SDL_Rect **)-1)	758	if (m && m != (SDL_Rect **)-1)
703	while (*m)	759	while (*m)
704	{	760	{
705	if ((m)->w >= 800 && (m)->h >= 600)	761	if ((m)->w >= 400 && (m)->h >= 300)
706	{	762	{
707	AV *av = newAV ();	763	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	764	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	765	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	766	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	808	SDL_GetKeyName (int sym)
753		809
754	int	810	int
755	SDL_GetAppState ()	811	SDL_GetAppState ()
756		812
		813	int
		814	SDL_GetModState ()
		815
757	void	816	void
758	poll_events ()	817	poll_events ()
759	PPCODE:	818	PPCODE:
760	{	819	{
761	SDL_Event ev;	820	SDL_Event ev;
…		…
770	{	829	{
771	case SDL_KEYDOWN:	830	case SDL_KEYDOWN:
772	case SDL_KEYUP:	831	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	832	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	833	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	834	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 */	835	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);	836	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	837	break;
779		838
780	case SDL_ACTIVEEVENT:	839	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	840	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	858	x = ev.motion.x;
800	y = ev.motion.y;	859	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	860	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	861	}
803		862
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	863	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	864	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	865	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	866	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	867	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	868	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	869	}
811	break;	870	break;
812		871
813	case SDL_MOUSEBUTTONDOWN:	872	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	873	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	874	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		875
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	876	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	877	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	878	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	879	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	884	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	885	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	886	break;
828	}	887	}
829		888
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	889	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	890	}
832	}	891	}
833		892
834	int	893	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	894	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	953	}
895	}	954	}
896	#endif	955	#endif
897	}	956	}
898		957
899	void	958	int
900	add_font (char *file)	959	add_font (char *file)
901	CODE:	960	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	961	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		962	OUTPUT:
		963	RETVAL
903		964
904	void	965	void
905	load_image_inline (SV *image_)	966	load_image_inline (SV *image_)
906	ALIAS:	967	ALIAS:
907	load_image_file = 1	968	load_image_file = 1
…		…
1023	#if DEBUG	1084	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1085	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1086	#endif
1026	}	1087	}
1027		1088
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1089	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1090
1030	PROTOTYPES: DISABLE	1091	PROTOTYPES: DISABLE
1031		1092
1032	CFPlus::Font	1093	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1094	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1095	CODE:
1035	{	1096	{
1036	int count;	1097	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1098	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1101	}
1041	OUTPUT:	1102	OUTPUT:
1042	RETVAL	1103	RETVAL
1043		1104
1044	void	1105	void
1045	DESTROY (CFPlus::Font self)	1106	DESTROY (DC::Font self)
1046	CODE:	1107	CODE:
1047	pango_font_description_free (self);	1108	pango_font_description_free (self);
1048		1109
1049	void	1110	void
1050	make_default (CFPlus::Font self)	1111	make_default (DC::Font self)
1051	PROTOTYPE: $	1112	PROTOTYPE: $
1052	CODE:	1113	CODE:
1053	default_font = self;	1114	default_font = self;
1054		1115
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1116	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1117
1057	PROTOTYPES: DISABLE	1118	PROTOTYPES: DISABLE
1058		1119
1059	void	1120	void
1060	glyph_cache_backup ()	1121	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1127	glyph_cache_restore ()
1067	PROTOTYPE:	1128	PROTOTYPE:
1068	CODE:	1129	CODE:
1069	tc_restore ();	1130	tc_restore ();
1070		1131
1071	CFPlus::Layout	1132	DC::Layout
1072	new (SV *class)	1133	new (SV *class)
1073	CODE:	1134	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1135	New (0, RETVAL, 1, struct cf_layout);
1075		1136
1076	RETVAL->pl = pango_layout_new (opengl_context);	1137	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1147	layout_update_font (RETVAL);
1087	OUTPUT:	1148	OUTPUT:
1088	RETVAL	1149	RETVAL
1089		1150
1090	void	1151	void
1091	DESTROY (CFPlus::Layout self)	1152	DESTROY (DC::Layout self)
1092	CODE:	1153	CODE:
1093	g_object_unref (self->pl);	1154	g_object_unref (self->pl);
1094	rc_free (self->rc);	1155	rc_free (self->rc);
1095	Safefree (self);	1156	Safefree (self);
1096		1157
1097	void	1158	void
1098	set_text (CFPlus::Layout self, SV *text_)	1159	set_text (DC::Layout self, SV *text_)
1099	CODE:	1160	CODE:
1100	{	1161	{
1101	STRLEN textlen;	1162	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1163	char *text = SvPVutf8 (text_, textlen);
1103		1164
1104	pango_layout_set_text (self->pl, text, textlen);	1165	pango_layout_set_text (self->pl, text, textlen);
1105	}	1166	}
1106		1167
1107	void	1168	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1169	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1170	CODE:
1110	{	1171	{
1111	STRLEN textlen;	1172	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1173	char *text = SvPVutf8 (text_, textlen);
1113		1174
1114	pango_layout_set_markup (self->pl, text, textlen);	1175	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1176	}
1116		1177
1117	void	1178	void
1118	set_shapes (CFPlus::Layout self, ...)	1179	set_shapes (DC::Layout self, ...)
1119	CODE:	1180	CODE:
1120	{	1181	{
1121	PangoAttrList *attrs = 0;	1182	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1183	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1184	const char *pos = text;
…		…
1158	if (attrs)	1219	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1220	pango_layout_set_attributes (self->pl, attrs);
1160	}	1221	}
1161		1222
1162	void	1223	void
1163	get_shapes (CFPlus::Layout self)	1224	get_shapes (DC::Layout self)
1164	PPCODE:	1225	PPCODE:
1165	{	1226	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1227	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1228
1168	do	1229	do
1169	{	1230	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1231	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1232
1172	if (run && shape_attr_p (run))	1233	if (run && shape_attr_p (run))
1173	{	1234	{
1174	PangoRectangle extents;	1235	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1236	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1244
1184	pango_layout_iter_free (iter);	1245	pango_layout_iter_free (iter);
1185	}	1246	}
1186		1247
1187	int	1248	int
1188	has_wrapped (CFPlus::Layout self)	1249	has_wrapped (DC::Layout self)
1189	CODE:	1250	CODE:
1190	{	1251	{
1191	int lines = 1;	1252	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1253	const char *text = pango_layout_get_text (self->pl);
1193		1254
…		…
1198	}	1259	}
1199	OUTPUT:	1260	OUTPUT:
1200	RETVAL	1261	RETVAL
1201		1262
1202	SV *	1263	SV *
1203	get_text (CFPlus::Layout self)	1264	get_text (DC::Layout self)
1204	CODE:	1265	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1266	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1267	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1268	OUTPUT:
1208	RETVAL	1269	RETVAL
1209		1270
1210	void	1271	void
1211	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1272	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212	CODE:	1273	CODE:
1213	self->r = r;	1274	self->r = r;
1214	self->g = g;	1275	self->g = g;
1215	self->b = b;	1276	self->b = b;
1216	self->a = a;	1277	self->a = a;
1217		1278
1218	void	1279	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1280	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1281	CODE:
1221	if (self->font != font)	1282	if (self->font != font)
1222	{	1283	{
1223	self->font = font;	1284	self->font = font;
1224	layout_update_font (self);	1285	layout_update_font (self);
1225	}	1286	}
1226		1287
1227	void	1288	void
1228	set_height (CFPlus::Layout self, int base_height)	1289	set_height (DC::Layout self, int base_height)
1229	CODE:	1290	CODE:
1230	if (self->base_height != base_height)	1291	if (self->base_height != base_height)
1231	{	1292	{
1232	self->base_height = base_height;	1293	self->base_height = base_height;
1233	layout_update_font (self);	1294	layout_update_font (self);
1234	}	1295	}
1235		1296
1236	void	1297	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1298	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1299	CODE:
1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1300	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240		1301
1241	void	1302	void
1242	set_indent (CFPlus::Layout self, int indent)	1303	set_indent (DC::Layout self, int indent)
1243	CODE:	1304	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1305	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1306
1246	void	1307	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1308	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1309	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1310	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1311
1251	void	1312	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1313	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1314	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1315	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1316	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1317	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1318	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1319	: PANGO_ELLIPSIZE_NONE
1259	);	1320	);
1260		1321
1261	void	1322	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1323	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1324	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1325	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1326
1266	void	1327	void
1267	size (CFPlus::Layout self)	1328	size (DC::Layout self)
1268	PPCODE:	1329	PPCODE:
1269	{	1330	{
1270	int w, h;	1331	int w, h;
1271		1332
1272	layout_get_pixel_size (self, &w, &h);	1333	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1336	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1337	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1338	}
1278		1339
1279	int	1340	int
1280	descent (CFPlus::Layout self)	1341	descent (DC::Layout self)
1281	CODE:	1342	CODE:
1282	{	1343	{
1283	PangoRectangle rect;	1344	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1345	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1346	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1347	RETVAL = PANGO_DESCENT (rect);
1287	}	1348	}
1288	OUTPUT:	1349	OUTPUT:
1289	RETVAL	1350	RETVAL
1290		1351
1291	int	1352	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1353	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1354	CODE:
1294	{	1355	{
1295	int index, trailing;	1356	int index, trailing;
1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1357	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297	RETVAL = index + trailing;	1358	RETVAL = index + trailing;
1298	}	1359	}
1299	OUTPUT:	1360	OUTPUT:
1300	RETVAL	1361	RETVAL
1301		1362
1302	void	1363	void
1303	cursor_pos (CFPlus::Layout self, int index)	1364	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1365	PPCODE:
1305	{	1366	{
1306	PangoRectangle strong_pos;	1367	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1368	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1369
1309	EXTEND (SP, 3);	1370	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1371	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1372	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1373	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1374	}
1314		1375
1315	void	1376	void
1316	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1377	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1378	PPCODE:
1318	{	1379	{
1319	int line, x;	1380	int line, x;
1320		1381
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1382	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1383	#if !PANGO_VERSION_CHECK (1, 17, 3)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1384	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1385	--line;
		1386	#endif
1324	EXTEND (SP, 2);	1387	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1388	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1389	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1390	}
1328		1391
1329	void	1392	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1393	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1394	PPCODE:
1332	{	1395	{
1333	PangoLayoutLine *lp;	1396	PangoLayoutLine *lp;
1334	int index, trailing;	1397	int index, trailing;
1335		1398
1336	if (line < 0)	1399	if (line < 0)
1337	XSRETURN_EMPTY;	1400	XSRETURN_EMPTY;
1338		1401
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1402	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1403	XSRETURN_EMPTY; /* do better */
1341		1404
1342	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1405	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343		1406
1344	EXTEND (SP, 2);	1407	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1413	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1414	}
1352	}	1415	}
1353		1416
1354	void	1417	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1418	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1419	CODE:
1357	rc_clear (self->rc);	1420	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1421	pango_opengl_render_layout_subpixel (
1359	self->pl,	1422	self->pl,
1360	self->rc,	1423	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1428	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1429	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1430	pango_layout_context_changed (self->pl);
1368		1431
1369	void	1432	void
1370	draw (CFPlus::Layout self)	1433	draw (DC::Layout self)
1371	CODE:	1434	CODE:
1372	{	1435	{
1373	glEnable (GL_TEXTURE_2D);	1436	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1437	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1438	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1446	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1447	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1448	glDisable (GL_TEXTURE_2D);
1386	}	1449	}
1387		1450
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1451	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1452
1390	PROTOTYPES: ENABLE	1453	PROTOTYPES: ENABLE
1391		1454
1392	void	1455	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1456	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1472	RETVAL = width > 0;	1535	RETVAL = width > 0;
1473	}	1536	}
1474	OUTPUT:	1537	OUTPUT:
1475	RETVAL	1538	RETVAL
1476		1539
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1540	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1541
1479	PROTOTYPES: DISABLE	1542	PROTOTYPES: DISABLE
1480		1543
1481	CFPlus::Map	1544	DC::Map
1482	new (SV *class)	1545	new (SV *class)
1483	CODE:	1546	CODE:
1484	New (0, RETVAL, 1, struct map);	1547	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1548	RETVAL->x = 0;
1486	RETVAL->y = 0;	1549	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1557	RETVAL->row = 0;
1495	OUTPUT:	1558	OUTPUT:
1496	RETVAL	1559	RETVAL
1497		1560
1498	void	1561	void
1499	DESTROY (CFPlus::Map self)	1562	DESTROY (DC::Map self)
1500	CODE:	1563	CODE:
1501	{	1564	{
1502	map_clear (self);	1565	map_clear (self);
1503	Safefree (self->face2tile);	1566	Safefree (self->face2tile);
1504	Safefree (self->tex);	1567	Safefree (self->tex);
1505	Safefree (self);	1568	Safefree (self);
1506	}	1569	}
1507		1570
1508	void	1571	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1572	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1573	CODE:
1511	self->w = map_width;	1574	self->w = map_width;
1512	self->h = map_height;	1575	self->h = map_height;
1513		1576
1514	void	1577	void
1515	clear (CFPlus::Map self)	1578	clear (DC::Map self)
1516	CODE:	1579	CODE:
1517	map_clear (self);	1580	map_clear (self);
1518		1581
1519	void	1582	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1583	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1584	CODE:
1522	{	1585	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1586	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1587	need_texid (self, tile);
1525	}	1588	}
1526		1589
1527	void	1590	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1591	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1592	CODE:
1530	{	1593	{
1531	tileid texid;	1594	tileid texid;
1532	maptex *tex;	1595	maptex *tex;
1533		1596
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1609	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1610	tex->smoothlevel = level;
1548	}	1611	}
1549		1612
1550	void	1613	void
1551	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)	1614	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)
1552	CODE:	1615	CODE:
1553	{	1616	{
1554	need_texid (self, texid);	1617	need_texid (self, texid);
1555		1618
1556	{	1619	{
…		…
1576	// from transparent color bleeding and ugly wrapping effects.	1639	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1640	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1641	}
1579		1642
1580	int	1643	int
1581	ox (CFPlus::Map self)	1644	ox (DC::Map self)
1582	ALIAS:	1645	ALIAS:
1583	oy = 1	1646	oy = 1
1584	x = 2	1647	x = 2
1585	y = 3	1648	y = 3
1586	w = 4	1649	w = 4
…		…
1597	}	1660	}
1598	OUTPUT:	1661	OUTPUT:
1599	RETVAL	1662	RETVAL
1600		1663
1601	void	1664	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1665	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1666	CODE:
1604	{	1667	{
1605	if (dx > 0)	1668	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1669	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1670	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1686	self->y += MAP_EXTEND_Y;
1624	}	1687	}
1625	}	1688	}
1626		1689
1627	SV *	1690	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1691	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1692	CODE:
1630	{	1693	{
1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1694	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1632	uint8_t data_end = (uint8_t )SvEND (data_);	1695	uint8_t data_end = (uint8_t )SvEND (data_);
1633	mapcell *cell;	1696	mapcell *cell;
…		…
1661	uint8_t ext, cmd;	1724	uint8_t ext, cmd;
1662		1725
1663	do	1726	do
1664	{	1727	{
1665	ext = *data++;	1728	ext = *data++;
1666	cmd = ext & 0x3f;	1729	cmd = ext & 0x7f;
1667		1730
1668	if (cmd < 4)	1731	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	1732	cell->darkness = 255 - ext * 64 + 1;
1670	else if (cmd == 5) // health	1733	else if (cmd == 5) // health
1671	{	1734	{
…		…
1674	}	1737	}
1675	else if (cmd == 6) // monster width	1738	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	1739	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	1740	else if (cmd == 0x47)
1678	{	1741	{
1679	if (*data == 4)	1742	if (*data == 1) cell->player = data [1];
1680	; // decode player count	1743	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1744	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1745	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681		1746
1682	data += *data + 1;	1747	data += *data + 1;
1683	}	1748	}
1684	else if (cmd == 8) // cell flags	1749	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	1750	cell->flags = *data++;
…		…
1722	}	1787	}
1723	OUTPUT:	1788	OUTPUT:
1724	RETVAL	1789	RETVAL
1725		1790
1726	SV *	1791	SV *
1727	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1792	mapmap (DC::Map self, int x0, int y0, int w, int h)
1728	CODE:	1793	CODE:
1729	{	1794	{
1730	int x1, x;	1795	int x1, x;
1731	int y1, y;	1796	int y1, y;
1732	int z;	1797	int z;
…		…
1777	}	1842	}
1778	OUTPUT:	1843	OUTPUT:
1779	RETVAL	1844	RETVAL
1780		1845
1781	void	1846	void
1782	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1847	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1783	CODE:	1848	CODE:
1784	{	1849	{
1785	int x, y, z;	1850	int x, y, z;
1786		1851
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1852	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1788	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1853	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1854	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790	smooth_key skey;	1855	smooth_key skey;
1791		1856	int pl_x, pl_y;
		1857	maptex pl_tex;
1792	rc_t *rc = rc_alloc ();	1858	rc_t *rc = rc_alloc ();
1793	rc_key_t key;	1859	rc_key_t key;
1794	rc_array_t *arr;	1860	rc_array_t *arr;
		1861
		1862	pl_tex.name = 0;
1795		1863
1796	// thats current max. sorry.	1864	// thats current max. sorry.
1797	if (sw > 255) sw = 255;	1865	if (sw > 255) sw = 255;
1798	if (sh > 255) sh = 255;	1866	if (sh > 255) sh = 255;
1799		1867
…		…
1854	tileid tile = cell->tile [z];	1922	tileid tile = cell->tile [z];
1855		1923
1856	if (tile)	1924	if (tile)
1857	{	1925	{
1858	maptex tex = self->tex [tile];	1926	maptex tex = self->tex [tile];
1859	int px, py;	1927	int px = (x + 1) * T - tex.w;
		1928	int py = (y + 1) * T - tex.h;
1860		1929
1861	if (key.texname != tex.name)	1930	if (key.texname != tex.name)
1862	{	1931	{
1863	if (!tex.name)	1932	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	1933	tex = self->tex [2]; /* missing, replace by noface */
1865		1934
1866	key.texname = tex.name;	1935	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	1936	arr = rc_array (rc, &key);
1868	}	1937	}
1869		1938
1870	px = (x + 1) * T - tex.w;	1939	if (expect_false (cell->player == player) && expect_false (z == 2))
1871	py = (y + 1) * T - tex.h;	1940	{
		1941	pl_x = px;
		1942	pl_y = py;
		1943	pl_tex = tex;
		1944	continue;
		1945	}
1872		1946
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1947	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1948	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1949	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1950	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877		1951
1878	if (cell->flags && z == 2)	1952	if (expect_false (cell->flags) && expect_false (z == 2))
1879	{	1953	{
1880	// overlays such as the speech bubble, probably more to come	1954	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)	1955	if (cell->flags & 1)
1882	{	1956	{
1883	maptex tex = self->tex [1];	1957	maptex tex = self->tex [1];
…		…
2022	}	2096	}
2023		2097
2024	hv_clear (smooth);	2098	hv_clear (smooth);
2025	}	2099	}
2026		2100
		2101	if (pl_tex.name)
		2102	{
		2103	maptex tex = pl_tex;
		2104	int px = pl_x + pdx;
		2105	int py = pl_y + pdy;
		2106
		2107	key.texname = tex.name;
		2108	arr = rc_array (rc, &key);
		2109
		2110	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2111	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2112	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2113	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2114
		2115	rc_draw (rc);
		2116	}
		2117
2027	glDisable (GL_BLEND);	2118	glDisable (GL_BLEND);
2028	rc_free (rc);	2119	rc_free (rc);
2029		2120
2030	// top layer: overlays such as the health bar	2121	// top layer: overlays such as the health bar
2031	for (y = 0; y < sh; y++)	2122	for (y = 0; y < sh; y++)
…		…
2058	}	2149	}
2059	}	2150	}
2060	}	2151	}
2061		2152
2062	void	2153	void
2063	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2154	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064	CODE:	2155	CODE:
2065	{	2156	{
2066	static float color[16][3] = {	2157	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2158	{ 0.00F, 0.00F, 0.00F },
2068	{ 1.00F, 1.00F, 1.00F },	2159	{ 1.00F, 1.00F, 1.00F },
…		…
2118	glDisable (GL_BLEND);	2209	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2210	glDisable (GL_TEXTURE_2D);
2120	}	2211	}
2121		2212
2122	void	2213	void
2123	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2214	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124	PPCODE:	2215	PPCODE:
2125	{	2216	{
2126	int x, y;	2217	int x, y;
2127	int sw1 = sw + 2;	2218	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2219	int sh1 = sh + 2;
…		…
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2290	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2291	PUSHs (darkness3_sv);
2201	}	2292	}
2202		2293
2203	SV *	2294	SV *
2204	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2295	get_rect (DC::Map self, int x0, int y0, int w, int h)
2205	CODE:	2296	CODE:
2206	{	2297	{
2207	int x, y, x1, y1;	2298	int x, y, x1, y1;
2208	SV data_sv = newSV (w h * 7 + 5);	2299	SV data_sv = newSV (w h * 7 + 5);
2209	uint8_t data = (uint8_t )SvPVX (data_sv);	2300	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2266	else	2357	else
2267	*data++ = 0;	2358	*data++ = 0;
2268	}	2359	}
2269	}	2360	}
2270		2361
		2362	/* if size is wh + 5 then no data has been found /
		2363	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2364	{
2271	SvPOK_only (data_sv);	2365	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2366	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2367	}
		2368
2273	RETVAL = data_sv;	2369	RETVAL = data_sv;
2274	}	2370	}
2275	OUTPUT:	2371	OUTPUT:
2276	RETVAL	2372	RETVAL
2277		2373
2278	void	2374	void
2279	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2375	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280	PPCODE:	2376	PPCODE:
2281	{	2377	{
2282	int x, y, z;	2378	int x, y, z;
2283	int w, h;	2379	int w, h;
2284	int x1, y1;	2380	int x1, y1;
		2381	STRLEN len;
		2382	uint8_t data, end;
		2383
		2384	len = SvLEN (data_sv);
		2385	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2386	data = SvPVbyte_nolen (data_sv);
		2387	end = data + len + 8;
		2388
		2389	if (len < 5)
		2390	XSRETURN_EMPTY;
2285		2391
2286	if (*data++ != 0)	2392	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2393	XSRETURN_EMPTY; /* version mismatch */
2288		2394
2289	w = data++ << 8; w \|= data++;	2395	w = data++ << 8; w \|= data++;
…		…
2304	{	2410	{
2305	maprow *row = map_get_row (self, y);	2411	maprow *row = map_get_row (self, y);
2306		2412
2307	for (x = x0; x < x1; x++)	2413	for (x = x0; x < x1; x++)
2308	{	2414	{
		2415	uint8_t flags;
		2416
		2417	if (data + 7 >= end)
		2418	XSRETURN_EMPTY;
		2419
2309	uint8_t flags = *data++;	2420	flags = *data++;
2310		2421
2311	if (flags)	2422	if (flags)
2312	{	2423	{
2313	mapcell *cell = row_get_cell (row, x);	2424	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2425	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2428	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2318	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2429	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2319		2430
2320	if (cell->darkness == 0)	2431	if (cell->darkness == 0)
2321	{	2432	{
2322	cell->darkness = 0;	2433	/cell->darkness = 0;/
		2434	EXTEND (SP, 3);
2323		2435
2324	for (z = 0; z <= 2; z++)	2436	for (z = 0; z <= 2; z++)
2325	{	2437	{
2326	tileid t = tile [z];	2438	tileid t = tile [z];
2327		2439
2328	if (t >= self->texs \|\| (t && !self->tex [t].name))	2440	if (t >= self->texs \|\| (t && !self->tex [t].name))
2329	{	2441	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2442	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2443	need_texid (self, t);
2332	}	2444	}
2333		2445
2334	cell->tile [z] = t;	2446	cell->tile [z] = t;
2335	}	2447	}
…		…
2337	}	2449	}
2338	}	2450	}
2339	}	2451	}
2340	}	2452	}
2341		2453
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2454	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2455
2344	CFPlus::RW	2456	DC::RW
2345	new (SV class, SV data_sv)	2457	new (SV class, SV data_sv)
2346	CODE:	2458	CODE:
2347	{	2459	{
2348	STRLEN datalen;	2460	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2461	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2463	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2464	}
2353	OUTPUT:	2465	OUTPUT:
2354	RETVAL	2466	RETVAL
2355		2467
2356	CFPlus::RW	2468	DC::RW
2357	new_from_file (SV class, const char path, const char *mode = "rb")	2469	new_from_file (SV class, const char path, const char *mode = "rb")
2358	CODE:	2470	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2471	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2472	OUTPUT:
2361	RETVAL	2473	RETVAL
2362		2474
2363	# fails on win32:	2475	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2476	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2477	#void
2366	#close (CFPlus::RW self)	2478	#close (DC::RW self)
2367	# CODE:	2479	# CODE:
2368	# (self->(close)) (self);	2480	# (self->(close)) (self);
2369		2481
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2482	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2483
2372	PROTOTYPES: DISABLE	2484	PROTOTYPES: DISABLE
2373		2485
2374	CFPlus::Channel	2486	DC::Channel
2375	find ()	2487	find ()
2376	CODE:	2488	CODE:
2377	{	2489	{
2378	RETVAL = Mix_GroupAvailable (-1);	2490	RETVAL = Mix_GroupAvailable (-1);
2379		2491
…		…
2392	}	2504	}
2393	OUTPUT:	2505	OUTPUT:
2394	RETVAL	2506	RETVAL
2395		2507
2396	void	2508	void
2397	halt (CFPlus::Channel self)	2509	halt (DC::Channel self)
2398	CODE:	2510	CODE:
2399	Mix_HaltChannel (self);	2511	Mix_HaltChannel (self);
2400		2512
2401	void	2513	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2514	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2515	CODE:
2404	Mix_ExpireChannel (self, ticks);	2516	Mix_ExpireChannel (self, ticks);
2405		2517
2406	void	2518	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2519	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2520	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2521	Mix_FadeOutChannel (self, ticks);
2410		2522
2411	int	2523	int
2412	volume (CFPlus::Channel self, int volume)	2524	volume (DC::Channel self, int volume)
2413	CODE:	2525	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2526	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2527	OUTPUT:
2416	RETVAL	2528	RETVAL
2417		2529
2418	void	2530	void
2419	unregister_all_effects (CFPlus::Channel self)	2531	unregister_all_effects (DC::Channel self)
2420	CODE:	2532	CODE:
2421	Mix_UnregisterAllEffects (self);	2533	Mix_UnregisterAllEffects (self);
2422		2534
2423	void	2535	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2536	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2537	CODE:
2426	left = CLAMP (left , 0, 255);	2538	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2539	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2540	Mix_SetPanning (self, left, right);
2429		2541
2430	void	2542	void
2431	set_distance (CFPlus::Channel self, int distance)	2543	set_distance (DC::Channel self, int distance)
2432	CODE:	2544	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2545	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2546
2435	void	2547	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2548	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2549	CODE:
2438		2550
2439	void	2551	void
2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2552	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441	CODE:	2553	CODE:
2442	{	2554	{
2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2555	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2556	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2557	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2558	}
2447		2559
2448	void	2560	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2561	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2562	CODE:
2451	Mix_SetReverseStereo (self, flip);	2563	Mix_SetReverseStereo (self, flip);
2452		2564
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2565	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2566
2455	PROTOTYPES: DISABLE	2567	PROTOTYPES: DISABLE
2456		2568
2457	CFPlus::MixChunk	2569	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2570	new (SV *class, DC::RW rwops)
2459	CODE:	2571	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2572	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2573	OUTPUT:
2462	RETVAL	2574	RETVAL
2463		2575
2464	void	2576	void
2465	DESTROY (CFPlus::MixChunk self)	2577	DESTROY (DC::MixChunk self)
2466	CODE:	2578	CODE:
2467	Mix_FreeChunk (self);	2579	Mix_FreeChunk (self);
2468		2580
2469	int	2581	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2582	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2583	CODE:
2472	if (items > 1)	2584	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2585	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2586	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2587	OUTPUT:
2476	RETVAL	2588	RETVAL
2477		2589
2478	CFPlus::Channel	2590	DC::Channel
2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2591	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480	CODE:	2592	CODE:
2481	{	2593	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2594	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2595
2484	if (RETVAL < 0)	2596	if (RETVAL < 0)
…		…
2491	}	2603	}
2492	}	2604	}
2493	OUTPUT:	2605	OUTPUT:
2494	RETVAL	2606	RETVAL
2495		2607
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2608	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2609
2498	int	2610	int
2499	volume (int volume = -1)	2611	volume (int volume = -1)
2500	PROTOTYPE: ;$	2612	PROTOTYPE: ;$
2501	CODE:	2613	CODE:
…		…
2513	void	2625	void
2514	halt ()	2626	halt ()
2515	CODE:	2627	CODE:
2516	Mix_HaltMusic ();	2628	Mix_HaltMusic ();
2517		2629
2518	CFPlus::MixMusic	2630	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2631	new (SV *class, DC::RW rwops)
2520	CODE:	2632	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2633	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2634	OUTPUT:
2523	RETVAL	2635	RETVAL
2524		2636
2525	void	2637	void
2526	DESTROY (CFPlus::MixMusic self)	2638	DESTROY (DC::MixMusic self)
2527	CODE:	2639	CODE:
2528	Mix_FreeMusic (self);	2640	Mix_FreeMusic (self);
2529		2641
2530	int	2642	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2643	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2644	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2645	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2646	OUTPUT:
2535	RETVAL	2647	RETVAL
2536		2648
2537	void	2649	void
2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2650	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539	CODE:	2651	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2652	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2653
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2654	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2655
2544	PROTOTYPES: ENABLE	2656	PROTOTYPES: ENABLE
2545		2657
2546	BOOT:	2658	BOOT:
2547	{	2659	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2660	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2661	static const struct {
2550	const char *name;	2662	const char *name;
2551	IV iv;	2663	IV iv;
2552	} *civ, const_iv[] = {	2664	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2665	# define const_iv(name) { # name, (IV)name }
…		…
2846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2958	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2847	CODE:	2959	CODE:
2848	if (gl.SeparableFilter2D)	2960	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2961	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		2962
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2963	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		2964
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2965	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		2966
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2967	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		2968
…		…
2882		2994
2883	void glEndList ()	2995	void glEndList ()
2884		2996
2885	void glCallList (int list)	2997	void glCallList (int list)
2886		2998
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2999	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		3000
2889	PROTOTYPES: DISABLE	3001	PROTOTYPES: DISABLE
2890		3002
2891	void	3003	void
2892	find_widget (SV *self, NV x, NV y)	3004	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	3008	XPUSHs (self);
2897	}	3009	}
2898		3010
2899	BOOT:	3011	BOOT:
2900	{	3012	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3013	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		3014
2903	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3015	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3016	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3017	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3018	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907	}	3019	}
2908		3020
2909	void	3021	void
2910	draw (SV *self)	3022	draw (SV *self)
2911	CODE:	3023	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	3030	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	3031	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	3032	double draw_x, draw_y;
2921		3033
2922	if (!SvROK (self))	3034	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3035	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		3036
2925	hv = (HV *)SvRV (self);	3037	hv = (HV *)SvRV (self);
2926		3038
2927	if (SvTYPE (hv) != SVt_PVHV)	3039	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3040	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		3041
2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3042	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3043	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932		3044
2933	if (!h \|\| !w)	3045	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs. Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC