ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.271 by root, Sun Jul 20 15:09:29 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;
		172	rc_t *rc;
155	} *CFPlus__Layout;	173	} *DC__Layout;
156		174
157	static CFPlus__Font default_font;	175	static DC__Font default_font;
158	static PangoContext *opengl_context;	176	static PangoContext *opengl_context;
159	static PangoFontMap *opengl_fontmap;	177	static PangoFontMap *opengl_fontmap;
160		178
161	static void	179	static void
162	substitute_func (FcPattern *pattern, gpointer data)	180	substitute_func (FcPattern *pattern, gpointer data)
…		…
167	#endif	185	#endif
168	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169	}	187	}
170		188
171	static void	189	static void
172	layout_update_font (CFPlus__Layout self)	190	layout_update_font (DC__Layout self)
173	{	191	{
174	/* 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
175	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
176	*/	194	*/
177	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
178		196
179	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
180	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181		199
182	pango_layout_set_font_description (self->pl, font);	200	pango_layout_set_font_description (self->pl, font);
183	}	201	}
184		202
185	static void	203	static void
186	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	204	layout_get_pixel_size (DC__Layout self, int *w, int *h)
187	{	205	{
188	PangoRectangle rect;	206	PangoRectangle rect;
189		207
190	// get_pixel_* wrongly rounds down	208	// get_pixel_* wrongly rounds down
191	pango_layout_get_extents (self->pl, 0, &rect);	209	pango_layout_get_extents (self->pl, 0, &rect);
…		…
202		220
203	typedef uint16_t tileid;	221	typedef uint16_t tileid;
204	typedef uint16_t faceid;	222	typedef uint16_t faceid;
205		223
206	typedef struct {	224	typedef struct {
207	int name;	225	GLuint name;
208	int w, h;	226	int w, h;
209	float s, t;	227	float s, t;
210	uint8_t r, g, b, a;	228	uint8_t r, g, b, a;
211	tileid smoothtile;	229	tileid smoothtile;
212	uint8_t smoothlevel;	230	uint8_t smoothlevel;
…		…
230	int faces; tileid *face2tile; // [faceid]	248	int faces; tileid *face2tile; // [faceid]
231	int texs; maptex *tex; // [tileid]	249	int texs; maptex *tex; // [tileid]
232		250
233	int32_t rows;	251	int32_t rows;
234	maprow *row;	252	maprow *row;
235	} *CFPlus__Map;	253	} *DC__Map;
236		254
237	static char *	255	static char *
238	prepend (char *ptr, int sze, int inc)	256	prepend (char *ptr, int sze, int inc)
239	{	257	{
240	char *p;	258	char *p;
…		…
278	self->texs *= 2;	296	self->texs *= 2;
279	}	297	}
280	}	298	}
281		299
282	static maprow *	300	static maprow *
283	map_get_row (CFPlus__Map self, int y)	301	map_get_row (DC__Map self, int y)
284	{	302	{
285	if (0 > y)	303	if (0 > y)
286	{	304	{
287	int extend = - y + MAP_EXTEND_Y;	305	int extend = - y + MAP_EXTEND_Y;
288	Prepend (maprow, self->row, self->rows, extend);	306	Prepend (maprow, self->row, self->rows, extend);
…		…
326		344
327	return row->col + (x - row->c0);	345	return row->col + (x - row->c0);
328	}	346	}
329		347
330	static mapcell *	348	static mapcell *
331	map_get_cell (CFPlus__Map self, int x, int y)	349	map_get_cell (DC__Map self, int x, int y)
332	{	350	{
333	return row_get_cell (map_get_row (self, y), x);	351	return row_get_cell (map_get_row (self, y), x);
334	}	352	}
335		353
336	static void	354	static void
337	map_clear (CFPlus__Map self)	355	map_clear (DC__Map self)
338	{	356	{
339	int r;	357	int r;
340		358
341	for (r = 0; r < self->rows; r++)	359	for (r = 0; r < self->rows; r++)
342	Safefree (self->row[r].col);	360	Safefree (self->row[r].col);
…		…
349	self->oy = 0;	367	self->oy = 0;
350	self->row = 0;	368	self->row = 0;
351	self->rows = 0;	369	self->rows = 0;
352	}	370	}
353		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
354	static void	382	static void
355	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)
356	{	384	{
357	int x, y;	385	int x, y;
358	maprow *row;	386	maprow *row;
359	mapcell *cell;	387	mapcell *cell;
360		388
…		…
372	if (x >= row->c1)	400	if (x >= row->c1)
373	break;	401	break;
374		402
375	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
376		404
377	cell->darkness = 0;	405	CELL_CLEAR (cell);
378	cell->stat_hp = 0;
379	cell->flags = 0;
380	cell->player = 0;
381	}	406	}
382	}	407	}
383	}	408	}
384		409
385	typedef struct {	410	typedef struct {
…		…
439	n |= n >> 16;	464	n |= n >> 16;
440		465
441	return n + 1;	466	return n + 1;
442	}	467	}
443		468
		469	static unsigned int
		470	popcount (unsigned int n)
		471	{
		472	n -= (n >> 1) & 0x55555555U;
		473	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		474	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		475	n *= 0x01010101U;
		476
		477	return n >> 24;
		478	}
		479
444	/* SDL should provide this, really. */	480	/* SDL should provide this, really. */
445	#define SDLK_MODIFIER_MIN 300	481	#define SDLK_MODIFIER_MIN 300
446	#define SDLK_MODIFIER_MAX 314	482	#define SDLK_MODIFIER_MAX 314
447		483
448	/******************************************************************************/	484	/******************************************************************************/
…		…
486	return 0;	522	return 0;
487		523
488	return 1;	524	return 1;
489	}	525	}
490		526
491	MODULE = CFPlus PACKAGE = CFPlus	527	MODULE = Deliantra::Client PACKAGE = DC
492		528
493	PROTOTYPES: ENABLE	529	PROTOTYPES: ENABLE
494		530
495	BOOT:	531	BOOT:
496	{	532	{
497	HV *stash = gv_stashpv ("CFPlus", 1);	533	HV *stash = gv_stashpv ("DC", 1);
498	static const struct {	534	static const struct {
499	const char *name;	535	const char *name;
500	IV iv;	536	IV iv;
501	} *civ, const_iv[] = {	537	} *civ, const_iv[] = {
502	# define const_iv(name) { # name, (IV)name }	538	# define const_iv(name) { # name, (IV)name }
…		…
524		560
525	const_iv (SDL_APPINPUTFOCUS),	561	const_iv (SDL_APPINPUTFOCUS),
526	const_iv (SDL_APPMOUSEFOCUS),	562	const_iv (SDL_APPMOUSEFOCUS),
527	const_iv (SDL_APPACTIVE),	563	const_iv (SDL_APPACTIVE),
528		564
		565	const_iv (SDLK_FIRST),
		566	const_iv (SDLK_LAST),
529	const_iv (SDLK_KP0),	567	const_iv (SDLK_KP0),
530	const_iv (SDLK_KP1),	568	const_iv (SDLK_KP1),
531	const_iv (SDLK_KP2),	569	const_iv (SDLK_KP2),
532	const_iv (SDLK_KP3),	570	const_iv (SDLK_KP3),
533	const_iv (SDLK_KP4),	571	const_iv (SDLK_KP4),
…		…
605	const_iv (KMOD_LMETA),	643	const_iv (KMOD_LMETA),
606	const_iv (KMOD_RMETA),	644	const_iv (KMOD_RMETA),
607	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
608	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
609	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
		648
		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)
610	# undef const_iv	679	# undef const_iv
611	};	680	};
612		681
613	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; )
614	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	683	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
632		701
633	NV floor (NV x)	702	NV floor (NV x)
634		703
635	NV ceil (NV x)	704	NV ceil (NV x)
636		705
		706	IV minpot (UV n)
		707
		708	IV popcount (UV n)
		709
637	void	710	void
638	pango_init ()	711	pango_init ()
639	CODE:	712	CODE:
640	{	713	{
641	opengl_fontmap = pango_opengl_font_map_new ();	714	opengl_fontmap = pango_opengl_font_map_new ();
642	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	715	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	716	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		717	/*pango_context_set_font_description (opengl_context, default_font);*/
		718	#if PANGO_VERSION_CHECK (1, 15, 2)
		719	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		720	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		721	#endif
644	}	722	}
645		723
646	char *
647	SDL_GetError ()	724	char *SDL_GetError ()
648		725
649	int	726	int SDL_Init (U32 flags)
650	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651		727
652	void	728	int SDL_InitSubSystem (U32 flags)
		729
		730	void SDL_QuitSubSystem (U32 flags)
		731
