[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.270 by root, Sun Jul 20 15:05:13 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);
…		…
350	self->oy = 0;	367	self->oy = 0;
351	self->row = 0;	368	self->row = 0;
352	self->rows = 0;	369	self->rows = 0;
353	}	370	}
354		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	if ((cell)->player) \
		375	(cell)->tile [2] = 0; \
		376	(cell)->darkness = 0; \
		377	(cell)->stat_hp = 0; \
		378	(cell)->flags = 0; \
		379	(cell)->player = 0; \
		380	} while (0)
		381
355	static void	382	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	383	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	384	{
358	int x, y;	385	int x, y;
359	maprow *row;	386	maprow *row;
360	mapcell *cell;	387	mapcell *cell;
361		388
…		…
373	if (x >= row->c1)	400	if (x >= row->c1)
374	break;	401	break;
375		402
376	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
377		404
378	cell->darkness = 0;	405	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	406	}
383	}	407	}
384	}	408	}
385		409
386	typedef struct {	410	typedef struct {
…		…
498	return 0;	522	return 0;
499		523
500	return 1;	524	return 1;
501	}	525	}
502		526
503	MODULE = CFPlus PACKAGE = CFPlus	527	MODULE = Deliantra::Client PACKAGE = DC
504		528
505	PROTOTYPES: ENABLE	529	PROTOTYPES: ENABLE
506		530
507	BOOT:	531	BOOT:
508	{	532	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	533	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	534	static const struct {
511	const char *name;	535	const char *name;
512	IV iv;	536	IV iv;
513	} *civ, const_iv[] = {	537	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	538	# define const_iv(name) { # name, (IV)name }
…		…
621	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
624		648
625	const_iv (MIX_DEFAULT_FORMAT),	649	const_iv (MIX_DEFAULT_FORMAT),
		650
		651	const_iv (SDL_INIT_TIMER),
		652	const_iv (SDL_INIT_AUDIO),
		653	const_iv (SDL_INIT_VIDEO),
		654	const_iv (SDL_INIT_CDROM),
		655	const_iv (SDL_INIT_JOYSTICK),
		656	const_iv (SDL_INIT_EVERYTHING),
		657	const_iv (SDL_INIT_NOPARACHUTE),
		658	const_iv (SDL_INIT_EVENTTHREAD),
		659
		660	const_iv (SDL_GL_RED_SIZE),
		661	const_iv (SDL_GL_GREEN_SIZE),
		662	const_iv (SDL_GL_BLUE_SIZE),
		663	const_iv (SDL_GL_ALPHA_SIZE),
		664	const_iv (SDL_GL_DOUBLEBUFFER),
		665	const_iv (SDL_GL_BUFFER_SIZE),
		666	const_iv (SDL_GL_DEPTH_SIZE),
		667	const_iv (SDL_GL_STENCIL_SIZE),
		668	const_iv (SDL_GL_ACCUM_RED_SIZE),
		669	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		670	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		671	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		672	const_iv (SDL_GL_STEREO),
		673	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		674	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		675	const_iv (SDL_GL_ACCELERATED_VISUAL),
		676	const_iv (SDL_GL_SWAP_CONTROL),
		677
		678	const_iv (FOW_DARKNESS)
626	# undef const_iv	679	# undef const_iv
627	};	680	};
628		681
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	682	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	683	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
648		701
649	NV floor (NV x)	702	NV floor (NV x)
650		703
651	NV ceil (NV x)	704	NV ceil (NV x)
652		705
		706	NV ceilabs (NV x)
		707	CODE:
		708	RETVAL = x < 0. ? - ceil (-x) : ceil (x);
		709	OUTPUT:
		710	RETVAL
		711
653	IV minpot (UV n)	712	IV minpot (UV n)
654		713
655	IV popcount (UV n)	714	IV popcount (UV n)
656		715
657	void	716	void
…		…
659	CODE:	718	CODE:
660	{	719	{
661	opengl_fontmap = pango_opengl_font_map_new ();	720	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	721	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);	722	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		723	/pango_context_set_font_description (opengl_context, default_font);/
		724	#if PANGO_VERSION_CHECK (1, 15, 2)
		725	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		726	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		727	#endif
664	}	728	}
665		729
666	char *
667	SDL_GetError ()	730	char *SDL_GetError ()
668		731
669	int	732	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		733
672	void	734	int SDL_InitSubSystem (U32 flags)
		735
		736	void SDL_QuitSubSystem (U32 flags)
		737
673	SDL_Quit ()	738	void SDL_Quit ()
		739
		740	int SDL_GL_SetAttribute (int attr, int value)
		741
		742	int SDL_GL_GetAttribute (int attr)
		743	CODE:
		744	if (SDL_GL_GetAttribute (attr, &RETVAL))
		745	XSRETURN_UNDEF;
		746	OUTPUT:
		747	RETVAL