653	SDL_Quit ()	732	void SDL_Quit ()
		733
		734	int SDL_GL_SetAttribute (int attr, int value)
		735
		736	int SDL_GL_GetAttribute (int attr)
		737	CODE:
		738	if (SDL_GL_GetAttribute (attr, &RETVAL))
		739	XSRETURN_UNDEF;
		740	OUTPUT:
		741	RETVAL
654		742
655	void	743	void
656	SDL_ListModes (int rgb, int alpha)	744	SDL_ListModes (int rgb, int alpha)
657	PPCODE:	745	PPCODE:
658	{	746	{
…		…
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	758	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	759	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	760	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673		761
674	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	762	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675	#if SDL_VERSION_ATLEAST(1,2,10)
676	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	763	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678	#endif
679		764
680	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	765	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681		766
682	if (m && m != (SDL_Rect **)-1)	767	if (m && m != (SDL_Rect **)-1)
683	while (*m)	768	while (*m)
684	{	769	{
685	if ((*m)->w >= 640 && (*m)->h >= 480)	770	if ((*m)->w >= 400 && (*m)->h >= 300)
686	{	771	{
687	AV *av = newAV ();	772	AV *av = newAV ();
688	av_push (av, newSViv ((*m)->w));	773	av_push (av, newSViv ((*m)->w));
689	av_push (av, newSViv ((*m)->h));	774	av_push (av, newSViv ((*m)->h));
690	av_push (av, newSViv (rgb));	775	av_push (av, newSViv (rgb));
…		…
714		799
715	if (RETVAL)	800	if (RETVAL)
716	{	801	{
717	av_clear (texture_av);	802	av_clear (texture_av);
718		803
719	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	804	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	805	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721	#include "glfunc.h"	806	#include "glfunc.h"
722	#undef GL_FUNC	807	#undef GL_FUNC
723	}	808	}
724	}	809	}
…		…
731	char *	816	char *
732	SDL_GetKeyName (int sym)	817	SDL_GetKeyName (int sym)
733		818
734	int	819	int
735	SDL_GetAppState ()	820	SDL_GetAppState ()
		821
		822	int
		823	SDL_GetModState ()
736		824
737	void	825	void
738	poll_events ()	826	poll_events ()
739	PPCODE:	827	PPCODE:
740	{	828	{
…		…
750	{	838	{
751	case SDL_KEYDOWN:	839	case SDL_KEYDOWN:
752	case SDL_KEYUP:	840	case SDL_KEYUP:
753	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	841	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	842	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	843	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
756	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	844	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
757	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	845	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758	break;	846	break;
759		847
760	case SDL_ACTIVEEVENT:	848	case SDL_ACTIVEEVENT:
761	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	849	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
779	x = ev.motion.x;	867	x = ev.motion.x;
780	y = ev.motion.y;	868	y = ev.motion.y;
781	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	869	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782	}	870	}
783		871
784	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	872	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785	hv_store (hv, "state", 5, newSViv (state), 0);	873	hv_store (hv, "state", 5, newSViv (state), 0);
786	hv_store (hv, "x", 1, newSViv (x), 0);	874	hv_store (hv, "x", 1, newSViv (x), 0);
787	hv_store (hv, "y", 1, newSViv (y), 0);	875	hv_store (hv, "y", 1, newSViv (y), 0);
788	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	876	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	877	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790	}	878	}
791	break;	879	break;
792		880
793	case SDL_MOUSEBUTTONDOWN:	881	case SDL_MOUSEBUTTONDOWN:
794	case SDL_MOUSEBUTTONUP:	882	case SDL_MOUSEBUTTONUP:
795	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	883	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796		884
797	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	885	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	886	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	887	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	888	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
805	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	893	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	894	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807	break;	895	break;
808	}	896	}
809		897
810	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	898	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811	}	899	}
812	}	900	}
813		901
814	int	902	int
815	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	903	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816	POSTCALL:	904	POSTCALL:
817	Mix_HookMusicFinished (music_finished);	905	Mix_HookMusicFinished (music_finished);
818	Mix_ChannelFinished (channel_finished);	906	Mix_ChannelFinished (channel_finished);
		907
		908	void
		909	Mix_QuerySpec ()
		910	PPCODE:
		911	{
		912	int freq, channels;
		913	Uint16 format;
		914
		915	if (Mix_QuerySpec (&freq, &format, &channels))
		916	{
		917	EXTEND (SP, 3);
		918	PUSHs (sv_2mortal (newSViv (freq)));
		919	PUSHs (sv_2mortal (newSViv (format)));
		920	PUSHs (sv_2mortal (newSViv (channels)));
		921	}
		922	}
819		923
820	void	924	void
821	Mix_CloseAudio ()	925	Mix_CloseAudio ()
822		926
823	int	927	int
…		…
858	}	962	}
859	}	963	}
860	#endif	964	#endif
861	}	965	}
862		966
863	void	967	int
864	add_font (char *file)	968	add_font (char *file)
865	CODE:	969	CODE:
866	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	970	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		971	OUTPUT:
		972	RETVAL
867		973
868	void	974	void
869	load_image_inline (SV *image_)	975	load_image_inline (SV *image_)
870	ALIAS:	976	ALIAS:
871	load_image_file = 1	977	load_image_file = 1
…		…
957	void	1063	void
958	error (char *message)	1064	error (char *message)
959	CODE:	1065	CODE:
960	fprintf (stderr, "ERROR: %s\n", message);	1066	fprintf (stderr, "ERROR: %s\n", message);
961	#ifdef _WIN32	1067	#ifdef _WIN32
962	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1068	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963	#endif	1069	#endif
964		1070
965	void	1071	void
966	fatal (char *message)	1072	fatal (char *message)
967	CODE:	1073	CODE:
968	fprintf (stderr, "FATAL: %s\n", message);	1074	fprintf (stderr, "FATAL: %s\n", message);
969	#ifdef _WIN32	1075	#ifdef _WIN32
970	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1076	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971	#endif	1077	#endif
972	_exit (1);	1078	_exit (1);
973		1079
974	void	1080	void
975	_exit (int retval = 0)	1081	_exit (int retval = 0)
…		…
987	#if DEBUG	1093	#if DEBUG
988	VALGRIND_DO_LEAK_CHECK;	1094	VALGRIND_DO_LEAK_CHECK;
989	#endif	1095	#endif
990	}	1096	}
991		1097
992	MODULE = CFPlus PACKAGE = CFPlus::Font	1098	MODULE = Deliantra::Client PACKAGE = DC::Font
993		1099
994	PROTOTYPES: DISABLE	1100	PROTOTYPES: DISABLE
995		1101
996	CFPlus::Font	1102	DC::Font
997	new_from_file (SV *class, char *path, int id = 0)	1103	new_from_file (SV *class, char *path, int id = 0)
998	CODE:	1104	CODE:
999	{	1105	{
1000	int count;	1106	int count;
1001	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1107	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1004	}	1110	}
1005	OUTPUT:	1111	OUTPUT:
1006	RETVAL	1112	RETVAL
1007		1113
1008	void	1114	void
1009	DESTROY (CFPlus::Font self)	1115	DESTROY (DC::Font self)
1010	CODE:	1116	CODE:
1011	pango_font_description_free (self);	1117	pango_font_description_free (self);
1012		1118
1013	void	1119	void
1014	make_default (CFPlus::Font self)	1120	make_default (DC::Font self)
1015	PROTOTYPE: $	1121	PROTOTYPE: $
1016	CODE:	1122	CODE:
1017	default_font = self;	1123	default_font = self;
1018		1124
1019	MODULE = CFPlus PACKAGE = CFPlus::Layout	1125	MODULE = Deliantra::Client PACKAGE = DC::Layout
1020		1126
1021	PROTOTYPES: DISABLE	1127	PROTOTYPES: DISABLE
1022		1128
1023	void	1129	void
1024	reset_glyph_cache ()	1130	glyph_cache_backup ()
1025	PROTOTYPE:	1131	PROTOTYPE:
1026	CODE:	1132	CODE:
		1133	tc_backup ();
		1134
		1135	void
		1136	glyph_cache_restore ()
		1137	PROTOTYPE:
		1138	CODE:
1027	tc_clear ();	1139	tc_restore ();
1028		1140
1029	CFPlus::Layout	1141	DC::Layout
1030	new (SV *class)	1142	new (SV *class)
1031	CODE:	1143	CODE:
1032	New (0, RETVAL, 1, struct cf_layout);	1144	New (0, RETVAL, 1, struct cf_layout);
1033		1145
1034	RETVAL->pl = pango_layout_new (opengl_context);	1146	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1036	RETVAL->g = 1.;	1148	RETVAL->g = 1.;
1037	RETVAL->b = 1.;	1149	RETVAL->b = 1.;
1038	RETVAL->a = 1.;	1150	RETVAL->a = 1.;
1039	RETVAL->base_height = MIN_FONT_HEIGHT;	1151	RETVAL->base_height = MIN_FONT_HEIGHT;
1040	RETVAL->font = 0;	1152	RETVAL->font = 0;
		1153	RETVAL->rc = rc_alloc ();
1041		1154
1042	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1155	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043	layout_update_font (RETVAL);	1156	layout_update_font (RETVAL);
1044	OUTPUT:	1157	OUTPUT:
1045	RETVAL	1158	RETVAL
1046		1159
1047	void	1160	void
1048	DESTROY (CFPlus::Layout self)	1161	DESTROY (DC::Layout self)
1049	CODE:	1162	CODE:
1050	g_object_unref (self->pl);	1163	g_object_unref (self->pl);
		1164	rc_free (self->rc);