674		748
675	void	749	void
676	SDL_ListModes (int rgb, int alpha)	750	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	751	PPCODE:
678	{	752	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	764	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	765	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	766	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		767
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	768	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);	769	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		770
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	771	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		772
702	if (m && m != (SDL_Rect **)-1)	773	if (m && m != (SDL_Rect **)-1)
703	while (*m)	774	while (*m)
704	{	775	{
705	if ((m)->w >= 800 && (m)->h >= 600)	776	if ((m)->w >= 400 && (m)->h >= 300)
706	{	777	{
707	AV *av = newAV ();	778	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	779	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	780	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	781	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	823	SDL_GetKeyName (int sym)
753		824
754	int	825	int
755	SDL_GetAppState ()	826	SDL_GetAppState ()
756		827
		828	int
		829	SDL_GetModState ()
		830
757	void	831	void
758	poll_events ()	832	poll_events ()
759	PPCODE:	833	PPCODE:
760	{	834	{
761	SDL_Event ev;	835	SDL_Event ev;
…		…
770	{	844	{
771	case SDL_KEYDOWN:	845	case SDL_KEYDOWN:
772	case SDL_KEYUP:	846	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	847	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	848	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	849	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 */	850	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);	851	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	852	break;
779		853
780	case SDL_ACTIVEEVENT:	854	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	855	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	873	x = ev.motion.x;
800	y = ev.motion.y;	874	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	875	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	876	}
803		877
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	878	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	879	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	880	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	881	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	882	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	883	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	884	}
811	break;	885	break;
812		886
813	case SDL_MOUSEBUTTONDOWN:	887	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	888	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	889	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		890
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	891	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	892	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	893	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	894	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	899	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	900	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	901	break;
828	}	902	}
829		903
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	904	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	905	}
832	}	906	}
833		907
834	int	908	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	909	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	968	}
895	}	969	}
896	#endif	970	#endif
897	}	971	}
898		972
899	void	973	int
900	add_font (char *file)	974	add_font (char *file)
901	CODE:	975	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	976	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		977	OUTPUT:
		978	RETVAL