1051	Safefree (self);	1165	Safefree (self);
1052		1166
1053	void	1167	void
1054	set_text (CFPlus::Layout self, SV *text_)	1168	set_text (DC::Layout self, SV *text_)
1055	CODE:	1169	CODE:
1056	{	1170	{
1057	STRLEN textlen;	1171	STRLEN textlen;
1058	char *text = SvPVutf8 (text_, textlen);	1172	char *text = SvPVutf8 (text_, textlen);
1059		1173
1060	pango_layout_set_text (self->pl, text, textlen);	1174	pango_layout_set_text (self->pl, text, textlen);
1061	}	1175	}
1062		1176
1063	void	1177	void
1064	set_markup (CFPlus::Layout self, SV *text_)	1178	set_markup (DC::Layout self, SV *text_)
1065	CODE:	1179	CODE:
1066	{	1180	{
1067	STRLEN textlen;	1181	STRLEN textlen;
1068	char *text = SvPVutf8 (text_, textlen);	1182	char *text = SvPVutf8 (text_, textlen);
1069		1183
1070	pango_layout_set_markup (self->pl, text, textlen);	1184	pango_layout_set_markup (self->pl, text, textlen);
1071	}	1185	}
1072		1186
1073	void	1187	void
1074	set_shapes (CFPlus::Layout self, ...)	1188	set_shapes (DC::Layout self, ...)
1075	CODE:	1189	CODE:
1076	{	1190	{
1077	PangoAttrList *attrs = 0;	1191	PangoAttrList *attrs = 0;
1078	const char *text = pango_layout_get_text (self->pl);	1192	const char *text = pango_layout_get_text (self->pl);
1079	const char *pos = text;	1193	const char *pos = text;
…		…
1114	if (attrs)	1228	if (attrs)
1115	pango_layout_set_attributes (self->pl, attrs);	1229	pango_layout_set_attributes (self->pl, attrs);
1116	}	1230	}
1117		1231
1118	void	1232	void
1119	get_shapes (CFPlus::Layout self)	1233	get_shapes (DC::Layout self)
1120	PPCODE:	1234	PPCODE:
1121	{	1235	{
1122	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1236	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123		1237
1124	do	1238	do
1125	{	1239	{
1126	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1240	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127		1241
1128	if (run && shape_attr_p (run))	1242	if (run && shape_attr_p (run))
1129	{	1243	{
1130	PangoRectangle extents;	1244	PangoRectangle extents;
1131	pango_layout_iter_get_run_extents (iter, 0, &extents);	1245	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1139		1253
1140	pango_layout_iter_free (iter);	1254	pango_layout_iter_free (iter);
1141	}	1255	}
1142		1256
1143	int	1257	int
1144	has_wrapped (CFPlus::Layout self)	1258	has_wrapped (DC::Layout self)
1145	CODE:	1259	CODE:
1146	{	1260	{
1147	int lines = 1;	1261	int lines = 1;
1148	const char *text = pango_layout_get_text (self->pl);	1262	const char *text = pango_layout_get_text (self->pl);
1149		1263
…		…
1154	}	1268	}
1155	OUTPUT:	1269	OUTPUT:
1156	RETVAL	1270	RETVAL
1157		1271
1158	SV *	1272	SV *
1159	get_text (CFPlus::Layout self)	1273	get_text (DC::Layout self)
1160	CODE:	1274	CODE:
1161	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1275	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162	sv_utf8_decode (RETVAL);	1276	sv_utf8_decode (RETVAL);
1163	OUTPUT:	1277	OUTPUT:
1164	RETVAL	1278	RETVAL
1165		1279
1166	void	1280	void
1167	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1281	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168	CODE:	1282	CODE:
1169	self->r = r;	1283	self->r = r;
1170	self->g = g;	1284	self->g = g;
1171	self->b = b;	1285	self->b = b;
1172	self->a = a;	1286	self->a = a;
1173		1287
1174	void	1288	void
1175	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1289	set_font (DC::Layout self, DC::Font font = 0)
1176	CODE:	1290	CODE:
1177	if (self->font != font)	1291	if (self->font != font)
1178	{	1292	{
1179	self->font = font;	1293	self->font = font;
1180	layout_update_font (self);	1294	layout_update_font (self);
1181	}	1295	}
1182		1296
1183	void	1297	void
1184	set_height (CFPlus::Layout self, int base_height)	1298	set_height (DC::Layout self, int base_height)
1185	CODE:	1299	CODE:
1186	if (self->base_height != base_height)	1300	if (self->base_height != base_height)
1187	{	1301	{
1188	self->base_height = base_height;	1302	self->base_height = base_height;
1189	layout_update_font (self);	1303	layout_update_font (self);
1190	}	1304	}
1191		1305
1192	void	1306	void
1193	set_width (CFPlus::Layout self, int max_width = -1)	1307	set_width (DC::Layout self, int max_width = -1)
1194	CODE:	1308	CODE:
1195	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1309	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196		1310
1197	void	1311	void
1198	set_indent (CFPlus::Layout self, int indent)	1312	set_indent (DC::Layout self, int indent)
1199	CODE:	1313	CODE:
1200	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1314	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201		1315
1202	void	1316	void
1203	set_spacing (CFPlus::Layout self, int spacing)	1317	set_spacing (DC::Layout self, int spacing)
1204	CODE:	1318	CODE:
1205	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1319	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206		1320
1207	void	1321	void
1208	set_ellipsise (CFPlus::Layout self, int ellipsise)	1322	set_ellipsise (DC::Layout self, int ellipsise)
1209	CODE:	1323	CODE:
1210	pango_layout_set_ellipsize (self->pl,	1324	pango_layout_set_ellipsize (self->pl,
1211	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1325	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1326	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1327	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214	: PANGO_ELLIPSIZE_NONE	1328	: PANGO_ELLIPSIZE_NONE
1215	);	1329	);
1216		1330
1217	void	1331	void
1218	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1332	set_single_paragraph_mode (DC::Layout self, int spm)
1219	CODE:	1333	CODE:
1220	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1334	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221		1335
1222	void	1336	void
1223	size (CFPlus::Layout self)	1337	size (DC::Layout self)
1224	PPCODE:	1338	PPCODE:
1225	{	1339	{
1226	int w, h;	1340	int w, h;
1227		1341
1228	layout_get_pixel_size (self, &w, &h);	1342	layout_get_pixel_size (self, &w, &h);
…		…
1231	PUSHs (sv_2mortal (newSViv (w)));	1345	PUSHs (sv_2mortal (newSViv (w)));
1232	PUSHs (sv_2mortal (newSViv (h)));	1346	PUSHs (sv_2mortal (newSViv (h)));
1233	}	1347	}
1234		1348
1235	int	1349	int
1236	descent (CFPlus::Layout self)	1350	descent (DC::Layout self)
1237	CODE:	1351	CODE:
1238	{	1352	{
1239	PangoRectangle rect;	1353	PangoRectangle rect;
1240	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1354	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241	pango_layout_line_get_pixel_extents (line, 0, &rect);	1355	pango_layout_line_get_pixel_extents (line, 0, &rect);
1242	RETVAL = PANGO_DESCENT (rect);	1356	RETVAL = PANGO_DESCENT (rect);
1243	}	1357	}
1244	OUTPUT:	1358	OUTPUT:
1245	RETVAL	1359	RETVAL
1246		1360
1247	int	1361	int
1248	xy_to_index (CFPlus::Layout self, int x, int y)	1362	xy_to_index (DC::Layout self, int x, int y)
1249	CODE:	1363	CODE:
1250	{	1364	{
1251	int index, trailing;	1365	int index, trailing;
1252	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1366	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253	RETVAL = index + trailing;	1367	RETVAL = index + trailing;
1254	}	1368	}
1255	OUTPUT:	1369	OUTPUT:
1256	RETVAL	1370	RETVAL
1257		1371
1258	void	1372	void
1259	cursor_pos (CFPlus::Layout self, int index)	1373	cursor_pos (DC::Layout self, int index)
1260	PPCODE:	1374	PPCODE:
1261	{	1375	{
1262	PangoRectangle strong_pos;	1376	PangoRectangle pos;
1263	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1377	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264		1378
1265	EXTEND (SP, 3);	1379	EXTEND (SP, 3);
1266	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1380	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1381	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1382	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269	}	1383	}
1270		1384
1271	void	1385	void
1272	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1386	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273	PPCODE:	1387	PPCODE:
1274	{	1388	{
1275	int line, x;	1389	int line, x;
1276		1390
1277	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1391	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1392	#if !PANGO_VERSION_CHECK (1, 17, 3)
1278	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1393	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279		1394	--line;
		1395	#endif
1280	EXTEND (SP, 2);	1396	EXTEND (SP, 2);
1281	PUSHs (sv_2mortal (newSViv (line - 1)));	1397	PUSHs (sv_2mortal (newSViv (line)));
1282	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1398	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283	}	1399	}
1284		1400
1285	void	1401	void
1286	line_x_to_index (CFPlus::Layout self, int line, int x)	1402	line_x_to_index (DC::Layout self, int line, int x)
1287	PPCODE:	1403	PPCODE:
1288	{	1404	{
1289	PangoLayoutLine *lp;	1405	PangoLayoutLine *lp;
1290	int index, trailing;	1406	int index, trailing;
1291		1407
1292	if (line < 0)	1408	if (line < 0)
1293	XSRETURN_EMPTY;	1409	XSRETURN_EMPTY;
1294		1410
1295	if (!(lp = pango_layout_get_line (self->pl, line)))	1411	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296	XSRETURN_EMPTY; /* do better */	1412	XSRETURN_EMPTY; /* do better */
1297		1413
1298	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1414	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299		1415
1300	EXTEND (SP, 2);	1416	EXTEND (SP, 2);
…		…
1306	PUSHs (sv_2mortal (newSViv (trailing)));	1422	PUSHs (sv_2mortal (newSViv (trailing)));
1307	}	1423	}
1308	}	1424	}
1309		1425
1310	void	1426	void
1311	render (CFPlus::Layout self, float x, float y, int flags = 0)	1427	render (DC::Layout self, float x, float y, int flags = 0)
1312	PPCODE:	1428	CODE:
		1429	rc_clear (self->rc);
1313	pango_opengl_render_layout_subpixel (	1430	pango_opengl_render_layout_subpixel (
1314	self->pl,	1431	self->pl,
		1432	self->rc,
1315	x * PANGO_SCALE, y * PANGO_SCALE,	1433	x * PANGO_SCALE, y * PANGO_SCALE,
1316	self->r, self->g, self->b, self->a,	1434	self->r, self->g, self->b, self->a,
1317	flags	1435	flags
1318	);	1436	);
		1437	// we assume that context_change actually clears/frees stuff
		1438	// and does not do any recomputation...
		1439	pango_layout_context_changed (self->pl);
1319		1440
1320	MODULE = CFPlus PACKAGE = CFPlus::Texture	1441	void
		1442	draw (DC::Layout self)
		1443	CODE:
		1444	{
		1445	glEnable (GL_TEXTURE_2D);
		1446	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1447	glEnable (GL_BLEND);
		1448	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1449	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1450	glEnable (GL_ALPHA_TEST);
		1451	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1452
		1453	rc_draw (self->rc);
		1454
		1455	glDisable (GL_ALPHA_TEST);
		1456	glDisable (GL_BLEND);
		1457	glDisable (GL_TEXTURE_2D);
		1458	}
		1459
		1460	MODULE = Deliantra::Client PACKAGE = DC::Texture
1321		1461
1322	PROTOTYPES: ENABLE	1462	PROTOTYPES: ENABLE
1323
1324	int minpot (int n)
1325		1463
1326	void	1464	void
1327	pad (SV *data_, int ow, int oh, int nw, int nh)	1465	pad (SV *data_, int ow, int oh, int nw, int nh)
1328	CODE:	1466	CODE:
1329	{	1467	{
…		…
1406	RETVAL = width > 0;	1544	RETVAL = width > 0;
1407	}	1545	}
1408	OUTPUT:	1546	OUTPUT:
1409	RETVAL	1547	RETVAL
1410		1548
1411	MODULE = CFPlus PACKAGE = CFPlus::Map	1549	MODULE = Deliantra::Client PACKAGE = DC::Map
1412		1550
1413	PROTOTYPES: DISABLE	1551	PROTOTYPES: DISABLE
1414		1552
1415	CFPlus::Map	1553	DC::Map
1416	new (SV *class)	1554	new (SV *class)
1417	CODE:	1555	CODE:
1418	New (0, RETVAL, 1, struct map);	1556	New (0, RETVAL, 1, struct map);
1419	RETVAL->x = 0;	1557	RETVAL->x = 0;
1420	RETVAL->y = 0;	1558	RETVAL->y = 0;
…		…
1428	RETVAL->row = 0;	1566	RETVAL->row = 0;
1429	OUTPUT:	1567	OUTPUT:
1430	RETVAL	1568	RETVAL
1431		1569
1432	void	1570	void
1433	DESTROY (CFPlus::Map self)	1571	DESTROY (DC::Map self)
1434	CODE:	1572	CODE:
1435	{	1573	{
1436	map_clear (self);	1574	map_clear (self);
1437	Safefree (self->face2tile);	1575	Safefree (self->face2tile);
1438	Safefree (self->tex);	1576	Safefree (self->tex);
1439	Safefree (self);	1577	Safefree (self);
1440	}	1578	}
1441		1579
1442	void	1580	void
1443	resize (CFPlus::Map self, int map_width, int map_height)	1581	resize (DC::Map self, int map_width, int map_height)
1444	CODE:	1582	CODE:
1445	self->w = map_width;	1583	self->w = map_width;
1446	self->h = map_height;	1584	self->h = map_height;
1447		1585
1448	void	1586	void
1449	clear (CFPlus::Map self)	1587	clear (DC::Map self)
1450	CODE:	1588	CODE:
1451	map_clear (self);	1589	map_clear (self);
1452		1590
1453	void	1591	void
1454	set_tileid (CFPlus::Map self, int face, int tile)	1592	set_tileid (DC::Map self, int face, int tile)
1455	CODE:	1593	CODE:
1456	{	1594	{
1457	need_facenum (self, face); self->face2tile [face] = tile;	1595	need_facenum (self, face); self->face2tile [face] = tile;
1458	need_texid (self, tile);	1596	need_texid (self, tile);
1459	}	1597	}
1460		1598
1461	void	1599	void
1462	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1600	set_smooth (DC::Map self, int face, int smooth, int level)
1463	CODE:	1601	CODE:
1464	{	1602	{
1465	tileid texid;	1603	tileid texid;
1466	maptex *tex;	1604	maptex *tex;
1467		1605
…		…
1480	tex->smoothtile = self->face2tile [smooth];	1618	tex->smoothtile = self->face2tile [smooth];
1481	tex->smoothlevel = level;	1619	tex->smoothlevel = level;
1482	}	1620	}
1483		1621
1484	void	1622	void
1485	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)	1623	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)
1486	CODE:	1624	CODE:
1487	{	1625	{
1488	need_texid (self, texid);	1626	need_texid (self, texid);
1489		1627
1490	{	1628	{
…		…
1510	// from transparent color bleeding and ugly wrapping effects.	1648	// from transparent color bleeding and ugly wrapping effects.
1511	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1649	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512	}	1650	}
1513		1651
1514	int	1652	int
1515	ox (CFPlus::Map self)	1653	ox (DC::Map self)
1516	ALIAS:	1654	ALIAS:
1517	oy = 1	1655	oy = 1
1518	x = 2	1656	x = 2
1519	y = 3	1657	y = 3
1520	w = 4	1658	w = 4
…		…
1531	}	1669	}
1532	OUTPUT:	1670	OUTPUT:
1533	RETVAL	1671	RETVAL
1534		1672
1535	void	1673	void
1536	scroll (CFPlus::Map self, int dx, int dy)	1674	scroll (DC::Map self, int dx, int dy)
1537	CODE:	1675	CODE:
1538	{	1676	{
1539	if (dx > 0)	1677	if (dx > 0)
1540	map_blank (self, self->x, self->y, dx, self->h);	1678	map_blank (self, self->x, self->y, dx, self->h);
1541	else if (dx < 0)	1679	else if (dx < 0)
…		…
1557	self->y += MAP_EXTEND_Y;	1695	self->y += MAP_EXTEND_Y;
1558	}	1696	}
1559	}	1697	}
1560		1698
1561	SV *	1699	SV *
1562	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1700	map1a_update (DC::Map self, SV *data_, int extmap)
1563	CODE:	1701	CODE:
1564	{	1702	{
1565	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1703	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566	uint8_t *data_end = (uint8_t *)SvEND (data_);	1704	uint8_t *data_end = (uint8_t *)SvEND (data_);
1567	mapcell *cell;	1705	mapcell *cell;
…		…
1595	uint8_t ext, cmd;	1733	uint8_t ext, cmd;
1596		1734
1597	do	1735	do
1598	{	1736	{
1599	ext = *data++;	1737	ext = *data++;
1600	cmd = ext & 0x3f;	1738	cmd = ext & 0x7f;
1601		1739
1602	if (cmd < 4)	1740	if (cmd < 4)
1603	cell->darkness = 255 - ext * 64 + 1;	1741	cell->darkness = 255 - ext * 64 + 1;
1604	else if (cmd == 5) // health	1742	else if (cmd == 5) // health
1605	{	1743	{
…		…
1608	}	1746	}
1609	else if (cmd == 6) // monster width	1747	else if (cmd == 6) // monster width
1610	cell->stat_width = *data++ + 1;	1748	cell->stat_width = *data++ + 1;
1611	else if (cmd == 0x47)	1749	else if (cmd == 0x47)
1612	{	1750	{
1613	if (*data == 4)	1751	if (*data == 1) cell->player = data [1];
1614	; // decode player count	1752	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1753	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1754	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615		1755
1616	data += *data + 1;	1756	data += *data + 1;
1617	}	1757	}
1618	else if (cmd == 8) // cell flags	1758	else if (cmd == 8) // cell flags
1619	cell->flags = *data++;	1759	cell->flags = *data++;
…		…
1649	}	1789	}
1650	}	1790	}
1651	}	1791	}
1652	}	1792	}
1653	else	1793	else
1654	cell->darkness = 0;	1794	CELL_CLEAR (cell);
1655	}	1795	}
1656	}	1796	}
1657	OUTPUT:	1797	OUTPUT:
1658	RETVAL	1798	RETVAL
1659		1799
1660	SV *	1800	SV *
1661	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1801	mapmap (DC::Map self, int x0, int y0, int w, int h)
1662	CODE:	1802	CODE:
1663	{	1803	{
1664	int x1, x;	1804	int x1, x;
1665	int y1, y;	1805	int y1, y;
1666	int z;	1806	int z;
…		…
1711	}	1851	}
1712	OUTPUT:	1852	OUTPUT:
1713	RETVAL	1853	RETVAL
1714		1854
1715	void	1855	void
1716	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1856	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717	CODE:	1857	CODE:
1718	{	1858	{
1719	int x, y, z;	1859	int x, y, z;
1720		1860
1721	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1861	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1862	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1863	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724	smooth_key skey;	1864	smooth_key skey;
1725		1865	int pl_x, pl_y;
		1866	maptex pl_tex;
1726	rc_t *rc = rc_alloc ();	1867	rc_t *rc = rc_alloc ();
1727	rc_key_t key;	1868	rc_key_t key;
1728	rc_array_t *arr;	1869	rc_array_t *arr;
		1870
		1871	pl_tex.name = 0;
1729		1872
1730	// thats current max. sorry.	1873	// thats current max. sorry.
1731	if (sw > 255) sw = 255;	1874	if (sw > 255) sw = 255;
1732	if (sh > 255) sh = 255;	1875	if (sh > 255) sh = 255;
1733		1876
…		…
1788	tileid tile = cell->tile [z];	1931	tileid tile = cell->tile [z];
1789		1932
1790	if (tile)	1933	if (tile)
1791	{	1934	{
1792	maptex tex = self->tex [tile];	1935	maptex tex = self->tex [tile];
1793	int px, py;	1936	int px = (x + 1) * T - tex.w;
		1937	int py = (y + 1) * T - tex.h;
1794		1938
1795	// suppressing texture state switches here
1796	// is only moderately effective, but worth the extra effort
1797	if (key.texname != tex.name)	1939	if (key.texname != tex.name)
1798	{	1940	{
1799	if (!tex.name)	1941	if (!tex.name)
1800	tex = self->tex [2]; /* missing, replace by noface */	1942	tex = self->tex [2]; /* missing, replace by noface */
1801		1943
1802	key.texname = tex.name;	1944	key.texname = tex.name;
1803	arr = rc_array (rc, &key);	1945	arr = rc_array (rc, &key);
1804	}	1946	}
1805		1947
1806	px = (x + 1) * T - tex.w;	1948	if (expect_false (cell->player == player) && expect_false (z == 2))
1807	py = (y + 1) * T - tex.h;	1949	{
		1950	pl_x = px;
		1951	pl_y = py;
		1952	pl_tex = tex;
		1953	continue;
		1954	}
1808		1955
1809	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1956	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1957	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1958	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1959	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813		1960
1814	if (cell->flags && z == 2)	1961	if (expect_false (cell->flags) && expect_false (z == 2))
1815	{	1962	{
1816	// overlays such as the speech bubble, probably more to come	1963	// overlays such as the speech bubble, probably more to come
1817	if (cell->flags & 1)	1964	if (cell->flags & 1)
1818	{	1965	{
1819	maptex tex = self->tex [1];	1966	maptex tex = self->tex [1];
…		…
1876	}	2023	}
1877	}	2024	}
1878	}	2025	}
1879	}	2026	}
1880		2027
		2028	rc_draw (rc);
		2029	rc_clear (rc);
		2030
1881	// go through all smoothlevels, lowest to highest, then draw.	2031	// go through all smoothlevels, lowest to highest, then draw.
1882	// this is basically counting sort	2032	// this is basically counting sort
1883	{	2033	{
1884	int w, b;	2034	int w, b;
1885		2035
		2036	glEnable (GL_TEXTURE_2D);
		2037	glBegin (GL_QUADS);
1886	for (w = 0; w < 256 / 32; ++w)	2038	for (w = 0; w < 256 / 32; ++w)
1887	{	2039	{
1888	uint32_t smask = smooth_level [w];	2040	uint32_t smask = smooth_level [w];
1889	if (smask)	2041	if (smask)
1890	for (b = 0; b < 32; ++b)	2042	for (b = 0; b < 32; ++b)
…		…
1915	{	2067	{
1916	// this time avoiding texture state changes	2068	// this time avoiding texture state changes
1917	// save gobs of state changes.	2069	// save gobs of state changes.
1918	if (key.texname != tex.name)	2070	if (key.texname != tex.name)
1919	{	2071	{
		2072	glEnd ();
1920	key.texname = tex.name;	2073	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921	arr = rc_array (rc, &key);	2074	glBegin (GL_QUADS);
1922	}	2075	}
1923		2076
1924	if (border)	2077	if (border)
1925	{	2078	{
1926	float ox = border * dx;	2079	float ox = border * dx;
1927		2080
1928	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2081	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2082	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2083	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2084	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932	}	2085	}
1933		2086
1934	if (corner)	2087	if (corner)
1935	{	2088	{
1936	float ox = corner * dx;	2089	float ox = corner * dx;
1937		2090
1938	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2091	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2092	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2093	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2094	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942	}	2095	}
1943	}	2096	}
1944	}	2097	}
1945	}	2098	}
1946	}	2099	}
1947	}	2100	}
		2101
		2102	glEnd ();
		2103	glDisable (GL_TEXTURE_2D);
		2104	key.texname = -1;