903		979
904	void	980	void
905	load_image_inline (SV *image_)	981	load_image_inline (SV *image_)
906	ALIAS:	982	ALIAS:
907	load_image_file = 1	983	load_image_file = 1
…		…
1023	#if DEBUG	1099	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1100	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1101	#endif
1026	}	1102	}
1027		1103
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1104	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1105
1030	PROTOTYPES: DISABLE	1106	PROTOTYPES: DISABLE
1031		1107
1032	CFPlus::Font	1108	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1109	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1110	CODE:
1035	{	1111	{
1036	int count;	1112	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1113	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1116	}
1041	OUTPUT:	1117	OUTPUT:
1042	RETVAL	1118	RETVAL
1043		1119
1044	void	1120	void
1045	DESTROY (CFPlus::Font self)	1121	DESTROY (DC::Font self)
1046	CODE:	1122	CODE:
1047	pango_font_description_free (self);	1123	pango_font_description_free (self);
1048		1124
1049	void	1125	void
1050	make_default (CFPlus::Font self)	1126	make_default (DC::Font self)
1051	PROTOTYPE: $	1127	PROTOTYPE: $
1052	CODE:	1128	CODE:
1053	default_font = self;	1129	default_font = self;
1054		1130
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1131	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1132
1057	PROTOTYPES: DISABLE	1133	PROTOTYPES: DISABLE
1058		1134
1059	void	1135	void
1060	glyph_cache_backup ()	1136	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1142	glyph_cache_restore ()
1067	PROTOTYPE:	1143	PROTOTYPE:
1068	CODE:	1144	CODE:
1069	tc_restore ();	1145	tc_restore ();
1070		1146
1071	CFPlus::Layout	1147	DC::Layout
1072	new (SV *class)	1148	new (SV *class)
1073	CODE:	1149	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1150	New (0, RETVAL, 1, struct cf_layout);
1075		1151
1076	RETVAL->pl = pango_layout_new (opengl_context);	1152	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1162	layout_update_font (RETVAL);
1087	OUTPUT:	1163	OUTPUT:
1088	RETVAL	1164	RETVAL
1089		1165
1090	void	1166	void
1091	DESTROY (CFPlus::Layout self)	1167	DESTROY (DC::Layout self)
1092	CODE:	1168	CODE:
1093	g_object_unref (self->pl);	1169	g_object_unref (self->pl);
1094	rc_free (self->rc);	1170	rc_free (self->rc);
1095	Safefree (self);	1171	Safefree (self);
1096		1172
1097	void	1173	void
1098	set_text (CFPlus::Layout self, SV *text_)	1174	set_text (DC::Layout self, SV *text_)
1099	CODE:	1175	CODE:
1100	{	1176	{
1101	STRLEN textlen;	1177	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1178	char *text = SvPVutf8 (text_, textlen);
1103		1179
1104	pango_layout_set_text (self->pl, text, textlen);	1180	pango_layout_set_text (self->pl, text, textlen);
1105	}	1181	}
1106		1182
1107	void	1183	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1184	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1185	CODE:
1110	{	1186	{
1111	STRLEN textlen;	1187	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1188	char *text = SvPVutf8 (text_, textlen);
1113		1189
1114	pango_layout_set_markup (self->pl, text, textlen);	1190	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1191	}
1116		1192
1117	void	1193	void
1118	set_shapes (CFPlus::Layout self, ...)	1194	set_shapes (DC::Layout self, ...)
1119	CODE:	1195	CODE:
1120	{	1196	{
1121	PangoAttrList *attrs = 0;	1197	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1198	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1199	const char *pos = text;
…		…
1158	if (attrs)	1234	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1235	pango_layout_set_attributes (self->pl, attrs);
1160	}	1236	}
1161		1237
1162	void	1238	void
1163	get_shapes (CFPlus::Layout self)	1239	get_shapes (DC::Layout self)
1164	PPCODE:	1240	PPCODE:
1165	{	1241	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1242	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1243
1168	do	1244	do
1169	{	1245	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1246	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1247
1172	if (run && shape_attr_p (run))	1248	if (run && shape_attr_p (run))
1173	{	1249	{
1174	PangoRectangle extents;	1250	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1251	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1259
1184	pango_layout_iter_free (iter);	1260	pango_layout_iter_free (iter);
1185	}	1261	}
1186		1262
1187	int	1263	int
1188	has_wrapped (CFPlus::Layout self)	1264	has_wrapped (DC::Layout self)
1189	CODE:	1265	CODE:
1190	{	1266	{
1191	int lines = 1;	1267	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1268	const char *text = pango_layout_get_text (self->pl);
1193		1269
…		…
1198	}	1274	}
1199	OUTPUT:	1275	OUTPUT:
1200	RETVAL	1276	RETVAL
1201		1277
1202	SV *	1278	SV *
1203	get_text (CFPlus::Layout self)	1279	get_text (DC::Layout self)
1204	CODE:	1280	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1281	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1282	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1283	OUTPUT:
1208	RETVAL	1284	RETVAL
1209		1285
1210	void	1286	void
1211	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1287	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212	CODE:	1288	CODE:
1213	self->r = r;	1289	self->r = r;
1214	self->g = g;	1290	self->g = g;
1215	self->b = b;	1291	self->b = b;
1216	self->a = a;	1292	self->a = a;
1217		1293
1218	void	1294	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1295	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1296	CODE:
1221	if (self->font != font)	1297	if (self->font != font)
1222	{	1298	{
1223	self->font = font;	1299	self->font = font;
1224	layout_update_font (self);	1300	layout_update_font (self);
1225	}	1301	}
1226		1302
1227	void	1303	void
1228	set_height (CFPlus::Layout self, int base_height)	1304	set_height (DC::Layout self, int base_height)
1229	CODE:	1305	CODE:
1230	if (self->base_height != base_height)	1306	if (self->base_height != base_height)
1231	{	1307	{
1232	self->base_height = base_height;	1308	self->base_height = base_height;
1233	layout_update_font (self);	1309	layout_update_font (self);
1234	}	1310	}
1235		1311
1236	void	1312	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1313	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1314	CODE:
1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1315	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240		1316
1241	void	1317	void
1242	set_indent (CFPlus::Layout self, int indent)	1318	set_indent (DC::Layout self, int indent)
1243	CODE:	1319	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1320	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1321
1246	void	1322	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1323	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1324	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1325	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1326
1251	void	1327	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1328	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1329	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1330	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1331	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1332	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1333	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1334	: PANGO_ELLIPSIZE_NONE
1259	);	1335	);
1260		1336
1261	void	1337	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1338	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1339	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1340	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1341
1266	void	1342	void
1267	size (CFPlus::Layout self)	1343	size (DC::Layout self)
1268	PPCODE:	1344	PPCODE:
1269	{	1345	{
1270	int w, h;	1346	int w, h;
1271		1347
1272	layout_get_pixel_size (self, &w, &h);	1348	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1351	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1352	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1353	}
1278		1354
1279	int	1355	int
1280	descent (CFPlus::Layout self)	1356	descent (DC::Layout self)
1281	CODE:	1357	CODE:
1282	{	1358	{
1283	PangoRectangle rect;	1359	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1360	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1361	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1362	RETVAL = PANGO_DESCENT (rect);
1287	}	1363	}
1288	OUTPUT:	1364	OUTPUT:
1289	RETVAL	1365	RETVAL
1290		1366
1291	int	1367	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1368	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1369	CODE:
1294	{	1370	{
1295	int index, trailing;	1371	int index, trailing;
1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1372	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297	RETVAL = index + trailing;	1373	RETVAL = index + trailing;
1298	}	1374	}
1299	OUTPUT:	1375	OUTPUT:
1300	RETVAL	1376	RETVAL
1301		1377
1302	void	1378	void
1303	cursor_pos (CFPlus::Layout self, int index)	1379	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1380	PPCODE:
1305	{	1381	{
1306	PangoRectangle strong_pos;	1382	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1383	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1384
1309	EXTEND (SP, 3);	1385	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1386	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1387	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1388	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1389	}
1314		1390
1315	void	1391	void
1316	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1392	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1393	PPCODE:
1318	{	1394	{
1319	int line, x;	1395	int line, x;
1320		1396
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1397	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1398	#if !PANGO_VERSION_CHECK (1, 17, 3)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1399	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1400	--line;
		1401	#endif
1324	EXTEND (SP, 2);	1402	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1403	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1404	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1405	}
1328		1406
1329	void	1407	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1408	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1409	PPCODE:
1332	{	1410	{
1333	PangoLayoutLine *lp;	1411	PangoLayoutLine *lp;
1334	int index, trailing;	1412	int index, trailing;
1335		1413
1336	if (line < 0)	1414	if (line < 0)
1337	XSRETURN_EMPTY;	1415	XSRETURN_EMPTY;
1338		1416
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1417	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1418	XSRETURN_EMPTY; /* do better */
1341		1419
1342	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1420	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343		1421
1344	EXTEND (SP, 2);	1422	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1428	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1429	}
1352	}	1430	}
1353		1431
1354	void	1432	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1433	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1434	CODE:
1357	rc_clear (self->rc);	1435	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1436	pango_opengl_render_layout_subpixel (
1359	self->pl,	1437	self->pl,
1360	self->rc,	1438	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1443	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1444	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1445	pango_layout_context_changed (self->pl);
1368		1446
1369	void	1447	void
1370	draw (CFPlus::Layout self)	1448	draw (DC::Layout self)
1371	CODE:	1449	CODE:
1372	{	1450	{
1373	glEnable (GL_TEXTURE_2D);	1451	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1452	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1453	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1461	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1462	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1463	glDisable (GL_TEXTURE_2D);
1386	}	1464	}
1387		1465
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1466	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1467
1390	PROTOTYPES: ENABLE	1468	PROTOTYPES: ENABLE
1391		1469
1392	void	1470	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1471	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1472	RETVAL = width > 0;	1550	RETVAL = width > 0;
1473	}	1551	}
1474	OUTPUT:	1552	OUTPUT:
1475	RETVAL	1553	RETVAL
1476		1554
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1555	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1556
1479	PROTOTYPES: DISABLE	1557	PROTOTYPES: DISABLE
1480		1558
1481	CFPlus::Map	1559	DC::Map
1482	new (SV *class)	1560	new (SV *class)
1483	CODE:	1561	CODE:
1484	New (0, RETVAL, 1, struct map);	1562	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1563	RETVAL->x = 0;
1486	RETVAL->y = 0;	1564	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1572	RETVAL->row = 0;
1495	OUTPUT:	1573	OUTPUT:
1496	RETVAL	1574	RETVAL
1497		1575
1498	void	1576	void
1499	DESTROY (CFPlus::Map self)	1577	DESTROY (DC::Map self)
1500	CODE:	1578	CODE:
1501	{	1579	{
1502	map_clear (self);	1580	map_clear (self);
1503	Safefree (self->face2tile);	1581	Safefree (self->face2tile);
1504	Safefree (self->tex);	1582	Safefree (self->tex);
1505	Safefree (self);	1583	Safefree (self);
1506	}	1584	}
1507		1585
1508	void	1586	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1587	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1588	CODE:
1511	self->w = map_width;	1589	self->w = map_width;
1512	self->h = map_height;	1590	self->h = map_height;
1513		1591
1514	void	1592	void
1515	clear (CFPlus::Map self)	1593	clear (DC::Map self)
1516	CODE:	1594	CODE:
1517	map_clear (self);	1595	map_clear (self);
1518		1596
1519	void	1597	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1598	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1599	CODE:
1522	{	1600	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1601	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1602	need_texid (self, tile);
1525	}	1603	}
1526		1604
1527	void	1605	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1606	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1607	CODE:
1530	{	1608	{
1531	tileid texid;	1609	tileid texid;
1532	maptex *tex;	1610	maptex *tex;
1533		1611
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1624	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1625	tex->smoothlevel = level;
1548	}	1626	}
1549		1627
1550	void	1628	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)	1629	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:	1630	CODE:
1553	{	1631	{
1554	need_texid (self, texid);	1632	need_texid (self, texid);
1555		1633
1556	{	1634	{
…		…
1576	// from transparent color bleeding and ugly wrapping effects.	1654	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1655	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1656	}
1579		1657
1580	int	1658	int
1581	ox (CFPlus::Map self)	1659	ox (DC::Map self)
1582	ALIAS:	1660	ALIAS:
1583	oy = 1	1661	oy = 1
1584	x = 2	1662	x = 2
1585	y = 3	1663	y = 3
1586	w = 4	1664	w = 4
…		…
1597	}	1675	}
1598	OUTPUT:	1676	OUTPUT:
1599	RETVAL	1677	RETVAL
1600		1678
1601	void	1679	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1680	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1681	CODE:
1604	{	1682	{
1605	if (dx > 0)	1683	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1684	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1685	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1701	self->y += MAP_EXTEND_Y;
1624	}	1702	}
1625	}	1703	}
1626		1704
1627	SV *	1705	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1706	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1707	CODE:
1630	{	1708	{
1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1709	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1632	uint8_t data_end = (uint8_t )SvEND (data_);	1710	uint8_t data_end = (uint8_t )SvEND (data_);
1633	mapcell *cell;	1711	mapcell *cell;
…		…
1661	uint8_t ext, cmd;	1739	uint8_t ext, cmd;
1662		1740
1663	do	1741	do
1664	{	1742	{
1665	ext = *data++;	1743	ext = *data++;
1666	cmd = ext & 0x3f;	1744	cmd = ext & 0x7f;
1667		1745
1668	if (cmd < 4)	1746	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	1747	cell->darkness = 255 - ext * 64 + 1;
1670	else if (cmd == 5) // health	1748	else if (cmd == 5) // health
1671	{	1749	{
…		…
1674	}	1752	}
1675	else if (cmd == 6) // monster width	1753	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	1754	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	1755	else if (cmd == 0x47)
1678	{	1756	{
1679	if (*data == 4)	1757	if (*data == 1) cell->player = data [1];
1680	; // decode player count	1758	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1759	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1760	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681		1761
1682	data += *data + 1;	1762	data += *data + 1;
1683	}	1763	}
1684	else if (cmd == 8) // cell flags	1764	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	1765	cell->flags = *data++;
…		…
1715	}	1795	}
1716	}	1796	}
1717	}	1797	}
1718	}	1798	}
1719	else	1799	else
1720	cell->darkness = 0;	1800	CELL_CLEAR (cell);
1721	}	1801	}
1722	}	1802	}
1723	OUTPUT:	1803	OUTPUT:
1724	RETVAL	1804	RETVAL
1725		1805
1726	SV *	1806	SV *
1727	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1807	mapmap (DC::Map self, int x0, int y0, int w, int h)
1728	CODE:	1808	CODE:
1729	{	1809	{
1730	int x1, x;	1810	int x1, x;
1731	int y1, y;	1811	int y1, y;
1732	int z;	1812	int z;
…		…
1777	}	1857	}
1778	OUTPUT:	1858	OUTPUT:
1779	RETVAL	1859	RETVAL
1780		1860
1781	void	1861	void
1782	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1862	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783	CODE:	1863	CODE:
1784	{	1864	{
1785	int x, y, z;	1865	int x, y, z;
1786		1866
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1867	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1788	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1868	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)	1869	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790	smooth_key skey;	1870	smooth_key skey;
1791		1871	int pl_x, pl_y;
		1872	maptex pl_tex;
1792	rc_t *rc = rc_alloc ();	1873	rc_t *rc = rc_alloc ();
1793	rc_key_t key;	1874	rc_key_t key;
1794	rc_array_t *arr;	1875	rc_array_t *arr;
		1876
		1877	pl_tex.name = 0;
1795		1878
1796	// thats current max. sorry.	1879	// thats current max. sorry.
1797	if (sw > 255) sw = 255;	1880	if (sw > 255) sw = 255;
1798	if (sh > 255) sh = 255;	1881	if (sh > 255) sh = 255;
1799		1882
…		…
1854	tileid tile = cell->tile [z];	1937	tileid tile = cell->tile [z];
1855		1938
1856	if (tile)	1939	if (tile)
1857	{	1940	{
1858	maptex tex = self->tex [tile];	1941	maptex tex = self->tex [tile];
1859	int px, py;	1942	int px = (x + 1) * T - tex.w;
		1943	int py = (y + 1) * T - tex.h;
1860		1944
1861	if (key.texname != tex.name)	1945	if (key.texname != tex.name)
1862	{	1946	{
1863	if (!tex.name)	1947	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	1948	tex = self->tex [2]; /* missing, replace by noface */
1865		1949
1866	key.texname = tex.name;	1950	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	1951	arr = rc_array (rc, &key);
1868	}	1952	}
1869		1953
1870	px = (x + 1) * T - tex.w;	1954	if (expect_false (cell->player == player) && expect_false (z == 2))
1871	py = (y + 1) * T - tex.h;	1955	{
		1956	pl_x = px;
		1957	pl_y = py;
		1958	pl_tex = tex;
		1959	continue;
		1960	}
1872		1961
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1962	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1963	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);	1964	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);	1965	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877		1966
1878	if (cell->flags && z == 2)	1967	if (expect_false (cell->flags) && expect_false (z == 2))
1879	{	1968	{
1880	// overlays such as the speech bubble, probably more to come	1969	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)	1970	if (cell->flags & 1)
1882	{	1971	{
1883	maptex tex = self->tex [1];	1972	maptex tex = self->tex [1];
…		…
2022	}	2111	}
2023		2112
2024	hv_clear (smooth);	2113	hv_clear (smooth);
2025	}	2114	}
2026		2115
		2116	if (pl_tex.name)
		2117	{
		2118	maptex tex = pl_tex;
		2119	int px = pl_x + sdx;
		2120	int py = pl_y + sdy;
		2121
		2122	key.texname = tex.name;
		2123	arr = rc_array (rc, &key);
		2124
		2125	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2126	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2127	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2128	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2129
		2130	rc_draw (rc);
		2131	}
		2132
2027	glDisable (GL_BLEND);	2133	glDisable (GL_BLEND);
2028	rc_free (rc);	2134	rc_free (rc);
2029		2135
2030	// top layer: overlays such as the health bar	2136	// top layer: overlays such as the health bar
2031	for (y = 0; y < sh; y++)	2137	for (y = 0; y < sh; y++)
…		…
2058	}	2164	}
2059	}	2165	}
2060	}	2166	}
2061		2167
2062	void	2168	void
2063	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2169	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064	CODE:	2170	CODE:
2065	{	2171	{
2066	static float color[16][3] = {	2172	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2173	{ 0.00F, 0.00F, 0.00F },
2068	{ 1.00F, 1.00F, 1.00F },	2174	{ 1.00F, 1.00F, 1.00F },
…		…
2118	glDisable (GL_BLEND);	2224	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2225	glDisable (GL_TEXTURE_2D);
2120	}	2226	}
2121		2227
2122	void	2228	void
2123	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2229	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124	PPCODE:	2230	PPCODE:
2125	{	2231	{
2126	int x, y;	2232	int x, y;
2127	int sw1 = sw + 2;	2233	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2234	int sh1 = sh + 2;
…		…
2136	SvCUR_set (darkness3_sv, sw34 * sh3);	2242	SvCUR_set (darkness3_sv, sw34 * sh3);
2137		2243
2138	mx += self->x - 1;	2244	mx += self->x - 1;
2139	my += self->y - 1;	2245	my += self->y - 1;
2140		2246
2141	memset (darkness1, 255, sw1 * sh1);	2247	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142		2248
2143	for (y = 0; y < sh1; y++)	2249	for (y = 0; y < sh1; y++)
2144	if (0 <= y + my && y + my < self->rows)	2250	if (0 <= y + my && y + my < self->rows)
2145	{	2251	{
2146	maprow *row = self->row + (y + my);	2252	maprow *row = self->row + (y + my);
…		…
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2305	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2306	PUSHs (darkness3_sv);
2201	}	2307	}
2202		2308
2203	SV *	2309	SV *
2204	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2310	get_rect (DC::Map self, int x0, int y0, int w, int h)
2205	CODE:	2311	CODE:
2206	{	2312	{
2207	int x, y, x1, y1;	2313	int x, y, x1, y1;
2208	SV data_sv = newSV (w h * 7 + 5);	2314	SV data_sv = newSV (w h * 7 + 5);
2209	uint8_t data = (uint8_t )SvPVX (data_sv);	2315	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2266	else	2372	else
2267	*data++ = 0;	2373	*data++ = 0;
2268	}	2374	}
2269	}	2375	}
2270		2376
		2377	/* if size is wh + 5 then no data has been found /
		2378	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2379	{
2271	SvPOK_only (data_sv);	2380	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2381	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2382	}
		2383
2273	RETVAL = data_sv;	2384	RETVAL = data_sv;
2274	}	2385	}
2275	OUTPUT:	2386	OUTPUT:
2276	RETVAL	2387	RETVAL
2277		2388
2278	void	2389	void
2279	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2390	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280	PPCODE:	2391	PPCODE:
2281	{	2392	{
2282	int x, y, z;	2393	int x, y, z;
2283	int w, h;	2394	int w, h;
2284	int x1, y1;	2395	int x1, y1;
		2396	STRLEN len;
		2397	uint8_t data, end;
		2398
		2399	len = SvLEN (data_sv);
		2400	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2401	data = SvPVbyte_nolen (data_sv);
		2402	end = data + len + 8;
		2403
		2404	if (len < 5)
		2405	XSRETURN_EMPTY;
2285		2406
2286	if (*data++ != 0)	2407	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2408	XSRETURN_EMPTY; /* version mismatch */
2288		2409
2289	w = data++ << 8; w \|= data++;	2410	w = data++ << 8; w \|= data++;
…		…
2304	{	2425	{
2305	maprow *row = map_get_row (self, y);	2426	maprow *row = map_get_row (self, y);
2306		2427
2307	for (x = x0; x < x1; x++)	2428	for (x = x0; x < x1; x++)
2308	{	2429	{
		2430	uint8_t flags;
		2431
		2432	if (data + 7 >= end)
		2433	XSRETURN_EMPTY;
		2434
2309	uint8_t flags = *data++;	2435	flags = *data++;
2310		2436
2311	if (flags)	2437	if (flags)
2312	{	2438	{
2313	mapcell *cell = row_get_cell (row, x);	2439	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2440	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2443	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2318	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2444	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2319		2445
2320	if (cell->darkness == 0)	2446	if (cell->darkness == 0)
2321	{	2447	{
2322	cell->darkness = 0;	2448	/cell->darkness = 0;/
		2449	EXTEND (SP, 3);
2323		2450
2324	for (z = 0; z <= 2; z++)	2451	for (z = 0; z <= 2; z++)
2325	{	2452	{
2326	tileid t = tile [z];	2453	tileid t = tile [z];
2327		2454
2328	if (t >= self->texs \|\| (t && !self->tex [t].name))	2455	if (t >= self->texs \|\| (t && !self->tex [t].name))
2329	{	2456	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2457	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2458	need_texid (self, t);
2332	}	2459	}
2333		2460
2334	cell->tile [z] = t;	2461	cell->tile [z] = t;
2335	}	2462	}
…		…
2337	}	2464	}
2338	}	2465	}
2339	}	2466	}
2340	}	2467	}
2341		2468
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2469	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2470
2344	CFPlus::RW	2471	DC::RW
2345	new (SV class, SV data_sv)	2472	new (SV class, SV data_sv)
2346	CODE:	2473	CODE:
2347	{	2474	{
2348	STRLEN datalen;	2475	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2476	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2478	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2479	}
2353	OUTPUT:	2480	OUTPUT:
2354	RETVAL	2481	RETVAL
2355		2482
2356	CFPlus::RW	2483	DC::RW
2357	new_from_file (SV class, const char path, const char *mode = "rb")	2484	new_from_file (SV class, const char path, const char *mode = "rb")
2358	CODE:	2485	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2486	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2487	OUTPUT:
2361	RETVAL	2488	RETVAL
2362		2489
2363	# fails on win32:	2490	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2491	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2492	#void
2366	#close (CFPlus::RW self)	2493	#close (DC::RW self)
2367	# CODE:	2494	# CODE:
2368	# (self->(close)) (self);	2495	# (self->(close)) (self);
2369		2496
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2497	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2498
2372	PROTOTYPES: DISABLE	2499	PROTOTYPES: DISABLE
2373		2500
2374	CFPlus::Channel	2501	DC::Channel
2375	find ()	2502	find ()
2376	CODE:	2503	CODE:
2377	{	2504	{
2378	RETVAL = Mix_GroupAvailable (-1);	2505	RETVAL = Mix_GroupAvailable (-1);
2379		2506
…		…
2392	}	2519	}
2393	OUTPUT:	2520	OUTPUT:
2394	RETVAL	2521	RETVAL
2395		2522
2396	void	2523	void
2397	halt (CFPlus::Channel self)	2524	halt (DC::Channel self)
2398	CODE:	2525	CODE:
2399	Mix_HaltChannel (self);	2526	Mix_HaltChannel (self);
2400		2527
2401	void	2528	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2529	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2530	CODE:
2404	Mix_ExpireChannel (self, ticks);	2531	Mix_ExpireChannel (self, ticks);
2405		2532
2406	void	2533	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2534	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2535	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2536	Mix_FadeOutChannel (self, ticks);
2410		2537
2411	int	2538	int
2412	volume (CFPlus::Channel self, int volume)	2539	volume (DC::Channel self, int volume)
2413	CODE:	2540	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2541	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2542	OUTPUT:
2416	RETVAL	2543	RETVAL
2417		2544
2418	void	2545	void
2419	unregister_all_effects (CFPlus::Channel self)	2546	unregister_all_effects (DC::Channel self)
2420	CODE:	2547	CODE:
2421	Mix_UnregisterAllEffects (self);	2548	Mix_UnregisterAllEffects (self);
2422		2549
2423	void	2550	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2551	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2552	CODE:
2426	left = CLAMP (left , 0, 255);	2553	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2554	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2555	Mix_SetPanning (self, left, right);
2429		2556
2430	void	2557	void
2431	set_distance (CFPlus::Channel self, int distance)	2558	set_distance (DC::Channel self, int distance)
2432	CODE:	2559	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2560	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2561
2435	void	2562	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2563	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2564	CODE:
2438		2565
2439	void	2566	void
2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2567	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441	CODE:	2568	CODE:
2442	{	2569	{
2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2570	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);	2571	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2572	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2573	}
2447		2574
2448	void	2575	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2576	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2577	CODE:
2451	Mix_SetReverseStereo (self, flip);	2578	Mix_SetReverseStereo (self, flip);
2452		2579
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2580	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2581
2455	PROTOTYPES: DISABLE	2582	PROTOTYPES: DISABLE
2456		2583
2457	CFPlus::MixChunk	2584	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2585	new (SV *class, DC::RW rwops)
2459	CODE:	2586	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2587	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2588	OUTPUT:
2462	RETVAL	2589	RETVAL
2463		2590
2464	void	2591	void
2465	DESTROY (CFPlus::MixChunk self)	2592	DESTROY (DC::MixChunk self)
2466	CODE:	2593	CODE:
2467	Mix_FreeChunk (self);	2594	Mix_FreeChunk (self);
2468		2595
2469	int	2596	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2597	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2598	CODE:
2472	if (items > 1)	2599	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2600	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2601	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2602	OUTPUT:
2476	RETVAL	2603	RETVAL
2477		2604
2478	CFPlus::Channel	2605	DC::Channel
2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2606	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480	CODE:	2607	CODE:
2481	{	2608	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2609	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2610
2484	if (RETVAL < 0)	2611	if (RETVAL < 0)
…		…
2491	}	2618	}
2492	}	2619	}
2493	OUTPUT:	2620	OUTPUT:
2494	RETVAL	2621	RETVAL
2495		2622
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2623	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2624
2498	int	2625	int
2499	volume (int volume = -1)	2626	volume (int volume = -1)
2500	PROTOTYPE: ;$	2627	PROTOTYPE: ;$
2501	CODE:	2628	CODE:
…		…
2513	void	2640	void
2514	halt ()	2641	halt ()
2515	CODE:	2642	CODE:
2516	Mix_HaltMusic ();	2643	Mix_HaltMusic ();
2517		2644
2518	CFPlus::MixMusic	2645	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2646	new (SV *class, DC::RW rwops)
2520	CODE:	2647	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2648	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2649	OUTPUT:
2523	RETVAL	2650	RETVAL
2524		2651
2525	void	2652	void
2526	DESTROY (CFPlus::MixMusic self)	2653	DESTROY (DC::MixMusic self)
2527	CODE:	2654	CODE:
2528	Mix_FreeMusic (self);	2655	Mix_FreeMusic (self);
2529		2656
2530	int	2657	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2658	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2659	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2660	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2661	OUTPUT:
2535	RETVAL	2662	RETVAL
2536		2663
2537	void	2664	void
2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2665	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539	CODE:	2666	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2667	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2668
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2669	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2670
2544	PROTOTYPES: ENABLE	2671	PROTOTYPES: ENABLE
2545		2672
2546	BOOT:	2673	BOOT:
2547	{	2674	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2675	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2676	static const struct {
2550	const char *name;	2677	const char *name;
2551	IV iv;	2678	IV iv;
2552	} *civ, const_iv[] = {	2679	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2680	# 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)	2973	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2847	CODE:	2974	CODE:
2848	if (gl.SeparableFilter2D)	2975	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2976	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		2977
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2978	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		2979
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2980	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		2981
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2982	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		2983
…		…
2882		3009
2883	void glEndList ()	3010	void glEndList ()
2884		3011
2885	void glCallList (int list)	3012	void glCallList (int list)
2886		3013
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3014	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		3015
2889	PROTOTYPES: DISABLE	3016	PROTOTYPES: DISABLE
2890		3017
2891	void	3018	void
2892	find_widget (SV *self, NV x, NV y)	3019	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	3023	XPUSHs (self);
2897	}	3024	}
2898		3025
2899	BOOT:	3026	BOOT:
2900	{	3027	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3028	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		3029
2903	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3030	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);	3031	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);	3032	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);	3033	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907	}	3034	}
2908		3035
2909	void	3036	void
2910	draw (SV *self)	3037	draw (SV *self)
2911	CODE:	3038	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	3045	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	3046	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	3047	double draw_x, draw_y;
2921		3048
2922	if (!SvROK (self))	3049	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3050	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		3051
2925	hv = (HV *)SvRV (self);	3052	hv = (HV *)SvRV (self);
2926		3053
2927	if (SvTYPE (hv) != SVt_PVHV)	3054	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3055	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		3056
2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3057	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.;	3058	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932		3059
2933	if (!h \|\| !w)	3060	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.270 by root, Sun Jul 20 15:05:13 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.270 by root, Sun Jul 20 15:05:13 2008 UTC