1948	}	2105	}
1949		2106
1950	hv_clear (smooth);	2107	hv_clear (smooth);
		2108	}
		2109
		2110	if (pl_tex.name)
		2111	{
		2112	maptex tex = pl_tex;
		2113	int px = pl_x + sdx;
		2114	int py = pl_y + sdy;
		2115
		2116	key.texname = tex.name;
		2117	arr = rc_array (rc, &key);
		2118
		2119	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2120	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2121	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2122	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2123
1951	rc_draw (rc);	2124	rc_draw (rc);
1952	rc_clear (rc);
1953	}	2125	}
1954		2126
1955	glDisable (GL_BLEND);	2127	glDisable (GL_BLEND);
1956	rc_free (rc);	2128	rc_free (rc);
1957		2129
…		…
1986	}	2158	}
1987	}	2159	}
1988	}	2160	}
1989		2161
1990	void	2162	void
1991	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2163	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1992	CODE:	2164	CODE:
1993	{	2165	{
1994	static float color[16][3] = {	2166	static float color[16][3] = {
1995	{ 0.00F, 0.00F, 0.00F },	2167	{ 0.00F, 0.00F, 0.00F },
1996	{ 1.00F, 1.00F, 1.00F },	2168	{ 1.00F, 1.00F, 1.00F },
…		…
2046	glDisable (GL_BLEND);	2218	glDisable (GL_BLEND);
2047	glDisable (GL_TEXTURE_2D);	2219	glDisable (GL_TEXTURE_2D);
2048	}	2220	}
2049		2221
2050	void	2222	void
2051	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2223	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052	PPCODE:	2224	PPCODE:
2053	{	2225	{
2054	int x, y;	2226	int x, y;
2055	int sw1 = sw + 2;	2227	int sw1 = sw + 2;
2056	int sh1 = sh + 2;	2228	int sh1 = sh + 2;
…		…
2064	SvCUR_set (darkness3_sv, sw34 * sh3);	2236	SvCUR_set (darkness3_sv, sw34 * sh3);
2065		2237
2066	mx += self->x - 1;	2238	mx += self->x - 1;
2067	my += self->y - 1;	2239	my += self->y - 1;
2068		2240
2069	memset (darkness1, 255, sw1 * sh1);	2241	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2070		2242
2071	for (y = 0; y < sh1; y++)	2243	for (y = 0; y < sh1; y++)
2072	if (0 <= y + my && y + my < self->rows)	2244	if (0 <= y + my && y + my < self->rows)
2073	{	2245	{
2074	maprow *row = self->row + (y + my);	2246	maprow *row = self->row + (y + my);
…		…
2127	PUSHs (sv_2mortal (newSViv (sh3)));	2299	PUSHs (sv_2mortal (newSViv (sh3)));
2128	PUSHs (darkness3_sv);	2300	PUSHs (darkness3_sv);
2129	}	2301	}
2130		2302
2131	SV *	2303	SV *
2132	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2304	get_rect (DC::Map self, int x0, int y0, int w, int h)
2133	CODE:	2305	CODE:
2134	{	2306	{
2135	int x, y, x1, y1;	2307	int x, y, x1, y1;
2136	SV *data_sv = newSV (w * h * 7 + 5);	2308	SV *data_sv = newSV (w * h * 7 + 5);
2137	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2309	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2194	else	2366	else
2195	*data++ = 0;	2367	*data++ = 0;
2196	}	2368	}
2197	}	2369	}
2198		2370
		2371	/* if size is w*h + 5 then no data has been found */
		2372	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2373	{
2199	SvPOK_only (data_sv);	2374	SvPOK_only (data_sv);
2200	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2375	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2376	}
		2377
2201	RETVAL = data_sv;	2378	RETVAL = data_sv;
2202	}	2379	}
2203	OUTPUT:	2380	OUTPUT:
2204	RETVAL	2381	RETVAL
2205		2382
2206	void	2383	void
2207	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2384	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208	PPCODE:	2385	PPCODE:
2209	{	2386	{
2210	int x, y, z;	2387	int x, y, z;
2211	int w, h;	2388	int w, h;
2212	int x1, y1;	2389	int x1, y1;
		2390	STRLEN len;
		2391	uint8_t *data, *end;
		2392
		2393	len = SvLEN (data_sv);
		2394	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2395	data = SvPVbyte_nolen (data_sv);
		2396	end = data + len + 8;
		2397
		2398	if (len < 5)
		2399	XSRETURN_EMPTY;
2213		2400
2214	if (*data++ != 0)	2401	if (*data++ != 0)
2215	return; /* version mismatch */	2402	XSRETURN_EMPTY; /* version mismatch */
2216		2403
2217	w = *data++ << 8; w |= *data++;	2404	w = *data++ << 8; w |= *data++;
2218	h = *data++ << 8; h |= *data++;	2405	h = *data++ << 8; h |= *data++;
2219		2406
2220	// we need to do this 'cause we don't keep an absolute coord system for rows	2407	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2232	{	2419	{
2233	maprow *row = map_get_row (self, y);	2420	maprow *row = map_get_row (self, y);
2234		2421
2235	for (x = x0; x < x1; x++)	2422	for (x = x0; x < x1; x++)
2236	{	2423	{
		2424	uint8_t flags;
		2425
		2426	if (data + 7 >= end)
		2427	XSRETURN_EMPTY;
		2428
2237	uint8_t flags = *data++;	2429	flags = *data++;
2238		2430
2239	if (flags)	2431	if (flags)
2240	{	2432	{
2241	mapcell *cell = row_get_cell (row, x);	2433	mapcell *cell = row_get_cell (row, x);
2242	tileid tile[3] = { 0, 0, 0 };	2434	tileid tile[3] = { 0, 0, 0 };
…		…
2245	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2437	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2438	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247		2439
2248	if (cell->darkness == 0)	2440	if (cell->darkness == 0)
2249	{	2441	{
2250	cell->darkness = 0;	2442	/*cell->darkness = 0;*/
		2443	EXTEND (SP, 3);
2251		2444
2252	for (z = 0; z <= 2; z++)	2445	for (z = 0; z <= 2; z++)
2253	{	2446	{
2254	tileid t = tile [z];	2447	tileid t = tile [z];
2255		2448
2256	if (t >= self->texs || (t && !self->tex [t].name))	2449	if (t >= self->texs || (t && !self->tex [t].name))
2257	{	2450	{
2258	XPUSHs (sv_2mortal (newSViv (t)));	2451	PUSHs (sv_2mortal (newSViv (t)));
2259	need_texid (self, t);	2452	need_texid (self, t);
2260	}	2453	}
2261		2454
2262	cell->tile [z] = t;	2455	cell->tile [z] = t;
2263	}	2456	}
…		…
2265	}	2458	}
2266	}	2459	}
2267	}	2460	}
2268	}	2461	}
2269		2462
2270	MODULE = CFPlus PACKAGE = CFPlus::RW	2463	MODULE = Deliantra::Client PACKAGE = DC::RW
2271		2464
2272	CFPlus::RW	2465	DC::RW
2273	new (SV *class, SV *data_sv)	2466	new (SV *class, SV *data_sv)
2274	CODE:	2467	CODE:
2275	{	2468	{
2276	STRLEN datalen;	2469	STRLEN datalen;
2277	char *data = SvPVbyte (data_sv, datalen);	2470	char *data = SvPVbyte (data_sv, datalen);
…		…
2279	RETVAL = SDL_RWFromConstMem (data, datalen);	2472	RETVAL = SDL_RWFromConstMem (data, datalen);
2280	}	2473	}
2281	OUTPUT:	2474	OUTPUT:
2282	RETVAL	2475	RETVAL
2283		2476
2284	CFPlus::RW	2477	DC::RW
2285	new_from_file (SV *class, const char *path, const char *mode = "rb")	2478	new_from_file (SV *class, const char *path, const char *mode = "rb")
2286	CODE:	2479	CODE:
2287	RETVAL = SDL_RWFromFile (path, mode);	2480	RETVAL = SDL_RWFromFile (path, mode);
2288	OUTPUT:	2481	OUTPUT:
2289	RETVAL	2482	RETVAL
2290		2483
2291	# fails on win32:	2484	# fails on win32:
2292	# CFPlus.xs(2268) : error C2059: syntax error : '('	2485	# dc.xs(2268) : error C2059: syntax error : '('
2293	#void	2486	#void
2294	#close (CFPlus::RW self)	2487	#close (DC::RW self)
2295	# CODE:	2488	# CODE:
2296	# (self->(close)) (self);	2489	# (self->(close)) (self);
2297		2490
2298	MODULE = CFPlus PACKAGE = CFPlus::Channel	2491	MODULE = Deliantra::Client PACKAGE = DC::Channel
2299		2492
2300	PROTOTYPES: DISABLE	2493	PROTOTYPES: DISABLE
2301		2494
2302	CFPlus::Channel	2495	DC::Channel
2303	find ()	2496	find ()
2304	CODE:	2497	CODE:
2305	{	2498	{
2306	RETVAL = Mix_GroupAvailable (-1);	2499	RETVAL = Mix_GroupAvailable (-1);
2307		2500
…		…
2320	}	2513	}
2321	OUTPUT:	2514	OUTPUT:
2322	RETVAL	2515	RETVAL
2323		2516
2324	void	2517	void
2325	halt (CFPlus::Channel self)	2518	halt (DC::Channel self)
2326	CODE:	2519	CODE:
2327	Mix_HaltChannel (self);	2520	Mix_HaltChannel (self);
2328		2521
2329	void	2522	void
2330	expire (CFPlus::Channel self, int ticks = -1)	2523	expire (DC::Channel self, int ticks = -1)
2331	CODE:	2524	CODE:
2332	Mix_ExpireChannel (self, ticks);	2525	Mix_ExpireChannel (self, ticks);
2333		2526
2334	void	2527	void
2335	fade_out (CFPlus::Channel self, int ticks = -1)	2528	fade_out (DC::Channel self, int ticks = -1)
2336	CODE:	2529	CODE:
2337	Mix_FadeOutChannel (self, ticks);	2530	Mix_FadeOutChannel (self, ticks);
2338		2531
2339	int	2532	int
2340	volume (CFPlus::Channel self, int volume)	2533	volume (DC::Channel self, int volume)
2341	CODE:	2534	CODE:
2342	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2535	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343	OUTPUT:	2536	OUTPUT:
2344	RETVAL	2537	RETVAL
2345		2538
2346	void	2539	void
2347	unregister_all_effects (CFPlus::Channel self)	2540	unregister_all_effects (DC::Channel self)
2348	CODE:	2541	CODE:
2349	Mix_UnregisterAllEffects (self);	2542	Mix_UnregisterAllEffects (self);
2350		2543
2351	void	2544	void
2352	set_panning (CFPlus::Channel self, int left, int right)	2545	set_panning (DC::Channel self, int left, int right)
2353	CODE:	2546	CODE:
2354	left = CLAMP (left , 0, 255);	2547	left = CLAMP (left , 0, 255);
2355	right = CLAMP (right, 0, 255);	2548	right = CLAMP (right, 0, 255);
2356	Mix_SetPanning (self, left, right);	2549	Mix_SetPanning (self, left, right);
2357		2550
2358	void	2551	void
2359	set_distance (CFPlus::Channel self, int distance)	2552	set_distance (DC::Channel self, int distance)
2360	CODE:	2553	CODE:
2361	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2554	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362		2555
2363	void	2556	void
2364	set_position (CFPlus::Channel self, int angle, int distance)	2557	set_position (DC::Channel self, int angle, int distance)
2365	CODE:	2558	CODE:
2366		2559
2367	void	2560	void
2368	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2561	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369	CODE:	2562	CODE:
2370	{	2563	{
2371	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2564	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2565	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2373	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2566	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374	}	2567	}
2375		2568
2376	void	2569	void
2377	set_reverse_stereo (CFPlus::Channel self, int flip)	2570	set_reverse_stereo (DC::Channel self, int flip)
2378	CODE:	2571	CODE:
2379	Mix_SetReverseStereo (self, flip);	2572	Mix_SetReverseStereo (self, flip);
2380		2573
2381	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2574	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382		2575
2383	PROTOTYPES: DISABLE	2576	PROTOTYPES: DISABLE
2384		2577
2385	CFPlus::MixChunk	2578	DC::MixChunk
2386	new (SV *class, CFPlus::RW rwops)	2579	new (SV *class, DC::RW rwops)
2387	CODE:	2580	CODE:
2388	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2581	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389	OUTPUT:	2582	OUTPUT:
2390	RETVAL	2583	RETVAL
2391		2584
2392	void	2585	void
2393	DESTROY (CFPlus::MixChunk self)	2586	DESTROY (DC::MixChunk self)
2394	CODE:	2587	CODE:
2395	Mix_FreeChunk (self);	2588	Mix_FreeChunk (self);
2396		2589
2397	int	2590	int
2398	volume (CFPlus::MixChunk self, int volume = -1)	2591	volume (DC::MixChunk self, int volume = -1)
2399	CODE:	2592	CODE:
2400	if (items > 1)	2593	if (items > 1)
2401	volume = CLAMP (volume, 0, 128);	2594	volume = CLAMP (volume, 0, 128);
2402	RETVAL = Mix_VolumeChunk (self, volume);	2595	RETVAL = Mix_VolumeChunk (self, volume);
2403	OUTPUT:	2596	OUTPUT:
2404	RETVAL	2597	RETVAL
2405		2598
2406	CFPlus::Channel	2599	DC::Channel
2407	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2600	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408	CODE:	2601	CODE:
2409	{	2602	{
2410	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2603	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411		2604
2412	if (RETVAL < 0)	2605	if (RETVAL < 0)
…		…
2419	}	2612	}
2420	}	2613	}
2421	OUTPUT:	2614	OUTPUT:
2422	RETVAL	2615	RETVAL
2423		2616
2424	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2617	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2425		2618
2426	int	2619	int
2427	volume (int volume = -1)	2620	volume (int volume = -1)
2428	PROTOTYPE: ;$	2621	PROTOTYPE: ;$
2429	CODE:	2622	CODE:
…		…
2441	void	2634	void
2442	halt ()	2635	halt ()
2443	CODE:	2636	CODE:
2444	Mix_HaltMusic ();	2637	Mix_HaltMusic ();
2445		2638
2446	CFPlus::MixMusic	2639	DC::MixMusic
2447	new (SV *class, CFPlus::RW rwops)	2640	new (SV *class, DC::RW rwops)
2448	CODE:	2641	CODE:
2449	RETVAL = Mix_LoadMUS_RW (rwops);	2642	RETVAL = Mix_LoadMUS_RW (rwops);
2450	OUTPUT:	2643	OUTPUT:
2451	RETVAL	2644	RETVAL
2452		2645
2453	void	2646	void
2454	DESTROY (CFPlus::MixMusic self)	2647	DESTROY (DC::MixMusic self)
2455	CODE:	2648	CODE:
2456	Mix_FreeMusic (self);	2649	Mix_FreeMusic (self);
2457		2650
2458	int	2651	int
2459	play (CFPlus::MixMusic self, int loops = -1)	2652	play (DC::MixMusic self, int loops = -1)
2460	CODE:	2653	CODE:
2461	RETVAL = Mix_PlayMusic (self, loops);	2654	RETVAL = Mix_PlayMusic (self, loops);
2462	OUTPUT:	2655	OUTPUT:
2463	RETVAL	2656	RETVAL
2464		2657
2465	void	2658	void
2466	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2659	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467	CODE:	2660	CODE:
2468	Mix_FadeInMusicPos (self, loops, ms, position);	2661	Mix_FadeInMusicPos (self, loops, ms, position);
2469		2662
2470	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2663	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471		2664
2472	PROTOTYPES: ENABLE	2665	PROTOTYPES: ENABLE
2473		2666
2474	BOOT:	2667	BOOT:
2475	{	2668	{
2476	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2669	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477	static const struct {	2670	static const struct {
2478	const char *name;	2671	const char *name;
2479	IV iv;	2672	IV iv;
2480	} *civ, const_iv[] = {	2673	} *civ, const_iv[] = {
2481	# define const_iv(name) { # name, (IV)name }	2674	# define const_iv(name) { # name, (IV)name }
…		…
2516	const_iv (GL_INTENSITY),	2709	const_iv (GL_INTENSITY),
2517	const_iv (GL_LUMINANCE),	2710	const_iv (GL_LUMINANCE),
2518	const_iv (GL_LUMINANCE_ALPHA),	2711	const_iv (GL_LUMINANCE_ALPHA),
2519	const_iv (GL_FLOAT),	2712	const_iv (GL_FLOAT),
2520	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2713	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2714	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2715	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2716	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2717	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2718	const_iv (GL_COMPRESSED_RGB_ARB),
		2719	const_iv (GL_COMPRESSED_RGBA_ARB),
2521	const_iv (GL_COMPILE),	2720	const_iv (GL_COMPILE),
2522	const_iv (GL_PROXY_TEXTURE_1D),	2721	const_iv (GL_PROXY_TEXTURE_1D),
2523	const_iv (GL_PROXY_TEXTURE_2D),	2722	const_iv (GL_PROXY_TEXTURE_2D),
2524	const_iv (GL_TEXTURE_1D),	2723	const_iv (GL_TEXTURE_1D),
2525	const_iv (GL_TEXTURE_2D),	2724	const_iv (GL_TEXTURE_2D),
…		…
2564	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2763	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565	const_iv (GL_POINT_SMOOTH_HINT),	2764	const_iv (GL_POINT_SMOOTH_HINT),
2566	const_iv (GL_LINE_SMOOTH_HINT),	2765	const_iv (GL_LINE_SMOOTH_HINT),
2567	const_iv (GL_POLYGON_SMOOTH_HINT),	2766	const_iv (GL_POLYGON_SMOOTH_HINT),
2568	const_iv (GL_GENERATE_MIPMAP_HINT),	2767	const_iv (GL_GENERATE_MIPMAP_HINT),
		2768	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569	const_iv (GL_FASTEST),	2769	const_iv (GL_FASTEST),
2570	const_iv (GL_DONT_CARE),	2770	const_iv (GL_DONT_CARE),
2571	const_iv (GL_NICEST),	2771	const_iv (GL_NICEST),
2572	const_iv (GL_V2F),	2772	const_iv (GL_V2F),
2573	const_iv (GL_V3F),	2773	const_iv (GL_V3F),
…		…
2581		2781
2582	texture_av = newAV ();	2782	texture_av = newAV ();
2583	AvREAL_off (texture_av);	2783	AvREAL_off (texture_av);
2584	}	2784	}
2585		2785
		2786	void
		2787	disable_GL_EXT_blend_func_separate ()
		2788	CODE:
		2789	gl.BlendFuncSeparate = 0;
		2790	gl.BlendFuncSeparateEXT = 0;
		2791
2586	char *	2792	char *
2587	gl_vendor ()	2793	gl_vendor ()
2588	CODE:	2794	CODE:
2589	RETVAL = (char *)glGetString (GL_VENDOR);	2795	RETVAL = (char *)glGetString (GL_VENDOR);
2590	OUTPUT:	2796	OUTPUT:
…		…
2711		2917
2712	void glRect (float x1, float y1, float x2, float y2)	2918	void glRect (float x1, float y1, float x2, float y2)
2713	CODE:	2919	CODE:
2714	glRectf (x1, y1, x2, y2);	2920	glRectf (x1, y1, x2, y2);
2715		2921
		2922	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2923	CODE:
		2924	glBegin (GL_LINE_LOOP);
		2925	glVertex2f (x1, y1);
		2926	glVertex2f (x2, y1);
		2927	glVertex2f (x2, y2);
		2928	glVertex2f (x1, y2);
		2929	glEnd ();
		2930
2716	PROTOTYPES: ENABLE	2931	PROTOTYPES: ENABLE
2717		2932
2718	void glBegin (int mode)	2933	void glBegin (int mode)
2719		2934
2720	void glEnd ()	2935	void glEnd ()
…		…
2752	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2967	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753	CODE:	2968	CODE:
2754	if (gl.SeparableFilter2D)	2969	if (gl.SeparableFilter2D)
2755	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2970	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756		2971
2757	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2972	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758		2973
2759	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2974	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760		2975
2761	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2976	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762		2977
…		…
2788		3003
2789	void glEndList ()	3004	void glEndList ()
2790		3005
2791	void glCallList (int list)	3006	void glCallList (int list)
2792		3007
2793	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3008	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794		3009
2795	PROTOTYPES: DISABLE	3010	PROTOTYPES: DISABLE
2796		3011
2797	void	3012	void
2798	find_widget (SV *self, NV x, NV y)	3013	find_widget (SV *self, NV x, NV y)
…		…
2802	XPUSHs (self);	3017	XPUSHs (self);
2803	}	3018	}
2804		3019
2805	BOOT:	3020	BOOT:
2806	{	3021	{
2807	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3022	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808		3023
2809	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3024	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3025	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3026	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3027	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813	}	3028	}
2814		3029
2815	void	3030	void
2816	draw (SV *self)	3031	draw (SV *self)
2817	CODE:	3032	CODE:
…		…
2821	NV x, y, w, h;	3036	NV x, y, w, h;
2822	SV *draw_x_sv = GvSV (draw_x_gv);	3037	SV *draw_x_sv = GvSV (draw_x_gv);
2823	SV *draw_y_sv = GvSV (draw_y_gv);	3038	SV *draw_y_sv = GvSV (draw_y_gv);
2824	SV *draw_w_sv = GvSV (draw_w_gv);	3039	SV *draw_w_sv = GvSV (draw_w_gv);
2825	SV *draw_h_sv = GvSV (draw_h_gv);	3040	SV *draw_h_sv = GvSV (draw_h_gv);
2826	SV *hover;
2827	double draw_x, draw_y, draw_w, draw_h;	3041	double draw_x, draw_y;
2828		3042
2829	if (!SvROK (self))	3043	if (!SvROK (self))
2830	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3044	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831		3045
2832	hv = (HV *)SvRV (self);	3046	hv = (HV *)SvRV (self);
2833		3047
2834	if (SvTYPE (hv) != SVt_PVHV)	3048	if (SvTYPE (hv) != SVt_PVHV)
2835	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3049	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836		3050
2837	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3051	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3052	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839		3053
2840	if (!h || !w)	3054	if (!h || !w)
…		…
2860	{	3074	{
2861	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3075	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862		3076
2863	if (svp && SvTRUE (*svp))	3077	if (svp && SvTRUE (*svp))
2864	{	3078	{
2865	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3079	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866	glEnable (GL_BLEND);	3080	glEnable (GL_BLEND);
2867	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3081	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868	glBegin (GL_QUADS);	3082	glBegin (GL_QUADS);
2869	glVertex2f (0, 0);	3083	glVertex2f (0, 0);
2870	glVertex2f (w, 0);	3084	glVertex2f (w, 0);
…		…
2873	glEnd ();	3087	glEnd ();
2874	glDisable (GL_BLEND);	3088	glDisable (GL_BLEND);
2875	}	3089	}
2876	}	3090	}
2877	#if 0	3091	#if 0
2878	if ($ENV{CFPLUS_DEBUG} & 1) {	3092	// draw borders, for debugging
2879	glPushMatrix;	3093	glPushMatrix ();
2880	glColor 1, 1, 0, 1;	3094	glColor4f (1., 1., 0., 1.);
2881	glTranslate 0.375, 0.375;	3095	glTranslatef (.5, .5, 0.);
2882	glBegin GL_LINE_LOOP;	3096	glBegin (GL_LINE_LOOP);
2883	glVertex 0 , 0;	3097	glVertex2f (0 , 0);
2884	glVertex $self->{w} - 1, 0;	3098	glVertex2f (w - 1, 0);
2885	glVertex $self->{w} - 1, $self->{h} - 1;	3099	glVertex2f (w - 1, h - 1);
2886	glVertex 0 , $self->{h} - 1;	3100	glVertex2f (0 , h - 1);
2887	glEnd;	3101	glEnd ();
2888	glPopMatrix;	3102	glPopMatrix ();
2889	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890	}
2891	#endif	3103	#endif
2892	PUSHMARK (SP);	3104	PUSHMARK (SP);
2893	XPUSHs (self);	3105	XPUSHs (self);
2894	PUTBACK;	3106	PUTBACK;
2895	call_method ("_draw", G_VOID | G_DISCARD);	3107	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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